[arch-commits] Commit in mesa/repos (extra-i686 extra-i686/PKGBUILD)

Jan de Groot jgc at archlinux.org
Sat Sep 5 10:48:34 UTC 2009


    Date: Saturday, September 5, 2009 @ 06:48:33
  Author: jgc
Revision: 51137

Merged revisions 51136 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mesa/trunk

........
  r51136 | jgc | 2009-09-05 12:48:17 +0200 (Sat, 05 Sep 2009) | 2 lines
  
  upgpkg: mesa 7.5.1-2
      Fix file conflicts with glew
........

Modified:
  mesa/repos/extra-i686/	(properties)
  mesa/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


Property changes on: mesa/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mesa/trunk:1-51022
   + /mesa/trunk:1-51136

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-05 10:48:17 UTC (rev 51136)
+++ extra-i686/PKGBUILD	2009-09-05 10:48:33 UTC (rev 51137)
@@ -4,7 +4,7 @@
 pkgbase="mesa"
 pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'trident-dri')
 pkgver=7.5.1
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 makedepends=('glproto>=1.4.10' 'pkgconfig' 'libdrm>=2.4.13' 'libxxf86vm>=1.0.99.1' 'libxdamage>=1.1.1' 'expat>=2.0.1' 'libx11>=1.2.2' 'libxt>=1.0.6' 'gcc-libs>=4.4.1' 'dri2proto=2.1')
 url="http://mesa3d.sourceforge.net"
@@ -71,6 +71,9 @@
 
   rm -f "${pkgdir}/usr/lib/libGL.so"*
   rm -rf "${pkgdir}/usr/lib/xorg"
+  rm -f "${pkgdir}/usr/include/GL/glew.h"
+  rm -f "${pkgdir}/usr/include/GL/glxew.h"
+  rm -f "${pkgdir}/usr/include/GL/wglew.h"
 
   cd "${srcdir}/gl-manpages-1.0.1" || return 1
   make DESTDIR="${pkgdir}" install || return 1




More information about the arch-commits mailing list