summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-05-07 20:35:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-05-07 20:35:18 +0000
commit22251560a1ea8b01698627662f84db6fc601bbd3 (patch)
treef267ad427981844eb7fb67d6ef7672d8afabcba1
parent569c1b3dff06d13c3ffaaef2c0724166d83d25d2 (diff)
x11/xorg-server: upgrade to 1.6.1
-rw-r--r--x11/xorg-server/APKBUILD20
1 files changed, 9 insertions, 11 deletions
diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD
index 81728c601c9..d38a71a5e1c 100644
--- a/x11/xorg-server/APKBUILD
+++ b/x11/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xorg-server
-pkgver=1.6.0
-pkgrel=4
+pkgver=1.6.1
+pkgrel=0
pkgdesc="X.Org X servers"
url="http://xorg.freedesktop.org"
license="custom"
@@ -54,18 +54,20 @@ 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
./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-dri \
--enable-ipv6 \
--enable-xfbdev \
@@ -74,6 +76,7 @@ build () {
--enable-randr \
--enable-xorg \
--enable-xv \
+ --enable-xres \
--disable-xephyr \
--disable-composite \
--disable-config-dbus \
@@ -81,19 +84,15 @@ build () {
--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 \
@@ -164,5 +163,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"