diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-04-16 23:34:56 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-04-16 23:34:56 +0000 |
| commit | bd2c4bc3daa27db43dc103d1a836d6aa086d9efe (patch) | |
| tree | 877baab4fa91c84297b7884ad4c1b3b353f4afbe /x11-base/xorg-server/files | |
| parent | Initial commit. (diff) | |
| download | gentoo-2-bd2c4bc3daa27db43dc103d1a836d6aa086d9efe.tar.gz gentoo-2-bd2c4bc3daa27db43dc103d1a836d6aa086d9efe.tar.bz2 gentoo-2-bd2c4bc3daa27db43dc103d1a836d6aa086d9efe.zip | |
Version bump. Drop old patches.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'x11-base/xorg-server/files')
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch | 25 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch | 32 |
2 files changed, 0 insertions, 57 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch b/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch deleted file mode 100644 index 6e1b3e59401c..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c5eeb329f06a3c58704351261f8633c0ed753f18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 4 Oct 2010 19:02:29 +0200 -Subject: [PATCH] Fix linking with tslib, with -Wl,--as-needed. - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4408e86..47df6c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1981,7 +1981,7 @@ if test "$KDRIVE" = yes; then - KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" -- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS" -+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $TSLIB_LIBS" - - AC_SUBST([XEPHYR_LIBS]) - AC_SUBST([XEPHYR_INCS]) --- -1.7.3.1 - diff --git a/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch deleted file mode 100644 index 3d144e2dd3b6..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.8-nouveau-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c -index 7f4ada8..d964c6c 100644 ---- a/hw/xfree86/common/xf86AutoConfig.c -+++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev, - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: -+ switch (dev->device_id) { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[0] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[0] = "nv"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ driverList[1] = "nv"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; --- -1.6.5.2 |