From 595c0a0620c38b6ada62e2b253fde4ef0e53fb8b Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 12 Mar 2011 23:34:58 +0100
Subject: mesa3d, correction port

---
 xorg/mesa3d/.footprint.i686   |  3 ---
 xorg/mesa3d/.footprint.x86_64 |  9 +++------
 xorg/mesa3d/Pkgfile           | 19 ++++---------------
 3 files changed, 7 insertions(+), 24 deletions(-)

(limited to 'xorg')

diff --git a/xorg/mesa3d/.footprint.i686 b/xorg/mesa3d/.footprint.i686
index 0a158fbc0..593b5d22a 100644
--- a/xorg/mesa3d/.footprint.i686
+++ b/xorg/mesa3d/.footprint.i686
@@ -67,6 +67,3 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gl.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/glu.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/glw.pc
-drwxr-xr-x	root/root	usr/lib/xorg/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
diff --git a/xorg/mesa3d/.footprint.x86_64 b/xorg/mesa3d/.footprint.x86_64
index 0f515f6ff..9803b3729 100644
--- a/xorg/mesa3d/.footprint.x86_64
+++ b/xorg/mesa3d/.footprint.x86_64
@@ -65,10 +65,10 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gl.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/glu.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/glw.pc
-drwxr-xr-x	root/root	usr/lib/xorg/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
 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
 lrwxrwxrwx	root/root	usr/lib64/libEGL.so.1 -> libEGL.so.1.0
 -rwxr-xr-x	root/root	usr/lib64/libEGL.so.1.0
@@ -81,6 +81,3 @@ lrwxrwxrwx	root/root	usr/lib64/libGLU.so.1 -> libGLU.so.1.3.071000
 lrwxrwxrwx	root/root	usr/lib64/libGLw.so -> libGLw.so.1
 lrwxrwxrwx	root/root	usr/lib64/libGLw.so.1 -> libGLw.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib64/libGLw.so.1.0.0
-drwxr-xr-x	root/root	usr/lib64/xorg/
-drwxr-xr-x	root/root	usr/lib64/xorg/modules/
-drwxr-xr-x	root/root	usr/lib64/xorg/modules/extensions/
diff --git a/xorg/mesa3d/Pkgfile b/xorg/mesa3d/Pkgfile
index 7799f38db..c32e1a4ef 100755
--- a/xorg/mesa3d/Pkgfile
+++ b/xorg/mesa3d/Pkgfile
@@ -20,9 +20,8 @@ build() {
 
 	sed -i -e "s|python|python2|" $SRC/Mesa-$version/src/gallium/auxiliary/Makefile
 
-	./configure --prefix=/usr \
-	            --with-driver=dri \
-	            --with-dri-driverdir=/usr/lib/dri
+	./configure $XORG_CONFIG \
+	            --enable-xcb
   	make
 
 	# mesa
@@ -30,26 +29,16 @@ build() {
 
 	# libgl	
 	cd $SRC/Mesa-*
-  	install -m755 -d $PKG/usr/lib
-  	install -m755 -d $PKG/usr/lib/xorg/modules/extensions
   	bin/minstall lib/lib* $PKG/usr/lib/
 
 	case `uname -m` in
 		x86_64)
-		install -m755 -d $PKG/usr/lib64
-        	install -m755 -d $PKG/usr/lib64/xorg/modules/extensions
+		install -m755 -d $PKG/$XORG_PREFIX/lib64
+        	install -m755 -d $PKG/$XORG_PREFIX/lib64/X11/modules/extensions
         	bin/minstall lib/lib* $PKG/usr/lib64/
 	esac
 
 	cd src/mesa/drivers/dri
 	make -C swrast DESTDIR=$PKG install
-
-
-#	for i in glew.h glxew.h wglew.h
-#	do
-#		rm $PKG/usr/include/GL/$i
-#	done
 	rm $PKG/usr/lib/libGL.*
-#	install -d $PKG/usr/bin
-#	install -m 755 progs/xdemos/glx{gears,info} $PKG/usr/bin
 }
-- 
cgit v1.2.3-70-g09d2