Date: Tue, 21 Jan 2014 07:26:25 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340561 - in head/emulators/dolphin-emu: . files Message-ID: <201401210726.s0L7QPRm034853@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Tue Jan 21 07:26:24 2014 New Revision: 340561 URL: http://svnweb.freebsd.org/changeset/ports/340561 QAT: https://qat.redports.org/buildarchive/r340561/ Log: - Remove useless USE_GCC (should fix build where Clang is the default compiler) - Use new options framework - Rename CMakeLists' USE_ICONV option to ICONV_LINK Modified: head/emulators/dolphin-emu/Makefile head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt Modified: head/emulators/dolphin-emu/Makefile ============================================================================== --- head/emulators/dolphin-emu/Makefile Tue Jan 21 07:25:23 2014 (r340560) +++ head/emulators/dolphin-emu/Makefile Tue Jan 21 07:26:24 2014 (r340561) @@ -27,8 +27,6 @@ USE_WX= 2.9+ WX_UNICODE= yes USE_GL= gl glew glu -USE_GCC= yes - USES= dos2unix cmake iconv openal pkgconfig DOS2UNIX_REGEX= .*\.(h|c|cpp) @@ -40,61 +38,44 @@ CMAKE_ARGS+= -DOPENMP:BOOL=OFF \ -DUSE_X11:BOOL=ON \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON -OPTIONS_DEFINE= PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP +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.2:${PORTSDIR}/audio/portaudio2 +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 -OPTIONS_DEFAULT= PORTAUDIO FRAMEDUMPS UPNP - -.include <bsd.port.options.mk> +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 -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CMAKE_ARGS+= -DDISABLE_NLS:BOOL=ON -PLIST_SUB+= NLS="@comment " -.endif +.include <bsd.port.pre.mk> +# XXX Temporary workaround for ports/184540 .if ${PORT_OPTIONS:MDEBUG} -CMAKE_ARGS+= -DFASTLOG:BOOL=ON -MAKE_ENV+= VERBOSE=yes +INSTALL_TARGET= install .endif -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -.else -CMAKE_ARGS+= -DDISABLE_PULSEAUDIO:BOOL=ON -.endif - -.if ${PORT_OPTIONS:MPORTAUDIO} -LIB_DEPENDS+= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 -.else -CMAKE_ARGS+= -DDISABLE_PORTAUDIO:BOOL=ON -.endif - -.if ${PORT_OPTIONS:MFRAMEDUMPS} -CMAKE_ARGS+= -DENCODE_FRAMEDUMPS:BOOL=ON -LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ - libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ - libswscale.so:${PORTSDIR}/multimedia/ffmpeg \ - libavutil.so:${PORTSDIR}/multimedia/ffmpeg -.else -CMAKE_ARGS+= -DENCODE_FRAMEDUMPS:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MUPNP} -CMAKE_ARGS+= -DUSE_UPNP:BOOL=ON -LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc -.else -CMAKE_ARGS+= -DUSE_UPNP:BOOL=OFF -.endif - -.include <bsd.port.pre.mk> - .if !empty(ICONV_LIB) -CMAKE_ARGS+= -DUSE_ICONV:BOOL=ON +CMAKE_ARGS+= -DICONV_LINK:BOOL=ON .else -CMAKE_ARGS+= -DUSE_ICONV:BOOL=OFF +CMAKE_ARGS+= -DICONV_LINK:BOOL=OFF .endif .include <bsd.port.post.mk> Modified: head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt ============================================================================== --- head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt Tue Jan 21 07:25:23 2014 (r340560) +++ head/emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt Tue Jan 21 07:26:24 2014 (r340561) @@ -14,12 +14,12 @@ else() - set(LIBS ${LIBS} png iconv) + set(LIBS ${LIBS} png) -+ set(USE_ICONV True) ++ set(ICONV_LINK True) +endif() + -+if(USE_ICONV) -+ message( "-- Adding iconv") -+ set(LIBS ${LIBS} iconv) ++if(ICONV_LINK) ++ message( "-- Linking to libiconv") ++ set(LIBS ${LIBS} iconv) endif() if(LIBAV_FOUND)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401210726.s0L7QPRm034853>