Index: head/emulators/dolphin-emu/Makefile =================================================================== --- head/emulators/dolphin-emu/Makefile (revision 399268) +++ head/emulators/dolphin-emu/Makefile (revision 399269) @@ -1,87 +1,87 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= dolphin-emu PORTVERSION= 4.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org COMMENT= Gamecube and Wii Emulator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libfreetype.so:${PORTSDIR}/print/freetype2 \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libSoundTouch.so:${PORTSDIR}/audio/soundtouch \ libpolarssl.so.5:${PORTSDIR}/security/polarssl USE_GITHUB= yes GH_PROJECT= dolphin USE_SDL= sdl USE_XORG= ice xext x11 xrandr xi USE_WX= 3.0+ WX_UNICODE= yes USE_GL= gl glew glu USES= dos2unix cmake iconv openal pkgconfig tar:tgz compiler:c++11-lib DOS2UNIX_REGEX= .*\.(h|c|cpp) NOT_FOR_ARCHS= armv6 # Disable ALSA (emulated) and ao (buggy) CMAKE_ARGS+= -DOPENMP:BOOL=OFF \ -DDISABLE_ALSA:BOOL=ON \ -DDISABLE_AO:BOOL=ON \ -DDISABLE_BLUEZ:BOOL=ON \ -DUSE_X11:BOOL=ON \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON OPTIONS_DEFINE= PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS OPTIONS_DEFAULT= PORTAUDIO FRAMEDUMPS UPNP NLS OPTIONS_SUB= yes PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CMAKE_ON= -DDISABLE_PULSEAUDIO:BOOL=OFF PULSEAUDIO_CMAKE_OFF= -DDISABLE_PULSEAUDIO:BOOL=ON PORTAUDIO_DESC= Enable PortAudio (mic) support PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio PORTAUDIO_CMAKE_ON= -DDISABLE_PORTAUDIO:BOOL=OFF PORTAUDIO_CMAKE_OFF= -DDISABLE_PORTAUDIO:BOOL=ON DEBUG_MAKE_ENV= VERBOSE=yes DEBUG_CMAKE_ON= -DFASTLOG:BOOL=ON DEBUG_CMAKE_OFF= -DFASTLOG:BOOL=OFF FRAMEDUMPS_DESC= Encode framedumps in AVI format FRAMEDUMPS_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ libswscale.so:${PORTSDIR}/multimedia/ffmpeg \ libavutil.so:${PORTSDIR}/multimedia/ffmpeg FRAMEDUMPS_CMAKE_ON= -DENCODE_FRAMEDUMPS:BOOL=ON FRAMEDUMPS_CMAKE_OFF= -DENCODE_FRAMEDUMPS:BOOL=OFF UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc UPNP_CMAKE_ON= -DUSE_UPNP:BOOL=ON UPNP_CMAKE_OFF= -DUSE_UPNP:BOOL=OFF NLS_USES= gettext NLS_CMAKE_ON= -DDISABLE_NLS:BOOL=OFF NLS_CMAKE_OFF= -DDISABLE_NLS:BOOL=ON .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 BROKEN= does not build: absence of xlocale.h .endif # XXX Temporary workaround for ports/184540 .if ${PORT_OPTIONS:MDEBUG} INSTALL_TARGET= install .endif .if !empty(ICONV_LIB) CMAKE_ARGS+= -DICONV_LINK:BOOL=ON .else CMAKE_ARGS+= -DICONV_LINK:BOOL=OFF .endif .include Index: head/emulators/dolphin-emu/files/patch-git_8c5744bc =================================================================== --- head/emulators/dolphin-emu/files/patch-git_8c5744bc (nonexistent) +++ head/emulators/dolphin-emu/files/patch-git_8c5744bc (revision 399269) @@ -0,0 +1,137 @@ +commit 8c5744bca705a0895bd51c966a30171ee2bab43a +Author: Marisa Kirisame +Date: Tue, 29 Sep 2015 23:10:31 +0200 + + miniupnpc API version 14 changed the upnpDiscover functions, + adding an argument for TTL (should default to 2) this enables support for + that should the build system have that specific version installed, the + miniupnpc bundled in the project is unchanged +--- + CMakeLists.txt | 5 ++++- + CMakeTests/FindMiniupnpc.cmake | 39 +++++++++++++++++++++++++++++++++----- + Source/Core/Core/NetPlayServer.cpp | 4 ++++ + 3 files changed, 42 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 291efee..7ac0679 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -690,9 +690,12 @@ if(USE_UPNP) + if(NOT APPLE AND NOT ANDROID) + include(FindMiniupnpc) + endif() +- if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ if(MINIUPNP_FOUND AND (MINIUPNPC_VERSION_1_7_OR_HIGHER OR MINIUPNPC_VERSION_API14_OR_HIGHER)) + message("Using shared miniupnpc") + include_directories(${MINIUPNP_INCLUDE_DIR}) ++ if (MINIUPNPC_VERSION_API14_OR_HIGHER) ++ add_definitions(-DUPNPDISCOVER_HAS_TTL) ++ endif() + else() + message("Using static miniupnpc from Externals") + add_subdirectory(Externals/miniupnpc) +diff --git a/CMakeTests/FindMiniupnpc.cmake b/CMakeTests/FindMiniupnpc.cmake +index bb1048c..5301d40 100644 +--- CMakeTests/FindMiniupnpc.cmake ++++ CMakeTests/FindMiniupnpc.cmake +@@ -58,6 +58,30 @@ if (MINIUPNP_FOUND) + #include + int main() + { ++ struct UPNPDev *devlist = NULL; ++ int upnp_delay = 5000; ++ const char *upnp_multicastif = NULL; ++ const char *upnp_minissdpdsock = NULL; ++ int upnp_sameport = 0; ++ int upnp_ipv6 = 0; ++ unsigned char upnp_ttl = 2; ++ int upnp_error = 0; ++ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error); ++ ++ return 0; ++ }" ++ MINIUPNPC_VERSION_API14_OR_HIGHER) ++ ++IF (NOT MINIUPNPC_VERSION_API14_OR_HIGHER) ++ set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) ++ set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) ++ check_cxx_source_runs(" ++ #include ++ #include ++ #include ++ #include ++ int main() ++ { + static struct UPNPUrls urls; + static struct IGDdatas data; + +@@ -66,8 +90,9 @@ if (MINIUPNP_FOUND) + return 0; + }" + MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ ENDIF() + +-IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) ++IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER) + set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) + check_cxx_source_runs(" +@@ -91,7 +116,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) + MINIUPNPC_VERSION_PRE1_7) + ENDIF() + +- IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER) + set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) + check_cxx_source_runs(" +@@ -116,7 +141,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) + + ENDIF() + +- IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER) + set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) + check_cxx_source_runs(" +@@ -136,7 +161,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) + MINIUPNPC_VERSION_1_5_OR_HIGHER) + ENDIF() + +- IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER) + set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY}) + check_cxx_source_runs(" +@@ -167,10 +192,14 @@ IF(MINIUPNPC_VERSION_PRE1_7) + message(STATUS "Found miniupnpc version is pre v1.7") + ENDIF() + +-IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7) ++IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER) + message(STATUS "Found miniupnpc version is v1.7 or higher") + ENDIF() + ++IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER) ++ message(STATUS "Found miniupnpc version is v1.9 API version 14 or higher") ++ENDIF() ++ + else () + message (STATUS "Could not find miniupnp") + endif () +diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp +index 7ed283a..27b46c9 100644 +--- Source/Core/Core/Src/NetPlayServer.cpp ++++ Source/Core/Core/Src/NetPlayServer.cpp +@@ -552,7 +552,11 @@ bool NetPlayServer::initUPnP() + memset(&m_upnp_data, 0, sizeof(IGDdatas)); + + // Find all UPnP devices ++#ifdef UPNPDISCOVER_HAS_TTL ++ devlist = upnpDiscover(2000, NULL, NULL, 0, 0, 2, &upnperror); ++#else + devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror); ++#endif + if (!devlist) + { + WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices."); Property changes on: head/emulators/dolphin-emu/files/patch-git_8c5744bc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property