[arch-commits] Commit in mesa/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Jan de Groot
jgc at archlinux.org
Sat Sep 5 11:09:22 UTC 2009
Date: Saturday, September 5, 2009 @ 07:09:22
Author: jgc
Revision: 51142
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-x86_64/ (properties)
mesa/repos/extra-x86_64/PKGBUILD
----------+
PKGBUILD | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Property changes on: mesa/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /mesa/trunk:1-51060
+ /mesa/trunk:1-51141
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-09-05 11:00:11 UTC (rev 51141)
+++ extra-x86_64/PKGBUILD 2009-09-05 11:09:22 UTC (rev 51142)
@@ -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