pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/avidemux Add "faad" as a PKG_OPTION. Due t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf08974793c9
branches:  trunk
changeset: 532680:cf08974793c9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Aug 28 21:43:35 2007 +0000

description:
Add "faad" as a PKG_OPTION.  Due to Dolby licensing restrictions, if
the "faad" option is selected, then the resulting avidemux binary
package cannot be distributed.  Ok'ed by <xtraeme>.

diffstat:

 multimedia/avidemux/Makefile |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 28bddcb5f7f5 -r cf08974793c9 multimedia/avidemux/Makefile
--- a/multimedia/avidemux/Makefile      Tue Aug 28 18:50:00 2007 +0000
+++ b/multimedia/avidemux/Makefile      Tue Aug 28 21:43:35 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/06/07 21:20:08 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2007/08/28 21:43:35 jlam Exp $
 #
 
 DISTNAME=      avidemux_2.3.0
@@ -23,15 +23,13 @@
 
 CONFIGURE_ENV+=                X11_LDFLAGS=${X11_LDFLAGS:Q}
 CONFIGURE_ENV+=                ac_cv_path_ART_CONFIG=no
-CONFIGURE_ARGS+=       --without-newfaad
-CONFIGURE_ARGS+=       --disable-faad # Dolby doesn't allow binary distribution
 CONFIGURE_ARGS+=       \
        --with-jsapi-include=${BUILDLINK_PREFIX.spidermonkey}/include
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.avidemux
-PKG_SUPPORTED_OPTIONS= # generally, none
+PKG_SUPPORTED_OPTIONS= faad
 .if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS+=        mmx
 .endif
@@ -47,6 +45,18 @@
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mfaad)
+.  include "../../audio/faad2/buildlink3.mk"
+CPPFLAGS+=             -I${BUILDLINK_PREFIX.faad2}/include/faad2
+CONFIGURE_ARGS+=       --with-faad2
+RESTRICTED=            Dolby doesn't allow binary distributions (FAAD)
+NO_BIN_ON_FTP=         ${RESTRICTED}
+NO_BIN_ON_CDROM=       ${RESTRICTED}
+.else
+CONFIGURE_ARGS+=       --without-newfaad
+CONFIGURE_ARGS+=       --disable-faad
+.endif
+
 .if empty(PKG_OPTIONS:Mmmx)
 CONFIGURE_ARGS+=       --disable-mmx
 



Home | Main Index | Thread Index | Old Index