diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-28 09:08:22 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-28 09:08:22 +0000 |
| commit | c959aedf3b69233b0f3bc2c320bc871ef1783086 (patch) | |
| tree | 47b6231af8f9ef0c53c3145c867287883fe9ac26 | |
| parent | b8812541b5d1da95dc6b74f8e598bc448ad1cfa2 (diff) | |
| download | aports-c959aedf3b69233b0f3bc2c320bc871ef1783086.tar.bz2 aports-c959aedf3b69233b0f3bc2c320bc871ef1783086.tar.xz | |
main/xorg-server: upgrade to 1.9.0
| -rw-r--r-- | main/xorg-server/APKBUILD | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 8bff2670a..5c52d54a0 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.7.7 -pkgrel=2 +pkgver=1.9.0 +pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" license="custom" subpackages="$pkgname-dev $pkgname-doc xfbdev xvfb" -install="$pkgname.post-install $pkgname.post-deinstall" depends=" font-misc-misc font-cursor-misc @@ -24,6 +23,7 @@ makedepends=" libxv-dev libxxf86dga-dev libxxf86misc-dev + recordproto-dev openssl-dev pixman-dev zlib-dev @@ -52,6 +52,8 @@ makedepends=" automake autoconf util-macros + udev-dev + xproto-dev " # hal>=0.5.11 xcursor-themes xkeyboard-config>=1.3 # xorg-server-utils xorg-utils xorg-fonts-misc xbitmaps libdrm>=2.3.1 @@ -80,16 +82,18 @@ build() { # cannot pass over the linker flag to .so files. so we tweak the # gcc specs. export LDFLAGS="$LDFLAGS -Wl,-z,lazy" + _fontroot="/usr/share/fonts" ./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-fontrootdir=$_fontroot \ + --with-default-font-path=${_fontroot}/misc,${_fontroot}/100dpi:unscaled,${_fontroot}/75dpi:unscaled,${_fontroot}/TTF,${_fontroot}/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-config-dbus \ + --enable-config-udev \ --enable-dri \ --enable-ipv6 \ --enable-xfbdev \ @@ -97,6 +101,7 @@ build() { --enable-xorg \ --enable-xv \ --enable-xres \ + --enable-xace \ --disable-xephyr \ --disable-config-hal \ --disable-dmx \ @@ -104,10 +109,11 @@ build() { --disable-xnest \ --disable-xsdl \ --disable-aiglx \ - --disable-xace \ + --disable-config-dbus \ + --enable-config-udev \ || return 1 - make + make || return 1 } package() { @@ -118,12 +124,9 @@ 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 - - mv "$pkgdir"/usr/lib/xorg/modules/extensions/libglx.so \ - "$pkgdir"/usr/lib/xorg/modules/extensions/libglx_xorg.so \ - || return 1 } + xfbdev() { pkgdesc="X.org server for framebuffer" depends= @@ -144,5 +147,6 @@ xephyr() { mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ } -md5sums="8c0146330fb155c23d947ac37d431d4b xorg-server-1.7.7.tar.bz2 +md5sums="ba1173998a5a4216fd7b40eded96697e xorg-server-1.9.0.tar.bz2 222de594206d1148a90eddfda4f7a11a xorg-redhat-die-ugly-pattern-die-die-die.patch" + |