[arch-commits] Commit in xorg-server/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 07:58:48
  Author: jgc
Revision: 3168

Merged revisions 1742-3167 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-server/trunk

........
  r2690 | jgc | 2008-06-12 06:56:31 +0000 (Thu, 12 Jun 2008) | 2 lines
  
  Prepare for 1.4.2 update
........
  r3167 | jgc | 2008-06-21 11:58:34 +0000 (Sat, 21 Jun 2008) | 6 lines
  
  upgpkg: xorg-server 1.4.2-1
      Security update to 1.4.2
  - Remove all patches applied upstream, including git snapshot
  - Use quilt to apply patches, makes PKGBUILD a lot cleaner
  - Remove libxrender from dependencies, nothing links to it
  - Move libgl to makedepends as mesa, xorg-server builds static against a local copy anyways
........

Modified:
  xorg-server/repos/extra-x86_64/	(properties)
  xorg-server/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   60 ++++++++++--------------------------------------------------
 1 file changed, 10 insertions(+), 50 deletions(-)


Property changes on: xorg-server/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-server/trunk:1-1741
   + /xorg-server/trunk:1-3167

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-21 11:58:34 UTC (rev 3167)
+++ extra-x86_64/PKGBUILD	2008-06-21 11:58:48 UTC (rev 3168)
@@ -3,77 +3,37 @@
 # 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')
 license=('custom')
 url="http://xorg.freedesktop.org"
 depends=('libxkbui' 'ncurses' 'libxxf86misc' 'libxfont'
-         'libxrender' 'libxaw' 'libxxf86vm' 'xcursor-themes'
+         'libxaw' 'libxxf86vm' 'xcursor-themes'
 	 'xkeyboard-config' 'xorg-server-utils' 'xorg-utils' 'libdrm>=2.3.0'
-	 'xorg-fonts-misc' 'pixman>=0.10' 'xbitmaps' 'libgl')
+	 'xorg-fonts-misc' 'pixman>=0.10' 'xbitmaps')
 makedepends=('pkgconfig' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto'
              'xf86bigfontproto' 'resourceproto' 'evieext' 'damageproto>=1.1.0'
 	     'compositeproto>=0.4' 'scrnsaverproto' 'libxres' 'xorg-util-macros'
 	     'randrproto' 'glproto>=1.4.9' 'renderproto>=0.9.3' 'autoconf'
 	     'automake' 'libtool' 'bison' 'flex' 'gcc' 'libxrender'
-	     'libxfixes')
+	     'libxfixes' 'quilt' 'mesa')
 options=('!libtool')
 provides=('x-server')
 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'
+	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)
+md5sums=('fa2915ae377f61c340a18ebef484b64b'
          'e6e6379d7793af40a6bc3ce1bace572e'
-         '655adfd348b5b24ca7be6fe6dd17dcf3')
+         'bc907d6d69b55b445c3046a4d7ecc8ef')
 
 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
-  patch -Np1 -i ${startdir}/src/001_ubuntu_add_extra_modelines_from_xorg.patch || return 1
-  patch -Np1 -i ${startdir}/src/02_libvgahw_gcc4_volatile_fix.diff || return 1
-  patch -Np1 -i ${startdir}/src/05_kill_type1.diff || return 1
-  patch -Np1 -i ${startdir}/src/06_use_proc_instead_of_sysfs_for_pci_domains.diff || return 1
-  patch -Np0 -i ${startdir}/src/10_dont_look_in_home_for_config.diff || return 1
-  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
-  patch -Np1 -i ${startdir}/src/45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff || return 1
-  patch -Np1 -i ${startdir}/src/46_reduce_wakeups_from_smart_scheduler.patch || return 1
-  patch -Np1 -i ${startdir}/src/101_fedora-apm-typedefs.patch || return 1
-  patch -Np1 -i ${startdir}/src/102_ubuntu_sharevts_load_cpu.patch || return 1
-  patch -Np1 -i ${startdir}/src/104_fedora_init_origins_fix.patch || return 1
-  patch -Np1 -i ${startdir}/src/107_fedora_dont_backfill_bg_none.patch || return 1
-  patch -Np1 -i ${startdir}/src/108_fedora_honor_displaysize.patch || return 1
-  patch -Np1 -i ${startdir}/src/109_glx_fail_if_no_texture_bound.diff || return 1
-  patch -Np1 -i ${startdir}/src/110_fedora_no_move_damage.patch || return 1
-  patch -Np1 -i ${startdir}/src/120_fedora_xserver-xaa-evict-pixmaps.patch || return 1
-  patch -Np1 -i ${startdir}/src/121_only_switch_vt_when_active.diff || return 1
-  patch -Np1 -i ${startdir}/src/139_fedora_xserver-1.3.0-document-fontpath-correctly.patch || return 1
-  patch -Np1 -i ${startdir}/src/142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch || return 1
-  patch -Np1 -i ${startdir}/src/144_fedora_xserver-1.3.0-xnest-exposures.patch || return 1
-  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
-
+  quilt push -a || return 1
   libtoolize --force --copy || return 1
   aclocal || return 1
   autoconf || return 1