Date: Fri, 22 Aug 2014 10:01:19 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365628 - in head/emulators/dolphin-emu: . files Message-ID: <201408221001.s7MA1Jfe046356@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Aug 22 10:01:19 2014 New Revision: 365628 URL: http://svnweb.freebsd.org/changeset/ports/365628 QAT: https://qat.redports.org/buildarchive/r365628/ Log: - Switch to bundled SFML in preparation to ports' SFML update (bundled one was used anyway, probably conflictiong with systemwide one) - Add USES=compiler:c++11-lib to fix build on 9.x - Patch build system to not pick up includes from systemwide SFML (also submitted upstream) - Minor whitespace fix Approved by: portmgr blanket (for bits not related to sfml update) Modified: head/emulators/dolphin-emu/Makefile head/emulators/dolphin-emu/files/patch-CMakeLists.txt Modified: head/emulators/dolphin-emu/Makefile ============================================================================== --- head/emulators/dolphin-emu/Makefile Fri Aug 22 09:50:16 2014 (r365627) +++ head/emulators/dolphin-emu/Makefile Fri Aug 22 10:01:19 2014 (r365628) @@ -3,7 +3,7 @@ PORTNAME= dolphin-emu PORTVERSION= 4.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac @@ -17,16 +17,15 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/ libfreetype.so:${PORTSDIR}/print/freetype2 \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libSoundTouch.so:${PORTSDIR}/audio/soundtouch \ - libsfml-network.so:${PORTSDIR}/devel/sfml \ libpolarssl.so:${PORTSDIR}/security/polarssl USE_SDL= sdl USE_XORG= ice xext x11 xrandr xi USE_WX= 3.0+ WX_UNICODE= yes -USE_GL= gl glew glu +USE_GL= gl glew glu -USES= dos2unix cmake iconv openal pkgconfig tar:tgz +USES= dos2unix cmake iconv openal pkgconfig tar:tgz compiler:c++11-lib DOS2UNIX_REGEX= .*\.(h|c|cpp) # Disable ALSA (emulated) and ao (buggy) Modified: head/emulators/dolphin-emu/files/patch-CMakeLists.txt ============================================================================== --- head/emulators/dolphin-emu/files/patch-CMakeLists.txt Fri Aug 22 09:50:16 2014 (r365627) +++ head/emulators/dolphin-emu/files/patch-CMakeLists.txt Fri Aug 22 10:01:19 2014 (r365628) @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2013-09-16 04:58:51.000000000 +0200 -+++ CMakeLists.txt 2013-09-16 05:15:59.000000000 +0200 +--- CMakeLists.txt.orig 2013-09-23 16:15:52.000000000 +0400 ++++ CMakeLists.txt 2014-08-20 17:37:42.000000000 +0400 @@ -351,51 +351,81 @@ message("OpenMP parallelization disabled") endif() @@ -158,3 +158,20 @@ if(OPROFILING) check_lib(OPROFILE opagent opagent.h) +@@ -577,14 +618,14 @@ + set(SFML_FIND_VERSION_MAJOR 1) + set(SFML_FIND_VERSION_MINOR 5) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID) +- include(FindSFML OPTIONAL) ++ #include(FindSFML OPTIONAL) + endif() + if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR + message("Using shared SFML") + else() + message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals") + add_subdirectory(Externals/SFML) +- include_directories(Externals/SFML/include) ++ include_directories(BEFORE Externals/SFML/include) + endif() + + if(USE_UPNP)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408221001.s7MA1Jfe046356>