Update multimedia/vlc to 0.7.2.

Changes between 0.7.1 and 0.7.2:
--------------------------------

Core support:
 * Bookmarks feature for easier seeking/access inside medias.
 * Support for video output embedded in interfaces.
 * Improved HTTP daemon.
 * Saved playlists now remember VLC-specific options.

Codecs:
 * New Continuous Media Markup Language (CMML) codec.
   (http://www.annodex.net/overview.html)
 * New H.261 video decoder using openmash.
 * H264 encoder, demuxer and packetizer.
 * Packetizer interfaces between demux and codec when needed
   (allows using ffmpeg plugin to decode MPEG streams and better aac decoding).
 * Support for Theora alpha3 (both decoding and encoding).

Input:
 * --start-time <sec> and --stop-time <sec> to start and stop playing a
   file at the specified amount of seconds. Only works with a few
   fileformats (avi, mov, mkv, mp4 )
 * Improved directory access module.
 * New "file-cat" option to play truncated movies.
 * Better handling of meta info (title, author, description, etc...).
 * New options to pass meta info to the input.
 * It is now possible to stream programs from a DVB-S/C/T stream
   (satellite, cable, or digital terestrial television)

Demux:
 * Annodex (http://www.annodex.net) support.
 * mmsh streaming fixes.
 * Fixed infinite loop in the AVI demux on broken/incomplete files.

Subtitles:
 * Subviewer and subviewer v2 subtitles support.
 * Ability to choose autodetected subtitles path.
 * Subtitles delay can be changed in real time with hotkeys.

Stream output:
 * Improved session announcement system.
 * Minimize threads usage by default.
 * Added faster than realtime stream output (limited by CPU) for file output.
 * Improved MOV/MP4 muxer.
 * Improved MPEG TS muxer.
 * Improved transrater.
 * Meta info options used by the muxers.
 * New configuration system.
 * Better audio channels downmixing when transcoding.

VideoLAN manager:
 * New videolan (media) manager (vlm): a little manager designed to launch
   and manage multiple streams from within one instance of VLC.
 * Supports live streams and VoD.
 * Supports scheduling.
 * Telnet interface for vlm.
 * HTTP interface for vlm.

Interfaces:
 * Skins II (Windows and Linux only)
    - Ability to embed video output.
    - Support for bitmap fonts.
    - Lots of improvements.
 * wxWindows (default Windows and Linux interface)
    - New design and set of icons.
    - Ability to embed video output.
    - Support for hotkeys.
    - Support for bookmarks.
 * Mac OS X
    - Support for 'groups' and playlist item properties.
    - Better hotkeys handling.

Mac OS X port:
 * OpenGL video output is now the default when available.
 * Added FAAC encoder (mp4a).
 * Audio output fix to work with multiple streams on a HAL device.
 * Possible fix for conflict with CodeTek VirtualDesktop (untested).

Win32 port:
 * DirectShow input plugin should work with more devices.
 * Disable monitor power down when watching movies.
 * Improved Windows installer.

Linux port:
 * PowerPC fixes.

Misc:
 * Improvements to the Goom visualisation plugin.
 * Roku HD1000 audio output

4 files changed, 63 insertions, 52 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 8b349607159..267b77d0d60 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/05/18 14:39:03 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/06/20 18:43:26 xtraeme Exp $
 #
 
-DISTNAME=		vlc-0.7.1
-PKGREVISION=		1
+DISTNAME=		vlc-${VLC_VER}
 CATEGORIES=		multimedia
-MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/0.7.1/
+MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -18,61 +17,61 @@ USE_X11=		yes
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 
-SUBST_CLASSES+=		oss
-SUBST_SED.oss+=		-e 's|/dev/dsp|${DEVOSSAUDIO}|'
-SUBST_STAGE.oss=	post-patch
-SUBST_MESSAGE.oss=	"patching hardcoded /dev/dsp."
-SUBST_FILES.oss+=	modules/access/v4l/v4l.c
-SUBST_FILES.oss+=	modules/audio_output/oss.c
-SUBST_FILES.oss+=	modules/gui/pda/pda_interface.c
-SUBST_FILES.oss+=	modules/gui/pda/pda.glade
-SUBST_FILES.oss+=	modules/gui/wxwindows/v4l.cpp
+VLC_VER=		0.7.2
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX FIXME
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=        --disable-vcd
 CONFIGURE_ARGS+=	--disable-skins2
 .endif
-BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
-
-CONFIGURE_ARGS+=	--enable-oss
-CONFIGURE_ARGS+=	--enable-dvb
+BUILDLINK_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
+BUILDLINK_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix 
 
-# XXX FIXME
-CONFIGURE_ARGS+=	--disable-arts
-CONFIGURE_ARGS+=	--disable-mkv
-CONFIGURE_ARGS+=	--disable-faad
-CONFIGURE_ARGS+=	--disable-ffmpeg
+CONFIGURE_ARGS+=	--disable-speex # pkgsrc version too old
 
+CONFIGURE_ARGS+=	--enable-dvb
 CONFIGURE_ARGS+=	--enable-flac
-CONFIGURE_ARGS+=	--enable-x11
-CONFIGURE_ARGS+=	--disable-qt
-CONFIGURE_ARGS+=	--disable-kde
-CONFIGURE_ARGS+=	--disable-gnome
 CONFIGURE_ARGS+=	--disable-gtk
+CONFIGURE_ARGS+=	--with-ffmpeg-tree=${BUILDLINK_PREFIX.ffmpeg}/lib
 
-WITH_DVDCSS?=		NO
 BUILD_DEFS+=		WITH_DVDCSS
 
-.if !empty(WITH_DVDCSS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-dvdcss="${BUILDLINK_PREFIX.libdvdcss}"
+.if defined(WITH_DVDCSS) && !empty(WITH_DVDCSS:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--with-dvdcss=${BUILDLINK_PREFIX.libdvdcss}
 .include "../../multimedia/libdvdcss/buildlink3.mk"
-PLIST_SUBST+=	DVDCSS=
+PLIST_SUBST+=		DVDCSS=
 .else
 CONFIGURE_ARGS+=	--disable-dvd
-PLIST_SUBST+=	DVDCSS="@comment "
+PLIST_SUBST+=		DVDCSS="@comment "
 .endif
 
 pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http
 	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/http/admin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins
 	${INSTALL_DATA_DIR} ${PREFIX}/share/vlc/skins/default
 
-#.include "../../audio/faad2/buildlink3.mk"
+ORIGFNT=		/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf
+DEFAULT_FONT?=		${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
+
+SUBST_CLASSES+=         oss fnt libav
+SUBST_STAGE.oss=        post-patch
+SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_FILES.oss+=	modules/access/v4l/v4l.c
+SUBST_FILES.oss+=	modules/audio_output/oss.c
+SUBST_FILES.oss+=	modules/gui/pda/pda_interface.c
+SUBST_FILES.oss+=	modules/gui/pda/pda.glade
+SUBST_FILES.oss+=	modules/gui/wxwindows/v4l.cpp
+SUBST_MESSAGE.oss=	"Fixing harcoded audio device."
+SUBST_STAGE.fnt=	post-patch
+SUBST_SED.fnt=		-e "s,${ORIGFNT},${DEFAULT_FONT},"
+SUBST_FILES.fnt=	modules/misc/freetype.c
+SUBST_MESSAGE.fnt=	"Fixing harcoded paths."
+SUBST_STAGE.libav=	post-patch
+SUBST_FILES.libav=	configure
+SUBST_SED.libav=	-e "s,libavcodec/libavcodec.a,libavcodec.a,g"
+
+BUILDLINK_TRANSFORM.ffmpeg+=	-e "s,include/ffmpeg,include/,g"
+
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
@@ -80,16 +79,16 @@ pre-install:
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-#.include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdplay/buildlink3.mk"
 .include "../../multimedia/libdvbpsi/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index b69b16a7717..6635144936b 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/19 18:15:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/06/20 18:43:26 xtraeme Exp $
 bin/vlc
 bin/vlc-config
 bin/wxvlc
@@ -59,6 +59,7 @@ lib/vlc/codec/liba52_plugin.so
 lib/vlc/codec/libadpcm_plugin.so
 lib/vlc/codec/libaraw_plugin.so
 lib/vlc/codec/libcinepak_plugin.so
+lib/vlc/codec/libcmml_plugin.so
 lib/vlc/codec/libcvdsub_plugin.so
 lib/vlc/codec/libdts_plugin.so
 lib/vlc/codec/libdvbsub_plugin.so
@@ -67,7 +68,6 @@ lib/vlc/codec/liblibmpeg2_plugin.so
 lib/vlc/codec/liblpcm_plugin.so
 lib/vlc/codec/libmpeg_audio_plugin.so
 lib/vlc/codec/librawvideo_plugin.so
-lib/vlc/codec/libspeex_plugin.so
 lib/vlc/codec/libspudec_plugin.so
 lib/vlc/codec/libsubsdec_plugin.so
 lib/vlc/codec/libsvcdsub_plugin.so
@@ -76,6 +76,7 @@ lib/vlc/control/libgestures_plugin.so
 lib/vlc/control/libhotkeys_plugin.so
 lib/vlc/control/libhttp_plugin.so
 lib/vlc/control/librc_plugin.so
+lib/vlc/control/libtelnet_plugin.so
 lib/vlc/demux/liba52sys_plugin.so
 lib/vlc/demux/libaac_plugin.so
 lib/vlc/demux/libaiff_plugin.so
@@ -87,6 +88,7 @@ lib/vlc/demux/libdemuxdump_plugin.so
 lib/vlc/demux/libdemuxsub_plugin.so
 lib/vlc/demux/libdtssys_plugin.so
 lib/vlc/demux/libflac_plugin.so
+lib/vlc/demux/libh264_plugin.so
 lib/vlc/demux/libid3_plugin.so
 lib/vlc/demux/libid3tag_plugin.so
 lib/vlc/demux/libm3u_plugin.so
@@ -103,11 +105,13 @@ lib/vlc/demux/libps_plugin.so
 lib/vlc/demux/libpva_plugin.so
 lib/vlc/demux/librawdv_plugin.so
 lib/vlc/demux/libreal_plugin.so
+lib/vlc/demux/libsgimb_plugin.so
 lib/vlc/demux/libts2_plugin.so
 lib/vlc/demux/libts_dvbpsi_plugin.so
 lib/vlc/demux/libts_plugin.so
 lib/vlc/demux/libwav_plugin.so
 lib/vlc/gui/libwxwindows_plugin.so
+lib/vlc/libffmpeg.a
 lib/vlc/libi420_rgb_mmx.a
 lib/vlc/libi420_ymga_mmx.a
 lib/vlc/libi420_yuy2_mmx.a
@@ -115,10 +119,11 @@ lib/vlc/libi422_yuy2_mmx.a
 lib/vlc/libmemcpy3dn.a
 lib/vlc/libmemcpymmx.a
 lib/vlc/libmemcpymmxext.a
+lib/vlc/libmkv.a
+lib/vlc/libstream_out_transcode.a
 lib/vlc/misc/libdummy_plugin.so
 lib/vlc/misc/libexport_plugin.so
 lib/vlc/misc/libfreetype_plugin.so
-lib/vlc/misc/libhttpd_plugin.so
 lib/vlc/misc/libipv4_plugin.so
 lib/vlc/misc/libipv6_plugin.so
 lib/vlc/misc/liblogger_plugin.so
@@ -134,6 +139,7 @@ lib/vlc/mux/libmux_ps_plugin.so
 lib/vlc/mux/libmux_ts_dvbpsi_plugin.so
 lib/vlc/mux/libmux_ts_plugin.so
 lib/vlc/packetizer/libpacketizer_copy_plugin.so
+lib/vlc/packetizer/libpacketizer_h264_plugin.so
 lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so
 lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so
 lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index f053326f624..c8e91355562 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/14 12:11:30 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/06/20 18:43:26 xtraeme Exp $
 #
 # This Makefile fragment is included by packages that use vlc.
 #
@@ -16,24 +16,30 @@ BUILDLINK_DEPENDS+=	vlc
 BUILDLINK_PACKAGES+=		vlc
 BUILDLINK_DEPENDS.vlc?=		vlc>=0.7.1
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
+.endif # VLC_BUILDLINK3_MK
 
+.include "../../multimedia/libdvdcss/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libcddb/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/speex/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../misc/libdvdcss/buildlink3.mk"
-.include "../../misc/libdvdplay/buildlink3.mk"
-.include "../../misc/libdvdread/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/libdvdplay/buildlink3.mk"
+.include "../../multimedia/libdvbpsi/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libmatroska/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
+.include "../../sysutils/vcdimager-devel/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
 
-.endif # VLC_BUILDLINK3_MK
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index fa0d6c124c9..7759ebef103 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/03/29 10:30:28 grant Exp $
+$NetBSD: distinfo,v 1.2 2004/06/20 18:43:26 xtraeme Exp $
 
-SHA1 (vlc-0.7.1.tar.bz2) = 87b673eb404bd23a312f9edbcfa0df4de0c4ec0b
-Size (vlc-0.7.1.tar.bz2) = 4063461 bytes
+SHA1 (vlc-0.7.2.tar.bz2) = 938eaea128af02451fcbf0305c84ce290c9d8c21
+Size (vlc-0.7.2.tar.bz2) = 4516835 bytes