From a5127ccd800ad7f697d25d5e71186116d4870c62 Mon Sep 17 00:00:00 2001 From: martymac Date: Mon, 16 Jan 2017 21:11:08 +0000 Subject: Link to OpenGL libraries earlier to avoid crash with Nvidia's libGL PR: 215803 Submitted by: Christian Zigotzky --- emulators/dolphin-emu/Makefile | 2 +- .../files/patch-Source-Core-Common-CMakeLists.txt | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt (limited to 'emulators') 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}) -- cgit