Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avifile/PKGBUILD
	community/blackbox/PKGBUILD
	community/blobby2/PKGBUILD
	community/chmsee/PKGBUILD
	community/extrema/PKGBUILD
	community/floyd/PKGBUILD
	community/gnash/PKGBUILD
	community/gq/PKGBUILD
	community/gsql/PKGBUILD
	community/haddock/PKGBUILD
	community/hashcash/PKGBUILD
	community/kvpnc/PKGBUILD
	community/uptimed/PKGBUILD
	community/wol/PKGBUILD
	core/jfsutils/PKGBUILD
	core/reiserfsprogs/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libffado/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/lua/PKGBUILD
	extra/mesa/PKGBUILD
	extra/valgrind/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD

1 files changed, 20 insertions, 10 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 9689c7c03..18cb3e9ce 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141617 2011-10-31 20:42:28Z andyrtr $
+# $Id: PKGBUILD 142908 2011-11-18 07:55:25Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
+pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
 [[ "$CARCH" = "mips64el" ]] && pkgname=('mesa' 'libglapi' 'libgl' 'libgles')
 # prepare 7.12/8.0
 #pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri')
@@ -16,9 +16,9 @@ if [ "${_git}" = "true" ]; then
     #pkgver=7.10.99.git20110709
     pkgver=7.11
   else
-    pkgver=7.11
+    pkgver=7.11.1
 fi
-pkgrel=4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev')
@@ -31,8 +31,8 @@ if [ "${_git}" = "true" ]; then
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
 	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
   else
-	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
+	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
+	#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
 )
 fi
 [ "$CARCH" = "mips64el" ] && \
@@ -144,7 +144,7 @@ package_libglapi() {
 }
 
 package_libgles() {
-  depends=('libglapi')
+  depends=('libglapi' 'khrplatform-devel')
   pkgdesc="Mesa GLES libraries and headers"
 
   cd ${srcdir}/?esa-*   
@@ -165,7 +165,7 @@ package_libgles() {
 }
 
 package_libegl() {
-  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev')
+  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
   pkgdesc="Mesa EGL libraries and headers"
 
   cd ${srcdir}/?esa-*   
@@ -175,7 +175,6 @@ package_libegl() {
   install -m755 -d "${pkgdir}/usr/include"
   install -m755 -d "${pkgdir}/usr/include/"
   install -m755 -d "${pkgdir}/usr/include/EGL"
-  install -m755 -d "${pkgdir}/usr/include/KHR"
   install -m755 -d "${pkgdir}/usr/share"
   install -m755 -d "${pkgdir}/usr/share/doc"
   install -m755 -d "${pkgdir}/usr/share/doc/libegl"
@@ -184,13 +183,24 @@ package_libegl() {
   bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
   bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
   bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
-  bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
   bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
 }
 
+package_khrplatform-devel() {
+  depends=('')
+  pkgdesc="Khronos platform development package"
+
+  cd ${srcdir}/?esa-*
+  install -m755 -d "${pkgdir}/usr/include/KHR"
+  bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
+}
+
 package_mesa() {
   depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6')
 [ "$CARCH" = "mips64el" ] || depends+=('dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc