haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

mesa: build with llvm 5.

Browse Source
This commit is contained in:
Jerome Duval
2017-09-24 21:36:13 +02:00
parent 515034125a
commit f11e60d78f
2 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sys-libs/mesa/mesa-17.1.7.recipe
View File

@@ -6,7 +6,7 @@ providing 3D rendering to Haiku applications."
HOMEPAGE="http://www.mesa3d.org/"
COPYRIGHT="1999-2017 Brian Paul"
LICENSE="MIT"
REVISION="2"
REVISION="3"
SOURCE_URI="https://mesa.freedesktop.org/archive/mesa-${portVersion}.tar.xz"
CHECKSUM_SHA256="69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5"
PATCHES="mesa-$portVersion.patchset"
@@ -21,7 +21,6 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libLLVM_4.0$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -49,13 +48,13 @@ PROVIDES_swpipe="
"
REQUIRED_swpipe="
mesa$secondaryArchSuffix == $portVersion base
lib:libLLVM_4.0$secondaryArchSuffix
lib:libLLVM_5.0$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libz$secondaryArchSuffix
llvm${secondaryArchSuffix}
llvm${secondaryArchSuffix} >= 5
"
BUILD_PREREQUIRES="
cmd:aclocal

47
sys-libs/mesa/patches/mesa-17.1.7.patchset
View File

@@ -1,4 +1,4 @@
From 0da7d7fd7c04003ac04b0d31150b3fae2c4cd4d9 Mon Sep 17 00:00:00 2001
From d2fcd1662f997fb6eff7b40a71c161612a90f790 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 11 Sep 2017 21:29:14 +0200
Subject: Haiku patch
@@ -510,3 +510,48 @@ index df907ff..9f21a71 100644
--
2.13.1
From f74290f200d01167a6f82598a1cfab9d28caf108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
Date: Wed, 10 May 2017 17:26:07 +0900
Subject: gallivm: Fix build against LLVM SVN >= r302589
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
deregisterEHFrames doesn't take any parameters anymore.
Reviewed-by: Vedran Miletić <vedran@miletic.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 2a388cb..0e4a531 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -342,14 +342,20 @@ class DelegatingJITMemoryManager : public BaseMemoryManager {
virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
mgr()->registerEHFrames(Addr, LoadAddr, Size);
}
- virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
- mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
- }
#else
virtual void registerEHFrames(llvm::StringRef SectionData) {
mgr()->registerEHFrames(SectionData);
}
#endif
+#if HAVE_LLVM >= 0x0500
+ virtual void deregisterEHFrames() {
+ mgr()->deregisterEHFrames();
+ }
+#elif HAVE_LLVM >= 0x0304
+ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
+ mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
+ }
+#endif
virtual void *getPointerToNamedFunction(const std::string &Name,
bool AbortOnFailure=true) {
return mgr()->getPointerToNamedFunction(Name, AbortOnFailure);
--
2.13.1