libgl 8.0.99-6404095f-1 màj port

5 files changed, 42 insertions, 25 deletions

diff --git a/libgl/.footprint.i686 b/libgl/.footprint.i686
index 40dcdf347..a60089141 100644
--- a/libgl/.footprint.i686
+++ b/libgl/.footprint.i686
@@ -5,5 +5,4 @@ drwxr-xr-x	root/root	usr/lib/X11/modules/
 drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
 lrwxrwxrwx	root/root	usr/lib/X11/modules/extensions/libglx.so -> libglx.xorg
 lrwxrwxrwx	root/root	usr/lib/libGL.so -> libGL.so.1
-lrwxrwxrwx	root/root	usr/lib/libGL.so.1 -> libGL.so.1.2
--rwxr-xr-x	root/root	usr/lib/libGL.so.1.2
+-rwxr-xr-x	root/root	usr/lib/libGL.so.1
diff --git a/libgl/.footprint.x86_64 b/libgl/.footprint.x86_64
index 40dcdf347..a60089141 100644
--- a/libgl/.footprint.x86_64
+++ b/libgl/.footprint.x86_64
@@ -5,5 +5,4 @@ drwxr-xr-x	root/root	usr/lib/X11/modules/
 drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
 lrwxrwxrwx	root/root	usr/lib/X11/modules/extensions/libglx.so -> libglx.xorg
 lrwxrwxrwx	root/root	usr/lib/libGL.so -> libGL.so.1
-lrwxrwxrwx	root/root	usr/lib/libGL.so.1 -> libGL.so.1.2
--rwxr-xr-x	root/root	usr/lib/libGL.so.1.2
+-rwxr-xr-x	root/root	usr/lib/libGL.so.1
diff --git a/libgl/.md5sum.i686 b/libgl/.md5sum.i686
index 80edb449b..536aaacac 100644
--- a/libgl/.md5sum.i686
+++ b/libgl/.md5sum.i686
@@ -1 +1 @@
-a368104e5700707048dc3e8691a9a7a1  MesaLib-8.0.2.tar.bz2
+86fa1596b9a238bdf79c7cd98a3bce20  mesa-6404095f.tar.gz
diff --git a/libgl/.md5sum.x86_64 b/libgl/.md5sum.x86_64
index 80edb449b..536aaacac 100644
--- a/libgl/.md5sum.x86_64
+++ b/libgl/.md5sum.x86_64
@@ -1 +1 @@
-a368104e5700707048dc3e8691a9a7a1  MesaLib-8.0.2.tar.bz2
+86fa1596b9a238bdf79c7cd98a3bce20  mesa-6404095f.tar.gz
diff --git a/libgl/Pkgfile b/libgl/Pkgfile
index b0de5e28c..6a33f4070 100644
--- a/libgl/Pkgfile
+++ b/libgl/Pkgfile
@@ -2,40 +2,59 @@
 # URL: http://www.mesa3d.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: talloc, expat, libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, xorg-libxmu, xorg-libxi, llvm
+# Depends on: talloc, expat, libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, xorg-libxmu, xorg-libxi, llvm, xorg-libxvmc, libvdpau
 # Run on: talloc,expat,libdrm,xorg-makedepend,xorg-libx11,xorg-libxext,xorg-libxxf86vm,xorg-libxt,xorg-libxdamage,xorg-libxmu,xorg-libxi
 
 name=libgl
-version=8.0.2
+version=8.0.99
 release=1
-source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2)
+release=6404095f-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)
 
 build() {
-	cd Mesa-$version
+	cd mesa-${release%-*}
+	./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|" $SRC/Mesa-$version/configs/{default,autoconf.in}
-	sed -i -e "s|python|python2|" $SRC/Mesa-$version/src/gallium/auxiliary/Makefile
+	sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" configs/{default,autoconf.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
 
 	./configure $XORG_CONFIG \
-		--with-dri-driverdir=$XORG_PREFIX/lib/dri \
-		--with-dri-drivers="i915,i965,nouveau,r200,radeon,swrast" \
-		--with-gallium-drivers="i915,r300,r600,nouveau,swrast,svga" \
-		--enable-egl \
+		--enable-opengl \
 		--enable-gles1 \
 		--enable-gles2 \
 		--enable-openvg \
-		--enable-gallium-egl \
-		--enable-gallium-llvm \
-		--enable-texture-float \
-		--enable-shared-glapi \
-		--enable-glx-tls \
 		--enable-dri \
-		--enable-shared-dricore \
+		--enable-glx \
 		--enable-osmesa \
+		--enable-egl \
+		--disable-xorg \
 		--enable-xa \
-#		--enable-gallium-g3dvl \
-#		--enable-d3d1x \
-#		--enable-xorg
+		--enable-gbm \
+		--enable-xvmc \
+		--enable-vdpau \
+		--disable-va \
+		--enable-opencl \
+		--disable-xlib-glx \
+		--enable-gallium-egl \
+		--enable-gallium-gbm \
+		--enable-r600-llvm-compiler \
+		--enable-gallium-tests \
+		--enable-shared-glapi \
+		--enable-driglx-direct \
+		--enable-glx-tls \
+		--enable-gallium-g3dvl \
+		--enable-glu \
+		--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"
+#		--enable-d3d1x
+#		--with-dri-drivers="i915,i965,intel,nouveau,r200,radeon,swrast"
+#		--with-gallium-drivers="i915,nouveau,r300,r600,radeonsi,svga"
 	make
 	install -m755 -d $PKG/$XORG_PREFIX/lib{,/X11/modules/extensions}
 	bin/minstall lib/libGL.so* $PKG/$XORG_PREFIX/lib/