From ccddc0cc38c53896246b52ec50bf566d7c284d83 Mon Sep 17 00:00:00 2001
From: ahze <ahze@FreeBSD.org>
Date: Wed, 10 May 2006 11:45:48 +0000
Subject: - Chase x264 libver bump

---
 multimedia/ffmpeg-devel/Makefile               | 3 ++-
 multimedia/gstreamer-plugins-x26480/Makefile   | 2 +-
 multimedia/gstreamer-plugins80/Makefile.common | 2 +-
 multimedia/mpeg4ip/Makefile                    | 3 ++-
 multimedia/mplayer/Makefile                    | 6 +++---
 multimedia/vlc-devel/Makefile                  | 4 ++--
 multimedia/vlc/Makefile                        | 4 ++--
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index c050943ca70..f67178d8e1a 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	0.4.9.cvs.${RELEASE_DATE}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 #		http://mplayerhq.hu/MPlayer/cvs/
@@ -305,7 +306,7 @@ FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
 .endif
 # x264
 .ifdef(WITH_X264)
-LIB_DEPENDS+=		x264.1:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=		x264.47:${PORTSDIR}/multimedia/x264
 
 CONFIGURE_ARGS+=	--enable-x264
 .endif
diff --git a/multimedia/gstreamer-plugins-x26480/Makefile b/multimedia/gstreamer-plugins-x26480/Makefile
index 2977859838a..403e2466c77 100644
--- a/multimedia/gstreamer-plugins-x26480/Makefile
+++ b/multimedia/gstreamer-plugins-x26480/Makefile
@@ -7,7 +7,7 @@
 #
 
 CATEGORIES=	multimedia
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer x264 plugin
 
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index 6b0a6b02c78..9b6ecfe878f 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -511,7 +511,7 @@ LIB_DEPENDS+=	wavpack.0:${PORTSDIR}/audio/wavpack
 
 # x264
 .if ${GST_PLUGIN}=="x264"
-LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.47:${PORTSDIR}/multimedia/x264
 PLIST_FILES=	${GST_LIB_DIR}/libx264.so \
 		${GST_LIB_DIR}/libx264.a \
 		${GST_LIB_DIR}/libx264.la
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 9aa18942f10..ae100eab0ee 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +24,7 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2	\
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		x264.1:${PORTSDIR}/multimedia/x264 \
+		x264.47:${PORTSDIR}/multimedia/x264 \
 		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
 		mp4av.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
 
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 7d7f2d886cd..790f7162818 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -270,7 +270,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.99.7
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -407,7 +407,7 @@ WITH_SVGALIB=	yes
 WITH_THEORA=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libx264.so.1)
+.if exists(${LOCALBASE}/lib/libx264.so.47)
 WITH_X264=	yes
 .endif
 
@@ -692,7 +692,7 @@ CONFIGURE_ARGS+=	--disable-theora
 .endif
 
 .if defined(WITH_X264)
-LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.47:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
 .endif
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 4e7274ad7e0..b0e3b46132b 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.6.20060507
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://nightlies.videolan.org/build/source/
 #		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
@@ -284,7 +284,7 @@ CONFIGURE_ARGS+=--disable-dirac
 
 .if !defined(WITHOUT_X264)
 CONFIGURE_ARGS+=--enable-x264
-LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.47:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=--disable-x264
 .endif
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 9e5b3db7415..c84beddd80f 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -279,7 +279,7 @@ CONFIGURE_ARGS+=--disable-dirac
 
 .if !defined(WITHOUT_X264)
 CONFIGURE_ARGS+=--enable-x264
-LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.47:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=--disable-x264
 .endif
-- 
cgit