- Update to 0.8.6, this is a stable release but it will live in

  vlc-devel for the time being since multimedia/ffmpeg support
  was dropped, you *must* use multimedia/ffmpeg-devel.

6 files changed, 31 insertions, 114 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 7dd633f9633b..90170c29c25a 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -9,21 +9,22 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.9.0.20061020
-PORTREVISION=	1
+DISTVERSION=	0.8.6
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net www
-MASTER_SITES=	http://nightlies.videolan.org/build/source/
-#		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
-#		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
-#		ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \
-#		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
+MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
+		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
+		ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \
+		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.9.0.//}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
 
-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+		avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
+
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 
 OPTIONS+=	A52 "a52 audio support, many DVDs use this" On
@@ -33,7 +34,6 @@ OPTIONS+=	CACA "Libcaca Console Graphics Support" Off
 OPTIONS+=	ARTS "Enable arts sound support" Off
 OPTIONS+=	CORBA "Enable a Corba interface via orbit2" Off
 OPTIONS+=	DAAP "Connect to iTunes(R) music shares" On
-OPTIONS+=	DBUS "Dbus support" On
 OPTIONS+=	DEBUG "Enable debuging support" Off
 OPTIONS+=	DTS "DTS decoder support, many DVDs use this" On
 OPTIONS+=	ESOUND "Esound Support" Off
@@ -62,13 +62,11 @@ OPTIONS+=	VORBIS "Vorbis support" On
 OPTIONS+=	WIN32_CODECS "win32 multimedia DLL's" Off
 OPTIONS+=	X264 "Enable H.264/AVC codec support" On
 
-CONFLICTS=	vlc-[0-9]*
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.9.0-svn
+CONFLICTS=	vlc-*
 
 WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -83,12 +81,14 @@ PLIST=		${WRKDIR}/plist
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \
+		LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lc" \
+		LIBS="-lc"
 
 CONFIGURE_ARGS+=	--enable-ffmpeg \
 			--with-ffmpeg=${LOCALBASE} \
 			--with-libiconv-prefix=${LOCALBASE} \
+			--with-libintl-prefix=${LOCALBASE} \
 			--with-ffmpeg-zlib \
 			--disable-gnome \
 			--disable-gtk \
@@ -109,12 +109,6 @@ BROKEN=		Does not compile on ${ARCH}
 BROKEN=	Does not compile with perl ${PERL_VERSION}
 .endif
 
-.if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
-.else
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-.endif
-
 # compatible knobs.
 .if defined(WITH_DEBUG)
 DEBUG=	yes
@@ -193,6 +187,7 @@ CONFIGURE_ARGS+=--disable-loader
 
 .if !defined(WITHOUT_WXGTK)
 USE_WX=		2.6
+WX_UNICODE=	yes
 CONFIGURE_ARGS+=--enable-wxwidgets
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
@@ -248,13 +243,6 @@ CONFIGURE_ARGS+=--enable-corba
 CONFIGURE_ARGS+=--disable-corba
 .endif
 
-.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus:${PORTSDIR}/devel/dbus
-CONFIGURE_ARGS+=	--enable-dbus
-.else
-CONFIGURE_ARGS+=	--disable-dbus
-.endif
-
 .if !defined(WITHOUT_DVBPSI)
 LIB_DEPENDS+=	dvbpsi.4:${PORTSDIR}/multimedia/libdvbpsi
 CONFIGURE_ARGS+=--enable-dvbpsi \
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index 953338403109..b8485b0b70ef 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -261,7 +261,17 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
 		${WRKSRC}/loader/module.c
 .endif
-	@${REINPLACE_CMD} -e 's|bindings/java/src/Makefile||' ${WRKSRC}/configure
+
+pre-configure:
+.if !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) && exists(${LOCALBASE}/lib/libavformat.a)
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "ERROR: ${PKGNAME} requires a newer version of FFMpeg"
+	@${ECHO_CMD} "please deinstall multimedia/ffmpeg before continuing"
+	@${ECHO_CMD} "the build."
+	@${ECHO_CMD} ""
+	@${FALSE}
+.endif
+
 
 pre-build:
 	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 86eebbe2ea9f..b2c99c63af78 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-snapshot-20061020.tar.gz) = 8f7585dfccf1eff8f2bed7ce7edd30cb
-SHA256 (vlc-snapshot-20061020.tar.gz) = 67cb59f7bb5b2b3242fa50921b6bbff5bd027fcd08e634b905309c82798ef97b
-SIZE (vlc-snapshot-20061020.tar.gz) = 13877097
+MD5 (vlc-0.8.6.tar.bz2) = 77a275f3408c4c9feae451d4eae47f89
+SHA256 (vlc-0.8.6.tar.bz2) = 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7
+SIZE (vlc-0.8.6.tar.bz2) = 10506025
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c
deleted file mode 100644
index 502fe4c9688f..000000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- modules/codec/ffmpeg/ffmpeg.c.orig	Fri May 13 07:48:21 2005
-+++ modules/codec/ffmpeg/ffmpeg.c	Fri May 13 13:28:17 2005
-@@ -42,11 +42,9 @@
- 
- #include "ffmpeg.h"
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
- #   ifdef HAVE_POSTPROC_POSTPROCESS_H
--#       include <postproc/postprocess.h>
--#   else
--#       include <libpostproc/postprocess.h>
-+#       include <ffmpeg/postproc/postprocess.h>
- #   endif
- #endif
- 
-@@ -105,7 +103,7 @@
-         VLC_TRUE );
-         change_integer_range( 0, 2 );
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-     add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
-     add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
-         LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c
deleted file mode 100644
index 29b5eb319416..000000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- modules/codec/ffmpeg/postprocess.c.orig	Fri May 13 07:48:21 2005
-+++ modules/codec/ffmpeg/postprocess.c	Sat May 14 00:11:53 2005
-@@ -35,13 +35,9 @@
- 
- #include "ffmpeg.h"
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
- 
--#ifdef HAVE_POSTPROC_POSTPROCESS_H
--#   include <postproc/postprocess.h>
--#else
--#   include <libpostproc/postprocess.h>
--#endif
-+#include <ffmpeg/postproc/postprocess.h>
- 
- #ifndef PP_CPU_CAPS_ALTIVEC
- #   define PP_CPU_CAPS_ALTIVEC 0
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c
deleted file mode 100644
index 1ed5bda68d4a..000000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- modules/codec/ffmpeg/video.c.orig	Fri May 13 13:30:36 2005
-+++ modules/codec/ffmpeg/video.c	Fri May 13 13:32:42 2005
-@@ -202,7 +202,7 @@
- 
-     p_pic = p_dec->pf_vout_buffer_new( p_dec );
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-     if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init )
-     {
-         E_(InitPostproc)( p_dec, p_sys->p_pp, p_context->width,
-@@ -301,7 +301,7 @@
-         p_sys->b_direct_rendering = 1;
-     }
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODE_BUILD > 4750
-     p_sys->p_pp = NULL;
-     p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = VLC_FALSE;
-     p_sys->p_pp = E_(OpenPostproc)( p_dec, &p_sys->b_pp_async );
-@@ -719,7 +719,7 @@
- 
-     if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-     E_(ClosePostproc)( p_dec, p_sys->p_pp );
- #endif
- 
-@@ -741,7 +741,7 @@
-         uint8_t *p_dst, *p_src;
-         int i_src_stride, i_dst_stride;
- 
--#ifdef LIBAVCODEC_PP
-+#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
-         if( p_sys->p_pp && p_sys->b_pp )
-             E_(PostprocPict)( p_dec, p_sys->p_pp, p_pic, p_ff_pic );
-         else