diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-07 09:53:09 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-07 09:53:09 +0000 |
| commit | 43436103bd687524182d0cdee741f5b996c378d9 (patch) | |
| tree | 10a38a8df13cd3b0b515c6c438e158da290a9307 | |
| parent | 83db88d96bc6f6a96eb577f660cc592be3278da1 (diff) | |
| parent | f33e29a239b9ffb650714a9e3cc1ee0e5f8d5d1c (diff) | |
merge of '20d0fba0036cb5884005ec525ad0313ac816ab40'
and '42116cabf57a560c5f62c543e5cfde0687c99243'
| -rw-r--r-- | packages/rxvt-unicode/rxvt-unicode_7.9.bb | 6 | ||||
| -rw-r--r-- | packages/xorg-xserver/gumstix-kmode.patch | 23 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 6 |
3 files changed, 32 insertions, 3 deletions
diff --git a/packages/rxvt-unicode/rxvt-unicode_7.9.bb b/packages/rxvt-unicode/rxvt-unicode_7.9.bb index 72d686bffd..e08583527c 100644 --- a/packages/rxvt-unicode/rxvt-unicode_7.9.bb +++ b/packages/rxvt-unicode/rxvt-unicode_7.9.bb @@ -13,7 +13,7 @@ FILES_${PN}-control = "${bindir}/rxvtc" SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch;patch=1 \ file://signedchar.patch;patch=1" -PR = "r0" +PR = "r1" inherit autotools update-alternatives @@ -23,6 +23,10 @@ ALTERNATIVE_PATH = "${bindir}/rxvt" CFLAGS_append = " -fpermissive" +# This is necessary so that the "tic" command executed during the install can +# link with the correct libary in staging. +export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}" + EXTRA_OECONF = "--enable-menubar --enable-xim \ --enable-utmp --enable-wtmp --enable-lastlog \ --disable-strings --with-term=rxvt --enable-keepscrolling \ diff --git a/packages/xorg-xserver/gumstix-kmode.patch b/packages/xorg-xserver/gumstix-kmode.patch new file mode 100644 index 0000000000..56817a7001 --- /dev/null +++ b/packages/xorg-xserver/gumstix-kmode.patch @@ -0,0 +1,23 @@ +--- /tmp/kmode.c 2007-10-07 11:49:52.000000000 +0200 ++++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2007-10-07 11:51:57.962045000 +0200 +@@ -119,7 +119,19 @@ + 0, 0, 0, KdSyncNegative, /* 59.940 */ + }, + +- ++ ++/* gumstix console-vx */ ++ { 480, 272, 60, 0, /* VESA */ ++ 0, 0, 0, KdSyncNegative, /* 31.469 */ ++ 0, 0, 0, KdSyncNegative, /* 59.940 */ ++ }, ++ ++ { 272, 480, 60, 0, /* VESA */ ++ 0, 0, 0, KdSyncNegative, /* 31.469 */ ++ 0, 0, 0, KdSyncNegative, /* 59.940 */ ++ }, ++ ++ + /* 800x600 modes */ + { 800, 600, 85, 56250, /* VESA */ + 32, 152, 248, KdSyncPositive, /* 53.674 */ diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 5f0896f3ed..3cc67078a0 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r17" +PR = "r19" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -19,7 +19,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://w100.patch;patch=1 \ file://w100-autofoo.patch;patch=1 \ file://w100-fix-offscreen-bmp.patch;patch=1 \ - " + file://kdrive-1.3-18bpp.patch;patch=1 \ + file://gumstix-kmode.patch;patch=1 \ +" S = "${WORKDIR}/xorg-server-${PV}" |