- Update to 2007-10-04

- Chase libtheora

4 files changed, 13 insertions, 23 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5aa506865d8b..00a9ebdeeb32 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#      $Id: Makefile 66 2007-10-09 17:50:49Z buhnux $
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2007-09-14
+DISTVERSION=	2007-10-04
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -32,7 +33,8 @@ CONFIGURE_ARGS+=--cc="${CC}" --prefix="${PREFIX}" \
 		--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
 		--extra-libs="${PTHREAD_LIBS}" \
 		--enable-gpl \
-		--enable-pthreads
+		--enable-pthreads \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV+=	LANG=C
 MAKE_ENV+=	INSTALL="${INSTALL}"
 SHLIB_VER=	1
@@ -145,7 +147,7 @@ PLIST_SUB+=	SWSCAL="@comment "
 ## theora
 .if !defined(WITHOUT_THEORA)
 WITH_OGG=	yes
-LIB_DEPENDS+=		theora.2:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=		theora.0:${PORTSDIR}/multimedia/libtheora
 
 CONFIGURE_ARGS+=	--enable-libtheora
 .endif
@@ -158,7 +160,7 @@ CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
 .endif
 # x264
-.ifdef(WITH_X264) || exists(${LOCALBASE}/lib/libx264.so)
+.ifndef(WITHOUT_X264) || exists(${LOCALBASE}/lib/libx264.so)
 LIB_DEPENDS+=		x264.50:${PORTSDIR}/multimedia/x264
 
 CONFIGURE_ARGS+=	--enable-libx264
@@ -238,8 +240,8 @@ pre-everything::
 	@${ECHO_MSG} 'Define WITHOUT_VORBIS to enable libvorbisenc VORBIS codec'
 	@${ECHO_MSG}
 .endif
-.ifndef(WITH_X264)
-	@${ECHO_MSG} 'Define WITH_X264 to enable X264 codec'
+.ifndef(WITHOUT_X264)
+	@${ECHO_MSG} 'Define WITHOUT_X264 to disable X264 codec'
 	@${ECHO_MSG}
 .endif
 .ifndef(WITH_XVID)
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 764008369353..9f92fea8ddc1 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2007-09-14.tar.bz2) = e23067b54add3cfb1c74f700fbeae5a4
-SHA256 (ffmpeg-2007-09-14.tar.bz2) = f92ae075e73017271737a5f6c4175f6bece363160cd820e7c6b0873c2e344a0e
-SIZE (ffmpeg-2007-09-14.tar.bz2) = 2320785
+MD5 (ffmpeg-2007-10-04.tar.bz2) = 9ec842daece6479cc92cbc421a008d53
+SHA256 (ffmpeg-2007-10-04.tar.bz2) = f8aa5a2b85c1ce27a91a4bb0415f01415dfc7e6110476da717ac835193679447
+SIZE (ffmpeg-2007-10-04.tar.bz2) = 2326718
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_Makefile b/multimedia/ffmpeg/files/patch-libavcodec_Makefile
deleted file mode 100644
index b12912f9dcb9..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/Makefile~	2007-08-18 08:52:23.156380000 +0200
-+++ libavcodec/Makefile	2007-08-19 11:46:16.402305301 +0200
-@@ -29,7 +29,7 @@
-       audioconvert.o \
- 
- 
--HEADERS = avcodec.h opt.h
-+HEADERS = allcodecs.h avcodec.h opt.h
- 
- OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
- OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 3360b659811d..20d8b219be4d 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -3,7 +3,6 @@ bin/ffserver
 @unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
 etc/ffserver.conf-dist
 include/ffmpeg/adler32.h
-include/ffmpeg/allcodecs.h
 include/ffmpeg/avcodec.h
 include/ffmpeg/avformat.h
 include/ffmpeg/avio.h
@@ -35,7 +34,7 @@ lib/libavcodec.so.51.44.0
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.%%SHLIB_VER%%
-lib/libavformat.so.51.13.3
+lib/libavformat.so.51.14.0
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.%%SHLIB_VER%%