diff options
| author | Piotr Brzeziński <thewildtree@outlook.com> | 2024-03-21 18:57:02 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2024-03-21 21:19:29 +0100 |
| commit | 057cc5706e56eb64ae5e24ee34eb0bd4ebba86c8 (patch) | |
| tree | d15eabde5d43ffe8d5617177e03db73fb39f5524 | |
| parent | 196a0518e738bc2c0c389fded9a43fcdd43032d8 (diff) | |
orc: Add a temporary patch to disable Orc on iOS
Causes crashes with any element that uses Orc.
Might have a better solution, but let's hotfix by disabling completely for now.
Related MR: https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/175
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1419>
| -rw-r--r-- | recipes/orc.recipe | 6 | ||||
| -rw-r--r-- | recipes/orc/0001-orccpu-arm-Only-enable-on-Apple-arm64-if-running-on-.patch | 35 |
2 files changed, 40 insertions, 1 deletions
diff --git a/recipes/orc.recipe b/recipes/orc.recipe index 9bd02de1..fb8be4c6 100644 --- a/recipes/orc.recipe +++ b/recipes/orc.recipe @@ -13,7 +13,11 @@ class Recipe(recipe.Recipe): remotes = {'origin': 'https://gitlab.freedesktop.org/gstreamer/orc.git'} commit = 'origin/main' - patches = [] + patches = [ + # Remove after the iOS Orc situation is resolved + # https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/175 + 'orc/0001-orccpu-arm-Only-enable-on-Apple-arm64-if-running-on-.patch', + ] btype = BuildType.MESON licenses = [{License.BSD_like: ['COPYING']}] diff --git a/recipes/orc/0001-orccpu-arm-Only-enable-on-Apple-arm64-if-running-on-.patch b/recipes/orc/0001-orccpu-arm-Only-enable-on-Apple-arm64-if-running-on-.patch new file mode 100644 index 00000000..7d3436c8 --- /dev/null +++ b/recipes/orc/0001-orccpu-arm-Only-enable-on-Apple-arm64-if-running-on-.patch @@ -0,0 +1,35 @@ +From 3f09e583e8e03f60492711614db7bfdee5213b04 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20Brzezi=C5=84ski?= <piotr@centricular.com> +Date: Thu, 21 Mar 2024 17:45:48 +0100 +Subject: [PATCH] orccpu-arm: Only enable on Apple arm64 if running on macOS + +--- + orc/orccpu-arm.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/orc/orccpu-arm.c b/orc/orccpu-arm.c +index 865df59..8e65cee 100644 +--- a/orc/orccpu-arm.c ++++ b/orc/orccpu-arm.c +@@ -47,6 +47,9 @@ + #if defined(__linux__) + #include <linux/auxvec.h> + #endif ++#ifdef __APPLE__ ++#include <TargetConditionals.h> ++#endif + + /***** arm *****/ + +@@ -120,7 +123,7 @@ orc_cpu_arm_getflags_cpuinfo () + #if defined (_WIN32) && defined (_M_ARM64) + /* On Windows, for desktop applications, we are on always on ARMv8 (aarch64)*/ + ret = ORC_TARGET_ARM_EDSP | ORC_TARGET_NEON_NEON; +-#elif defined (__APPLE__) && defined (__arm64__) ++#elif defined (__APPLE__) && defined (__arm64__) && TARGET_OS_OSX + ret = ORC_TARGET_ARM_EDSP | ORC_TARGET_NEON_NEON; + #else + char *cpuinfo; +-- +2.39.3 (Apple Git-145) + |