- Don't build ffmpeg with swscaler by default: VLC 0.8.6c does not

  support it; if you still need it, please define WITH_SWSCALER;

- re-activate Theora support;

- remove ancient bits from DTS;

- define CONFIGURE_LOG to track possible failures.

PR:		ports/115428
Approved by:	mezz

2 files changed, 33 insertions, 17 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index ea9cfd452a07..ba135e328374 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2007-07-12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -16,6 +16,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
 
 HAS_CONFIGURE=	yes
+CONFIGURE_LOG=	config.err
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WANT_SDL=	yes
@@ -32,8 +33,7 @@ CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--extra-ldflags="-L${LOCALBASE}/lib" \
 		--extra-libs="${PTHREAD_LIBS}" \
 		--enable-gpl \
-		--enable-pthreads \
-		--enable-swscaler
+		--enable-pthreads
 CONFIGURE_ENV+=	LANG=C
 MAKE_ENV=	INSTALL="${INSTALL}"
 SHLIB_VER=	1
@@ -96,9 +96,6 @@ CONFIGURE_ARGS+=	--enable-libfaad \
 .endif
 USE_RC_SUBR=		ffserver
 
-#### BROKEN LIST #####
-WITHOUT_THEORA=	yes
-
 .if ${MACHINE_CPU:Mmmx}==""
 CONFIGURE_ARGS+=	--disable-mmx
 
@@ -134,6 +131,16 @@ MAN1+=	ffplay.1
 .else
 CONFIGURE_ARGS+=	--disable-ffplay
 .endif
+
+## swscaler
+.if defined(WITH_SWSCALER)
+CONFIGURE_ARGS+=	--enable-swscaler
+PLIST_SUB+=	SWSCAL=""
+.else
+PLIST_SUB+=	SWSCAL="@comment "
+.endif
+
+## theora
 .if !defined(WITHOUT_THEORA)
 WITH_OGG=	yes
 LIB_DEPENDS+=		theora.2:${PORTSDIR}/multimedia/libtheora
@@ -216,6 +223,15 @@ pre-everything::
 	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
 	@${ECHO_MSG}
 .endif
+.ifndef(WITH_SWSCALER)
+	@${ECHO_MSG} 'Define WITH_SWSCALER to enable software scaler support'
+	@${ECHO_MSG} 'Warning: swscaler does not work with VLC!'
+	@${ECHO_MSG}
+.endif
+.ifndef(WITHOUT_THEORA)
+	@${ECHO_MSG} 'Define WITHOUT_THEORA to disable libtheora support'
+	@${ECHO_MSG}
+.endif
 .ifndef(WITHOUT_VORBIS)
 	@${ECHO_MSG} 'Define WITHOUT_VORBIS to enable libvorbisenc VORBIS codec'
 	@${ECHO_MSG}
@@ -289,13 +305,13 @@ post-patch:
 .endif
 
 post-configure:
-.ifdef(WITH_DTS)
-	@${REINPLACE_CMD} -E \
-		-e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
-		-e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
-			${WRKSRC}/config.mak \
-			${WRKSRC}/libavcodec/Makefile
-.endif
+#.ifdef(WITH_DTS)
+#	@${REINPLACE_CMD} -E \
+#		-e 's|-ldts|${LOCALBASE}/lib/libdts_pic.a|' \
+#		-e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \
+#			${WRKSRC}/config.mak \
+#			${WRKSRC}/libavcodec/Makefile
+#.endif
 .ifdef(WITHOUT_THEORA)
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 78dd57c7fda8..275dbe5ac4f0 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -43,10 +43,10 @@ lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.%%SHLIB_VER%%
 lib/libpostproc.so.51.1.0
-lib/libswscale.a
-lib/libswscale.so
-lib/libswscale.so.%%SHLIB_VER%%
-lib/libswscale.so.0.5.0
+%%SWSCAL%%lib/libswscale.a
+%%SWSCAL%%lib/libswscale.so
+%%SWSCAL%%lib/libswscale.so.%%SHLIB_VER%%
+%%SWSCAL%%lib/libswscale.so.0.5.0
 lib/vhook/fish.so
 lib/vhook/null.so
 lib/vhook/ppm.so