View | Details | Raw Unified | Return to bug 184540 | Differences between
and this patch

Collapse All | Expand All

(-)emulators/dolphin-emu/Makefile (-52 / +28 lines)
Lines 1-9 Link Here
1
# Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
1
# Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
2
# $FreeBSD: emulators/dolphin-emu/Makefile 335626 2013-12-04 18:48:48Z makc $
2
# $FreeBSD: emulators/dolphin-emu/Makefile 335549 2013-12-03 08:34:29Z martymac $
3
3
4
PORTNAME=	dolphin-emu
4
PORTNAME=	dolphin-emu
5
PORTVERSION=	4.0.0
5
PORTVERSION=	4.0.0
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	emulators
7
CATEGORIES=	emulators
8
MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
8
MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
9
		LOCAL/martymac
9
		LOCAL/martymac
Lines 28-35 Link Here
28
WX_UNICODE=	yes
28
WX_UNICODE=	yes
29
USE_GL=	gl glew glu
29
USE_GL=	gl glew glu
30
30
31
USE_GCC=	yes
32
33
USES=		dos2unix cmake pkgconfig iconv
31
USES=		dos2unix cmake pkgconfig iconv
34
DOS2UNIX_REGEX=	.*\.(h|c|cpp)
32
DOS2UNIX_REGEX=	.*\.(h|c|cpp)
35
33
Lines 41-101 Link Here
41
		-DUSE_X11:BOOL=ON \
39
		-DUSE_X11:BOOL=ON \
42
		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
40
		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
43
41
44
OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP
42
OPTIONS_DEFINE=	PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS
43
OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP NLS
44
OPTIONS_SUB=	yes
45
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
46
PULSEAUDIO_CMAKE_ON=	-DDISABLE_PULSEAUDIO:BOOL=OFF
47
PULSEAUDIO_CMAKE_OFF=	-DDISABLE_PULSEAUDIO:BOOL=ON
45
PORTAUDIO_DESC=	Enable PortAudio (mic) support
48
PORTAUDIO_DESC=	Enable PortAudio (mic) support
49
PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
50
PORTAUDIO_CMAKE_ON=	-DDISABLE_PORTAUDIO:BOOL=OFF
51
PORTAUDIO_CMAKE_OFF=	-DDISABLE_PORTAUDIO:BOOL=ON
52
DEBUG_MAKE_ENV=	VERBOSE=yes
53
DEBUG_CMAKE_ON=	-DFASTLOG:BOOL=ON
54
DEBUG_CMAKE_OFF=	-DFASTLOG:BOOL=OFF
46
FRAMEDUMPS_DESC=	Encode framedumps in AVI format
55
FRAMEDUMPS_DESC=	Encode framedumps in AVI format
47
OPTIONS_DEFAULT=	PORTAUDIO FRAMEDUMPS UPNP
56
FRAMEDUMPS_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
48
57
			libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
49
.include <bsd.port.options.mk>
58
			libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
50
59
			libavutil.so:${PORTSDIR}/multimedia/ffmpeg
51
.if ${PORT_OPTIONS:MNLS}
60
FRAMEDUMPS_CMAKE_ON=	-DENCODE_FRAMEDUMPS:BOOL=ON
52
USES+=		gettext
61
FRAMEDUMPS_CMAKE_OFF=	-DENCODE_FRAMEDUMPS:BOOL=OFF
53
PLIST_SUB+=	NLS=""
62
UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
54
.else
63
UPNP_CMAKE_ON=	-DUSE_UPNP:BOOL=ON
55
CMAKE_ARGS+=	-DDISABLE_NLS:BOOL=ON
64
UPNP_CMAKE_OFF=	-DUSE_UPNP:BOOL=OFF
56
PLIST_SUB+=	NLS="@comment "
65
NLS_USES=	gettext
57
.endif
66
NLS_CMAKE_ON=	-DDISABLE_NLS:BOOL=OFF
58
67
NLS_CMAKE_OFF=	-DDISABLE_NLS:BOOL=ON
59
.if ${PORT_OPTIONS:MDEBUG}
60
CMAKE_ARGS+=	-DFASTLOG:BOOL=ON
61
MAKE_ENV+=	VERBOSE=yes
62
.endif
63
64
.if ${PORT_OPTIONS:MPULSEAUDIO}
65
LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
66
.else
67
CMAKE_ARGS+=	-DDISABLE_PULSEAUDIO:BOOL=ON
68
.endif
69
70
.if ${PORT_OPTIONS:MPORTAUDIO}
71
LIB_DEPENDS+=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
72
.else
73
CMAKE_ARGS+=	-DDISABLE_PORTAUDIO:BOOL=ON
74
.endif
75
76
.if ${PORT_OPTIONS:MFRAMEDUMPS}
77
CMAKE_ARGS+=	-DENCODE_FRAMEDUMPS:BOOL=ON
78
LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
79
		libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
80
		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
81
		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
82
.else
83
CMAKE_ARGS+=	-DENCODE_FRAMEDUMPS:BOOL=OFF
84
.endif
85
86
.if ${PORT_OPTIONS:MUPNP}
87
CMAKE_ARGS+=	-DUSE_UPNP:BOOL=ON
88
LIB_DEPENDS+=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
89
.else
90
CMAKE_ARGS+=	-DUSE_UPNP:BOOL=OFF
91
.endif
92
68
93
.include <bsd.port.pre.mk>
69
.include <bsd.port.pre.mk>
94
70
95
.if !empty(ICONV_LIB)
71
.if !empty(ICONV_LIB)
96
CMAKE_ARGS+=	-DUSE_ICONV:BOOL=ON
72
CMAKE_ARGS+=	-DICONV_LINK:BOOL=ON
97
.else
73
.else
98
CMAKE_ARGS+=	-DUSE_ICONV:BOOL=OFF
74
CMAKE_ARGS+=	-DICONV_LINK:BOOL=OFF
99
.endif
75
.endif
100
76
101
.include <bsd.port.post.mk>
77
.include <bsd.port.post.mk>
(-)emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt (-4 / +4 lines)
Lines 14-25 Link Here
14
 else()
14
 else()
15
-	set(LIBS ${LIBS} png iconv)
15
-	set(LIBS ${LIBS} png iconv)
16
+	set(LIBS ${LIBS} png)
16
+	set(LIBS ${LIBS} png)
17
+	set(USE_ICONV True)
17
+	set(ICONV_LINK True)
18
+endif()
18
+endif()
19
+
19
+
20
+if(USE_ICONV)
20
+if(ICONV_LINK)
21
+	message( "-- Adding iconv")
21
+	message( "-- Linking to libiconv")
22
+	set(LIBS  ${LIBS} iconv)
22
+	set(LIBS ${LIBS} iconv)
23
 endif()
23
 endif()
24
 
24
 
25
 if(LIBAV_FOUND)
25
 if(LIBAV_FOUND)

Return to bug 184540