Thu Feb 9 23:14:54 UTC 2012

1 files changed, 28 insertions, 27 deletions

diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index b88939af8..81395d897 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 60968 2011-12-19 20:44:35Z lcarlier $
+# $Id: PKGBUILD 64038 2012-02-08 20:14:24Z lcarlier $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=lib32-mesa
-pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri'
+pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri'
   'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri')
 # prepare 7.12/8.0
-# pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
+# pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
 
 #_git=true
 _gitdate=20111031
@@ -19,10 +19,10 @@ if [ "${_git}" = "true" ]; then
     pkgver=7.11.2
 fi
 
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3'
-  'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm' 'namcap')
+  'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 if [ "${_git}" = "true" ]; then
@@ -57,14 +57,15 @@ build() {
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,nouveau,swrast \
     --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi \
+    --disable-gallium-egl --enable-shared-glapi \
+    --enable-shared-glapi \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
     --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
+    --disable-egl \
     --enable-texture-float \
     --enable-shared-dricore \
     --enable-32-bit \
@@ -75,14 +76,14 @@ build() {
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,nouveau,swrast \
     --enable-gallium-llvm \
-    --enable-gallium-egl --enable-shared-glapi \
+    --disable-gallium-egl --enable-shared-glapi \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
     --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-egl \
+    --disable-egl \
     --enable-texture-float \
     --enable-shared-dricore \
     --enable-32-bit \
@@ -106,7 +107,7 @@ package_lib32-libgl() {
 
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
   ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so"
-  ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
+  # ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
 
   rm -rf "${pkgdir}"/usr/{include,share,bin}
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
@@ -140,23 +141,23 @@ package_lib32-libgles() {
   ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
 }
 
-package_lib32-libegl() {
-  depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
-  pkgdesc="Mesa libEGL libraries (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/lib32/egl"
-  bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
-  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
-}
+#package_lib32-libegl() {
+#  depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
+#  pkgdesc="Mesa libEGL libraries (32-bit)"
+#
+#  cd ${srcdir}/?esa-*
+#  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
+#
+#  install -m755 -d "${pkgdir}/usr/lib32"
+#  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
+#  install -m755 -d "${pkgdir}/usr/lib32/egl"
+#  bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
+#  bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
+#  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
+#
+#  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
+#  ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
+#}
 
 package_lib32-mesa() {
   depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')