wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-29 17:02:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

MesaLib: rebuild against new libudev. Add patch for llvm-3.1.

Browse source
This commit is contained in:
Juan RP 2012-05-26 15:56:40 +02:00
parent 2b979dda29
commit 182ad0da0a
4 changed files with 51 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/MesaLib/MesaLib-devel.template
View file

@ -1,14 +1,12 @@
# Template file for 'MesaLib-devel'. # 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" short_desc="${short_desc} - development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
noarch=yes
do_install() { do_install() {
vmove usr/include usr vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib vmove usr/lib/pkgconfig usr/lib

2
srcpkgs/MesaLib/libEGL.rshlibs
View file

@ -12,7 +12,7 @@ libXext.so.6
libXfixes.so.3 libXfixes.so.3
libglapi.so.0 libglapi.so.0
libm.so.6 libm.so.6
libudev.so.0
libstdc++.so.6 libstdc++.so.6
libgcc_s.so.1 libgcc_s.so.1
libdrm_intel.so.1 libdrm_intel.so.1
libudev.so.1

44
srcpkgs/MesaLib/patches/mesa-8.0.3-llvm-3.1-fixes.patch Normal file
View file

@ -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<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
+ if (!MRI) {
+ debug_printf("error: no register info for target %s\n", Triple.c_str());
+ return;
+ }
+
+ OwningPtr<const MCInstrInfo> 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<MCInstPrinter> Printer(
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
+#elif HAVE_LLVM == 0x0300
OwningPtr<MCInstPrinter> 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
}

10
srcpkgs/MesaLib/template
View file

@ -1,6 +1,7 @@
# Template build file for 'MesaLib'. # Template build file for 'MesaLib'.
pkgname=MesaLib pkgname=MesaLib
version=8.0.3 version=8.0.3
revision=1
wrksrc="Mesa-${version}" wrksrc="Mesa-${version}"
distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2" distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
build_style=gnu-configure 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-gallium-egl --disable-va --enable-vdpau --enable-xvmc --enable-xa
--enable-texture-float --with-gallium-drivers=i915,r300,r600,svga,swrast --enable-texture-float --with-gallium-drivers=i915,r300,r600,svga,swrast
--with-dri-drivers=i915,i965,r200,radeon,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" short_desc="Graphics library similar to SGI's OpenGL"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.mesa3d.org/" homepage="http://www.mesa3d.org/"
@ -22,8 +25,3 @@ long_desc="
or state machine, it is being used with authorization from Silicon Graphics, 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 Inc. However, the author makes no claim that Mesa is in any way a
compatible replacement for OpenGL or associated with Silicon Graphics, Inc." 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"