diff options
| -rw-r--r-- | main/xorg-server/APKBUILD | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 90a6c809aa..f2bb3208a0 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server pkgver=1.19.3 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" arch="all" @@ -23,38 +23,26 @@ depends_dev=" bigreqsproto compositeproto damageproto - dri2proto fixesproto - fontsproto - glproto - inputproto - kbproto libepoxy-dev - libpciaccess-dev libxfont2-dev mesa-dev - pixman-dev - presentproto - randrproto recordproto - renderproto - resourceproto - scrnsaverproto - videoproto xcmiscproto - xextproto - xf86driproto - xineramaproto - xproto " makedepends=" $depends_dev autoconf automake + dri2proto eudev-dev + fontsproto + glproto + inputproto + kbproto libdrm-dev libepoxy-dev - libressl-dev + libpciaccess-dev libtool libx11-dev libxdamage-dev @@ -64,8 +52,16 @@ makedepends=" libxv-dev libxxf86dga-dev libxxf86misc-dev + openssl-dev perl + pixman-dev + presentproto + randrproto + renderproto + resourceproto + scrnsaverproto util-macros + videoproto wayland-dev wayland-protocols xcb-util-dev @@ -73,6 +69,10 @@ makedepends=" xcb-util-keysyms-dev xcb-util-renderutil-dev xcb-util-wm-dev + xextproto + xf86driproto + xineramaproto + xproto xtrans zlib-dev " @@ -85,14 +85,14 @@ source="http://www.x.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 20-modules.conf " -_builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$_builddir" + cd "$builddir" default_prepare # Fix dbus config path - sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* || return 1 - sed -i -e 's/termio.h/termios.h/' hw/xfree86/os-support/xf86_OSlib.h || return 1 + sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* + sed -i -e 's/termio.h/termios.h/' hw/xfree86/os-support/xf86_OSlib.h } build() { @@ -116,13 +116,11 @@ build() { --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --without-systemd-daemon \ - --enable-aiglx \ --enable-composite \ --enable-config-udev \ --enable-dri \ --enable-dri2 \ --enable-glamor \ - --enable-glx-tls \ --enable-ipv6 \ --enable-kdrive \ --enable-xace \ @@ -138,23 +136,27 @@ build() { --disable-dmx \ --disable-tslib \ --disable-systemd-logind \ - || return 1 + --with-os-vendor="Adélie" + + make +} - make || return 1 +check() { + cd "$builddir" + make check } package() { - cd "$_builddir" - make -j1 DESTDIR="$pkgdir" install || return 1 + cd "$builddir" + make -j1 DESTDIR="$pkgdir" install chmod u+s "$pkgdir"/usr/bin/Xorg # Don't conflict with xf86-input-evdev - rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf || return 1 + rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf - install -m755 -d "$pkgdir"/etc/X11/xorg.conf.d || return 1 - install -m644 "$srcdir"/20-modules.conf "$pkgdir"/etc/X11/xorg.conf.d/ \ - || return 1 - install -m755 -d "$pkgdir"/var/lib/xkb || return 1 + install -m755 -d "$pkgdir"/etc/X11/xorg.conf.d + install -m644 "$srcdir"/20-modules.conf "$pkgdir"/etc/X11/xorg.conf.d/ + install -m755 -d "$pkgdir"/var/lib/xkb install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } |