[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg4 ffmpeg4: pkg-config is needed to fi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2c5aec8b39f
branches:  trunk
changeset: 313403:b2c5aec8b39f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Sep 29 14:25:39 2018 +0000

description:
ffmpeg4: pkg-config is needed to find libxml2, so it is always needed

(this fixes ffplay4)

diffstat:

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

diffs (59 lines):

diff -r fb9c34032089 -r b2c5aec8b39f multimedia/ffmpeg4/Makefile.common
--- a/multimedia/ffmpeg4/Makefile.common        Sat Sep 29 14:01:58 2018 +0000
+++ b/multimedia/ffmpeg4/Makefile.common        Sat Sep 29 14:25:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2018/09/25 09:39:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2018/09/29 14:25:39 tnn Exp $
 # used by multimedia/ffmpeg4/Makefile
 # used by multimedia/ffplay4/Makefile
 
@@ -13,7 +13,7 @@
 
 USE_LANGUAGES=         c99
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake pod2man perl
+USE_TOOLS+=            gmake pod2man perl pkg-config
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --cc=${CC:Q}
 CONFIGURE_ARGS+=       --disable-debug
diff -r fb9c34032089 -r b2c5aec8b39f multimedia/ffmpeg4/options.mk
--- a/multimedia/ffmpeg4/options.mk     Sat Sep 29 14:01:58 2018 +0000
+++ b/multimedia/ffmpeg4/options.mk     Sat Sep 29 14:25:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/09/25 09:39:56 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2018/09/29 14:25:39 tnn Exp $
 
 # Global and legacy options
 
@@ -29,7 +29,6 @@
 
 # Fontconfig
 .if !empty(PKG_OPTIONS:Mfontconfig)
-USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --enable-fontconfig
 .include "../../fonts/fontconfig/buildlink3.mk"
 .else
@@ -38,7 +37,6 @@
 
 # freetype option
 .if !empty(PKG_OPTIONS:Mfreetype)
-USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --enable-libfreetype
 .include "../../graphics/freetype2/buildlink3.mk"
 .else
@@ -47,7 +45,6 @@
 
 # ass option
 .if !empty(PKG_OPTIONS:Mass)
-USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --enable-libass
 .include "../../multimedia/libass/buildlink3.mk"
 .else
@@ -110,7 +107,6 @@
 # RTMP support via librtmp
 .if !empty(PKG_OPTIONS:Mrtmp)
 CONFIGURE_ARGS+=       --enable-librtmp
-USE_TOOLS+=            pkg-config
 .include "../../net/rtmpdump/buildlink3.mk"
 .endif