PKGBUILDs/extra/gstreamer/0001-meson-Allow-building-with-system-orc.patch

29 lines
932 B
Diff
Raw Normal View History

2022-06-06 18:05:15 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
2022-06-16 23:37:01 +00:00
Date: Mon, 6 Jun 2022 00:29:08 +0200
2022-06-06 18:05:15 +00:00
Subject: [PATCH] meson: Allow building with system orc
---
2022-06-16 23:37:01 +00:00
meson.build | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
2022-06-06 18:05:15 +00:00
diff --git a/meson.build b/meson.build
2022-06-16 23:37:01 +00:00
index 617ba8a41461..509565e90891 100644
2022-06-06 18:05:15 +00:00
--- a/meson.build
+++ b/meson.build
2022-06-16 23:37:01 +00:00
@@ -112,7 +112,13 @@ elif build_system == 'darwin'
2022-06-06 18:05:15 +00:00
subproject('macos-bison-binary')
endif
-orc_subproject = subproject('orc', required: get_option('orc'))
2022-06-16 23:37:01 +00:00
+orc_subproject_required = get_option('orc')
+if orc_subproject_required.allowed()
+ # Download if possible, otherwise use system orc
+ orc_subproject_required = false
+endif
+
+orc_subproject = subproject('orc', required: orc_subproject_required)
2022-06-06 18:05:15 +00:00
foreach custom_subproj: get_option('custom_subprojects').split(',')
if custom_subproj != ''