diff options
| author | drochner <drochner@pkgsrc.org> | 2012-02-01 17:56:07 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2012-02-01 17:56:07 +0000 |
| commit | ab6f13cba9f794de3d366a3981839b98ab721ba2 (patch) | |
| tree | 0786c09721ec96e3d6c73fb7e05c6e1c49a6ca16 /multimedia | |
| parent | 188de3b7862cd6b350c0d842259cbba2868f0eb2 (diff) | |
| download | pkgsrc-ab6f13cba9f794de3d366a3981839b98ab721ba2.tar.gz | |
cleanup/fix option handling, make "lame" an option too (default unchanged),
from Gianni D'Aprile per PR pkg/45900
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 16 |
2 files changed, 14 insertions, 12 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 8e726829031..5b263e31556 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2012/01/31 12:00:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.84 2012/02/01 17:56:07 drochner Exp $ # XXX This is release 0.7.11 but we had date-based pkgnames before. PKGNAME= ffmpeg-20120112.${DISTVERSION} @@ -13,9 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-avfilter #CONFIGURE_ARGS+= --enable-avfilter-lavf CONFIGURE_ARGS+= --enable-postproc -CONFIGURE_ARGS+= --enable-libvorbis -CONFIGURE_ARGS+= --enable-libmp3lame -CONFIGURE_ARGS+= --enable-libx264 INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg @@ -40,15 +37,10 @@ post-install: .include "options.mk" -# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding. -BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1 - .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) CFLAGS+= -no-integrated-as .endif -.include "../../audio/lame/buildlink3.mk" -.include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/ffmpeg/Makefile.common" diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index e9c88aa52dc..68aa7184941 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.23 2012/01/09 17:08:52 drochner Exp $ +# $NetBSD: options.mk,v 1.24 2012/02/01 17:56:07 drochner Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg -PKG_SUPPORTED_OPTIONS= theora vorbis xvid faac x264 opencore-amr libvpx -PKG_SUGGESTED_OPTIONS= theora vorbis xvid x264 libvpx +PKG_SUPPORTED_OPTIONS= faac lame libvpx opencore-amr theora vorbis x264 xvid +PKG_SUGGESTED_OPTIONS= lame libvpx theora vorbis x264 xvid #PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder #PKG_OPTIONS_GROUP.aac-decoder= faac @@ -67,6 +67,16 @@ CONFIGURE_ARGS+= --enable-libvorbis .endif ### +### LAME MP3 encoder +### +.if !empty(PKG_OPTIONS:Mlame) +# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding. +BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1 +CONFIGURE_ARGS+= --enable-libmp3lame +.include "../../audio/lame/buildlink3.mk" +.endif + +### ### XviD support ### .if !empty(PKG_OPTIONS:Mxvid) |