[arch-commits] Commit in xorg-server/trunk (PKGBUILD xorg-server.install)
Jan de Groot
jgc at archlinux.org
Sun Mar 1 12:32:16 UTC 2009
Date: Sunday, March 1, 2009 @ 07:32:16
Author: jgc
Revision: 28472
upgpkg: xorg-server 1.6.0-1
Update to 1.6
Remove all patches except the pattern patch
Remove all symlink hacks, only keep the libglx.so hack to avoid fileconflicts with nvidia
Enable record extension
Revisit every (make)dependency. Some extensions have been removed from X and no longer require these dependencies
Modified:
xorg-server/trunk/PKGBUILD
xorg-server/trunk/xorg-server.install
---------------------+
PKGBUILD | 49 ++++++++-----------------------------------------
xorg-server.install | 29 +++++------------------------
2 files changed, 13 insertions(+), 65 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-01 12:06:20 UTC (rev 28471)
+++ PKGBUILD 2009-03-01 12:32:16 UTC (rev 28472)
@@ -3,48 +3,28 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.5.3
-pkgrel=4
+pkgver=1.6.0
+pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
-depends=('libx11>=1.1.5' 'libxkbui>=1.0.2' 'libgl' 'libxfont>=1.3.3' 'openssl>=0.9.8h' 'libxxf86misc>=1.0.1' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' 'libxaw>=1.0.4' 'pixman>=0.11.10' 'hal>=0.5.11' 'xcursor-themes' 'xkeyboard-config>=1.3' 'xorg-server-utils' 'xorg-utils' 'xorg-fonts-misc' 'xbitmaps' 'libdrm>=2.3.1' 'diffutils' 'xf86-input-evdev')
-makedepends=('glproto>=1.4.9' 'xf86driproto>=2.0.4' 'mesa>=7.2' 'randrproto>=1.2.2' 'renderproto>=0.9.3' 'scrnsaverproto>=1.1.0' 'fontsproto>=2.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'trapproto>=3.4.3' 'resourceproto>=1.0.2' 'xineramaproto>=1.1.2' 'evieext>=1.0.2' 'libxkbfile>=1.0.5' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'libxxf86dga>=1.0.2' 'inputproto>=1.4.4' 'xcmiscproto>=1.1.2' 'bigreqsproto' 'libdrm=2.3.1' 'xtrans')
+depends=('hal>=0.5.11' 'libgl' 'libxfont>=1.4.0' 'openssl>=0.9.8j' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' 'pixman>=0.14.0' 'xcursor-themes' 'xkeyboard-config>=1.5' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.1.3')
+makedepends=('libx11>=1.2' 'mesa>=7.3' 'xf86driproto>=2.0.4' 'xtrans>=1.2.3' 'libxkbfile>=1.0.5' 'randrproto>=1.2.99.3' 'renderproto>=0.9.3' 'xcmiscproto>=1.1.2' 'bigreqsproto>=1.0.2' 'resourceproto>=1.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'scrnsaverproto>=1.1.0' 'resourceproto>=1.0.2' 'libxinerama>=1.0.3' 'xf86dgaproto>=2.0.3' 'recordproto>=1.13.2')
options=('!libtool')
provides=('x-server')
groups=('xorg')
install=xorg-server.install
source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
- xserver-1.5-branch-4970d.patch
- 001_fedora_extramodes.patch
- xorg-redhat-die-ugly-pattern-die-die-die.patch
- xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch
- xserver-1.5.3-AEI-on-by-default.patch)
-md5sums=('308971036e25250e7fe3cccfd5a120f8'
- '61f9bb524501247dce647b218ad14347'
- '033427f2b406cba8dd6103ff374e7156'
- '1a336eb22e27cbf443ec5a2ecddfa93c'
- '7b03ba9b75d795e4f7fdfaa550d97159'
- '63d1d61d217005db7c23c4a98fc3e7eb')
+ xorg-redhat-die-ugly-pattern-die-die-die.patch)
+md5sums=('aafe73f5807ce8bb534727ecb72467c7'
+ '1a336eb22e27cbf443ec5a2ecddfa93c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # Upstream commits from server-1.5 branch
- patch -Np1 -i "${srcdir}/xserver-1.5-branch-4970d.patch" || return 1
-
- # extramodes
- patch -Np1 -i "${srcdir}/001_fedora_extramodes.patch" || return 1
-
# Get rid of the ugly pattern
patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return 1
- # Patch from Fedora to fix FS#12248
- patch -Np1 -i "${srcdir}/xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch" || return 1
-
- # Upstream patch to fix evdev issues with >=2.1.0
- patch -Np1 -i "${srcdir}/xserver-1.5.3-AEI-on-by-default.patch" || return 1
-
# Fix dbus config path
sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* || return 1
@@ -57,21 +37,16 @@
--enable-composite \
--enable-xcsecurity \
--enable-xorg \
- --enable-xtrap \
- --enable-xevie \
--enable-xephyr \
--enable-glx-tls \
- --enable-xorgcfg \
--enable-kdrive \
--enable-install-setuid \
--enable-config-hal \
--enable-config-dbus \
+ --enable-record \
--disable-xfbdev \
--disable-xfake \
--disable-xsdl \
- --disable-kdrive-vesa \
- --disable-dri2 \
- --disable-xprint \
--disable-static \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
@@ -88,18 +63,10 @@
install -m755 -d "${pkgdir}/etc/X11" || return 1
install -m755 -d "${pkgdir}/var/lib/xkb" || return 1
- # No longer needed, but as nvidia-utils mangles these files,
- # keep them like this so they can be restored
- mv "${pkgdir}/usr/lib/xorg/modules/libwfb.so" \
- "${pkgdir}/usr/lib/xorg/modules/libwfb.so.1.4" || return 1
-
# 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
- mv "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.so" \
- "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.xorg" || return 1
-
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
}
Modified: xorg-server.install
===================================================================
--- xorg-server.install 2009-03-01 12:06:20 UTC (rev 28471)
+++ xorg-server.install 2009-03-01 12:32:16 UTC (rev 28472)
@@ -1,33 +1,14 @@
post_install() {
- rm -f usr/lib/xorg/modules/libwfb.so
- ln -sf libwfb.so.1.4 usr/lib/xorg/modules/libwfb.so
+cat << _EOF
- cmp usr/lib/xorg/modules/extensions/libdri.so usr/lib/xorg/modules/extensions/libglx.xorg >/dev/null 2>&1 && rm -f usr/lib/xorg/modules/extensions/libdri.so
+ Input device handling has changed since xorg-server 1.5.
+ Please read http://wiki.archlinux.org/index.php/Xorg_input_hotplugging.
- # If the symlink is dead or non-existent, remove it and make a new one
- if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then
- rm -f usr/lib/xorg/modules/extensions/libdri.so
- ln -sf libdri.xorg usr/lib/xorg/modules/extensions/libdri.so
- fi
+_EOF
}
post_upgrade() {
if [ "`vercmp $2 1.4.99.906`" -lt 0 ]; then
- cat << _EOF
-
- Input device handling has changed in xorg-server 1.5.
- Please read http://wiki.archlinux.org/index.php/Xorg_input_hotplugging.
-
-_EOF
+ post_install
fi
- post_install
}
-
-post_remove() {
- rm -f /usr/lib/xorg/modules/libwfb.so
-
- # If the symlink is dead, remove it
- if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then
- rm -f usr/lib/xorg/modules/extensions/libdri.so
- fi
-}
More information about the arch-commits
mailing list