diff options
Diffstat (limited to 'x11/xorg-server/APKBUILD')
| -rw-r--r-- | x11/xorg-server/APKBUILD | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD index 81728c601..62bb2608c 100644 --- a/x11/xorg-server/APKBUILD +++ b/x11/xorg-server/APKBUILD @@ -1,12 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.6.0 -pkgrel=4 +pkgver=1.6.1 +pkgrel=3 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" license="custom" subpackages="$pkgname-dev $pkgname-doc xfbdev" depends=" + font-misc-misc + font-cursor-misc libpciaccess libx11 libxdamage @@ -19,6 +21,9 @@ depends=" pixman uclibc libgcc + xkeyboard-config + xkbcomp + xinit " makedepends=" libpciaccess-dev @@ -34,6 +39,7 @@ makedepends=" pixman-dev bigreqsproto + compositeproto damageproto fixesproto inputproto @@ -54,49 +60,49 @@ makedepends=" # xorg-server-utils xorg-utils xorg-fonts-misc xbitmaps libdrm>=2.3.1 # diffutils xf86-input-evdev" -source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 - nocxx.patch" +source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2" depends_dev="pixman-dev libpciaccess-dev" build () { cd "$srcdir"/$pkgname-$pkgver - patch configure < ../nocxx.patch || return 1 + + # 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. + ${CC:-gcc} -dumpspecs | sed 's/%(link_now)//g' > "$srcdir"/gcc-specs + export GCC_SPECS="$srcdir"/gcc-specs ./configure --prefix=/usr \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ + --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/100dpi:unscaled,/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-dri-driver-path=/usr/lib/xorg/modules/dri \ + --enable-composite \ --enable-dri \ --enable-ipv6 \ --enable-xfbdev \ --enable-kdrive \ - --enable-kdrive-vesa \ - --enable-randr \ --enable-xorg \ --enable-xv \ + --enable-xres \ --disable-xephyr \ - --disable-composite \ --disable-config-dbus \ --disable-config-hal \ --disable-dmx \ --disable-glx \ - --disable-glx-tsl \ - --disable-install-libxf86config \ --disable-tslib \ --disable-xfree86-utils \ --disable-xinerama \ --disable-xnest \ - --disable-xorgcfg \ --disable-xsdl \ - --disable-xvfb \ --disable-aiglx \ - --disable-xres \ --disable-xvmc \ --disable-screensaver \ - --disable-glx \ --disable-xinerama \ --disable-xace \ - --disable-dbe \ || return 1 # --enable-xnest \ @@ -164,5 +170,4 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="aafe73f5807ce8bb534727ecb72467c7 xorg-server-1.6.0.tar.bz2 -28513788ba4d556ccd538867dc6205ab nocxx.patch" +md5sums="ed0878bf32a24d4948c3b8a122a39eff xorg-server-1.6.1.tar.bz2" |