diff options
| -rw-r--r-- | recipes/tasks/task-sdk-extra.bb | 15 | ||||
| -rw-r--r-- | recipes/xorg-lib/libx11_1.2.bb | 5 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive-common.inc | 1 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch | 24 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 2 |
5 files changed, 37 insertions, 10 deletions
diff --git a/recipes/tasks/task-sdk-extra.bb b/recipes/tasks/task-sdk-extra.bb index c4414dbcf8..98234cea1c 100644 --- a/recipes/tasks/task-sdk-extra.bb +++ b/recipes/tasks/task-sdk-extra.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages" -PR = "r8" +PR = "r10" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -25,17 +25,14 @@ RDEPENDS_task-sdk-x11-ext = "\ libxcursor-dev \ libxdmcp-dev \ libxft-dev \ - libxrandr-dev \ - libxrender-dev \ libxsettings-client-dev \ randrproto-dev \ libxau-dev \ - xcalibrateext-dev \ - libxcomposite-dev \ - libxdamage-dev \ - libxext-dev \ + calibrateproto-dev \ + compositeproto-dev \ + damageproto-dev \ xextproto-dev \ - libxfont-dev \ + fontsproto-dev \ libxpm-dev \ xproto-dev \ libxt-dev \ @@ -52,5 +49,5 @@ RDEPENDS_task-sdk-gpe = "\ libgpelaunch-dev \ libgpewidget-dev \ libhandoff-dev \ + libxi-dev \ gconf-dbus-dev" - diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb index a3d000f030..e9665bcc2f 100644 --- a/recipes/xorg-lib/libx11_1.2.bb +++ b/recipes/xorg-lib/libx11_1.2.bb @@ -13,6 +13,11 @@ SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" +# Dolt gets used on x86 and ppc and hardcodes 'libtool' +do_configure_append() { + cp ${TARGET_PREFIX}libtool libtool || true +} + do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc index dadfbbb5e7..bcd3d684eb 100644 --- a/recipes/xorg-xserver/xserver-kdrive-common.inc +++ b/recipes/xorg-xserver/xserver-kdrive-common.inc @@ -73,6 +73,7 @@ SRC_URI ?= "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES}" KDRIVE_COMMON_PATCHES = " \ file://kmode.patch;patch=1 \ + file://kmode-800_480.patch;patch=1 \ file://disable-apm.patch;patch=1 \ file://no-serial-probing.patch;patch=1 \ file://fbdev-not-fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch b/recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch new file mode 100644 index 0000000000..61c2ec4afc --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive/kmode-800_480.patch @@ -0,0 +1,24 @@ +--- a/hw/kdrive/src/kmode.c~ 2009-05-28 16:30:24.000000000 +0200 ++++ b/hw/kdrive/src/kmode.c 2009-05-28 16:30:24.000000000 +0200 +@@ -112,10 +112,18 @@ + }, + + +- { 480, 640, 60, 0, /* VESA */ +- 0, 0, 0, KdSyncNegative, /* 31.469 */ ++ { 480, 640, 60, 0, /* VESA */ ++ 0, 0, 0, KdSyncNegative, /* 31.469 */ + 0, 0, 0, KdSyncNegative, /* 59.940 */ +- }, ++ }, ++ { 800, 480, 51, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ { 480, 800, 51, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, + + + /* 800x600 modes */ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index 70503d749c..fe0335d2cd 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r5" +PR = "r6" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ |