- Always build libswscale

  This fixes build on multimedia/handbrake

4 files changed, 37 insertions, 18 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 7f603594b7f6..ee90a9d175cc 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2007-04-29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ahze
@@ -31,7 +31,8 @@ CONFIGURE_ARGS=	--cc="${CC}" --prefix="${PREFIX}" \
 		--extra-libs="${PTHREAD_LIBS}" \
 		--disable-bktr \
 		--enable-gpl \
-		--enable-pthreads
+		--enable-pthreads \
+		--enable-swscaler
 CONFIGURE_ENV+=	LANG=C
 MAKE_ENV=	INSTALL="${INSTALL}"
 SHLIB_VER=	1
@@ -141,14 +142,6 @@ 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
 LIB_DEPENDS+=		theora.2:${PORTSDIR}/multimedia/libtheora
@@ -226,10 +219,6 @@ 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/files/patch-libavcode_imgconvert.c b/multimedia/ffmpeg-devel/files/patch-libavcode_imgconvert.c
new file mode 100644
index 000000000000..5a985ae7be0f
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcode_imgconvert.c
@@ -0,0 +1,18 @@
+--- libavcodec/imgconvert.c.orig	Thu May  3 09:07:28 2007
++++ libavcodec/imgconvert.c	Thu May  3 09:08:25 2007
+@@ -2319,7 +2319,6 @@
+ }
+ #endif
+ 
+-#ifndef CONFIG_SWSCALER
+ /* XXX: always use linesize. Return -1 if not supported */
+ int img_convert(AVPicture *dst, int dst_pix_fmt,
+                 const AVPicture *src, int src_pix_fmt,
+@@ -2561,7 +2560,6 @@
+     avpicture_free(tmp);
+     return ret;
+ }
+-#endif
+ 
+ /* NOTE: we scan all the pixels to have an exact information */
+ static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec_Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec_Makefile
new file mode 100644
index 000000000000..e48db852bb7d
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec_Makefile
@@ -0,0 +1,12 @@
+--- 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-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index faa1756f3adc..673ea74d02d7 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -40,10 +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/libswscale.a
+lib/libswscale.so
+lib/libswscale.so.%%SHLIB_VER%%
+lib/libswscale.so.0.5.0
 lib/vhook/fish.so
 lib/vhook/null.so
 lib/vhook/ppm.so