From owner-svn-ports-all@freebsd.org  Mon Jan 16 21:11:10 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20B70CB340F;
 Mon, 16 Jan 2017 21:11:10 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DEA1D1194;
 Mon, 16 Jan 2017 21:11:09 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0GLB9fi055827;
 Mon, 16 Jan 2017 21:11:09 GMT (envelope-from martymac@FreeBSD.org)
Received: (from martymac@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GLB888055825;
 Mon, 16 Jan 2017 21:11:08 GMT (envelope-from martymac@FreeBSD.org)
Message-Id: <201701162111.v0GLB888055825@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: martymac set sender to
 martymac@FreeBSD.org using -f
From: Ganael LAPLANCHE <martymac@FreeBSD.org>
Date: Mon, 16 Jan 2017 21:11:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431702 - in head/emulators/dolphin-emu: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2017 21:11:10 -0000

Author: martymac
Date: Mon Jan 16 21:11:08 2017
New Revision: 431702
URL: https://svnweb.freebsd.org/changeset/ports/431702

Log:
  Link to OpenGL libraries earlier to avoid crash with Nvidia's libGL
  
  PR:		215803
  Submitted by:	Christian Zigotzky <chzigotzky@xenosoft.de>

Added:
  head/emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt   (contents, props changed)
Modified:
  head/emulators/dolphin-emu/Makefile

Modified: head/emulators/dolphin-emu/Makefile
==============================================================================
--- head/emulators/dolphin-emu/Makefile	Mon Jan 16 20:01:06 2017	(r431701)
+++ head/emulators/dolphin-emu/Makefile	Mon Jan 16 21:11:08 2017	(r431702)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org

Added: head/emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Common-CMakeLists.txt	Mon Jan 16 21:11:08 2017	(r431702)
@@ -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})