Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=110fee018d8dbbde18f1834b63b0b9b9b416126b
commit 110fee018d8dbbde18f1834b63b0b9b9b416126b Author: James Buren <[email protected]> Date: Tue Jun 19 09:31:22 2012 -0500 mesa-8.0.3-1-x86_64 * version bump * build with libdrm-old for now diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 8158b46..0f1e6ab 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -20,15 +20,15 @@ USE_WAYLAND_EGL=${USE_WAYLAND_EGL:-"n"} pkgname=mesa origname=Mesa _F_archive_name="MesaLib" -pkgver=8.0.2 -pkgrel=4 +pkgver=8.0.3 +pkgrel=1 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/"; # libgl: provided by libgl, fglrx and nvidia packages depends=() -makedepends=('makedepend') +makedepends=('makedepend' 'libdrm-old' 'libdrm-nouveau') # should be mesa-*=$pkgver but apps should not depends on mesa anymore first, unless specific to mesa rodepends=('libgl') archs=('i686' 'x86_64' 'arm') @@ -43,14 +43,16 @@ if Fuse DEVEL; then Finclude scm else source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2";) - sha1sums=('bbb55d81294425137ee66c7389fbb474a43c9ab9') + sha1sums=('768bdb2fe133bbcccd3323b79484d0d17bc0d05d') fi source=("${source[@]}" \ + mesa-8.0.3-llvm-3.1-fixes.patch \ libGL.la \ libGLU.la) sha1sums=("${sha1sums[@]}" \ + '4ab1665ceda9efdc54c5270605bb2163c45e60be' \ '650973d708466f5c4c21e70c1f1f6c118b27e614' \ '12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39') @@ -59,8 +61,8 @@ subdescs=('Mesa DRI OpenGL files.' 'Mesa OpenGL headers files.') subprovides=('libgl-mesa' 'libgl-headers') subreplaces=('' '') subconflicts=('fglrx nvidia' 'nvidia') -subdepends=('expat libdrm libxdamage libxxf86vm' 'dri2proto glproto') -subrodepends=("libgl-headers-mesa>=$pkgver-$pkgrel libglapi libglx mesa-dri-drivers>=$pkgver-$pkgrel libgbm>=$pkgver-$pkgrel" '') +subdepends=('expat libxdamage libxxf86vm' 'dri2proto glproto') +subrodepends=("libgl-headers-mesa>=$pkgver-$pkgrel libglapi libglx mesa-dri-drivers>=$pkgver-$pkgrel libgbm>=$pkgver-$pkgrel libdrm libdrm-nouveau" '') # Remove mesa-dri-drivers when situation is more clearer about gles # Remove libgbm rodepend after 1.6 it's only for help migration to mesa 7.11 subgroups=('x11' 'x11') @@ -102,7 +104,7 @@ subprovides=("${subprovides[@]}" 'libgles-mesa') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') subdepends=("${subdepends[@]}" '') -subrodepends=("${subrodepends[@]}" 'libdrm libglapi khr-headers') +subrodepends=("${subrodepends[@]}" 'libdrm libdrm-nouveau libglapi khr-headers') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") @@ -122,8 +124,8 @@ if Fuse EGL; then subprovides=("${subprovides[@]}" 'libegl-mesa') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends=("${subdepends[@]}" 'dri2proto glproto libdrm') - subrodepends=("${subrodepends[@]}" 'khr-headers libgbm') + subdepends=("${subdepends[@]}" 'dri2proto glproto') + subrodepends=("${subrodepends[@]}" 'khr-headers libgbm libdrm libdrm-nouveau') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") diff --git a/source/x11/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/source/x11/mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 0000000..922577a --- /dev/null +++ b/source/x11/mesa/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 +--- 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<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 +--- 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 + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
