Find Arch's FFmpeg 4.4.
authorCarl Hetherington <cth@carlh.net>
Sun, 29 Sep 2024 20:10:30 +0000 (22:10 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 29 Sep 2024 21:36:28 +0000 (23:36 +0200)
cscript

diff --git a/cscript b/cscript
index 7205a6dee1e37c2a8e38ebe312fb708dd43c57de..57277f727793d88b0869bf35e4711613987a62d5 100644 (file)
--- a/cscript
+++ b/cscript
@@ -718,6 +718,9 @@ def build(target, options, for_package):
             json.dump(desc, outfile)
         target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
     elif target.platform != 'linux' or target.detail == 'appimage' or not for_package:
+        if target.distro == 'arch':
+            # We're using a special pinned distro FFmpeg on Arch, and this is necessary to find it
+            target.append_with_colon('PKG_CONFIG_PATH', '/usr/lib/ffmpeg4.4/pkgconfig')
         target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options, for_package)))
         target.command('./waf')
         target.command('./waf install')