Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=527a432cd2e0f443f30748314f214f66ec8766bf
commit 527a432cd2e0f443f30748314f214f66ec8766bf Author: Michel Hermier <herm...@frugalware.org> Date: Fri Jan 21 22:26:02 2011 +0100 xorg-server-1.9.3-2-i686 * Remove long dead multibuffer option. * Add patch to enable nouveau by default (nv fallback). diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 1e50ada..cfcdba1 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -6,11 +6,10 @@ USE_DGA=${USE_DGA:-"y"} USE_KDRIVE=${USE_KDRIVE:-"y"} USE_UDEV=${USE_UDEV:-"y"} USE_SERVERDMX=${USE_SERVERDMX:-"y"} -USE_MULTIBUFFER=${USE_MULTIBUFFER:-"n"} pkgname=xorg-server pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64' 'ppc') @@ -36,10 +35,14 @@ backup=('etc/sysconfig/desktop' 'etc/X11/xorg.conf.d/10-evdev.conf' \ 'etc/X11/xorg.conf.d/20-synaptics.conf') _F_archive_grepv="99" Finclude xorg -source=(${source[@]} \ - desktop 10-evdev.conf 20-synaptics.conf) +source=("${source[@]}" \ + xorg-server-1.9-nouveau-default.patch + desktop \ + 10-evdev.conf \ + 20-synaptics.conf) sha1sums=('4f275aa4dc76ca0b727d1b87c9bd0e85f78c91be' \ + 'bda6f333b53fcc2e1d823364a1e12e2061a66700' \ '905cc57547421ff3ca77ec1c8e6898a7a414346f' \ '9318b631eb06833bea18d5a5efd15df89ad5d12a' \ '6c0156d129ddd2fb5277b76af1738298c2d09d4d') @@ -53,8 +56,6 @@ if Fuse $USE_DEVEL; then source=(${source[@]} desktop) fi - - Fconfopts="${Fconfopts[@]} --disable-static \ --enable-ipv6 \ @@ -126,16 +127,9 @@ if Fuse $USE_SERVERDMX; then subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') Fconfopts="${Fconfopts[@]} --enable-dmx" - if Fuse $USE_MULTIBUFFER; then - Fconfopts="${Fconfopts[@]} --enable-multibuffer" - else - Fconfopts="${Fconfopts[@]} --disable-multibuffer" - fi - else Fconfopts="${Fconfopts[@]} - --disable-dmx \ - --disable-multibuffer" + --disable-dmx" fi if Fuse $USE_DGA; then diff --git a/source/x11/xorg-server/xorg-server-1.9-nouveau-default.patch b/source/x11/xorg-server/xorg-server-1.9-nouveau-default.patch new file mode 100644 index 0000000..7bbde41 --- /dev/null +++ b/source/x11/xorg-server/xorg-server-1.9-nouveau-default.patch @@ -0,0 +1,31 @@ +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index 74016af..9c296f5 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1118,7 +1118,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; +-- _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git