mesa3d 8.0.99-284325d9-1 màj port

5 files changed, 50 insertions, 23 deletions

diff --git a/mesa3d/.footprint.i686 b/mesa3d/.footprint.i686
index ff591afd8..3d2eb7ca5 100644
--- a/mesa3d/.footprint.i686
+++ b/mesa3d/.footprint.i686
@@ -48,9 +48,6 @@ drwxr-xr-x	root/root	usr/lib/dri/
 -rwxr-xr-x	root/root	usr/lib/dri/i915_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/i965_dri.la
 -rwxr-xr-x	root/root	usr/lib/dri/i965_dri.so
--rwxr-xr-x	root/root	usr/lib/dri/libdricore.la
--rwxr-xr-x	root/root	usr/lib/dri/libdricore.so
--rwxr-xr-x	root/root	usr/lib/dri/libglsl.so
 -rwxr-xr-x	root/root	usr/lib/dri/nouveau_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/nouveau_vieux_dri.la
 -rwxr-xr-x	root/root	usr/lib/dri/nouveau_vieux_dri.so
@@ -86,7 +83,8 @@ lrwxrwxrwx	root/root	usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libGLU.so -> libGLU.so.1
 lrwxrwxrwx	root/root	usr/lib/libGLU.so.1 -> libGLU.so.1.3.08100
 -rwxr-xr-x	root/root	usr/lib/libGLU.so.1.3.08100
-lrwxrwxrwx	root/root	usr/lib/libOSMesa.so -> libOSMesa.so.8
+-rwxr-xr-x	root/root	usr/lib/libOSMesa.la
+lrwxrwxrwx	root/root	usr/lib/libOSMesa.so -> libOSMesa.so.8.1.0
 lrwxrwxrwx	root/root	usr/lib/libOSMesa.so.8 -> libOSMesa.so.8.1.0
 -rwxr-xr-x	root/root	usr/lib/libOSMesa.so.8.1.0
 -rwxr-xr-x	root/root	usr/lib/libOpenCL.la
@@ -108,7 +106,10 @@ lrwxrwxrwx	root/root	usr/lib/libXvMCr600.so.1 -> libXvMCr600.so.1.0
 lrwxrwxrwx	root/root	usr/lib/libXvMCsoftpipe.so -> libXvMCsoftpipe.so.1
 lrwxrwxrwx	root/root	usr/lib/libXvMCsoftpipe.so.1 -> libXvMCsoftpipe.so.1.0
 -rwxr-xr-x	root/root	usr/lib/libXvMCsoftpipe.so.1.0
--rwxr-xr-x	root/root	usr/lib/libdricore.so
+-rwxr-xr-x	root/root	usr/lib/libdricore8.1.0.la
+lrwxrwxrwx	root/root	usr/lib/libdricore8.1.0.so -> libdricore8.1.0.so.1
+lrwxrwxrwx	root/root	usr/lib/libdricore8.1.0.so.1 -> libdricore8.1.0.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libdricore8.1.0.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libgbm.la
 -rwxr-xr-x	root/root	usr/lib/libgbm.so
 lrwxrwxrwx	root/root	usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
@@ -117,7 +118,6 @@ lrwxrwxrwx	root/root	usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libglapi.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libglsl.so
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so -> libxatracker.so.1
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so.1 -> libxatracker.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libxatracker.so.1.0.0
@@ -152,3 +152,29 @@ lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_r600.so.1 -> libvdpau_r600.so.1.0
 lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_softpipe.so -> libvdpau_softpipe.so.1
 lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_softpipe.so.1 -> libvdpau_softpipe.so.1.0
 -rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_softpipe.so.1.0
+drwxr-xr-x	root/root	usr/lib64/
+drwxr-xr-x	root/root	usr/lib64/X11/
+drwxr-xr-x	root/root	usr/lib64/X11/modules/
+drwxr-xr-x	root/root	usr/lib64/X11/modules/extensions/
+lrwxrwxrwx	root/root	usr/lib64/libEGL.so -> libEGL.so.1
+-rwxr-xr-x	root/root	usr/lib64/libEGL.so.1
+lrwxrwxrwx	root/root	usr/lib64/libGLESv1_CM.so -> libGLESv1_CM.so.1
+lrwxrwxrwx	root/root	usr/lib64/libGLESv1_CM.so.1 -> libGLESv1_CM.so.1.1.0
+-rwxr-xr-x	root/root	usr/lib64/libGLESv1_CM.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib64/libGLESv2.so -> libGLESv2.so.2
+lrwxrwxrwx	root/root	usr/lib64/libGLESv2.so.2 -> libGLESv2.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib64/libGLESv2.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib64/libGLU.so -> libGLU.so.1
+lrwxrwxrwx	root/root	usr/lib64/libGLU.so.1 -> libGLU.so.1.3.08100
+-rwxr-xr-x	root/root	usr/lib64/libGLU.so.1.3.08100
+lrwxrwxrwx	root/root	usr/lib64/libOSMesa.so -> libOSMesa.so.8.1.0
+lrwxrwxrwx	root/root	usr/lib64/libOpenCL.so -> libOpenCL.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib64/libOpenCL.so.1 -> libOpenCL.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib64/libOpenCL.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib64/libOpenVG.so -> libOpenVG.so.1
+lrwxrwxrwx	root/root	usr/lib64/libOpenVG.so.1 -> libOpenVG.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib64/libOpenVG.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib64/libdricore8.1.0.so -> libdricore8.1.0.so.1
+-rwxr-xr-x	root/root	usr/lib64/libdricore8.1.0.so.1
+-rwxr-xr-x	root/root	usr/lib64/libgbm.so
+-rwxr-xr-x	root/root	usr/lib64/libglapi.so
diff --git a/mesa3d/.footprint.x86_64 b/mesa3d/.footprint.x86_64
index e217972d9..3d2eb7ca5 100644
--- a/mesa3d/.footprint.x86_64
+++ b/mesa3d/.footprint.x86_64
@@ -48,9 +48,6 @@ drwxr-xr-x	root/root	usr/lib/dri/
 -rwxr-xr-x	root/root	usr/lib/dri/i915_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/i965_dri.la
 -rwxr-xr-x	root/root	usr/lib/dri/i965_dri.so
--rwxr-xr-x	root/root	usr/lib/dri/libdricore.la
--rwxr-xr-x	root/root	usr/lib/dri/libdricore.so
--rwxr-xr-x	root/root	usr/lib/dri/libglsl.so
 -rwxr-xr-x	root/root	usr/lib/dri/nouveau_dri.so
 -rwxr-xr-x	root/root	usr/lib/dri/nouveau_vieux_dri.la
 -rwxr-xr-x	root/root	usr/lib/dri/nouveau_vieux_dri.so
@@ -86,7 +83,8 @@ lrwxrwxrwx	root/root	usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libGLU.so -> libGLU.so.1
 lrwxrwxrwx	root/root	usr/lib/libGLU.so.1 -> libGLU.so.1.3.08100
 -rwxr-xr-x	root/root	usr/lib/libGLU.so.1.3.08100
-lrwxrwxrwx	root/root	usr/lib/libOSMesa.so -> libOSMesa.so.8
+-rwxr-xr-x	root/root	usr/lib/libOSMesa.la
+lrwxrwxrwx	root/root	usr/lib/libOSMesa.so -> libOSMesa.so.8.1.0
 lrwxrwxrwx	root/root	usr/lib/libOSMesa.so.8 -> libOSMesa.so.8.1.0
 -rwxr-xr-x	root/root	usr/lib/libOSMesa.so.8.1.0
 -rwxr-xr-x	root/root	usr/lib/libOpenCL.la
@@ -108,7 +106,10 @@ lrwxrwxrwx	root/root	usr/lib/libXvMCr600.so.1 -> libXvMCr600.so.1.0
 lrwxrwxrwx	root/root	usr/lib/libXvMCsoftpipe.so -> libXvMCsoftpipe.so.1
 lrwxrwxrwx	root/root	usr/lib/libXvMCsoftpipe.so.1 -> libXvMCsoftpipe.so.1.0
 -rwxr-xr-x	root/root	usr/lib/libXvMCsoftpipe.so.1.0
--rwxr-xr-x	root/root	usr/lib/libdricore.so
+-rwxr-xr-x	root/root	usr/lib/libdricore8.1.0.la
+lrwxrwxrwx	root/root	usr/lib/libdricore8.1.0.so -> libdricore8.1.0.so.1
+lrwxrwxrwx	root/root	usr/lib/libdricore8.1.0.so.1 -> libdricore8.1.0.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libdricore8.1.0.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libgbm.la
 -rwxr-xr-x	root/root	usr/lib/libgbm.so
 lrwxrwxrwx	root/root	usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
@@ -117,7 +118,6 @@ lrwxrwxrwx	root/root	usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libglapi.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libglsl.so
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so -> libxatracker.so.1
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so.1 -> libxatracker.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libxatracker.so.1.0.0
@@ -167,16 +167,14 @@ lrwxrwxrwx	root/root	usr/lib64/libGLESv2.so.2 -> libGLESv2.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib64/libGLU.so -> libGLU.so.1
 lrwxrwxrwx	root/root	usr/lib64/libGLU.so.1 -> libGLU.so.1.3.08100
 -rwxr-xr-x	root/root	usr/lib64/libGLU.so.1.3.08100
-lrwxrwxrwx	root/root	usr/lib64/libOSMesa.so -> libOSMesa.so.8
-lrwxrwxrwx	root/root	usr/lib64/libOSMesa.so.8 -> libOSMesa.so.8.1.0
--rwxr-xr-x	root/root	usr/lib64/libOSMesa.so.8.1.0
+lrwxrwxrwx	root/root	usr/lib64/libOSMesa.so -> libOSMesa.so.8.1.0
 lrwxrwxrwx	root/root	usr/lib64/libOpenCL.so -> libOpenCL.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib64/libOpenCL.so.1 -> libOpenCL.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib64/libOpenCL.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib64/libOpenVG.so -> libOpenVG.so.1
 lrwxrwxrwx	root/root	usr/lib64/libOpenVG.so.1 -> libOpenVG.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib64/libOpenVG.so.1.0.0
--rwxr-xr-x	root/root	usr/lib64/libdricore.so
+lrwxrwxrwx	root/root	usr/lib64/libdricore8.1.0.so -> libdricore8.1.0.so.1
+-rwxr-xr-x	root/root	usr/lib64/libdricore8.1.0.so.1
 -rwxr-xr-x	root/root	usr/lib64/libgbm.so
 -rwxr-xr-x	root/root	usr/lib64/libglapi.so
--rwxr-xr-x	root/root	usr/lib64/libglsl.so
diff --git a/mesa3d/.md5sum.i686 b/mesa3d/.md5sum.i686
index 63f49e4a6..0754b58a6 100644
--- a/mesa3d/.md5sum.i686
+++ b/mesa3d/.md5sum.i686
@@ -1 +1 @@
-aea0ddea54745523f8ed64f792aeca10  mesa-e2c08e82.tar.gz
+d78cbcd3a62cea657fd357932a5bd64d  mesa-284325d9.tar.gz
diff --git a/mesa3d/.md5sum.x86_64 b/mesa3d/.md5sum.x86_64
index 63f49e4a6..0754b58a6 100644
--- a/mesa3d/.md5sum.x86_64
+++ b/mesa3d/.md5sum.x86_64
@@ -1 +1 @@
-aea0ddea54745523f8ed64f792aeca10  mesa-e2c08e82.tar.gz
+d78cbcd3a62cea657fd357932a5bd64d  mesa-284325d9.tar.gz
diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index 651282d6b..5f3cd2b6e 100755
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -7,7 +7,7 @@
 
 name=mesa3d
 version=8.0.99
-release=e2c08e82-1
+release=284325d9-1
 #source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2)
 source=(http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-${release%-*}.tar.gz)
 
@@ -16,11 +16,11 @@ build() {
 	./autogen.sh
 
 	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $SRC -name '*.py')
-	sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" configs/{default,autoconf.in}
+	sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" configs/{default,current.in}
 	sed -i -e "s|python|python2|" src/gallium/auxiliary/Makefile
 
 	sed -i 's|$(LLVM_LIBS)|$(LLVM_LIBS) $(LLVM_LDFLAGS)|'  src/gallium/tests/trivial/Makefile
-	sed -i 's|$(LLVM_LIBS)|$(LLVM_LIBS) $(LLVM_LDFLAGS)|' src/gallium/targets/opencl/Makefile.am
+#	sed -i 's|$(LLVM_LIBS)|$(LLVM_LIBS) $(LLVM_LDFLAGS)|' src/gallium/targets/opencl/Makefile.am
 
 	./configure $XORG_CONFIG \
 		--enable-opengl \
@@ -51,7 +51,8 @@ build() {
 		--enable-gallium-llvm \
 		--with-gallium-drivers="i915,nouveau,r300,r600,swrast,svga"  \
 		--with-dri-driverdir=$XORG_PREFIX/lib/dri \
-		--with-dri-drivers="i915,i965,intel,nouveau,r200,radeon,swrast"
+		--with-dri-drivers="i915,i965,intel,nouveau,r200,radeon,swrast" \
+		--with-clang-libdir=/usr/lib
 #		--enable-d3d1x
 #		--with-dri-drivers="i915,i965,intel,nouveau,r200,radeon,swrast"
 #		--with-gallium-drivers="i915,nouveau,r300,r600,radeonsi,svga"
@@ -60,6 +61,8 @@ build() {
 	# mesa
 	make DESTDIR=$PKG install
 
+	cp src/mesa/gl.pc $PKG/usr/lib/pkgconfig
+
 	# libgl
 	bin/minstall lib/lib* $PKG/usr/lib/