MesaLib: update to 9.0.

common/shlibs

@@ -101,8 +101,7 @@ libGLESv1_CM.so.1 libEGL-7.11_1
 libGL.so.1 libGL-7.11_1
 libglapi.so.0 libglapi-7.11_1
 libOpenVG.so.1 libOpenVG-7.11_1
-libglsl.so MesaLib-7.11_1
+libgbm.so.1 libgbm-9.0_1
-libdricore.so MesaLib-7.11_1
 librsvg-2.so.2 librsvg-2.26.0_1
 libdbus-1.so.3 dbus-libs-1.2.10_1
 libdbus-glib-1.so.2 dbus-glib-0.80_1

srcpkgs/MesaLib/MesaLib-devel.template

@@ -1,7 +1,11 @@
 # Template file for 'MesaLib-devel'.
 #
 noarch=yes
-depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.23 expat-devel libXt-devel libGL>=$version libOpenVG>=$version libGLES>=$version libGLU>=$version libEGL>=$version libOSMesa>=${version}"
+depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
+ libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39 expat-devel
+ libXt-devel libGL-${version}_${revision} libOpenVG-${version}_${revision}
+ libGLES-${version}_${revision} libEGL-${version}_${revision}
+ libOSMesa-${version}_${revision} libgbm-${version}_${revision}"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 

srcpkgs/MesaLib/MesaLib.rshlibs

@@ -1,15 +1,14 @@
+libstdc++.so.6
+libm.so.6
+libc.so.6
+libgcc_s.so.1
+libexpat.so.1
 libpthread.so.0
 libdl.so.2
-libc.so.6
-libdrm.so.2
-libexpat.so.1
-libm.so.6
-libgcc_s.so.1
-libstdc++.so.6
 libdrm_intel.so.1
+libdrm.so.2
+libdrm_nouveau.so.2
 libdrm_radeon.so.1
-libXfixes.so.3
+libX11-xcb.so.1
-libXext.so.6
+libxcb-dri2.so.0
-libX11.so.6
-librt.so.1
 libXv.so.1

srcpkgs/MesaLib/libEGL.rshlibs

@@ -1,18 +1,22 @@
-libdl.so.2
-libpthread.so.0
 libX11-xcb.so.1
-libX11.so.6
 libxcb-dri2.so.0
 libxcb-xfixes.so.0
+libxcb-render.so.0
+libxcb-shape.so.0
 libxcb.so.1
+libX11.so.6
+libpthread.so.0
+libudev.so.1
+librt.so.1
+libdl.so.2
 libdrm.so.2
 libc.so.6
 libOpenVG.so.1
 libXext.so.6
 libXfixes.so.3
+libdrm_nouveau.so.2
+libdrm_radeon.so.1
 libglapi.so.0
 libm.so.6
 libstdc++.so.6
 libgcc_s.so.1
-libdrm_intel.so.1
-libudev.so.1

srcpkgs/MesaLib/libGL.INSTALL

@@ -2,7 +2,6 @@
 case ${ACTION} in
 post)
 	if [ ! -e usr/lib/libGL-nvidia.so* ]; then
-		rm -f usr/lib/libGL.so usr/lib/libGL.so.1
 		cd usr/lib
 		ln -sf libGL-mesa.so* libGL.so
 		ln -sf libGL-mesa.so* libGL.so.1

srcpkgs/MesaLib/libGL.rshlibs

@@ -2,12 +2,13 @@ libglapi.so.0
 libXext.so.6
 libXdamage.so.1
 libXfixes.so.3
-libXxf86vm.so.1
 libX11-xcb.so.1
 libX11.so.6
 libxcb-glx.so.0
 libxcb.so.1
+libXxf86vm.so.1
 libdrm.so.2
+libm.so.6
 libpthread.so.0
 libdl.so.2
 libc.so.6

srcpkgs/MesaLib/libGL.template

@@ -14,5 +14,5 @@ replaces="MesaLib<7.11_2"
 do_install() {
 	vmove "usr/lib/libGL.so*" usr/lib
 	rm -f ${DESTDIR}/usr/lib/libGL.so{,.1}
-	mv ${DESTDIR}/usr/lib/libGL.so.1.2 ${DESTDIR}/usr/lib/libGL-mesa.so.1.2
+	mv ${DESTDIR}/usr/lib/libGL.so.1.2.0 ${DESTDIR}/usr/lib/libGL-mesa.so.1.2.0
 }

srcpkgs/MesaLib/libGLES.rshlibs

@@ -1,2 +1,6 @@
+libdrm.so.2
+libm.so.6
+libdl.so.2
 libglapi.so.0
+libpthread.so.0
 libc.so.6

srcpkgs/MesaLib/libGLU.rshlibs

@@ -1,5 +0,0 @@
-libGL.so.1
-libstdc++.so.6
-libm.so.6
-libgcc_s.so.1
-libc.so.6

srcpkgs/MesaLib/libGLU.template

@@ -1,16 +0,0 @@
-# Template file for 'libGLU'.
-#
-short_desc="Mesa OpenGL utility library (GLU)"
-long_desc="
- GLU offers simple interfaces for building mipmaps; checking for the presence
- of extensions in the OpenGL (or other libraries which follow the same
- conventions for advertising extensions); drawing piecewise-linear curves,
- NURBS, quadrics and other primitives (including, but not limited to,
- teapots); tesselating surfaces; setting up projection matrices and
- unprojecting screen coordinates to world coordinates."
-
-replaces="MesaLib<7.11_2"
-
-do_install() {
-	vmove "usr/lib/libGLU.so*" usr/lib
-}

srcpkgs/MesaLib/libOSMesa.rshlibs

@@ -1,6 +1,7 @@
+libglapi.so.0
 libpthread.so.0
 libdl.so.2
 libstdc++.so.6
 libm.so.6
-libgcc_s.so.1
 libc.so.6
+libgcc_s.so.1

srcpkgs/MesaLib/libgbm.rshlibs

@@ -0,0 +1,7 @@
+libudev.so.1
+librt.so.1
+libkms.so.1
+libdl.so.2
+libglapi.so.0
+libpthread.so.0
+libc.so.6

srcpkgs/MesaLib/libgbm.template

@@ -0,0 +1,12 @@
+# Template file for 'libgbm'.
+#
+short_desc="generic buffer management API -- runtime"
+long_desc="
+ This package contains the GBM buffer management library. It provides a
+ mechanism for allocating buffers for graphics rendering tied to Mesa.
+
+ GBM is intended to be used as a native platform for EGL on drm or openwfd."
+
+do_install() {
+	vmove "usr/lib/libgbm.so*" usr/lib
+}

srcpkgs/MesaLib/patches/mesa-8.0.3-llvm-3.1-fixes.patch

@@ -1,44 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }

srcpkgs/MesaLib/template

@@ -1,31 +1,34 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
-version=8.0.4
+version=9.0
-revision=5
+revision=1
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
---enable-shared-dricore --enable-gles1 --enable-gles2 --enable-openvg
+ --enable-gles1 --enable-gles2 --enable-openvg --enable-egl --disable-va
---enable-egl --with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-xa
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-vdpau --enable-xa
---enable-gallium-egl --disable-va --enable-vdpau --enable-xvmc --enable-xa
+ --enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
---enable-texture-float --enable-osmesa
+ --with-gallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau
---with-gallium-drivers=i915,r300,r600,svga,swrast
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast --enable-gbm"
---with-dri-drivers=i915,i965,r200,radeon,swrast"
+subpackages="libgbm libEGL libglapi libGLES libGL libOpenVG libOSMesa MesaLib-devel"
-makedepends="perl>=0 flex pkg-config glproto dri2proto>=2.1 makedepend
-libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libxcb-devel
-libudev-devel>=183 libdrm-devel expat-devel libXt-devel talloc-devel
-libxml2-python llvm-devel libvdpau-devel libXvMC-devel>=1.0.6"
-# XXX reenable nouveau driver when it's updated for libdrm>=2.4.34
-subpackages="libEGL libglapi libGLES libGL libGLU libOpenVG libOSMesa MesaLib-devel"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mesa3d.org/"
 license="MIT, LGPL-2.1"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
-checksum=02ed19f4f5f6535dda03a9932a81438aa78ea723ebba1f39a3d49a70a4e1d07e
+checksum=0b7d206a2721d1c843f3decb71e10f86941cb4ddfd4c8a48cee75e7f0aabc3b5
 long_desc="
  MesaLib is a 3-D graphics library with an API which is very similar to
  that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax
  or state machine, it is being used with authorization from Silicon Graphics,
  Inc. However, the author makes no claim that Mesa is in any way a
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
+
+makedepends="perl flex pkg-config glproto dri2proto>=2.1 makedepend
+ libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libxcb-devel
+ libudev-devel>=183 libdrm-devel expat-devel libXt-devel talloc-devel
+ libxml2-python llvm-devel libvdpau-devel libXvMC-devel>=1.0.6 automake"
+
+pre_configure() {
+	./autogen.sh
+}