diff options
Diffstat (limited to 'libre-testing')
| -rw-r--r-- | libre-testing/xorg-server-libre/PKGBUILD | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libre-testing/xorg-server-libre/PKGBUILD b/libre-testing/xorg-server-libre/PKGBUILD index 398888c8b..6f0b4b79e 100644 --- a/libre-testing/xorg-server-libre/PKGBUILD +++ b/libre-testing/xorg-server-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=xorg-server pkgname=('xorg-server-libre') pkgver=1.16.0 -pkgrel=3 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgrel=5 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -76,13 +76,12 @@ build() { --enable-systemd-logind \ --enable-suid-wrapper \ --disable-install-setuid \ - --disable-config-dbus \ --enable-record \ --disable-xfbdev \ --disable-xfake \ --disable-static \ --libexecdir=/usr/bin \ - --sysconfdir=/etc/X11 \ + --sysconfdir=/etc \ --localstatedir=/var \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ @@ -105,7 +104,6 @@ build() { package_xorg-server-libre() { pkgdesc="Xorg X server, without nonfree nvidia driver support" depends=(libepoxy 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') # 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=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server' "$pkgbase=$pkgver") @@ -117,10 +115,7 @@ package_xorg-server-libre() { cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - - rmdir "${pkgdir}/usr/share/X11" + install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ |