diff options
| author | ahoka <ahoka> | 2008-09-08 17:57:02 +0000 |
|---|---|---|
| committer | ahoka <ahoka> | 2008-09-08 17:57:02 +0000 |
| commit | 0eeca2a7e5051f998e9fc25d12f998b4acfcff22 (patch) | |
| tree | 6f6a29e45a5374b438ad98e6bebc93447e9bc09d /multimedia | |
| parent | cedc474fc79421963dcb4d17c3b053f1f6497a6d (diff) | |
| download | pkgsrc-0eeca2a7e5051f998e9fc25d12f998b4acfcff22.tar.gz | |
Fix the PLIST handling of the SDL option.
Problem reported by Amitai Schlair.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/PLIST | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg/PLIST.sdl | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 10 |
4 files changed, 11 insertions, 10 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index c36a796607f..d6701c1477e 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2008/09/08 00:16:35 ahoka Exp $ +# $NetBSD: Makefile,v 1.39 2008/09/08 17:57:02 ahoka Exp $ DISTNAME= ffmpeg-${DISTVERSION} PKGNAME= ffmpeg-${DISTVERSION:S/-//g} +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_FREEBSD} EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST index 98224dc7d45..3fc93966667 100644 --- a/multimedia/ffmpeg/PLIST +++ b/multimedia/ffmpeg/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.7 2008/09/07 23:39:37 ahoka Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/09/08 17:57:02 ahoka Exp $ bin/ffmpeg -bin/ffplay bin/ffserver +${PLIST.sdl}bin/ffplay +${PLIST.sdl}man/man1/ffplay.1 include/libavcodec/avcodec.h include/libavcodec/opt.h include/libavdevice/avdevice.h @@ -65,7 +66,6 @@ lib/pkgconfig/libavutil.pc lib/pkgconfig/libpostproc.pc lib/pkgconfig/libswscale.pc man/man1/ffmpeg.1 -man/man1/ffplay.1 man/man1/ffserver.1 share/doc/ffmpeg/README share/doc/ffmpeg/TODO diff --git a/multimedia/ffmpeg/PLIST.sdl b/multimedia/ffmpeg/PLIST.sdl deleted file mode 100644 index a996ab221ea..00000000000 --- a/multimedia/ffmpeg/PLIST.sdl +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.sdl,v 1.1 2008/09/07 23:39:37 ahoka Exp $ -bin/ffplay diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index f9efdbcdf98..ac9bbb44850 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2008/09/07 23:39:37 ahoka Exp $ +# $NetBSD: options.mk,v 1.8 2008/09/08 17:57:02 ahoka Exp $ # Global and legacy options @@ -11,6 +11,8 @@ PKG_SUGGESTED_OPTIONS= faac theora xvid .include "../../mk/bsd.options.mk" .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= sdl + ### ### faad option ### @@ -37,11 +39,11 @@ CONFIGURE_ARGS+= --enable-libfaac ### .if !empty(PKG_OPTIONS:Msdl) - CONFIGURE_ARGS+= --enable-ffplay -PLIST_SRC+= ${PKGDIR}/PLIST.sdl - +PLIST.sdl= yes .include "../../devel/SDL/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-ffplay .endif ### |