diff options
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
-rw-r--r-- | extra/xorg-server/PKGBUILD | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 48bed0ef9..398e39971 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,46 +1,43 @@ -# $Id: PKGBUILD 175947 2013-01-25 08:45:46Z andyrtr $ +# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.13.2 +pkgver=1.14.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' +makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' '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' 'libgcrypt') -[ "$CARCH" != "mips64el" ] && makedepends+=('dri2proto') + 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch + xserver-1.6.0-less-acpi-brokenness.patch + bug59825.patch xvfb-run xvfb-run.1 10-quirks.conf loongson.patch - #git-fixes.patch - use-pixman-glyph-cache.patch) -sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408' + git-fixes.patch) +sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' + '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - '966b8c509006e3b7e6ac951c93a760ecbb2cb2ad7a5807fb919f0c4ee5e079a5' - '7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308') + 'c1081681093cd56003f77e1bf4febc3e6bb84a1bde95292fbe19e8c461a7d207' + 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Apply upstream fixes from server-1.13 branch -# patch -Np1 -i "${srcdir}/git-fixes.patch" - - # Use pixman 0.28.0 glyph cache - backported from git master -# patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch" - # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" @@ -50,16 +47,19 @@ build() { # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html patch -Np1 -i "${srcdir}/loongson.patch" - autoreconf -fi + # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo + patch -Np1 -i "${srcdir}/bug59825.patch" - if [ "$CARCH" = "mips64el" ]; then - extra="--disable-dri --disable-dri2 --disable-glx --disable-glx-tls" - else - extra="--enable-dri --enable-glx-tls" - fi + # From Fedora. Do not build acpid code, it is buggy and we do not need it + patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch" + # post release git fixes + patch -Np1 -i "${srcdir}/git-fixes.patch" + + autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ + --enable-dri \ --enable-dmx \ --enable-xvfb \ --enable-xnest \ @@ -67,6 +67,7 @@ build() { --enable-xcsecurity \ --enable-xorg \ --enable-xephyr \ + --enable-glx-tls \ --enable-kdrive \ --enable-kdrive-evdev \ --enable-kdrive-kbd \ @@ -82,8 +83,7 @@ build() { --localstatedir=/var \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts \ - $extra + --with-fontrootdir=/usr/share/fonts make # Disable subdirs for make install rule to make splitting easier @@ -115,8 +115,8 @@ package_xorg-server() { pkgdesc="Xorg X server" depends=(libxdmcp libxfont libpciaccess libdrm 'pixman>=0.28.0' libgcrypt libxau xorg-server-common xf86-input-evdev) backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on - provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') + # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on + provides=('X-ABI-VIDEODRV_VERSION=14' 'X-ABI-XINPUT_VERSION=19' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') groups=('xorg') conflicts=('nvidia-utils<=290.10') @@ -129,11 +129,9 @@ package_xorg-server() { rmdir "${pkgdir}/usr/share/X11" - if [ "$CARCH" != "mips64el" ]; then # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - fi rm -rf "${pkgdir}/var" @@ -200,12 +198,11 @@ package_xorg-server-devel() { depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc xproto randrproto renderproto xextproto inputproto kbproto fontsproto pixman videoproto xf86driproto glproto - mesa xineramaproto libpciaccess + mesa dri2proto xineramaproto libpciaccess # see FS#32146 resourceproto scrnsaverproto # not technically required but almost every Xorg pkg needs it to build xorg-util-macros) -[ "$CARCH" = "mips64el" ] || depends+=('dri2proto') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install |