]> granicus.if.org Git - handbrake/commitdiff
contrib: Use PKGCONFIG.exe when building libav on mingw.
authorBradley Sepos <bradley@bradleysepos.com>
Sat, 3 Sep 2016 05:04:08 +0000 (01:04 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Sat, 3 Sep 2016 05:29:08 +0000 (01:29 -0400)
Fixes broken external libraries such as opus, and needed for libav 12, anyway.

contrib/ffmpeg/module.defs

index ccb61eca1322fbdebd74c1c8b0a49ca82d38c77c..bb27b953da3ddeaae4c02e05c693031fe262e5a5 100644 (file)
@@ -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))