Date: Tue, 5 Dec 2006 21:54:47 +0100 From: "Pawel Pekala" <c0rn@o2.pl> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: riggs@rrr.de Subject: ports/106389: [patch] multimedia/mplayer add WITH_NAS knob and other improvements Message-ID: <1165352087.5008@caprica.slowicza.org> Resent-Message-ID: <200612052100.kB5L0SNA093952@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106389
>Category: ports
>Synopsis: [patch] multimedia/mplayer add WITH_NAS knob and other improvements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 05 21:00:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Pawel Pekala
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD 6.2-PRERELEASE #1: Thu Nov 2 13:19:37 CET 2006
corn@caprica.slowicza.org:/usr/obj/usr/src/sys/GENERIC
>Description:
- add WITH_NAS knob
(if audio/nas is installed mplayer links to libaudio and missed dependency occurs)
- remove WITH_SKINS, make it on by default when WITH_GUI is defined
(gmplayer needs default skin to run, other idea would be to install default skin in mplayer port and leave other skins in multimedia/mplayer-skins - possibly even better choice?)
- add desktop entry if WITH_GUI is defined
- change some renamed configure options
>How-To-Repeat:
>Fix:
--- mplayer.diff begins here ---
diff -ur /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile
--- /usr/ports/multimedia/mplayer/Makefile Tue Nov 21 16:08:06 2006
+++ mplayer/Makefile Tue Dec 5 19:52:01 2006
@@ -116,9 +116,10 @@
--enable-png \
--enable-menu \
--disable-libfame \
- --disable-external-faad \
- --disable-external-vidix \
- --disable-tv-v4l
+ --disable-faad-external \
+ --disable-vidix-external \
+ --disable-tv-v4l1 \
+ --disable-tv-v4l2
OPTIONS= DEBUG "Include debug symbols in mplayer's binary files" off
@@ -133,13 +134,13 @@
OPTIONS+= SDL "Enable SDL video output" off
OPTIONS+= VIDIX "Enable VIDIX video output on supported archs" on
OPTIONS+= NVIDIA "Enable experimental nvidia xvmc driver" off
-OPTIONS+= SKINS "Force dependency on mplayer-skins" on
OPTIONS+= FREETYPE "Use freetype for OSD fonts (TrueType!)" on
OPTIONS+= RTC "Add support for kernel real time clock timing" off
OPTIONS+= ARTS "Enable KDE sound system support" off
OPTIONS+= ESOUND "Enable GNOME esound support" off
OPTIONS+= JACK "Enable JackIt audio server support" off
OPTIONS+= POLYP "Enable polyp sound server support" off
+OPTIONS+= NAS "Enable NAS sound server support" off
OPTIONS+= OPENAL "Enable OpenAL sound support" off
OPTIONS+= LIBUNGIF "Enable gif support" on
OPTIONS+= AALIB "Enable aalib support" off
@@ -207,11 +208,11 @@
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/mplayer/vidix
PLIST_SUB+= VIDIX=""
.else
-CONFIGURE_ARGS+=--disable-internal-vidix
+CONFIGURE_ARGS+=--disable-vidix-internal
PLIST_SUB+= VIDIX="@comment "
.endif
.else
-CONFIGURE_ARGS+=--disable-internal-vidix
+CONFIGURE_ARGS+=--disable-vidix-internal
PLIST_SUB+= VIDIX="@comment "
.endif
@@ -268,9 +269,8 @@
.if !defined(WITHOUT_GUI)
PLIST_SUB+= GMPLAYER=""
-.if !defined(WITHOUT_SKINS)
+DESKTOP_ENTRIES= "MPlayer" "High performance media player" "" "gmplayer" "" false
RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
-.endif
USE_GNOME+= gtk20
CONFIGURE_ARGS+= --enable-gui
@@ -428,6 +428,13 @@
CONFIGURE_ARGS+= --disable-polyp
.endif
+.if defined(WITH_NAS)
+CONFIGURE_ARGS+= --enable-nas
+LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas
+.else
+CONFIGURE_ARGS+= --disable-nas
+.endif
+
.if defined(WITH_OPENAL)
LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal
.else
@@ -435,7 +442,7 @@
.endif
.if !defined(WITH_TREMOR)
-CONFIGURE_ARGS+= --disable-internal-tremor
+CONFIGURE_ARGS+= --disable-tremor-internal
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
.endif
--- mplayer.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1165352087.5008>