ports/133534: Move VLC to 0.9.9a and revamp OPTIONS to allow for stream server only

Thu Apr 9 07:50:23 UTC 2009

>Number:         133534
>Category:       ports
>Synopsis:       Move VLC to 0.9.9a and revamp OPTIONS to allow for stream server only
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 09 07:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Joseph S. Atkinson
>Release:        FreeBSD 7.1-RELEASE-p4 i386
>Organization:
>Environment:


System: FreeBSD 7.1-RELEASE-p4 #4: Fri Mar 27 01:04:54 EDT 2009
    jsa at mephisto.wickedmachine.net:/usr/obj/usr/src/sys/MEPHISTO



>Description:


First, and foremost, this moves VLC to 0.9.9a, keep FreeBSD up to date.

Second, as requested by Christopher Key via private email, I've attempted to make optional X11, DBUS, and V4L. How well these work is not tested well locally and exists for the brave to dare.

There is a known issue with this Makefile, and it will not pass portlint due to the conditional inclusion of USE_QT_VER dependant on if a person's selection of WITH(OUT)_QT4. I believe this to be unavoidable.

Please run this through a tinderbox in case I missed something beyond my ability to test for.


>How-To-Repeat:





>Fix:

--- vlc99a.diff begins here ---
--- Makefile.orig	2009-04-08 11:46:41.000000000 -0400
+++ Makefile	2009-04-09 03:08:33.000000000 -0400
@@ -9,8 +9,7 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.9.8a
-PORTREVISION=	4
+DISTVERSION=	0.9.9a
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -26,44 +25,45 @@
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 
-OPTIONS+=	A52 "a52 audio support, many DVDs use this" On
-OPTIONS+=	AALIB "Aalib Console Graphics Support" Off
-OPTIONS+=	AVAHI "Avahi (Rendezvous/Bonjour (R) ) networking" On
-OPTIONS+=	CACA "Libcaca Console Graphics Support" Off
-OPTIONS+=	ARTS "Enable arts sound support" Off
-OPTIONS+=	DEBUG "Enable debuging support" Off
-OPTIONS+=	DTS "DTS decoder support, many DVDs use this" On
-OPTIONS+=	ESOUND "Esound Support" Off
-OPTIONS+=	FAAC "Faac audio encoder (mp4/aac) support" Off
-OPTIONS+=	FAAD "Faad audio decoder (mp4/aac) support" On
-OPTIONS+=	FLAC "Flac audio codec support" On
-OPTIONS+=	HTTPD "Streaming media control via http" On
-OPTIONS+=	LIVEMEDIA "Support for rstp/rtp/sdp protocols" On
-OPTIONS+=	LUA "Enable lua scripting" Off
-OPTIONS+=	MAD "Mad mp3 audio decoder support" On
-OPTIONS+=	MATROSKA "Matroska Container Format support" On
-OPTIONS+=	MPEG2 "Mpeg-2 audio/video decoder Support" On
-OPTIONS+=	NCURSES "Enable ncurses (console) interface" Off
-OPTIONS+=	OGG "Ogg audio decoder support" On
-OPTIONS+=	QT4 "QT4 Interface" On
-OPTIONS+=	REALAUDIO "Real audio(R) support" On
-OPTIONS+=	SAMBA "SAMBA Access module" On
-OPTIONS+=	SDL "SDL video output" On
-OPTIONS+=	SVG "SVG graphics support" Off
-OPTIONS+=	SVGALIB "SVGALIB video output" Off
-OPTIONS+=	SHOUT "Shout2 support" Off
-OPTIONS+=	SKINS "Enable winamp skins interface (requires QT4)" Off
-OPTIONS+=	SPEEX "Speex voice codec support" On
-OPTIONS+=	THEORA "OGG/Vorbis video codec support" On
-OPTIONS+=	TWOLAME "Twolame mpeg2 audio encoder support" On
-OPTIONS+=	VORBIS "Vorbis support" On
-OPTIONS+=	WIN32_CODECS "win32 multimedia DLL's" Off
-OPTIONS+=	X264 "Enable H.264/AVC codec support" On
+OPTIONS=	A52 "a52 audio support, many DVDs use this" On \
+		AALIB "Aalib Console Graphics Support" Off \
+		ARTS "Enable arts sound support" Off \
+		AVAHI "Avahi (Rendezvous/Bonjour (R) ) networking" On \
+		CACA "Libcaca Console Graphics Support" Off \
+		DBUS "Enable D-Bus control support" On \
+		DEBUG "Enable debuging support" Off \
+		DTS "DTS decoder support, many DVDs use this" On \
+		ESOUND "Esound Support" Off \
+		FAAC "Faac audio encoder (mp4/aac) support" Off \
+		FAAD "Faad audio decoder (mp4/aac) support" On \
+		FLAC "Flac audio codec support" On \
+		HTTPD "Streaming media control via http" On \
+		LIVEMEDIA "Support for rstp/rtp/sdp protocols" On \
+		LUA "Enable lua scripting" Off \
+		MAD "Mad mp3 audio decoder support" On \
+		MATROSKA "Matroska Container Format support" On \
+		MPEG2 "Mpeg-2 audio/video decoder Support" On \
+		NCURSES "Enable ncurses (console) interface" Off \
+		OGG "Ogg audio decoder support" On \
+		QT4 "QT4 Interface (requires X11)" On \
+		REALAUDIO "Real audio(R) support" On \
+		SAMBA "SAMBA Access module" On \
+		SDL "SDL video output" On \
+		SVG "SVG graphics support" Off \
+		SVGALIB "SVGALIB video output" Off \
+		SHOUT "Shout2 support" Off \
+		SKINS "Enable winamp skins interface (requires QT4)" Off \
+		SPEEX "Speex voice codec support" On \
+		THEORA "OGG/Vorbis video codec support" On \
+		TWOLAME "Twolame mpeg2 audio encoder support" On \
+		V4L "Enable Video for Linux" On\
+		VORBIS "Vorbis support" On \
+		WIN32_CODECS "win32 multimedia DLL's" Off \
+		X264 "Enable H.264/AVC codec support" On \
+		X11 "Enable X11 (disable for stream only server)" On
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_XORG=	xpm
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnometarget libxml2
 WANT_SDL=	yes
@@ -97,6 +97,21 @@
 BROKEN=	Does not compile with perl ${PERL_VERSION}
 .endif
 
+.if !defined(WITHOUT_QT4)
+USE_QT_VER+=	4
+QT_COMPONENTS+=	gui corelib moc rcc uic
+CONFIGURE_ARGS+=--enable-qt4
+.else
+CONFIGURE_ARGS+=--disable-qt4
+.endif
+
+.if defined(WITHOUT_DBUS)
+CONFIGURE_ARGS+=--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=--enable-dbus
+.endif
+
 # compatible knobs.
 .if defined(WITH_DEBUG)
 DEBUG=	yes
@@ -128,6 +143,7 @@
 # end compatible knobs
 
 .if defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--disable-nls
 .endif
 
@@ -150,14 +166,6 @@
 DEFAULT_CDROM_DEVICE=/dev/acd0
 .endif
 
-.if !defined(WITHOUT_QT4)
-USE_QT_VER+=	4
-QT_COMPONENTS+=	gui corelib moc rcc uic
-CONFIGURE_ARGS+=--enable-qt4
-.else
-CONFIGURE_ARGS+=--disable-qt4
-.endif
-
 .if !defined(WITHOUT_LIBNOTIFY)
 LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-notify
@@ -575,5 +583,18 @@
 CONFIGURE_ARGS+=--enable-release
 .endif
 
+.if defined(WITHOUT_V4L)
+CONFIGURE_ARGS+=--disable-v4l
+.else
+CONFIGURE_ARGS+=--enable-v4l
+.endif
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--disable-x11
+.else
+USE_XORG=	xpm
+CONFIGURE_ARGS+=--enable-x11
+.endif
+
 .include "${.CURDIR}/Makefile.inc"
 .include <bsd.port.post.mk>
--- distinfo.orig	2009-04-08 11:46:48.000000000 -0400
+++ distinfo	2009-04-08 11:47:35.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (vlc-0.9.8a.tar.bz2) = 8ffa2ff763badd5de7592004d8d69a63
-SHA256 (vlc-0.9.8a.tar.bz2) = 197c29803790efc0273bb4577d54629d0769a3b49b091c6430eb6704fd69824f
-SIZE (vlc-0.9.8a.tar.bz2) = 17032727
+MD5 (vlc-0.9.9a.tar.bz2) = c8d832deeef7f4072a73506f8d033198
+SHA256 (vlc-0.9.9a.tar.bz2) = e5d0a168263f56bccc62d30031287d56f0b6a3447b552f3a5224132d0b597dd6
+SIZE (vlc-0.9.9a.tar.bz2) = 17500620
--- vlc99a.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

