CVS commit: pkgsrc/multimedia/ffmpeg4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 25 09:39:56 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg4: Makefile.common options.mk

Log Message:
ffmpeg4: fix librtmp detection

While here, fix a LICENSE issue.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg4/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg4/Makefile.common:1.4 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.5
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.4       Tue Jul 31 19:13:10 2018
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Tue Sep 25 09:39:56 2018
@@ -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 @@ CATEGORIES=     multimedia
 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
 

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.2 pkgsrc/multimedia/ffmpeg4/options.mk:1.3
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.2    Mon Apr 30 09:00:46 2018
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Tue Sep 25 09:39:56 2018
@@ -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 @@ CONFIGURE_ARGS+=      --enable-libopencore-am
 # 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 @@ CONFIGURE_ARGS+=    --disable-openssl
 # RTMP support via librtmp
 .if !empty(PKG_OPTIONS:Mrtmp)
 CONFIGURE_ARGS+=       --enable-librtmp
+USE_TOOLS+=            pkg-config
 .include "../../net/rtmpdump/buildlink3.mk"
 .endif