From 5337799cf9caa20d2f0bbe629582ee343914f93e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sun, 9 Dec 2012 02:22:05 +0100 Subject: [PATCH] mesa3d: updated to 9.0.1 --- mesa3d/.footprint | 34 +++++++++++--------- mesa3d/.md5sum | 3 +- mesa3d/Pkgfile | 16 ++++------ mesa3d/mesa-8.0.3-llvm-3.1-fixes.patch | 44 -------------------------- 4 files changed, 26 insertions(+), 71 deletions(-) delete mode 100644 mesa3d/mesa-8.0.3-llvm-3.1-fixes.patch diff --git a/mesa3d/.footprint b/mesa3d/.footprint index e6e174d..d307002 100644 --- a/mesa3d/.footprint +++ b/mesa3d/.footprint @@ -9,8 +9,6 @@ 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/glu.h --rw-r--r-- root/root usr/include/GL/glu_mangle.h -rw-r--r-- root/root usr/include/GL/glx.h -rw-r--r-- root/root usr/include/GL/glx_mangle.h -rw-r--r-- root/root usr/include/GL/glxext.h @@ -33,24 +31,31 @@ 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.la -rwxr-xr-x root/root usr/lib/dri/swrast_dri.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 +-rwxr-xr-x root/root usr/lib/libEGL.la +lrwxrwxrwx root/root usr/lib/libEGL.so -> libEGL.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libEGL.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libGL.la +lrwxrwxrwx root/root usr/lib/libGL.so -> libGL.so.1.2.0 +lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.2.0 +-rwxr-xr-x root/root usr/lib/libGL.so.1.2.0 +-rwxr-xr-x root/root usr/lib/libGLESv1_CM.la +lrwxrwxrwx root/root usr/lib/libGLESv1_CM.so -> libGLESv1_CM.so.1.1.0 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 +-rwxr-xr-x root/root usr/lib/libGLESv2.la +lrwxrwxrwx root/root usr/lib/libGLESv2.so -> libGLESv2.so.2.0.0 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.08004 --rwxr-xr-x root/root usr/lib/libGLU.so.1.3.08004 -lrwxrwxrwx root/root usr/lib/libglapi.so -> libglapi.so.0 +-rwxr-xr-x root/root usr/lib/libdricore9.0.1.la +lrwxrwxrwx root/root usr/lib/libdricore9.0.1.so -> libdricore9.0.1.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libdricore9.0.1.so.1 -> libdricore9.0.1.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libdricore9.0.1.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libglapi.la +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 drwxr-xr-x root/root usr/lib/pkgconfig/ @@ -59,4 +64,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/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 fbdcd85..ce5e182 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1,2 +1 @@ -d546f988adfdf986cff45b1efa2d8a46 MesaLib-8.0.4.tar.bz2 -0082f4d17674155aa13bc611a5687788 mesa-8.0.3-llvm-3.1-fixes.patch +97d6554c05ea7449398afe3a0ede7018 MesaLib-9.0.1.tar.bz2 diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 45ca6fe..c8721e9 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -2,26 +2,22 @@ # URL: http://www.mesa3d.org # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu # 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 +# Depends on: libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2prroto, xorg-libx11, xorg-xf86vidmodeproto, xorg-libxext, xorg-libxxf86vm, xorg-libbxt, xorg-libxdamage, xorg-libpciaccess, expat, talloc, libxml2-python name=mesa3d -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) +version=9.0.1 +release=1 +source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2) build() { cd Mesa-$version - patch -p 1 -i $SRC/mesa-8.0.3-llvm-3.1-fixes.patch - + autoreconf --install --symlink ./configure --prefix=/usr \ - --with-driver=dri \ --with-dri-drivers=swrast \ --with-gallium-drivers=svga \ --enable-gles1 \ - --enable-gles2 \ - --enable-glu + --enable-gles2 make make DESTDIR=$PKG install diff --git a/mesa3d/mesa-8.0.3-llvm-3.1-fixes.patch b/mesa3d/mesa-8.0.3-llvm-3.1-fixes.patch deleted file mode 100644 index 922577a..0000000 --- a/mesa3d/mesa-8.0.3-llvm-3.1-fixes.patch +++ /dev/null @@ -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 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/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 MRI(T->createMCRegInfo(Triple)); -+ if (!MRI) { -+ debug_printf("error: no register info for target %s\n", Triple.c_str()); -+ return; -+ } -+ -+ OwningPtr 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 Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); -+#elif HAVE_LLVM == 0x0300 - OwningPtr 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 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/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 - } -- 2.26.2