diff options
Diffstat (limited to 'abs/core')
| -rw-r--r-- | abs/core/xorg-server/PKGBUILD | 62 |
1 files changed, 43 insertions, 19 deletions
diff --git a/abs/core/xorg-server/PKGBUILD b/abs/core/xorg-server/PKGBUILD index 4f53332..90b6a88 100644 --- a/abs/core/xorg-server/PKGBUILD +++ b/abs/core/xorg-server/PKGBUILD @@ -4,9 +4,9 @@ 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.19.3 +pkgver=1.19.6+13+gd0d1a694f pkgrel=1 -arch=('i686' 'x86_64') +arch=('x86_64') license=('custom') groups=('xorg') url="http://xorg.freedesktop.org" @@ -16,8 +16,10 @@ 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' 'systemd' 'wayland-protocols') -source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} + 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'git') +_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19 +#source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} +source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit" Xwrapper.config nvidia-add-modulepath-support.patch xserver-autobind-hotplug.patch @@ -25,10 +27,17 @@ source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pk xvfb-run.1) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' - 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') + 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' + '995ED5C8A6138EB0961F18474C09DD83CAAA50B2') + +pkgver() { + cd xserver + git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g' +} prepare() { - cd "${pkgbase}-${pkgver}" + cd xserver + #cd "${pkgbase}-${pkgver}" # merged upstream in trunk patch -Np1 -i ../nvidia-add-modulepath-support.patch @@ -39,7 +48,15 @@ prepare() { } build() { - cd "${pkgbase}-${pkgver}" + # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf + # With them, module fail to load with undefined symbol. + # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845 + export CFLAGS=${CFLAGS/-fno-plt} + export CXXFLAGS=${CXXFLAGS/-fno-plt} + export LDFLAGS=${LDFLAGS/,-z,now} + + cd xserver + #cd "${pkgbase}-${pkgver}" ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ @@ -88,9 +105,10 @@ build() { package_xorg-server-common() { pkgdesc="Xorg server common files" - depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc) + depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap) - cd "${pkgbase}-${pkgver}" + cd xserver + #cd "${pkgbase}-${pkgver}" install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" @@ -115,7 +133,8 @@ package_xorg-server() { replaces=('glamor-egl' 'xf86-video-modesetting') install=xorg-server.install - cd "${pkgbase}-${pkgver}" + cd xserver + #cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install # distro specific files must be installed in /usr/share/X11/xorg.conf.d @@ -142,7 +161,8 @@ package_xorg-server-xephyr() { depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms) - cd "${pkgbase}-${pkgver}/hw/kdrive" + cd xserver/hw/kdrive + #cd "${pkgbase}-${pkgver}/hw/kdrive" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" @@ -151,9 +171,10 @@ package_xorg-server-xephyr() { package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl) + depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl which) - cd "${pkgbase}-${pkgver}/hw/vfb" + cd xserver/hw/vfb + #cd "${pkgbase}-${pkgver}/hw/vfb" make DESTDIR="${pkgdir}" install install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" @@ -167,7 +188,8 @@ package_xorg-server-xnest() { pkgdesc="A nested X server that runs as an X application" depends=(libxfont2 libxext libunwind pixman xorg-server-common libsystemd) - cd "${pkgbase}-${pkgver}/hw/xnest" + cd xserver/hw/xnest + #cd "${pkgbase}-${pkgver}/hw/xnest" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" @@ -178,7 +200,8 @@ package_xorg-server-xdmx() { pkgdesc="Distributed Multihead X Server and utilities" depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common) - cd "${pkgbase}-${pkgver}/hw/dmx" + cd xserver/hw/dmx + #cd "${pkgbase}-${pkgver}/hw/dmx" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" @@ -189,7 +212,8 @@ package_xorg-server-xwayland() { pkgdesc="run X clients under wayland" depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common) - cd "${pkgbase}-${pkgver}/hw/xwayland" + cd xserver/hw/xwayland + #cd "${pkgbase}-${pkgver}/hw/xwayland" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland" @@ -206,7 +230,8 @@ package_xorg-server-devel() { # not technically required but almost every Xorg pkg needs it to build xorg-util-macros) - cd "${pkgbase}-${pkgver}" + cd xserver + #cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/bin" @@ -220,8 +245,7 @@ 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=('015d2fc4b9f2bfe7a626edb63a62c65e' - 'SKIP' +md5sums=('SKIP' 'e3d31449c79ce49a748a678463ea3f20' '75a60eb4b99b64cda18614e9c085a2d3' 'ec10c9be9a7f1b352393684b658976d2' |