From: Bradley Sepos <bradley@bradleysepos.com>
Date: Sat, 3 Sep 2016 05:04:08 +0000 (-0400)
Subject: contrib: Use PKGCONFIG.exe when building libav on mingw.
X-Git-Tag: 1.0.0~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed0be87a9c8a6989b2b45f7b4135a0b2401c0756;p=handbrake

contrib: Use PKGCONFIG.exe when building libav on mingw.

Fixes broken external libraries such as opus, and needed for libav 12, anyway.
---

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index ccb61eca1..bb27b953d 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -92,6 +92,11 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
         --arch=$(BUILD.machine) \
         --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
     FFMPEG.GCC.args.extra += -fno-common
+    ifeq (1,$(FEATURE.local_pkgconfig))
+        FFMPEG.CONFIGURE.extra += --pkg-config="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/$(PKGCONFIG.exe))"
+    else
+        FFMPEG.CONFIGURE.extra += --pkg-config=$(PKGCONFIG.exe)
+    endif
 endif
 
 ifneq (none,$(FFMPEG.GCC.g))