diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2017-01-16 21:11:08 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2017-01-16 21:11:08 +0000 |
| commit | 3ea4191a368f36e633bf3994d7979ba651bd328e (patch) | |
| tree | a7c5769142829906d07bb7a20a6428fcffd82cd4 /emulators/dolphin-emu | |
| parent | 82eaa2decc5b1c713d5dd26a2d3952b7f59d40dc (diff) | |
| download | ports-3ea4191a368f36e633bf3994d7979ba651bd328e.tar.gz ports-3ea4191a368f36e633bf3994d7979ba651bd328e.zip | |
Link to OpenGL libraries earlier to avoid crash with Nvidia's libGL
PR: 215803
Submitted by: Christian Zigotzky <chzigotzky@xenosoft.de>
Notes
Notes:
svn path=/head/; revision=431702
Diffstat (limited to 'emulators/dolphin-emu')
| -rw-r--r-- | emulators/dolphin-emu/Makefile | 2 | ||||
| -rw-r--r-- | emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index 834c1c18fdcb..5b7104bd7e2a 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -3,7 +3,7 @@ PORTNAME= dolphin-emu PORTVERSION= 5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org diff --git a/emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt b/emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt new file mode 100644 index 000000000000..f1331a4fdc96 --- /dev/null +++ b/emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt @@ -0,0 +1,13 @@ +Link to OpenGL libraries earlier to avoid crash with Nvidia's libGL + +--- Source/Core/Common/CMakeLists.txt.orig 2016-06-24 08:09:07.000000000 +0000 ++++ Source/Core/Common/CMakeLists.txt 2017-01-12 20:59:59.578506000 +0000 +@@ -88,7 +88,7 @@ + set(SRCS ${SRCS} GL/GLInterface/GLX.cpp) + # GLX has a hard dependency on libGL. + # Make sure to link to it if using GLX. +- set(LIBS ${LIBS} ${OPENGL_LIBRARIES}) ++ set(LIBS ${OPENGL_LIBRARIES} ${LIBS}) + endif() + set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp) + set(LIBS ${LIBS} ${XRANDR_LIBRARIES}) |