diff options
Diffstat (limited to 'xorg-server-hwcursor-gamma/PKGBUILD')
| -rw-r--r-- | xorg-server-hwcursor-gamma/PKGBUILD | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/xorg-server-hwcursor-gamma/PKGBUILD b/xorg-server-hwcursor-gamma/PKGBUILD index fb15603..f089553 100644 --- a/xorg-server-hwcursor-gamma/PKGBUILD +++ b/xorg-server-hwcursor-gamma/PKGBUILD @@ -4,13 +4,14 @@ _pkgname=xorg-server pkgname=xorg-server-hwcursor-gamma -pkgver=1.15.2 +pkgver=1.16.0 pkgrel=1 pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" -depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence) -backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') -provides=('xorg-server' 'X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server') -conflicts=('xorg-server' 'nvidia-utils<=331.20') +depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence) +provides=('xorg-server=1.16.0' 'X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server') +conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl') +replaces=('glamor-egl') +install=xorg-server-hwcursor-gamma.install arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -18,40 +19,40 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' + '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/${_pkgname}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch + glamor-upstream-fix.patch + nvidia-drm-outputclass.conf xvfb-run xvfb-run.1 - 10-quirks.conf - CVE-2013-6424.diff 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) -sha256sums=('3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163' +sha256sums=('38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'fbd898f0e867c77c9bf918fd2e7956c7776ecb3cc3634c61290fb03513b47987' + 'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61' 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') prepare() { cd "${_pkgname}-${pkgver}" - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i ../autoconfig-nvidia.patch - # Use unofficial imedia SiS driver for supported SiS devices patch -Np0 -i ../autoconfig-sis.patch - - # Fix CVE-2013-6424 (FS#38401) - patch -Np1 -i ../CVE-2013-6424.diff - + # outputclass config file works only when nvidia-drm kernel driver is exposed + # this means that older drivers (304xx and before) aren't currently supported + # Use nouveau/nv/nvidia drivers for nvidia devices + patch -Np1 -i ../autoconfig-nvidia.patch + # merged upstream (1.16 branch) + patch -Np1 -i ../glamor-upstream-fix.patch + # Apply hardware cursors gamma adjustments patchs patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch @@ -71,26 +72,30 @@ build() { --enable-xcsecurity \ --enable-xorg \ --enable-xephyr \ + --enable-glamor \ + --enable-xwayland \ --enable-glx-tls \ --enable-kdrive \ --enable-kdrive-evdev \ --enable-kdrive-kbd \ --enable-kdrive-mouse \ - --enable-install-setuid \ --enable-config-udev \ - --disable-config-dbus \ + --enable-systemd-logind \ + --enable-suid-wrapper \ + --disable-install-setuid \ --enable-record \ --disable-xfbdev \ --disable-xfake \ --disable-static \ - --sysconfdir=/etc/X11 \ + --libexecdir=/usr/bin \ + --sysconfdir=/etc \ --localstatedir=/var \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --with-fontrootdir=/usr/share/fonts -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ +# --without-dtrace \ +# --disable-linux-acpi --disable-linux-apm \ make @@ -99,6 +104,7 @@ build() { -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ + -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ -i hw/Makefile } @@ -106,11 +112,9 @@ package() { cd "${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" + # distro specific files must be installed in /usr/share/X11/xorg.conf.d + install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" + install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/" # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ |