6 files changed, 28 insertions, 118 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index f823297e50bf..3adc5485b6cb 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2007-05-30
-PORTREVISION=	2
+DISTVERSION=	2007-07-12
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -19,13 +18,16 @@ HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WANT_SDL=	yes
+
+.include <bsd.port.pre.mk>
+
 CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--make="${GMAKE}" \
 		--disable-debug \
 		--enable-memalign-hack \
 		--enable-shared \
 		--enable-pp \
-		--extra-cflags="-fPIC -DPIC ${CFLAGS} -I${LOCALBASE}/include" \
+		--extra-cflags="${CFLAGS} -I${LOCALBASE}/include" \
 		--extra-ldflags="-L${LOCALBASE}/lib" \
 		--extra-libs="${PTHREAD_LIBS}" \
 		--enable-gpl \
@@ -37,7 +39,7 @@ SHLIB_VER=	1
 PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	yes
 
-FFMPEG_MAN1=	ffmpeg.1
+MAN1+=	ffmpeg.1 ffserver.1
 
 ##
 DOC_FILES=	COPYING Changelog README
@@ -47,12 +49,6 @@ DOC_DOCFILES=	TODO faq.html ffmpeg-doc.html \
 		hooks.html optimization.txt
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH}=="amd64"
-EXTRA_PATCHES=	${PATCHDIR}/amd64-patch
-.endif
-
 ## sse hardware vector support
 .if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} == "sse")
 WITH_BUILTIN_VECTOR=	yes
@@ -92,14 +88,13 @@ LIB_DEPENDS+=		faac.0:${PORTSDIR}/audio/faac
 CONFIGURE_ARGS+=	--enable-libfaac
 .endif
 ## faad
-.ifdef(WITH_FAAD) || exists(${LOCALBASE}/lib/libfaad.so)
+.ifndef(WITHOUT_FAAD) || exists(${LOCALBASE}/lib/libfaad.so)
 LIB_DEPENDS+=		faad.0:${PORTSDIR}/audio/faad
 
 CONFIGURE_ARGS+=	--enable-libfaad \
 			--enable-libfaadbin
 .endif
 USE_RC_SUBR=		ffserver
-FFMPEG_MAN1+=		ffserver.1
 
 #### BROKEN LIST #####
 WITHOUT_THEORA=	yes
@@ -132,8 +127,6 @@ CONFIGURE_ARGS+=	--enable-libogg
 .ifdef(WITH_SDL) || ${HAVE_SDL:Msdl}
 USE_SDL+=	sdl
 
-FFMPEG_MAN1+=	ffplay.1
-
 PLIST_FILES+=	bin/ffplay
 .else
 CONFIGURE_ARGS+=	--disable-ffplay
@@ -156,7 +149,7 @@ FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
 .ifdef(WITH_X264) || exists(${LOCALBASE}/lib/libx264.so)
 LIB_DEPENDS+=		x264.50:${PORTSDIR}/multimedia/x264
 
-CONFIGURE_ARGS+=	--enable-x264
+CONFIGURE_ARGS+=	--enable-libx264
 .endif
 ## builtin vector, requires mmx
 .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR)
@@ -179,11 +172,7 @@ WITHOUT_IMLIB2=	yes
 .ifdef(WITH_XVID) || exists(${LOCALBASE}/lib/libxvidcore.so)
 LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid
 
-CONFIGURE_ARGS+=	--enable-xvid
-.endif
-
-.ifndef(NOPORTDOCS)
-MAN1=	${FFMPEG_MAN1}
+CONFIGURE_ARGS+=	--enable-libxvid
 .endif
 
 pre-everything::
@@ -239,7 +228,7 @@ pre-everything::
 
 post-patch:
 # Faad compat
-	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/faad.c
+	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.c
 # {C,LD}FLAGS safeness
 # fix x264 math, use correct log base 2 from math(3)
 .if ${OSVERSION} <= 601000
@@ -312,10 +301,7 @@ post-configure:
 		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
 		${WRKSRC}/config.mak
 .endif
-# shared libraries PIC
-	@${REINPLACE_CMD} -E \
-		-e 's|^(PIC[[:space:]]*=.*)$$|\1 -fpic -fPIC -DPIC|' \
-		${WRKSRC}/config.mak
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist
 	if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index eeabf2fc514a..6442e922ce92 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2007-05-30.tar.bz2) = 85d6f1a5657ca9c7730dac76c1cca883
-SHA256 (ffmpeg-2007-05-30.tar.bz2) = fa2237b2852ea8f01b329863f9b07f72865a1f58af5d001904d67f974ab0e18b
-SIZE (ffmpeg-2007-05-30.tar.bz2) = 2256282
+MD5 (ffmpeg-2007-07-12.tar.bz2) = 6f055a17766e7d6a044281ea4a43c481
+SHA256 (ffmpeg-2007-07-12.tar.bz2) = 7abbb87ec7a8ae9ea0ec2e0ad6138d60406e9ef3f1ab6293af98d662276c6210
+SIZE (ffmpeg-2007-07-12.tar.bz2) = 2277468
diff --git a/multimedia/ffmpeg/files/amd64-patch b/multimedia/ffmpeg/files/amd64-patch
deleted file mode 100644
index db2116a39116..000000000000
--- a/multimedia/ffmpeg/files/amd64-patch
+++ /dev/null
@@ -1,55 +0,0 @@
-$OpenBSD: patch-libavcodec_mpegvideo_c,v 1.1 2007/01/23 09:34:45 robert Exp $
---- libavcodec/mpegvideo.c.orig	Sat Dec 23 05:05:36 2006
-+++ libavcodec/mpegvideo.c	Tue Jan  2 18:22:01 2007
-@@ -4837,7 +4837,7 @@ static int pre_estimate_motion_thread(AV
- static int estimate_motion_thread(AVCodecContext *c, void *arg){
-     MpegEncContext *s= arg;
- 
--    ff_check_alignment();
-+    /*ff_check_alignment();*/
- 
-     s->me.dia_size= s->avctx->dia_size;
-     s->first_slice_line=1;
-@@ -4865,7 +4865,7 @@ static int mb_var_thread(AVCodecContext 
-     MpegEncContext *s= arg;
-     int mb_x, mb_y;
- 
--    ff_check_alignment();
-+    /*ff_check_alignment();*/
- 
-     for(mb_y=s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
-         for(mb_x=0; mb_x < s->mb_width; mb_x++) {
-@@ -4914,7 +4914,7 @@ static int encode_thread(AVCodecContext 
-     PutBitContext pb[2], pb2[2], tex_pb[2];
- //printf("%d->%d\n", s->resync_mb_y, s->end_mb_y);
- 
--    ff_check_alignment();
-+    /*ff_check_alignment();*/
- 
-     for(i=0; i<2; i++){
-         init_put_bits(&pb    [i], bit_buf    [i], MAX_MB_BYTES);
---- libavcodec/dsputil.c.orig	Wed Apr 18 09:42:55 2007
-+++ libavcodec/dsputil.c	Wed Apr 18 10:16:01 2007
-@@ -3814,6 +3814,7 @@
-     for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
- }
- 
-+/*
- int ff_check_alignment(void){
-     static int did_fail=0;
-     DECLARE_ALIGNED_16(int, aligned);
-@@ -3832,12 +3833,12 @@
-     }
-     return 0;
- }
--
-+*/
- void dsputil_init(DSPContext* c, AVCodecContext *avctx)
- {
-     int i;
- 
--    ff_check_alignment();
-+    /*ff_check_alignment();*/
- 
- #ifdef CONFIG_ENCODERS
-     if(avctx->dct_algo==FF_DCT_FASTINT) {
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index aa9b8f17d1ed..ac71b897fc17 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sun May 27 12:31:02 2007
-+++ configure	Wed May 30 21:50:21 2007
+--- configure.orig	2007-07-08 13:47:15.000000000 -0400
++++ configure	2007-07-09 12:37:09.000000000 -0400
 @@ -210,11 +210,11 @@
  
  # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
@@ -14,7 +14,7 @@
  }
  
  set_all(){
-@@ -1020,15 +1020,9 @@
+@@ -992,15 +992,9 @@
      enable fast_unaligned
    ;;
    x86_64|amd64)
@@ -32,30 +32,20 @@
    ;;
    # armv4l is a subset of armv[567]*l
    arm|armv[4567]*l)
-@@ -1781,14 +1775,14 @@
- # not all compilers support -Os
- test "$optimize" = "small" && check_cflags -Os
- 
--if enabled optimize; then
+@@ -1734,12 +1728,6 @@
+     check_cflags -Os            # not all compilers support -Os
+     optimize="small"
+ elif enabled optimize; then
 -    if test -n "`$cc -v 2>&1 | grep xlc`"; then
 -        add_cflags  "-O5"
 -        add_ldflags "-O5"
 -    else
 -        add_cflags "-O3"
 -    fi
--fi
-+#if enabled optimize; then
-+#    if test -n "`$cc -v 2>&1 | grep xlc`"; then
-+#        add_cflags  "-O5"
-+#        add_ldflags "-O5"
-+#    else
-+#        add_cflags "-O3"
-+#    fi
-+#fi
+ fi
  
  # PIC flags for shared library objects where they are needed
- if enabled shared; then
-@@ -1996,15 +1990,15 @@
+@@ -1927,15 +1915,15 @@
  if enabled shared; then
    echo "BUILD_SHARED=yes" >> config.mak
    echo "PIC=-fPIC -DPIC" >> config.mak
@@ -76,7 +66,7 @@
    echo "SWSVERSION=$sws_version" >> config.mak
    echo "SLIBNAME=${SLIBNAME}" >> config.mak
    echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-@@ -2039,7 +2033,7 @@
+@@ -1969,7 +1957,7 @@
  
  echo "SRC_PATH=\"$source_path\"" >> config.mak
  echo "SRC_PATH_BARE=$source_path" >> config.mak
@@ -85,7 +75,7 @@
  
  # Apparently it's not possible to portably echo a backslash.
  if enabled asmalign_pot; then
-@@ -2119,8 +2113,8 @@
+@@ -2047,8 +2035,8 @@
  Version: $version
  Requires: $requires
  Conflicts:
@@ -96,7 +86,7 @@
  EOF
  }
  
-@@ -2143,7 +2137,8 @@
+@@ -2071,7 +2059,8 @@
  Requires: $requires
  Conflicts:
  Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
diff --git a/multimedia/ffmpeg/files/patch-libavcodec_Makefile b/multimedia/ffmpeg/files/patch-libavcodec_Makefile
deleted file mode 100644
index e48db852bb7d..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavcodec/Makefile.orig	Thu May  3 08:50:33 2007
-+++ libavcodec/Makefile	Thu May  3 08:50:42 2007
-@@ -293,9 +293,7 @@
- 
- OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
- 
--ifneq ($(CONFIG_SWSCALER),yes)
- OBJS += imgresample.o
--endif
- 
- # processor-specific code
- ifeq ($(TARGET_MMX),yes)
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 55b46bce01bf..78dd57c7fda8 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -6,6 +6,7 @@ include/ffmpeg/adler32.h
 include/ffmpeg/avcodec.h
 include/ffmpeg/avformat.h
 include/ffmpeg/avio.h
+include/ffmpeg/avstring.h
 include/ffmpeg/avutil.h
 include/ffmpeg/base64.h
 include/ffmpeg/common.h
@@ -37,7 +38,7 @@ lib/libavformat.so.51.12.1
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.%%SHLIB_VER%%
-lib/libavutil.so.49.4.0
+lib/libavutil.so.49.4.1
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.%%SHLIB_VER%%