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

Collapse All | Expand All

(-)mplayer/Makefile (-4 / +34 lines)
Lines 19-24 Link Here
19
OPTIONS+=	SIMD "Allow mplayer to use vector engines (MMX...)" on
19
OPTIONS+=	SIMD "Allow mplayer to use vector engines (MMX...)" on
20
OPTIONS+=	IPV6 "Include inet6 network support" on
20
OPTIONS+=	IPV6 "Include inet6 network support" on
21
OPTIONS+=	X11 "Enable X11 support for mplayer's video output" on
21
OPTIONS+=	X11 "Enable X11 support for mplayer's video output" on
22
OPTIONS+=	X11XV "X11 video drivers: XV" on
23
OPTIONS+=	X11DGA "X11 video drivers: DGA" on
24
OPTIONS+=	X11GL "X11 video drivers: OpenGL" on
25
OPTIONS+=	X11XIN "X11 video drivers: Xinerama" on
26
OPTIONS+=	X11VM "X11 VidMode support" on
22
OPTIONS+=	GUI "Enable GTK2 graphical user interface with X11" on
27
OPTIONS+=	GUI "Enable GTK2 graphical user interface with X11" on
23
OPTIONS+=	SDL "Enable SDL video output" off
28
OPTIONS+=	SDL "Enable SDL video output" off
24
OPTIONS+=	VIDIX "Enable VIDIX video output on supported archs" on
29
OPTIONS+=	VIDIX "Enable VIDIX video output on supported archs" on
Lines 88-94 Link Here
88
CONFIGURE_ARGS+=--disable-vidix-internal
93
CONFIGURE_ARGS+=--disable-vidix-internal
89
.endif
94
.endif
90
95
91
.if !defined(WITHOUT_GUI)
96
.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
92
PLIST_SUB+=	GMPLAYER=""
97
PLIST_SUB+=	GMPLAYER=""
93
DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "${DATADIR}/skins/Blue/icons/icon32x32.png" "gmplayer" "" false
98
DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "${DATADIR}/skins/Blue/icons/icon32x32.png" "gmplayer" "" false
94
.if !defined(WITHOUT_SKINS)
99
.if !defined(WITHOUT_SKINS)
Lines 119-126 Link Here
119
124
120
.if !defined(WITHOUT_X11)
125
.if !defined(WITHOUT_X11)
121
USE_XORG=	x11
126
USE_XORG=	x11
127
.if !defined(WITHOUT_X11XV)
128
USE_XORG+=	xv
122
.else
129
.else
123
WITHOUT_GUI=	yes
130
CONFIGURE_ARGS+=--disable-xv
131
.endif
132
.if !defined(WITHOUT_X11DGA)
133
USE_XORG+=	xxf86dga
134
.else
135
CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
136
.endif
137
.if !defined(WITHOUT_X11GL)
138
USE_XORG+=	glproto
139
LIB_DEPENDS+=	GL.1:${PORTSDIR}/graphics/libGL
140
.else
141
CONFIGURE_ARGS+=--disable-gl
142
.endif
143
.if !defined(WITHOUT_X11XIN)
144
USE_XORG+=	xinerama xineramaproto
145
.else
146
CONFIGURE_ARGS+=--disable-xinerama
147
.endif
148
.if !defined(WITHOUT_X11VM)
149
USE_XORG+=	xxf86vm
150
.else
151
CONFIGURE_ARGS+=--disable-vm
152
.endif
153
.else				#WITHOUT_X11
124
CONFIGURE_ARGS+=--disable-x11 \
154
CONFIGURE_ARGS+=--disable-x11 \
125
		--disable-fontconfig
155
		--disable-fontconfig
126
.endif
156
.endif
Lines 206-212 Link Here
206
	@${ECHO_MSG} "OPTIONS framework. You might want to check the Makefile in"
236
	@${ECHO_MSG} "OPTIONS framework. You might want to check the Makefile in"
207
	@${ECHO_MSG} "order to learn more about them."
237
	@${ECHO_MSG} "order to learn more about them."
208
238
209
.if !defined(WITHOUT_GUI)
239
.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
210
	@${ECHO_MSG} "If you want to use the GUI, you can either install"
240
	@${ECHO_MSG} "If you want to use the GUI, you can either install"
211
	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
241
	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
212
	@${ECHO_MSG} "or download official skin collections from"
242
	@${ECHO_MSG} "or download official skin collections from"
Lines 257-263 Link Here
257
	@${CHMOD} 755 ${DOCSDIR}
287
	@${CHMOD} 755 ${DOCSDIR}
258
	@${INSTALL_DATA} ${WRKSRC}/DOCS/HTML/en/* ${DOCSDIR}
288
	@${INSTALL_DATA} ${WRKSRC}/DOCS/HTML/en/* ${DOCSDIR}
259
.endif
289
.endif
260
.if !defined(WITHOUT_GUI)
290
.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
261
	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
291
	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
262
.endif
292
.endif
263
	@${CAT} ${PKGMESSAGE}
293
	@${CAT} ${PKGMESSAGE}

Return to bug 127524