[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

[Jan de Groot]

    Date: Thursday, June 12, 2008 @ 02:56:31
  Author: jgc
Revision: 2690

Prepare for 1.4.2 update

Modified:
  xorg-server/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-11 22:45:13 UTC (rev 2689)
+++ PKGBUILD	2008-06-12 06:56:31 UTC (rev 2690)
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.4.0.90
-pkgrel=13
+pkgver=1.4.2
+pkgrel=1
 _mesaver=7.0.3
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -25,17 +25,12 @@
 groups=('xorg')
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
-        http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-7.0.3.tar.bz2
-	ftp://ftp.archlinux.org/other/xorg-server/xorg-server-patches-1.4-13.tar.bz2)
-md5sums=('bb16e969850dbb5d3805cb88d35656d0'
-         'e6e6379d7793af40a6bc3ce1bace572e'
-         '655adfd348b5b24ca7be6fe6dd17dcf3')
+	http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
+	ftp://ftp.archlinux.org/other/xorg-server/xorg-server-patches-1.4.2-1.tar.bz2)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   # Upstream git patches
-  patch -Np1 -i ${startdir}/src/xorg-server-1.4-git20080511.patch || return 1
-  patch -Np1 -i ${startdir}/src/dix-getevents.patch || return 1
   patch -Np1 -i ${startdir}/src/xorg-mesa-source.diff || return 1
 
   # Patches from other vendors
@@ -47,7 +42,6 @@
   patch -Np1 -i ${startdir}/src/11_dont_crash_on_bad_dri_mode.diff || return 1
   patch -Np1 -i ${startdir}/src/14_default_screen_section.diff || return 1
   patch -Np1 -i ${startdir}/src/21_glx_align_fixes.patch || return 1
-  patch -Np1 -i ${startdir}/src/40_default_dpi_96.patch || return 1
   patch -Np1 -i ${startdir}/src/41_vbe_filter_less.diff || return 1
   patch -Np1 -i ${startdir}/src/43_allow_override_BIOS_EDID_preferred_mode.diff || return 1
   patch -Np1 -i ${startdir}/src/44_preferredmode_infinite_loop.diff || return 1
@@ -68,10 +62,8 @@
   patch -Np1 -i ${startdir}/src/149_add_quirks_for_physical_screen_size_issues.patch || return 1
   patch -Np1 -i ${startdir}/src/150_edid_quirk_lp154w01.patch || return 1
   patch -Np1 -i ${startdir}/src/152_xserver_exa_force_greedy.patch || return 1
-  patch -Np1 -i ${startdir}/src/153_exa_skip_empty_glyphs.diff || return 1
   patch -Np3 -i ${startdir}/src/xorg-redhat-die-ugly-pattern-die-die-die.patch || return 1
 
-  patch -Np1 -i ${startdir}/src/xkb-fixes.patch || return 1
   patch -Np1 -i ${startdir}/src/xserver-1.3.0-intel-by-default.patch || return 1
 
   libtoolize --force --copy || return 1