From 182ad0da0a412f8c9a2c73494b97748b49403436 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 26 May 2012 15:56:40 +0200 Subject: [PATCH] MesaLib: rebuild against new libudev. Add patch for llvm-3.1. --- srcpkgs/MesaLib/MesaLib-devel.template | 6 +-- srcpkgs/MesaLib/libEGL.rshlibs | 2 +- .../patches/mesa-8.0.3-llvm-3.1-fixes.patch | 44 +++++++++++++++++++ srcpkgs/MesaLib/template | 10 ++--- 4 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 srcpkgs/MesaLib/patches/mesa-8.0.3-llvm-3.1-fixes.patch diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template index b1b34c94a12..f92eca1edc0 100644 --- a/srcpkgs/MesaLib/MesaLib-devel.template +++ b/srcpkgs/MesaLib/MesaLib-devel.template @@ -1,14 +1,12 @@ # Template file for 'MesaLib-devel'. # -depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.23 expat-devel libXt-devel libGL>=8.0.3 libOpenVG>=8.0.3 libGLES>=8.0.3 libGLU>=8.0.3 libEGL>=8.0.3" +noarch=yes +depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.23 expat-devel libXt-devel libGL>=$version libOpenVG>=$version libGLES>=$version libGLU>=$version libEGL>=$version" short_desc="${short_desc} - development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -noarch=yes - do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib diff --git a/srcpkgs/MesaLib/libEGL.rshlibs b/srcpkgs/MesaLib/libEGL.rshlibs index b069f4456f3..e80dc036adf 100644 --- a/srcpkgs/MesaLib/libEGL.rshlibs +++ b/srcpkgs/MesaLib/libEGL.rshlibs @@ -12,7 +12,7 @@ libXext.so.6 libXfixes.so.3 libglapi.so.0 libm.so.6 -libudev.so.0 libstdc++.so.6 libgcc_s.so.1 libdrm_intel.so.1 +libudev.so.1 diff --git a/srcpkgs/MesaLib/patches/mesa-8.0.3-llvm-3.1-fixes.patch b/srcpkgs/MesaLib/patches/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 00000000000..39ed9cd2d1a --- /dev/null +++ b/srcpkgs/MesaLib/patches/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,44 @@ +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ 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 +--- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ 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 + } diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index 8bf96988b10..cf9a9e9abc9 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,6 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib version=8.0.3 +revision=1 wrksrc="Mesa-${version}" distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2" build_style=gnu-configure @@ -10,7 +11,9 @@ configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl --enable-gallium-egl --disable-va --enable-vdpau --enable-xvmc --enable-xa --enable-texture-float --with-gallium-drivers=i915,r300,r600,svga,swrast --with-dri-drivers=i915,i965,r200,radeon,swrast" -makedepends="perl>=0 flex pkg-config glproto dri2proto>=2.1 makedepend libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libxcb-devel libudev-devel libdrm-devel expat-devel libXt-devel talloc-devel libxml2-python llvm-devel libvdpau-devel libXvMC-devel>=1.0.6" +makedepends="perl>=0 flex pkg-config glproto dri2proto>=2.1 makedepend libXext-devel libXxf86vm-devel libXdamage-devel libXfixes-devel libxcb-devel libudev-devel>=183 libdrm-devel expat-devel libXt-devel talloc-devel libxml2-python llvm-devel libvdpau-devel libXvMC-devel>=1.0.6" +# XXX reenable nouveau driver when it's updated for libdrm>=2.4.34 +subpackages="libEGL libglapi libGLES libGL libGLU libOpenVG MesaLib-devel" short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " homepage="http://www.mesa3d.org/" @@ -22,8 +25,3 @@ long_desc=" or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc." - -# XXX reenable nouveau driver when it's updated for libdrm>=2.4.34 -subpackages="libEGL libglapi libGLES libGL libGLU libOpenVG" -subpackages="${subpackages} ${pkgname}-devel" -