[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg cleanup/fix option handling, make "l...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/643e81635343
branches:  trunk
changeset: 598898:643e81635343
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Feb 01 17:56:07 2012 +0000

description:
cleanup/fix option handling, make "lame" an option too (default unchanged),
from Gianni D'Aprile per PR pkg/45900

diffstat:

 multimedia/ffmpeg/Makefile   |  10 +---------
 multimedia/ffmpeg/options.mk |  16 +++++++++++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diffs (69 lines):

diff -r af24f41f7bdf -r 643e81635343 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Wed Feb 01 14:47:45 2012 +0000
+++ b/multimedia/ffmpeg/Makefile        Wed Feb 01 17:56:07 2012 +0000
@@ -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 @@
 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 @@
 
 .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 -r af24f41f7bdf -r 643e81635343 multimedia/ffmpeg/options.mk
--- a/multimedia/ffmpeg/options.mk      Wed Feb 01 14:47:45 2012 +0000
+++ b/multimedia/ffmpeg/options.mk      Wed Feb 01 17:56:07 2012 +0000
@@ -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 @@
 .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)