Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/aspell-ca/PKGBUILD
	community/corkscrew/PKGBUILD
	cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/libxi/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/mpc/PKGBUILD
	extra/poppler/PKGBUILD
	extra/xf86-video-siliconmotion/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/vte3/PKGBUILD
	multilib/chuck/PKGBUILD
	multilib/lib32-libpciaccess/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-libxcb/PKGBUILD
	multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-libxi/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	testing/grep/PKGBUILD
	testing/sudo/PKGBUILD
	testing/xf86-input-joystick/PKGBUILD
	testing/xf86-input-wacom/PKGBUILD

1 files changed, 47 insertions, 105 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 6264b49c4..7b8d4c4d6 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 143633 2011-11-27 22:29:58Z andyrtr $
+# $Id: PKGBUILD 153288 2012-03-12 20:52:15Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-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')
+pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel')
+[[ "$CARCH" != "mips64el" ]] && pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
 
 #_git=true
 _gitdate=20111031
 _git=false
 
 if [ "${_git}" = "true" ]; then
-    #pkgver=7.10.99.git20110709
-    pkgver=7.11
+    pkgver=7.10.99.git20110709
+    #pkgver=7.11
   else
-    pkgver=7.11.2
+    pkgver=8.0.1
 fi
-pkgrel=1
+pkgrel=2
 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' 
+makedepends=('glproto>=1.4.15' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev')
-[ "$CARCH" = "mips64el" ] || makedepends+=('dri2proto=2.6' 'llvm')
+[[ "$CARCH" != "mips64el" ]] && makedepends+=('libdrm>=2.4.30' 'dri2proto>=2.6' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(LICENSE)
@@ -32,11 +30,15 @@ if [ "${_git}" = "true" ]; then
 	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[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
 	#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
 )
 fi
-[ "$CARCH" = "mips64el" ] && \
-  source+=(mesa-7.5-mips-wmb.patch mesa-loongson.patch)
+source+=(mesa-7.5-mips-wmb.patch mesa-loongson.patch)
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+         '24eeebf66971809d8f40775a379b36c9'
+         'c7788f2495060bf133771aef6ad25929'
+         '598c24dccfcdcc99c07d883f7c09f36a')
 
 build() {
     cd ${srcdir}/?esa-*
@@ -67,17 +69,18 @@ if [ "${_git}" = "true" ]; then
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
     --enable-gallium-llvm \
     --enable-gallium-egl --enable-shared-glapi\
     --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --disable-glut \
+    --enable-dri \
+    --enable-glx \
+    --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
     --enable-egl \
     --enable-texture-float \
+    --enable-xa \
     --enable-shared-dricore
     
     #    --enable-gallium-svga \
@@ -86,17 +89,18 @@ if [ "${_git}" = "true" ]; then
      autoreconf -vfi
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
     --enable-gallium-llvm \
     --enable-gallium-egl --enable-shared-glapi\
     --enable-glx-tls \
-    --with-driver=dri \
-    --enable-xcb \
-    --disable-glut \
+    --enable-dri \
+    --enable-glx \
+    --enable-osmesa \
     --enable-gles1 \
     --enable-gles2 \
     --enable-egl \
     --enable-texture-float \
+    --enable-xa \
     --enable-shared-dricore
 fi
 fi
@@ -105,9 +109,10 @@ fi
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
+  depends=('libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-  [[ "$CARCH" = "mips64el" ]] && pkgdesc="Mesa 3-D graphics library (Xlib)"
+  replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
+  [[ "$CARCH" != "mips64el" ]] && depends+=('libdrm>=2.4.31')
 
   cd ${srcdir}/?esa-*
   install -m755 -d "${pkgdir}/usr/lib"
@@ -122,7 +127,6 @@ package_libgl() {
   cd src/mesa/drivers/dri
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
 
-  ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
   fi
@@ -131,6 +135,14 @@ package_libgl() {
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
 }
 
+package_osmesa() {
+  depends=('mesa')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  pkgdesc="Mesa 3D off-screen rendering library"
+  
+  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
+}
+
 package_libglapi() {
   depends=('glibc')
   pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
@@ -165,8 +177,9 @@ package_libgles() {
 }
 
 package_libegl() {
-  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
+  depends=('libglapi' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
   pkgdesc="Mesa EGL libraries and headers"
+  [[ "$CARCH" != "mips64el" ]] && depends+=('libdrm')
 
   cd ${srcdir}/?esa-*   
   make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
@@ -190,7 +203,7 @@ package_libegl() {
 }
 
 package_khrplatform-devel() {
-  depends=('')
+  #depends=('')
   pkgdesc="Khronos platform development package"
 
   cd ${srcdir}/?esa-*
@@ -215,7 +228,8 @@ package_mesa() {
   rm -f "${pkgdir}/usr/lib/libGLESv"*
   rm -f "${pkgdir}/usr/lib/libEGL"*
   rm -rf "${pkgdir}/usr/lib/egl"
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
+  rm -f "${pkgdir}/usr/lib/libOSMesa"*
+  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc}
   rm -rf "${pkgdir}/usr/lib/xorg"
   rm -f "${pkgdir}/usr/include/GL/glew.h"
   rm -f "${pkgdir}/usr/include/GL/glxew.h"
@@ -244,66 +258,10 @@ package_intel-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa DRI drivers for Intel"
 
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
   make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
 }
 
-package_unichrome-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
-}
-
-package_mach64-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Mach64"
-  conflicts=('xf86-video-mach64<6.8.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
-}
-
-package_mga-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Matrox"
-  conflicts=('xf86-video-mga<1.4.11')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
-}
-
-package_r128-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for ATI Rage128"
-  conflicts=('xf86-video-r128<6.8.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
-}
-
-package_savage-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
-  conflicts=('xf86-video-savage<2.3.1')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
-}
-
-package_sis-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for SiS"
-  conflicts=('xf86-video-sis<0.10.2')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
-}
-
-package_tdfx-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for 3dfx"
-  conflicts=('xf86-video-tdfx<1.4.3')
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
-}
-
 package_nouveau-dri() {
   depends=("libgl=${pkgver}")
   pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
@@ -314,25 +272,9 @@ package_nouveau-dri() {
   make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
 }
 
-#package_llvm-dri() {
-#  depends=("libgl=${pkgver}")
-#  pkgdesc="Mesa common LLVM support"
-
-#if [ "${_git}" = "true" ]; then
-#    cd ${srcdir}/mesa-*/src/gallium
-#  else
-#    cd "${srcdir}/Mesa-${pkgver}/src/gallium"
-#fi
-
-  # gallium llvmpipe
-#if [ "${_git}" = "true" ]; then
-#    make -C drivers/llvmpipe DESTDIR="${pkgdir}" install
-#    #make -C targets/dri-swrast DESTDIR="${pkgdir}" install
-#  else
-#    make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-#fi
-#}
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '0837c52698fe3252369c3fdb5195afcc'
-         'c7788f2495060bf133771aef6ad25929'
-         '598c24dccfcdcc99c07d883f7c09f36a')
+package_svga-dri() {
+  depends=("mesa=${pkgver}")
+  pkgdesc="Gallium3D VMware guest GL driver"
+
+  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+}