summaryrefslogtreecommitdiff
path: root/libre/xorg-server-libre/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'libre/xorg-server-libre/PKGBUILD')
-rw-r--r--libre/xorg-server-libre/PKGBUILD101
1 files changed, 55 insertions, 46 deletions
diff --git a/libre/xorg-server-libre/PKGBUILD b/libre/xorg-server-libre/PKGBUILD
index 0f77ca01d..cd84a2066 100644
--- a/libre/xorg-server-libre/PKGBUILD
+++ b/libre/xorg-server-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id$
+# $Id: PKGBUILD 218446 2014-07-31 12:02:24Z lcarlier $
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
# 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-libre')
-pkgver=1.15.2
-pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgver=1.16.0
+pkgrel=6 # 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"
@@ -14,44 +14,52 @@ 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/${pkgbase}-${pkgver}.tar.bz2
+source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+ autoconfig-nvidia-libre.patch
autoconfig-sis.patch
+ glamor-upstream-fix.patch
xvfb-run
- xvfb-run.1
- 10-quirks.conf
- CVE-2013-6424.diff)
-sha256sums=('3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163'
+ xvfb-run.1)
+sha256sums=('38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b'
+ 'SKIP'
+ 'eca387a72345ac9cce866a8ca3b31e6ef696f298be4863196da75009c6673363'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+ 'fbd898f0e867c77c9bf918fd2e7956c7776ecb3cc3634c61290fb03513b47987'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
- '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
- '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
- '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61')
+ '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
prepare() {
cd "${pkgbase}-${pkgver}"
# 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
-
- # fix os name
- sed -i '\|Current Operating System| s| %s %s||
- s|name.sysname, name.nodename, name.release|OSNAME, name.nodename|
- s|name.version, name.machine|name.version|
+ # 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
+ # merged upstream (1.16 branch)
+ patch -Np1 -i ../glamor-upstream-fix.patch
+
+ # fix os name:
+ #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR=""
+ #Current Operating System = --kernel-name --nodename --kernel-release --kernel-version --machine
+ # to:
+ #Build Operating System = OSNAME="--operating-system" OSVENDOR="--machine - kernel --kernel-release"
+ #Current Operating System = OSNAME="--operating-system" --nodename --machine - kernel --kernel-release --kernel-version
+ # see: man uname
+
+ sed -i '\|Current Operating System| s|%s %s %s %s %s|%s %s %s - kernel %s %s|
+ s|name.sysname, name.nodename, name.release|OSNAME, name.nodename, name.machine|
+ s|name.version, name.machine|name.release, name.version|
' hw/xfree86/common/xf86Init.c
sed -i 's|Linux|GNU/Linux|
+ s|GNU Hurd|GNU/Hurd|
' hw/xfree86/man/{Xorg,xorg.conf}.man
- sed -i '\|OSNAME| s|hurd|gnu|
- \|OSNAME| s|linux|gnu/linux|
- s|#define OSNAME "freebsd"|#define OSNAME "freebsd"\n#elif defined(__FreeBSD_kernel__)\n#define OSNAME "gnu/kfreebsd"|
- ' hw/xfree86/loader/os.c
- sed -i 's|uname -s|uname -o|
- s|uname -r|uname -sr|
- s|uname -orm|echo $(uname -o) $(uname -m) - $(uname -s) kernel $(uname -r)|
- ' ChangeLog config.guess configure.ac configure
+ sed -i 's|uname -srm|uname -o|
+ s|uname -s|uname -o|
+ ' ChangeLog config.guess configure.ac configure compile
}
build() {
@@ -67,26 +75,32 @@ 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
+ --with-fontrootdir=/usr/share/fonts \
+ --with-os-name="$(uname -o)" \
+ --with-os-vendor="$(uname -m) - kernel $(uname -r)"
-# --without-dtrace \
-# --disable-linux-acpi --disable-linux-apm \
+# --without-dtrace \
+# --disable-linux-acpi --disable-linux-apm \
make
@@ -95,29 +109,24 @@ 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
}
package_xorg-server-libre() {
pkgdesc="Xorg X server, without nonfree nvidia driver support"
- 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')
+ depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence)
# 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=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server' "$pkgbase=$pkgver")
+ provides=('X-ABI-VIDEODRV_VERSION=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server' "$pkgbase=$pkgver")
groups=('xorg')
- conflicts=('nvidia-utils' "$pkgbase")
- replaces=('nvidia-utils' "$pkgbase")
+ conflicts=('nvidia-utils' 'glamor-egl' "$pkgbase")
+ replaces=('nvidia-utils' 'glamor-egl' "$pkgbase")
+ install=xorg-server.install
cd "${pkgbase}-${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"
-
# 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"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 20:45:50 +0000