CVS commit: pkgsrc/multimedia/ffmpeg4

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Sep 29 14:25:39 UTC 2018

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

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

(this fixes ffplay4)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg4/Makefile.common
cvs rdiff -u -r1.3 -r1.4 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.5 pkgsrc/multimedia/ffmpeg4/Makefile.common:1.6
--- pkgsrc/multimedia/ffmpeg4/Makefile.common:1.5       Tue Sep 25 09:39:56 2018
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common   Sat Sep 29 14:25:39 2018
@@ -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 @@ PATCHDIR=     ${.CURDIR}/../../multimedia/ff
 
 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

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.3 pkgsrc/multimedia/ffmpeg4/options.mk:1.4
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.3    Tue Sep 25 09:39:56 2018
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Sat Sep 29 14:25:39 2018
@@ -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 @@ PKG_SUGGESTED_OPTIONS+=       vaapi
 
 # Fontconfig
 .if !empty(PKG_OPTIONS:Mfontconfig)
-USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       --enable-fontconfig
 .include "../../fonts/fontconfig/buildlink3.mk"
 .else
@@ -38,7 +37,6 @@ CONFIGURE_ARGS+=      --disable-fontconfig
 
 # 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 @@ CONFIGURE_ARGS+=      --disable-libfreetype
 
 # 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 @@ 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