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

mesa: link the SoftwarePipe addon against libGL.so.

Browse Source 
* otherwise some symbols get no type.
This commit is contained in:
Jerome Duval
2017-10-20 17:05:25 +02:00
parent c8c2b122df
commit a67b365fb3
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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="4"
REVISION="5"
SOURCE_URI="https://mesa.freedesktop.org/archive/mesa-${portVersion}.tar.xz"
CHECKSUM_SHA256="69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5"
PATCHES="mesa-$portVersion.patchset"

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

@@ -1,4 +1,4 @@
From d2fcd1662f997fb6eff7b40a71c161612a90f790 Mon Sep 17 00:00:00 2001
From ec8d0a5d3dffdb41b48d2dd1e83c5a05bad0e95f 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
@@ -272,10 +272,10 @@ index 0000000..3076ba3
+ bitmap_wrapper.cpp
diff --git a/src/gallium/targets/haiku-softpipe/Makefile.am b/src/gallium/targets/haiku-softpipe/Makefile.am
new file mode 100644
index 0000000..d68050f
index 0000000..94599a3
--- /dev/null
+++ b/src/gallium/targets/haiku-softpipe/Makefile.am
@@ -0,0 +1,68 @@
@@ -0,0 +1,69 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
@@ -308,6 +308,7 @@ index 0000000..d68050f
+ $(GC_SECTIONS)
+
+libswpipe_la_LIBADD = \
+ $(top_builddir)/src/hgl/libGL.la \
+ $(top_builddir)/src/gallium/winsys/sw/hgl/libswhgl.la \
+ $(top_builddir)/src/gallium/state_trackers/hgl/libhgl.la \
+ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
@@ -508,10 +509,10 @@ index df907ff..9f21a71 100644
* APIENTRY to _mesa_* entrypoints will not cause crashes on debug builds, as
* the initial ESP value is saved in the EBP in the function prologue, then
--
2.13.1
2.14.2
From f74290f200d01167a6f82598a1cfab9d28caf108 Mon Sep 17 00:00:00 2001
From 639a31f891f1a419d876004930fe1560440e3d23 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
@@ -528,7 +529,7 @@ diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxilia
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 {
@@ -342,13 +342,19 @@ class DelegatingJITMemoryManager : public BaseMemoryManager {
virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
mgr()->registerEHFrames(Addr, LoadAddr, Size);
}
@@ -539,7 +540,7 @@ index 2a388cb..0e4a531 100644
virtual void registerEHFrames(llvm::StringRef SectionData) {
mgr()->registerEHFrames(SectionData);
}
#endif
+#endif
+#if HAVE_LLVM >= 0x0500
+ virtual void deregisterEHFrames() {
+ mgr()->deregisterEHFrames();
@@ -548,10 +549,9 @@ index 2a388cb..0e4a531 100644
+ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
+ mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
+ }
+#endif
#endif
virtual void *getPointerToNamedFunction(const std::string &Name,
bool AbortOnFailure=true) {
return mgr()->getPointerToNamedFunction(Name, AbortOnFailure);
--
2.13.1
2.14.2