Sun Oct 14 00:45:38 PDT 2012

1 files changed, 159 insertions, 138 deletions

diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index 591a51d11..284026eef 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,38 +1,38 @@
-# $Id: PKGBUILD 74678 2012-08-01 20:07:21Z lcarlier $
+# $Id: PKGBUILD 77676 2012-10-13 12:39:51Z bluewind $
 # 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-osmesa' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-libgbm') # 'lib32-nouveau-dri'
-
+pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri'
+         'lib32-nouveau-dri') # lib32-libgbm needs udev
 #_git=true
-_gitdate=20111031
+#_gitdate=20121005
 _git=false
 
 if [ "${_git}" = "true" ]; then
-    #pkgver=7.10.99.git20110709
-    pkgver=7.11
+    pkgver=8.99.git_$_gitdate
   else
-    pkgver=8.0.4
+    pkgver=9.0
 fi
 
-pkgrel=4
+pkgrel=1
 arch=('x86_64')
-makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.33' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1'
-  'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap')
+makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0'
+             'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2'
+             'gcc-multilib' 'imake' 'lib32-llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=('mesa-8.0.3-llvm-3.1-fixes.patch')
+options=('!libtool')
+source=(git_fixes.diff)
 if [ "${_git}" = "true" ]; then
-  # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
-  source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
-  md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd')
+  # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
+  #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
+  source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
 else
   source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-  md5sums=('0082f4d17674155aa13bc611a5687788'
-           'd546f988adfdf986cff45b1efa2d8a46')
 fi
-#options=('!buildflags')
+md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee'
+         '60e557ce407be3732711da484ab3db6c')
 
 build() {
   export CC="gcc -m32"
@@ -47,14 +47,14 @@ build() {
 
   cd ${srcdir}/?esa-*
 
-  patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-  autoreconf -vfi
+  # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
+  patch -Np1 -i ${srcdir}/git_fixes.diff
 
-  if [ "${_git}" = "true" ]; then
-     ./autogen.sh --prefix=/usr \
+  COMMONOPTS="--prefix=/usr \
+    --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
+    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --enable-gallium-llvm \
     --disable-gallium-egl --enable-shared-glapi \
     --enable-shared-glapi \
@@ -64,173 +64,194 @@ build() {
     --enable-gles2 \
     --disable-egl \
     --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-gbm \
     --enable-osmesa \
     --enable-32-bit \
-    --libdir=/usr/lib32
-    #  --enable-gallium-svga \
+    --libdir=/usr/lib32 "
+    # --enable-gbm disabled because it needs udev
+
+  if [ "${_git}" = "true" ]; then
+    ./autogen.sh \
+      $COMMONOPTS
   else
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,svga,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,swrast \
-    --enable-gallium-llvm \
-    --disable-gallium-egl --enable-shared-glapi \
-    --enable-glx-tls \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-egl \
-    --enable-gbm \
-    --enable-osmesa \
-    --enable-texture-float \
-    --enable-shared-dricore \
-    --enable-32-bit \
-    --libdir=/usr/lib32
-#   --with-gallium-drivers=r300,r600,nouveau,swrast \ # also without --with-dri-driver
+    autoreconf -vfi
+    ./configure \
+      $COMMONOPTS
   fi
 
   make
 }
 
+package_lib32-libglapi() {
+  depends=('lib32-glibc' 'libglapi')
+  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
+
+  cd ${srcdir}/?esa-*   
+
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
+  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
+}
+
 package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
+  depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi'
+           'libgl')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-  #replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri')
+  # currently disabled so force the remove
+  conflicts=('lib32-libgbm')
+  replace=('lib32-libgbm')
 
   cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
 
-  bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
-  bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
+  # fix linking because of splitted package
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
 
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-  ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
+  # libGL & libdricore
+  make -C src/glx DESTDIR="${pkgdir}" install
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+  
+  # --with-gallium-drivers=swrast
+  make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
 
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
   install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
+  ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl"
 }
 
-package_lib32-osmesa() {
-  depends=('lib32-mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
-
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
-}
+package_lib32-mesa() {
+  # check also gl.pc
+  depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxext>=1.3.1' 'lib32-libxdamage' 'lib32-libxfixes' 'lib32-libxcb'
+           'lib32-libxxf86vm' 'mesa')
+  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
 
-package_lib32-libglapi() {
-  depends=('lib32-glibc' 'libglapi')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
+  cd ${srcdir}/?esa-*
 
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib32"
-  bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/"
+  # .pc files
+  make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
+  make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
 }
 
-package_lib32-libgbm() {
-  depends=('lib32-glibc')
-  pkgdesc="Mesa gbm library (32-bit)"
+package_lib32-osmesa() {
+  depends=('lib32-libglapi' 'lib32-gcc-libs' 'osmesa')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
 
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  bin/minstall lib32/libgbm.so* "${pkgdir}/usr/lib32/"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib32/pkgconfig/"
+  # fix linking because of splitted package
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
+  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
 }
 
+# package_lib32-libgbm() {
+#   depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm')
+#   pkgdesc="Mesa gbm library (32-bit)"
+# 
+#   cd ${srcdir}/?esa-*
+# 
+#   # fix linking because of splitted package
+#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+# 
+#   make -C src/gbm DESTDIR="${pkgdir}" install
+# 
+#   # fix linking because of splitted package - cleanup
+#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+# 
+#   install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
+#   ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
+# }
+
 package_lib32-libgles() {
-  depends=('lib32-libglapi' 'libgles')
+  depends=('lib32-libglapi' 'lib32-libdrm' 'libgles')
   pkgdesc="Mesa GLES libraries (32-bit)"
 
   cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib32"
-  install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-  bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/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-mesa() {
-  depends=('lib32-libgl' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
-  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
+  # fix linking because of splitted package
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
 
-  cd ${srcdir}/?esa-*
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/lib32/libGL.so"*
-  rm -f "${pkgdir}/usr/lib32/libglapi.so"*
-  rm -f "${pkgdir}/usr/lib32/libgbm.so"*
-  rm -f "${pkgdir}/usr/lib32/libGLESv"*
-  rm -f "${pkgdir}/usr/lib32/libEGL"*
-  rm -rf "${pkgdir}/usr/lib32/egl"
-  rm -f "${pkgdir}/usr/lib32/libOSMesa"*
-  rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
-  rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
+  # --enable-gles1 --enable-gles2
+  make -C src/mapi/es1api DESTDIR="${pkgdir}" install
+  make -C src/mapi/es2api DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
+  # fix linking because of splitted package - cleanup
+  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+  
+  rm -r "${pkgdir}"/usr/include
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
+  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
 }
 
 package_lib32-ati-dri() {
-  depends=("lib32-libgl=${pkgver}")
+  depends=("lib32-libgl=${pkgver}" 'ati-dri')
   pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
   conflicts=('xf86-video-ati<6.9.0-6')
 
-  cd ${srcdir}/?esa-*/src/mesa/drivers/dri
+  cd ${srcdir}/?esa-*
+  
+  # fix linking because of splitted package
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+
   # classic mesa drivers for radeon,r200
-  make -C radeon DESTDIR="${pkgdir}" install
-  make -C r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
+  # gallium3D driver for r300,r600
+  make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+  make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+  make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
+  ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri"
 }
 
 package_lib32-intel-dri() {
-  depends=("lib32-libgl=${pkgver}")
+  depends=("lib32-libgl=${pkgver}" 'intel-dri')
   pkgdesc="Mesa DRI drivers for Intel (32-bit)"
 
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
+  cd ${srcdir}/?esa-*
+  
+  # fix linking because of splitted package
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+
+  make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
+  ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri"
 }
 
 package_lib32-nouveau-dri() {
-  depends=("lib32-libgl=${pkgver}")
+  depends=("lib32-libgl=${pkgver}" 'nouveau-dri')
   pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
 
+  cd ${srcdir}/?esa-*
+  
+  # fix linking because of splitted package
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
+
   # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
+  make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
   # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+  make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
+  
+  # fix linking because of splitted package - cleanup
+  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
+  ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri"
 }