diff options
| -rw-r--r-- | x11/xorg-server/APKBUILD | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD index db8ab3aba8a..9bb430cadb0 100644 --- a/x11/xorg-server/APKBUILD +++ b/x11/xorg-server/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.7.1 +pkgver=1.7.3.901 pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" @@ -62,7 +62,7 @@ source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver depends_dev="pixman-dev libpciaccess-dev" -build () { +prepare() { cd "$srcdir"/$pkgname-$pkgver for i in ../*.patch; do @@ -71,11 +71,14 @@ build () { done # Fix dbus config path sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* || return 1 +} +build() { + cd "$srcdir"/$pkgname-$pkgver # xorg modules does not work with the -z now and it seems like we # cannot pass over the linker flag to .so files. so we tweak the # gcc specs. - export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs + export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure --prefix=/usr \ --sysconfdir=/etc/X11 \ @@ -113,11 +116,6 @@ package() { install -m755 -d "$pkgdir"/etc/X11 || return 1 install -m755 -d "$pkgdir"/var/lib/xkb || return 1 install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING - - # 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" || return 1 - } @@ -135,5 +133,5 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="dda7842467cda6018fdc87e6002e4db1 xorg-server-1.7.1.tar.bz2 +md5sums="cae5564c2f42212346ed4b44d3b97353 xorg-server-1.7.3.901.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" |