- Update to 0.8.6.20060901

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7208 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 37 insertions, 28 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index cecd471bf..771c38793 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.16 2006/08/09 15:43:58 ahze Exp $
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.17 2006/08/20 05:49:25 mezz Exp $
 #
 # *** PLEASE READ Makefile.inc for more information on knobs ***
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.6.20060719
-PORTREVISION=	2
+DISTVERSION=	0.8.6.20060901
+PORTREVISION=	0
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://nightlies.videolan.org/build/source/
 #		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
@@ -23,6 +23,7 @@ DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.6.//}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
 
+LIB_DEPENDS=	notify.2:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 
 CONFLICTS=	vlc-[0-9]*
@@ -191,10 +192,9 @@ CONFIGUE_ARGS+=		--disable-bonjour
 
 .if !defined(WITHOUT_CDROM)
 LIB_DEPENDS+=	vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
-		cdio.7:${PORTSDIR}/sysutils/libcdio
+		cdio.7:${PORTSDIR}/sysutils/libcdio \
 CONFIGURE_ARGS+=--enable-vcd \
-		--disable-libcdio \
-		--disable-libcddb \
+		--enable-libcddb \
 		--disable-cddax
 .else
 CONFIGURE_ARGS+=--disable-vcd \
@@ -379,7 +379,7 @@ CONFIGURE_ARGS+=--enable-libmpeg2
 CONFIGURE_ARGS+=--disable-libmpeg2
 .endif
 
-.if defined(WITH_REALAUDIO)
+.if !defined(WITHOUT_REALAUDIO)
 CONFIGURE_ARGS+=	--enable-real \
 			--enable-realrtsp
 .endif
@@ -398,10 +398,10 @@ CONFIGURE_ARGS+=--disable-theora
 
 .if (defined(WITH_LIVEMEDIA) || exists(${LOCALBASE}/live/liveMedia/libliveMedia.a)) && !defined(WITHOUT_LIVEMEDIA)
 BUILD_DEPENDS+=	${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
-CONFIGURE_ARGS+=--enable-livedotcom \
-		--with-livedotcom-tree=${LOCALBASE}/live
+CONFIGURE_ARGS+=--enable-live555 \
+		--with-live555-tree=${LOCALBASE}/live
 .else
-CONFIGURE_ARGS+=--disable-livedotcom
+CONFIGURE_ARGS+=--disable-live555
 .endif
 
 .if !defined(WITHOUT_MAD)
@@ -413,6 +413,20 @@ CONFIGURE_ARGS+=--enable-mad \
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
+.if !defined(WITHOUT_MODDEMUX)
+LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+=--enable-mod
+.else
+CONFIGURE_ARGS+=--disable-mod
+.endif
+
+.if !defined(WITHOUT_MPCDEMUX)
+LIB_DEPENDS+=	mpcdec.4:${PORTSDIR}/audio/libmpcdec
+CONFIGURE_ARGS+=--enable-mpc
+.else
+CONFIGURE_ARGS+=--disable-mpc
+.endif
+
 .if !defined(WITHOUT_OGG)
 LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 CONFIGURE_ARGS+=--enable-ogg
@@ -450,7 +464,7 @@ CONFIGURE_ARGS+=--disable-sdl
 RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
 .endif
 
-.if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
+.if !defined(WITHOUT_HTTPD)
 LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 .else
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index a5f94d42b..b8f09ed33 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -5,7 +5,7 @@
 # and will be autodetected to enable
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.3 2006/05/22 01:50:17 ahze Exp $
+#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.4 2006/06/21 22:50:36 ahze Exp $
 #
 # If you define for example WITH_FAAD and WITHOUT_FAAD
 # the WITHOUT_ will always over ride the WITH_.
@@ -61,9 +61,15 @@
 #   ** NOT DEFINED if PACKAGE_BUILDING is defined **
 #
 # WITHOUT_A52=yes
-#  liba52 audio Support
+#  liba52 audio support
 #
-# WITH_REALAUDIO
+# WITHOUT_MODDEMUX
+#  ModPlug mod-like music support
+#
+# WITHOUT_MPCDEMUX
+#  Musepack audio compression support
+#
+# WITHOUT_REALAUDIO
 #  Real audio(R) support
 #
 # WITH_SHOUT
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index e1324ef9a..856db4055 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-snapshot-20060719.tar.gz) = 1b2aceb04c180e0dd593930be21e1bba
-SHA256 (vlc-snapshot-20060719.tar.gz) = 751528b954892c6cf11f24af4d3d40d4a9a5b4d26a50bca223210f2f36d02282
-SIZE (vlc-snapshot-20060719.tar.gz) = 12643298
+MD5 (vlc-snapshot-20060901.tar.gz) = 7e3e427c695f73b2ae74770c056c2f36
+SHA256 (vlc-snapshot-20060901.tar.gz) = c8c81499ef8e078c5e58c725223714b35465aee211a65d94a4265dbfffc39a58
+SIZE (vlc-snapshot-20060901.tar.gz) = 13165608
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_x264.c b/multimedia/vlc-devel/files/patch-modules_codec_x264.c
deleted file mode 100644
index 2ff0294a2..000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_x264.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/codec/x264.c.orig	Wed Aug  9 21:24:08 2006
-+++ modules/codec/x264.c	Wed Aug  9 21:24:27 2006
-@@ -588,7 +588,7 @@
- 
-     /* cbr = 1 overrides qp or crf and sets an average bitrate
-        but maxrate = average bitrate is needed for "real" CBR */
--    if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1;
-+    if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = 1;
- 
-     var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
-     if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;