From ae7453db8ca30c59e6f0df1b45ee09a89574b79d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 1 Oct 2012 00:31:23 +0000 Subject: [PATCH] mesa3d: updated and added gallium and gles(v1 and v2) support) --- mesa3d/.footprint | 34 ++++++++++++++++++++++++---------- mesa3d/.md5sum | 7 ++----- mesa3d/Pkgfile | 29 ++++++++++++----------------- mesa3d/mesa3d-7.10.2-arm.diff | 11 ----------- 4 files changed, 38 insertions(+), 43 deletions(-) delete mode 100644 mesa3d/mesa3d-7.10.2-arm.diff diff --git a/mesa3d/.footprint b/mesa3d/.footprint index 625f827..e6e174d 100644 --- a/mesa3d/.footprint +++ b/mesa3d/.footprint @@ -1,17 +1,14 @@ drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/glxgears --rwxr-xr-x root/root usr/bin/glxinfo drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/EGL/ -rw-r--r-- root/root usr/include/EGL/egl.h -rw-r--r-- root/root usr/include/EGL/eglext.h +-rw-r--r-- root/root usr/include/EGL/eglmesaext.h -rw-r--r-- root/root usr/include/EGL/eglplatform.h drwxr-xr-x root/root usr/include/GL/ -rw-r--r-- root/root usr/include/GL/gl.h -rw-r--r-- root/root usr/include/GL/gl_mangle.h -rw-r--r-- root/root usr/include/GL/glext.h --rw-r--r-- root/root usr/include/GL/glfbdev.h -rw-r--r-- root/root usr/include/GL/glu.h -rw-r--r-- root/root usr/include/GL/glu_mangle.h -rw-r--r-- root/root usr/include/GL/glx.h @@ -19,30 +16,47 @@ drwxr-xr-x root/root usr/include/GL/ -rw-r--r-- root/root usr/include/GL/glxext.h drwxr-xr-x root/root usr/include/GL/internal/ -rw-r--r-- root/root usr/include/GL/internal/dri_interface.h --rw-r--r-- root/root usr/include/GL/mesa_wgl.h -rw-r--r-- root/root usr/include/GL/osmesa.h -rw-r--r-- root/root usr/include/GL/vms_x_fix.h -rw-r--r-- root/root usr/include/GL/wglext.h -rw-r--r-- root/root usr/include/GL/wmesa.h +drwxr-xr-x root/root usr/include/GLES/ +-rw-r--r-- root/root usr/include/GLES/egl.h +-rw-r--r-- root/root usr/include/GLES/gl.h +-rw-r--r-- root/root usr/include/GLES/glext.h +-rw-r--r-- root/root usr/include/GLES/glplatform.h +drwxr-xr-x root/root usr/include/GLES2/ +-rw-r--r-- root/root usr/include/GLES2/gl2.h +-rw-r--r-- root/root usr/include/GLES2/gl2ext.h +-rw-r--r-- root/root usr/include/GLES2/gl2platform.h drwxr-xr-x root/root usr/include/KHR/ -rw-r--r-- root/root usr/include/KHR/khrplatform.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/dri/ -rwxr-xr-x root/root usr/lib/dri/swrast_dri.so -drwxr-xr-x root/root usr/lib/egl/ --rwxr-xr-x root/root usr/lib/egl/egl_dri2.so --rwxr-xr-x root/root usr/lib/egl/egl_glx.so +-rwxr-xr-x root/root usr/lib/dri/vmwgfx_dri.so lrwxrwxrwx root/root usr/lib/libEGL.so -> libEGL.so.1 lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0 -rwxr-xr-x root/root usr/lib/libEGL.so.1.0 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 +lrwxrwxrwx root/root usr/lib/libGLESv1_CM.so -> libGLESv1_CM.so.1 +lrwxrwxrwx root/root usr/lib/libGLESv1_CM.so.1 -> libGLESv1_CM.so.1.1.0 +-rwxr-xr-x root/root usr/lib/libGLESv1_CM.so.1.1.0 +lrwxrwxrwx root/root usr/lib/libGLESv2.so -> libGLESv2.so.2 +lrwxrwxrwx root/root usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0 +-rwxr-xr-x root/root usr/lib/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.071000 --rwxr-xr-x root/root usr/lib/libGLU.so.1.3.071000 +lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.08004 +-rwxr-xr-x root/root usr/lib/libGLU.so.1.3.08004 +lrwxrwxrwx root/root usr/lib/libglapi.so -> libglapi.so.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 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dri.pc -rw-r--r-- root/root usr/lib/pkgconfig/egl.pc -rw-r--r-- root/root usr/lib/pkgconfig/gl.pc +-rw-r--r-- root/root usr/lib/pkgconfig/glesv1_cm.pc +-rw-r--r-- root/root usr/lib/pkgconfig/glesv2.pc -rw-r--r-- root/root usr/lib/pkgconfig/glu.pc diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index 608ba4c..fbdcd85 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1,5 +1,2 @@ -1ef1b3af508887003a0e0076c5d2cc74 Makefile -f5de82852f1243f42cc004039e10b771 MesaLib-7.10.2.tar.bz2 -2ce4a8684cea9529a6e72c7220b1192f glxgears.c -9f306d954d8c135ee326887707bc0fb1 glxinfo.c -a273bbd8e032d713615f44cf6793cdd4 mesa3d-7.10.2-arm.diff +d546f988adfdf986cff45b1efa2d8a46 MesaLib-8.0.4.tar.bz2 +0082f4d17674155aa13bc611a5687788 mesa-8.0.3-llvm-3.1-fixes.patch diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 283ce37..45ca6fe 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -1,33 +1,28 @@ # Description: Mesa 3D Graphics Library # URL: http://www.mesa3d.org -# Maintainer: Tilman Sauerbeck, tilman at crux dot nu # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu -# Depends on: libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-xf86vidmodeproto, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, expat, libxml2-python +# Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu +# Depends on: libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-xf86vidmodeproto, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, xorg-libpciaccess, expat, talloc, libxml2-python name=mesa3d -version=7.10.2 -release=1 -source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2 \ - Makefile glxgears.c glxinfo.c $name-$version-arm.diff) +version=8.0.4 +release=2 +source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2 + mesa-8.0.3-llvm-3.1-fixes.patch) build() { cd Mesa-$version - patch -p0 -i $SRC/$name-$version-arm.diff - mkdir -p progs/xdemos - mv $SRC/{Makefile,glx{gears,info}.c} progs/xdemos + + patch -p 1 -i $SRC/mesa-8.0.3-llvm-3.1-fixes.patch ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/dri \ --with-driver=dri \ --with-dri-drivers=swrast \ - --enable-glu \ - --disable-glw \ - --disable-gallium + --with-gallium-drivers=svga \ + --enable-gles1 \ + --enable-gles2 \ + --enable-glu make - make -C progs/xdemos make DESTDIR=$PKG install - - install -d $PKG/usr/bin - install -m 755 progs/xdemos/glx{gears,info} $PKG/usr/bin } diff --git a/mesa3d/mesa3d-7.10.2-arm.diff b/mesa3d/mesa3d-7.10.2-arm.diff deleted file mode 100644 index 706c3ec..0000000 --- a/mesa3d/mesa3d-7.10.2-arm.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mesa/drivers/dri/sis/sis_context.h_orig 2010-11-15 08:54:00.499406000 +0000 -+++ src/mesa/drivers/dri/sis/sis_context.h 2010-11-15 08:55:33.139406000 +0000 -@@ -400,7 +400,7 @@ - #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg)) - #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg)) - --#if defined(__i386__) || defined(__x86_64__) -+#if defined(__i386__) || defined(__x86_64__) || defined(__ARM__) || defined(__arm__) - #define MMIO_WMB() __asm __volatile("" : : : "memory") - #elif defined(__ia64__) - #define MMIO_WMB() __asm __volatile("mf" : : : "memory") -- 2.26.2