[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg Make swscale an option (on by defaul...

[sborrill <sborrill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/72b4adb8cd90
branches:  trunk
changeset: 547114:72b4adb8cd90
user:      sborrill <sborrill%pkgsrc.org@localhost>
date:      Fri Sep 12 13:44:23 2008 +0000

description:
Make swscale an option (on by default). This option needs to be disabled for
vlc08 (0.8.6i).

diffstat:

 multimedia/ffmpeg/Makefile   |   3 +--
 multimedia/ffmpeg/PLIST      |  16 ++++++++--------
 multimedia/ffmpeg/options.mk |  17 +++++++++++++----
 3 files changed, 22 insertions(+), 14 deletions(-)

diffs (101 lines):

diff -r e188e8e2a4e6 -r 72b4adb8cd90 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Fri Sep 12 13:41:20 2008 +0000
+++ b/multimedia/ffmpeg/Makefile        Fri Sep 12 13:44:23 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2008/09/12 12:21:07 ahoka Exp $
+# $NetBSD: Makefile,v 1.42 2008/09/12 13:44:23 sborrill Exp $
 
 DISTNAME=      ffmpeg-${DISTVERSION}
 PKGNAME=       ffmpeg-${DISTVERSION:S/-//g}
@@ -45,7 +45,6 @@
                        --disable-debug \
                        --disable-vhook \
                        --enable-avfilter \
-                       --enable-swscale \
                        --enable-gpl \
                        --enable-postproc \
                        --enable-pthreads \
diff -r e188e8e2a4e6 -r 72b4adb8cd90 multimedia/ffmpeg/PLIST
--- a/multimedia/ffmpeg/PLIST   Fri Sep 12 13:41:20 2008 +0000
+++ b/multimedia/ffmpeg/PLIST   Fri Sep 12 13:44:23 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2008/09/08 17:57:02 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/09/12 13:44:23 sborrill Exp $
 bin/ffmpeg
 bin/ffserver
 ${PLIST.sdl}bin/ffplay
@@ -28,8 +28,8 @@
 include/libavutil/rational.h
 include/libavutil/sha1.h
 include/libpostproc/postprocess.h
-include/libswscale/rgb2rgb.h
-include/libswscale/swscale.h
+${PLIST.swscale}include/libswscale/rgb2rgb.h
+${PLIST.swscale}include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.51
@@ -54,17 +54,17 @@
 lib/libpostproc.so
 lib/libpostproc.so.51
 lib/libpostproc.so.51.1.0
-lib/libswscale.a
-lib/libswscale.so
-lib/libswscale.so.0
-lib/libswscale.so.0.5.1
+${PLIST.swscale}lib/libswscale.a
+${PLIST.swscale}lib/libswscale.so
+${PLIST.swscale}lib/libswscale.so.0
+${PLIST.swscale}lib/libswscale.so.0.5.1
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
 lib/pkgconfig/libavformat.pc
 lib/pkgconfig/libavutil.pc
 lib/pkgconfig/libpostproc.pc
-lib/pkgconfig/libswscale.pc
+${PLIST.swscale}lib/pkgconfig/libswscale.pc
 man/man1/ffmpeg.1
 man/man1/ffserver.1
 share/doc/ffmpeg/README
diff -r e188e8e2a4e6 -r 72b4adb8cd90 multimedia/ffmpeg/options.mk
--- a/multimedia/ffmpeg/options.mk      Fri Sep 12 13:41:20 2008 +0000
+++ b/multimedia/ffmpeg/options.mk      Fri Sep 12 13:44:23 2008 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: options.mk,v 1.9 2008/09/12 12:21:07 ahoka Exp $
+# $NetBSD: options.mk,v 1.10 2008/09/12 13:44:23 sborrill Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac x264
-PKG_SUGGESTED_OPTIONS= faac theora xvid x264
+PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac swscale x264
+PKG_SUGGESTED_OPTIONS= faac theora xvid swscale x264
 #PKG_OPTIONS_OPTIONAL_GROUPS=  aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=        faad faac
 
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=   sdl
+PLIST_VARS+=   sdl swscale
 
 ###
 ### faad option
@@ -47,6 +47,15 @@
 .endif
 
 ###
+### swscale option
+###
+
+.if !empty(PKG_OPTIONS:Mswscale)
+CONFIGURE_ARGS+=       --enable-swscale
+PLIST.swscale=         yes
+.endif
+
+###
 ### OGG Theora support
 ###