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

[andyrtr at archlinux.org]

    Date: Friday, November 18, 2011 @ 02:54:38
  Author: andyrtr
Revision: 142907

upgpkg: mesa 7.11.1-1

upstream update 7.11.1; add khrplatform-devel pkg to fix FS#26094 following Fedora packaging

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-18 07:42:07 UTC (rev 142906)
+++ PKGBUILD	2011-11-18 07:54:38 UTC (rev 142907)
@@ -3,7 +3,7 @@
 # Maintainer: Andreas Radke <andyrtr at 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')
 # prepare 7.12/8.0
 #pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri')
 
@@ -15,9 +15,9 @@
     #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')
 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' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
@@ -29,12 +29,12 @@
 	#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
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '774eb6f30b31fa08c04e16e00ca070e1')
+         'a77307102cee844ff6544ffa8fafeac1')
 
 build() {
     cd ${srcdir}/?esa-*
@@ -114,7 +114,7 @@
 }
 
 package_libgles() {
-  depends=('libglapi')
+  depends=('libglapi' 'khrplatform-devel')
   pkgdesc="Mesa GLES libraries and headers"
 
   cd ${srcdir}/?esa-*   
@@ -135,7 +135,7 @@
 }
 
 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-*   
@@ -145,7 +145,6 @@
   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"
@@ -154,13 +153,24 @@
   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' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
   optdepends=('opengl-man-pages: for the OpenGL API man pages')