[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg4 ffmpeg4: fix librtmp detection

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09ea8de60bce
branches:  trunk
changeset: 313296:09ea8de60bce
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Sep 25 09:39:56 2018 +0000

description:
ffmpeg4: fix librtmp detection

While here, fix a LICENSE issue.

diffstat:

 multimedia/ffmpeg4/Makefile.common |  4 ++--
 multimedia/ffmpeg4/options.mk      |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 6d560595b2da -r 09ea8de60bce multimedia/ffmpeg4/Makefile.common
--- a/multimedia/ffmpeg4/Makefile.common        Tue Sep 25 09:26:13 2018 +0000
+++ b/multimedia/ffmpeg4/Makefile.common        Tue Sep 25 09:39:56 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2018/07/31 19:13:10 rjs Exp $
+# $NetBSD: Makefile.common,v 1.5 2018/09/25 09:39:56 wiz Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -7,7 +7,7 @@
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.xz
 
-LICENSE=       gnu-lgpl-v2.1 AND gnu-gpl-v2
+LICENSE=       gnu-lgpl-v2.1 AND gnu-gpl-v2 ${ADDITIONAL_LICENSE}
 
 PATCHDIR=      ${.CURDIR}/../../multimedia/ffmpeg4/patches
 
diff -r 6d560595b2da -r 09ea8de60bce multimedia/ffmpeg4/options.mk
--- a/multimedia/ffmpeg4/options.mk     Tue Sep 25 09:26:13 2018 +0000
+++ b/multimedia/ffmpeg4/options.mk     Tue Sep 25 09:39:56 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/04/30 09:00:46 adam Exp $
+# $NetBSD: options.mk,v 1.3 2018/09/25 09:39:56 wiz Exp $
 
 # Global and legacy options
 
@@ -91,7 +91,7 @@
 # OpenCORE libraries with FFmpeg, the license version needs to be
 # upgraded by passing --enable-version3 to configure."
 CONFIGURE_ARGS+=       --enable-version3
-# TODO: LICENSE
+ADDITIONAL_LICENSE+=           AND gnu-lgpl-v3
 .include "../../audio/opencore-amr/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-libopencore-amrnb
@@ -110,6 +110,7 @@
 # RTMP support via librtmp
 .if !empty(PKG_OPTIONS:Mrtmp)
 CONFIGURE_ARGS+=       --enable-librtmp
+USE_TOOLS+=            pkg-config
 .include "../../net/rtmpdump/buildlink3.mk"
 .endif