diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/xorg-server/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/xorg-server/autoconfig-nvidia-libre.patch | 26 |
2 files changed, 3 insertions, 36 deletions
diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD index b99ae0d28..a2e9830a4 100644 --- a/libre/xorg-server/PKGBUILD +++ b/libre/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 225889 2014-11-10 18:57:26Z andyrtr $ +# $Id: PKGBUILD 227404 2014-12-10 14:44:10Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@parabola.nu> pkgbase=xorg-server pkgname=('xorg-server') -pkgver=1.16.2 +pkgver=1.16.2.901 pkgrel=1.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -17,13 +17,11 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} - autoconfig-nvidia-libre.patch autoconfig-sis.patch xvfb-run xvfb-run.1) -sha256sums=('446e0c3ebd556aced78ec0000ba9ae73f1e5317117d497f827afba48b787ce64' +sha256sums=('ef885a5ce441e6ae5c73461b624f9e66e801e52eaf495e551663306ec4464ba6' 'SKIP' - 'eca387a72345ac9cce866a8ca3b31e6ef696f298be4863196da75009c6673363' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') @@ -32,11 +30,6 @@ prepare() { cd "${pkgbase}-${pkgver}" # Use unofficial imedia SiS driver for supported SiS devices patch -Np0 -i ../autoconfig-sis.patch - # NV01 (Diamond Edge 3D) and NV03 (Riva 128) is not supported by nouveau: - # http://nouveau.freedesktop.org/wiki/CodeNames/#Ancient - # Use nouveau/nv/vesa drivers for nvidia devices - # Note: nonfree "nvidia" driver support was removed on our patch version - patch -Np1 -i ../autoconfig-nvidia-libre.patch # fix os name: #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR="" diff --git a/libre/xorg-server/autoconfig-nvidia-libre.patch b/libre/xorg-server/autoconfig-nvidia-libre.patch deleted file mode 100644 index 688b495e1..000000000 --- a/libre/xorg-server/autoconfig-nvidia-libre.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,21 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 - Diamond Edge 3D */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 - Riva 128 */ -+ case 0x0018: -+ driverList[idx++] = "nv"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; |