- Update to 2007.04.29 snapshot (this will probably be moved to multimedia/ffmpeg, assumeing we have no major problems)

- Add support for libswscale [1]
- Honor CFLAGS [1]
- Update WWW [1]
- Fix build on amd64 [2]
- Replace erroneous tr with a better one [3]
- Better CONFLICTS with multimedia/ffmpeg [4]
- Disable liba52 instead of building internal liba52 if WITHOUT_A52 is defined since it's no longer
  required [5]

PR:		ports/111335 [1]
		ports/111560 [3]
		ports/112068 [4]
		ports/112192 [5]
Submitted by:	thierry [1]
		vanilla (partly submitted by) [2]
		ast@marabu.ch [3]
		Ganael LAPLANCHE <ganael.laplanche@martymac.com> [4]
		Martin Tournoij <carpetsmoker@xs4all.nl> [5]

4 files changed, 69 insertions, 16 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index d0a9e1f94d7a..b77aee439cd7 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2007-04-18
+DISTVERSION=	2007-04-29
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -25,18 +25,19 @@ CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--enable-memalign-hack \
 		--enable-shared \
 		--enable-pp \
-		--extra-cflags="-fPIC ${CFLAGS} -I${LOCALBASE}/include" \
+		--extra-cflags="-fPIC -DPIC ${CFLAGS} -I${LOCALBASE}/include" \
 		--extra-ldflags="-L${LOCALBASE}/lib" \
 		--extra-libs="${PTHREAD_LIBS}" \
 		--disable-bktr \
-		--enable-gpl
+		--enable-gpl \
+		--enable-pthreads
 CONFIGURE_ENV+=	LANG=C
 MAKE_ENV=	INSTALL="${INSTALL}"
 SHLIB_VER=	1
 PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	yes
 
-CONFLICTS=	ffmpeg-[0-9]*-*
+CONFLICTS=	ffmpeg-[0-9]*
 
 MAN1=		ffmpeg.1
 
@@ -52,7 +53,6 @@ PORTDOCS=	*
 
 .if ${ARCH}=="amd64"
 EXTRA_PATCHES=	${PATCHDIR}/amd64-patch
-BROKEN=		Does not build
 .endif
 
 ## sse hardware vector support
@@ -80,7 +80,7 @@ CONFIGURE_ARGS+=	--enable-liba52 \
 			--enable-liba52bin
 FFMPEG_LDFLAGS+=		-la52
 .else
-CONFIGURE_ARGS+=	--enable-liba52
+CONFIGURE_ARGS+=	--disable-liba52
 .endif
 ## dts
 .ifdef(WITH_DTS) || exists(${LOCALBASE}/lib/libdts.a)
@@ -141,6 +141,13 @@ PLIST_FILES+=	bin/ffplay
 .else
 CONFIGURE_ARGS+=	--disable-ffplay
 .endif
+# libswscale
+.if !defined(WITHOUT_SWSCALE)
+CONFIGURE_ARGS+=	--enable-swscaler
+PLIST_SUB+=		SWSCALE=""
+.else
+PLIST_SUB+=		SWSCALE="@comment "
+.endif
 ## theora
 .if !defined(WITHOUT_THEORA)
 WITH_OGG=	yes
@@ -219,6 +226,10 @@ pre-everything::
 	@${ECHO_MSG} 'Define WITH_OGG to enable OGG codec'
 	@${ECHO_MSG}
 .endif
+.ifndef(WITHOUT_SWSCALE)
+	@${ECHO_MSG} 'You can disable libswscale support by defining WITHOUT_SWSCALE'
+	@${ECHO_MSG}
+.endif
 .ifndef(WITH_OPTIMIZED_CFLAGS)
 	@${ECHO_MSG} 'You can enable additional compilation optimizations'
 	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index befb9336b203..7d108db8ef8a 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ffmpeg-2007-04-18.tar.bz2) = d77435c856716d340103c553b2628bfa
-SHA256 (ffmpeg-2007-04-18.tar.bz2) = 19a47e1ddb2f2c53435592f3f6bb8eae5debbb7eec4e2820e094a131aadb1674
-SIZE (ffmpeg-2007-04-18.tar.bz2) = 2193991
+MD5 (ffmpeg-2007-04-29.tar.bz2) = ba24faba9b09397a241ec7bac52282f5
+SHA256 (ffmpeg-2007-04-29.tar.bz2) = 708dcb08e4aaad7e66a803caaca22af1fa1572749bd8c398a0a1871a48c5ee03
+SIZE (ffmpeg-2007-04-29.tar.bz2) = 2234128
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure
index 71ad1a17e9ae..3ce966240eac 100644
--- a/multimedia/ffmpeg-devel/files/patch-configure
+++ b/multimedia/ffmpeg-devel/files/patch-configure
@@ -1,10 +1,25 @@
---- configure.orig	Sun Apr 15 12:34:50 2007
-+++ configure	Wed Apr 18 10:31:48 2007
-@@ -982,14 +982,8 @@
-     arch="x86_32"
+--- configure.orig	Fri Apr 27 03:13:50 2007
++++ configure	Mon Apr 30 09:59:52 2007
+@@ -208,11 +208,11 @@
+ 
+ # "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
+ toupper(){
+-    echo "$@" | tr '[a-z]' '[A-Z]'
++    echo "$@" | tr '[:lower:]' '[:upper:]'
+ }
+ 
+ tolower(){
+-    echo "$@" | tr '[A-Z]' '[a-z]'
++    echo "$@" | tr '[:upper:]' '[:lower:]'
+ }
+ 
+ set_all(){
+@@ -986,15 +986,9 @@
+     enable fast_unaligned
    ;;
    x86_64|amd64)
 -    arch="x86_32"
+     enable fast_unaligned
 -    canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
 -    if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
 -      if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
@@ -17,6 +32,29 @@
    ;;
    # armv4l is a subset of armv[567]*l
    arm|armv[4567]*l)
+@@ -1749,14 +1743,14 @@
+ # not all compilers support -Os
+ test "$optimize" = "small" && check_cflags -Os
+ 
+-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
++#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
+ 
+ # PIC flags for shared library objects where they are needed
+ if enabled shared; then
 @@ -1965,15 +1959,15 @@
  if enabled shared; then
    echo "BUILD_SHARED=yes" >> config.mak
@@ -38,7 +76,7 @@
    echo "SWSVERSION=$sws_version" >> config.mak
    echo "SLIBNAME=${SLIBNAME}" >> config.mak
    echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-@@ -2096,8 +2090,8 @@
+@@ -2095,8 +2089,8 @@
  Version: $version
  Requires: $requires
  Conflicts:
@@ -49,7 +87,7 @@
  EOF
  }
  
-@@ -2120,7 +2114,8 @@
+@@ -2119,7 +2113,8 @@
  Requires: $requires
  Conflicts:
  Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index 926cde5ca718..faa1756f3adc 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -27,7 +27,7 @@ include/postproc/postprocess.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.%%SHLIB_VER%%
-lib/libavcodec.so.51.40.3
+lib/libavcodec.so.51.40.4
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.%%SHLIB_VER%%
@@ -40,6 +40,10 @@ lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.%%SHLIB_VER%%
 lib/libpostproc.so.51.1.0
+%%SWSCALE%%lib/libswscale.a
+%%SWSCALE%%lib/libswscale.so
+%%SWSCALE%%lib/libswscale.so.%%SHLIB_VER%%
+%%SWSCALE%%lib/libswscale.so.0.5.0
 lib/vhook/fish.so
 lib/vhook/null.so
 lib/vhook/ppm.so