From d139124e3caf3f49b1f0088cc2e70b5f231d3aaa Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 5 Mar 2012 09:24:28 +0100 Subject: [PATCH] xorg-server: update to 1.12.0. --- srcpkgs/xorg-server/INSTALL | 7 --- srcpkgs/xorg-server/depends | 2 +- .../patches/autoconfig-nvidia.patch | 54 +++++++++---------- .../xorg-server/patches/autoconfig-sis.patch | 19 +++++++ srcpkgs/xorg-server/template | 14 +++-- 5 files changed, 55 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/xorg-server/INSTALL create mode 100644 srcpkgs/xorg-server/patches/autoconfig-sis.patch diff --git a/srcpkgs/xorg-server/INSTALL b/srcpkgs/xorg-server/INSTALL deleted file mode 100644 index 6f0fefe3cff..00000000000 --- a/srcpkgs/xorg-server/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -# -# Sets up correct perms to Xorg. -case "${ACTION}" in -post) - chmod 4755 usr/bin/Xorg || exit $? - ;; -esac diff --git a/srcpkgs/xorg-server/depends b/srcpkgs/xorg-server/depends index dc19526fa5c..ddac921f128 100644 --- a/srcpkgs/xorg-server/depends +++ b/srcpkgs/xorg-server/depends @@ -1,2 +1,2 @@ -abi_depends=">=1.11.0" +abi_depends=">=1.12.0" api_depends="${abi_depends}" diff --git a/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch b/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch index e85c10a5403..b2667860631 100644 --- a/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch +++ b/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch @@ -1,29 +1,27 @@ ---- hw/xfree86/common/xf86pciBus.c -+++ hw/xfree86/common/xf86pciBus.c -@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * +--- hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 +@@ -1111,7 +1111,23 @@ + { + int idx = 0; + #ifdef __linux__ +- driverList[idx++] = "nouveau"; ++ switch (dev->device_id) ++ { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[idx++] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[idx++] = "nouveau"; ++ break; ++ default: ++ driverList[idx++] = "nouveau"; ++ driverList[idx++] = "nvidia"; ++ break; ++ } + #endif + driverList[idx++] = "nv"; 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"; -+ driverList[2] = "nvidia"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; diff --git a/srcpkgs/xorg-server/patches/autoconfig-sis.patch b/srcpkgs/xorg-server/patches/autoconfig-sis.patch new file mode 100644 index 00000000000..9a75453cf05 --- /dev/null +++ b/srcpkgs/xorg-server/patches/autoconfig-sis.patch @@ -0,0 +1,19 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1140,7 +1140,15 @@ + driverList[0] = "savage"; break; + } + break; +- case 0x1039: driverList[0] = "sis"; break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: driverList[0] = "siliconmotion"; break; + case 0x121a: + if (dev->device_id < 0x0003) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index b8cde74e83b..0e01108dddf 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,6 +1,6 @@ # Template build file for 'xorg-server'. pkgname=xorg-server -version=1.11.4 +version=1.12.0 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--enable-ipv6 --enable-xcsecurity --enable-record @@ -9,12 +9,13 @@ configure_args="--enable-ipv6 --enable-xcsecurity --enable-record --disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11 --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto ---disable-dmx --disable-xfree86-utils --enable-dga" -short_desc="Modular X11 server from modular X.org" +--disable-dmx --disable-xfree86-utils --enable-dga +--enable-install-setuid" +short_desc="X11 server from X.org" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" license="MIT/X11, BSD" -checksum=3e2935bc400612df58d5b5e6840829e2c63af02c2e7d2893092500358a4366fc +checksum=280a14c5de8697a4aab18dca85429671286e69e5ada0c1535f03666e56f07799 long_desc=" The X11 server from the modularized source tree of X.org." @@ -25,8 +26,9 @@ subpackages="$pkgname-devel" Add_dependency run MesaLib Add_dependency build pkg-config -Add_dependency build perl ">=0" +Add_dependency build perl Add_dependency build flex +Add_dependency build inputproto ">=2.2" Add_dependency build glproto ">=1.4.14" Add_dependency build xproto ">=7.0.22" Add_dependency build dri2proto ">=2.1" @@ -37,6 +39,8 @@ Add_dependency build compositeproto Add_dependency build scrnsaverproto Add_dependency build resourceproto Add_dependency build xineramaproto +Add_dependency build xcmiscproto +Add_dependency build bigreqsproto Add_dependency build libudev-devel Add_dependency build openssl-devel Add_dependency build libX11-devel