[arch-commits] CVS update of extra/x11/xorg-server (PKGBUILD)
Alexander Baldeck
alexander at archlinux.org
Sat Sep 22 18:03:27 UTC 2007
Date: Saturday, September 22, 2007 @ 14:03:27
Author: alexander
Path: /home/cvs-extra/extra/x11/xorg-server
Modified: PKGBUILD (1.33 -> 1.34)
* upgrade to X.org 7.3
----------+
PKGBUILD | 101 +++++++++++++++++++------------------------------------------
1 file changed, 32 insertions(+), 69 deletions(-)
Index: extra/x11/xorg-server/PKGBUILD
diff -u extra/x11/xorg-server/PKGBUILD:1.33 extra/x11/xorg-server/PKGBUILD:1.34
--- extra/x11/xorg-server/PKGBUILD:1.33 Sat Sep 8 12:06:52 2007
+++ extra/x11/xorg-server/PKGBUILD Sat Sep 22 14:03:27 2007
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD,v 1.33 2007/09/08 16:06:52 alexander Exp $
+# $Id: PKGBUILD,v 1.34 2007/09/22 18:03:27 alexander Exp $
# Maintainer: Alexander Baldeck <kth5 at archlinux.org>
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.3.0.0
-pkgrel=7
+pkgver=1.4
+pkgrel=1
_mesaver=7.0.1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org"
depends=('gcc' 'libxkbui' 'ncurses' 'libxi' 'libxxf86misc' 'libxfont'
'libxrender' 'libdmx' 'libxaw' 'libxxf86vm' 'xcursor-themes'
- 'xkeyboard-config' 'xorg-server-utils' 'xorg-utils' 'libdrm>=2.3.0'
- 'libxfixes' 'xorg-fonts-misc')
+ 'xkeyboard-config' 'xorg-server-utils' 'xorg-utils' 'libdrm>=2.3.0'
+ 'libxfixes' 'xorg-fonts-misc' 'pixman>=0.9.5')
makedepends=('pkgconfig' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto'
'xf86bigfontproto' 'resourceproto' 'evieext' 'damageproto>=1.1.0'
- 'compositeproto' 'scrnsaverproto' 'libxres' 'xorg-util-macros'
- 'randrproto' 'glproto>=1.4.8')
-groups=('xorg')
+ 'compositeproto>=0.4' 'scrnsaverproto' 'libxres' 'xorg-util-macros'
+ 'randrproto' 'glproto>=1.4.8' 'renderproto>=0.9.3')
options=('!libtool')
provides=('x-server')
source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
@@ -25,21 +24,10 @@
xorg-x11-server-0.99.3-init-origins-fix.patch
xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
xorg-x11-server-1.1.0-no-move-damage.patch
- xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
xorg-x11-server-1.1.1-offscreen-pixmaps.patch
- xorg-x11-server-1.2.0-xephyr-only.patch
- xserver-1.2.0-vfprintf.patch
xorg-x11-server-1.1.1-vbe-filter-less.patch
- xorg-server-1.2.0-record-maxdotclock-filter.patch
- xorg-x11-server-1.1.1-glcore-visual-matching.patch
xorg-server-1.2.0-defaultdpi.patch
- xorg-x11-server-1.1.1-automake-1.10-fixes.patch
- xserver-1.2.0-honor-displaysize.patch
- xorg-x11-server-1.1.1-no-scanpci.patch
- xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
- xorg-server-1.3.0-mesa-6.5.3.patch
- xserver-xv-crash.patch
- 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch)
+ xorg-x11-server-1.1.1-no-scanpci.patch)
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
@@ -49,24 +37,9 @@
patch -Np0 -i ${startdir}/src/xorg-x11-server-0.99.3-init-origins-fix.patch || return 1
patch -Np1 -i ${startdir}/src/xorg-x11-server-1.0.1-Red-Hat-extramodes.patch || return 1
patch -Np0 -i ${startdir}/src/xorg-x11-server-1.1.0-no-move-damage.patch || return 1
- patch -Np0 -i ${startdir}/src/xorg-x11-server-1.1.0-dont-backfill-bg-none.patch || return 1
patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-offscreen-pixmaps.patch || return 1
- patch -Np1 -i ${startdir}/src/xorg-x11-server-1.2.0-xephyr-only.patch || return 1
- patch -Np1 -i ${startdir}/src/xserver-1.2.0-vfprintf.patch || return 1
patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-vbe-filter-less.patch || return 1
- patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-glcore-visual-matching.patch || return 1
- patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-automake-1.10-fixes.patch || return 1
patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-no-scanpci.patch || return 1
- patch -Np1 -i ${startdir}/src/xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch || return 1
- patch -Np1 -i ${startdir}/src/xserver-1.2.0-honor-displaysize.patch || return 1
- patch -Np1 -i ${startdir}/src/1.2.0-properly-free-device-devprivates-memory-leak-fix.patch || return 1
-
- # Upstream patches backported from GIT:
- patch -Np1 -i ${startdir}/src/xorg-server-1.3.0-mesa-6.5.3.patch || return 1
- patch -Np0 -i ${startdir}/src/xserver-xv-crash.patch || return 1
-
- # Reversed patch, fixes issues with MergedFB
- patch -Np1 -R -i ${startdir}/src/xorg-server-1.2.0-record-maxdotclock-filter.patch || return 1
# Own patches
patch -Np1 -i ${startdir}/src/xorg-server-1.2.0-defaultdpi.patch || return 1
@@ -77,28 +50,29 @@
./configure --prefix=/usr \
--with-mesa-source=${startdir}/src/Mesa-${_mesaver} \
--enable-ipv6 \
- --enable-dri \
- --enable-dmx \
- --enable-xvfb \
- --enable-xnest \
- --enable-composite \
- --enable-xcsecurity \
- --enable-xorg \
- --enable-xtrap \
- --enable-xevie \
+ --enable-dri \
+ --enable-dmx \
+ --enable-xvfb \
+ --enable-xnest \
+ --enable-composite \
+ --enable-xcsecurity \
+ --enable-xorg \
+ --enable-xtrap \
+ --enable-xevie \
--enable-xephyr \
- --enable-kdrive \
- --enable-glx-tls \
- --enable-install-setuid \
- --disable-xprint \
- --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-rgb-path=/usr/share/X11/rgb \
- --with-xkb-path=/usr/share/X11/xkb \
- --with-xkb-output=/usr/share/X11/xkb/compiled \
- --with-dri-driver-path=/usr/lib/xorg/modules/dri \
- --disable-static
+ --enable-glx-tls \
+ --disable-kdrive \
+ --enable-install-setuid \
+ --disable-xprint \
+ --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-rgb-path=/usr/share/X11/rgb \
+ --with-xkb-path=/usr/share/X11/xkb \
+ --with-xkb-output=/usr/share/X11/xkb/compiled \
+ --with-dri-driver-path=/usr/lib/xorg/modules/dri \
+ --disable-static
+
make || return 1
make DESTDIR=${startdir}/pkg install || return 1
mkdir -p ${startdir}/pkg/etc/X11
@@ -110,24 +84,13 @@
mv libGLcore.so libGLcore.xorg
mv libglx.so libglx.xorg
}
-md5sums=('a51a7d482e3c689394755bb17bda8526'
+md5sums=('a06d9fe4f9f1d459ae02657f9ce64220'
'c056abd763e899114bf745c9eedbf9ad'
'1a336eb22e27cbf443ec5a2ecddfa93c'
'342a7d2fc0727b12f2840057c1feb2be'
'e49b4a78cdc47a379ee49663acbabedc'
'0faff1bfae0c6378fae5d2875fb3972c'
- '016e4e9f4bf2296ac756b476ff2c0495'
'8cae706ff61477f510f9f14b3d64fea9'
- '4303627243b853c38422334102d018c9'
- 'a6d376b50bf487e4f2aaddc064cf1070'
'91d5eea40148b9e9db59c659b15fe443'
- '0199583988cf6025759b260f9e0ef58c'
- 'af7fa4cdac7216af86f84914226aecda'
'e162134c68230f7b168430fe73b4881a'
- 'db37f05c6f5b6bb7d72fbf7f70386bdc'
- '41424d3d8edb5f1fda1291675e274d0f'
- '43257d8ade0f087870426eca1f09005c'
- 'a4dde794b9e71749dfee55b4704f12f3'
- 'b435c8a83022e197fbee26f3b430a228'
- '9ec278cada5dbbb76dd1e95279ad46fb'
- 'a4b32046f3cfde77ae5f964faabf0254')
+ '43257d8ade0f087870426eca1f09005c')
More information about the arch-commits
mailing list