diff options
Diffstat (limited to 'abs/core/xorg-server/PKGBUILD')
| -rw-r--r-- | abs/core/xorg-server/PKGBUILD | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/abs/core/xorg-server/PKGBUILD b/abs/core/xorg-server/PKGBUILD index f84da16..7f0e9d5 100644 --- a/abs/core/xorg-server/PKGBUILD +++ b/abs/core/xorg-server/PKGBUILD @@ -4,10 +4,11 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.17.2 -pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgver=1.18.0 +pkgrel=4 arch=('i686' 'x86_64') license=('custom') +groups=('xorg') url="http://xorg.freedesktop.org" makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' @@ -15,36 +16,33 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' - 'libxshmfence' 'libunwind') + 'libxshmfence' 'libunwind') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} - nvidia-drm-outputclass.conf xvfb-run xvfb-run.1 - 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch - 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + 0001-systemd-logind-do-not-rely-on-directed-signals.patch + v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch + xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch Xwrapper.config) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') -sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993' - 'SKIP' - 'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7' - '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96' - 'SKIP') prepare() { cd "${pkgbase}-${pkgver}" - # fix FS#45229, merged upstream - patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch - patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + # fix VT switching with kdbus; from upstream + patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch + + # fix xorg only working with root FS#47061 + patch -Np1 -i ../v2-Xorg.wrap-activate-libdrm-based-detection-for-KMS-drivers.patch + # disable debugging glamor messages in xorg log file + patch -Np1 -i ../xserver-glamor-Disable-debugging-messages-other-than-GL-API-errors.patch + + autoreconf -fvi } build() { cd "${pkgbase}-${pkgver}" - autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ @@ -58,9 +56,7 @@ build() { --enable-xephyr \ --enable-glamor \ --enable-xwayland \ - --enable-glx-tls \ --enable-kdrive \ - --enable-kdrive-evdev \ --enable-kdrive-kbd \ --enable-kdrive-mouse \ --enable-config-udev \ @@ -113,22 +109,21 @@ package_xorg-server-common() { package_xorg-server() { pkgdesc="Xorg X server" - depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl) + depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-driver) + # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg - provides=('X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') - groups=('xorg') + provides=('X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') replaces=('glamor-egl' 'xf86-video-modesetting') install=xorg-server.install cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install - + # 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/" - + # LinHES Xwrapper.config install -m644 "${srcdir}/Xwrapper.config" "${pkgdir}/etc/X11/Xwrapper.config" @@ -232,3 +227,11 @@ package_xorg-server-devel() { install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" } +md5sums=('3c1c1057d3ad27380d8dd87ffcc182cd' + 'SKIP' + '52fd3effd80d7bc6c1660d4ecf23d31c' + '376c70308715cd2643f7bff936d9934b' + 'bea02fd837ba756456bf14ed51ff36c8' + 'ea8214d68150f3819eb049326b275f43' + 'dc9eda462a8d83413d3edd2e7b9669f6' + 'e3d31449c79ce49a748a678463ea3f20') |