From 1882ea352616bc65e5fa991863052e3baa855af2 Mon Sep 17 00:00:00 2001
From: ahze <ahze@FreeBSD.org>
Date: Fri, 28 Oct 2005 10:06:16 +0000
Subject: - Update to 0.8.4.20051027 - Disable matroska support until libebml
 is updated - OPTIONS are disabled, too many problems right now.

---
 multimedia/vlc-devel/Makefile | 13 ++++++++-----
 multimedia/vlc-devel/distinfo |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 24edc66d59bb..5c1dfa1067c1 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -217,8 +217,8 @@
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.2.20050813
-PORTREVISION=	2
+DISTVERSION=	0.8.4.20051027
+PORTREVISION=	0
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/vlc/snapshots/
 #		http://download2.videolan.org/pub/videolan/testing/${PORTNAME}-${DISTVERSION}/ \
@@ -228,7 +228,7 @@ MASTER_SITES=	http://download.videolan.org/pub/vlc/snapshots/
 #		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
 MASTER_SITE_SUBDIR=	ahze/:mozilla
 PKGNAMESUFFIX?=	-devel${ESOUND_SUFFIX}${MOZILLA_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.2.//}
+DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.4.//}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
@@ -236,12 +236,13 @@ COMMENT=	Multimedia streaming server and player for various audio/video formats
 RUN_DEPEDNS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
-CONFLICTS=	vlc-*-0.8.2*
+CONFLICTS=	vlc-*-0.8.4*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-snapshot-${PORTVERSION:S/0.8.2.//}
+WRKSRC=		${WRKDIR}/${PORTNAME}-snapshot-${PORTVERSION:S/0.8.4.//}
 ### BROKEN -- Needs newer verision of toolame ###
 WITHOUT_TOOLAME=	yes
 WITHOUT_MOZILLA_PLUGIN=	yes
+WITHOUT_LIBMATROSKA=	yes	# needs newer version of libebml
 ### BROKEN ###
 
 WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
@@ -312,6 +313,7 @@ WXGTK2_PORT=	wxgtk26
 CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
 .endif
 
+.if 0
 .if !defined(BATCH)
 OPTIONS=	AALIB "Console graphics support" Off \
 		ARTS "Arts audio support" Off \
@@ -356,6 +358,7 @@ OPTIONS=	AALIB "Console graphics support" Off \
 		WXGTK "WxGtk+2 frontend" On \
 		X264 "H.264 AVC video codec" Off
 .endif
+.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 1e54a73d9634..a855bf73bbfb 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (vlc-snapshot-20050813.tar.gz) = f06dc10a8a7440ae3c7415891b7dc5e8
-SIZE (vlc-snapshot-20050813.tar.gz) = 9722817
+MD5 (vlc-snapshot-20051027.tar.gz) = 0c890f4e41fa963278bdbb5759fd9703
+SIZE (vlc-snapshot-20051027.tar.gz) = 9279202
-- 
cgit