diff options
| author | sborrill <sborrill@pkgsrc.org> | 2008-09-12 13:44:23 +0000 |
|---|---|---|
| committer | sborrill <sborrill@pkgsrc.org> | 2008-09-12 13:44:23 +0000 |
| commit | d515a5b3e8011834ac79b98c086c901801631753 (patch) | |
| tree | 987c24f8948b000d6db70e651ae7870a3c85b3d2 /multimedia | |
| parent | f840ed76d3890488b1f3d561724e7d7a23b5205b (diff) | |
| download | pkgsrc-d515a5b3e8011834ac79b98c086c901801631753.tar.gz | |
Make swscale an option (on by default). This option needs to be disabled for
vlc08 (0.8.6i).
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/PLIST | 16 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 17 |
3 files changed, 22 insertions, 14 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f0d0ba3b71c..aac3e8ae7a6 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -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 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} \ --disable-debug \ --disable-vhook \ --enable-avfilter \ - --enable-swscale \ --enable-gpl \ --enable-postproc \ --enable-pthreads \ diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST index 3fc93966667..fdb8fd80613 100644 --- a/multimedia/ffmpeg/PLIST +++ b/multimedia/ffmpeg/PLIST @@ -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/random.h 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.a 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 --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index 70f3c8cda35..0a1a2ea8714 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -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 @@ CONFIGURE_ARGS+= --disable-ffplay .endif ### +### swscale option +### + +.if !empty(PKG_OPTIONS:Mswscale) +CONFIGURE_ARGS+= --enable-swscale +PLIST.swscale= yes +.endif + +### ### OGG Theora support ### |