diff --git a/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.cpp b/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.cpp deleted file mode 100644 index 6135252f7975..000000000000 --- a/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- JuceLibraryCode/modules/juce_core/juce_core.cpp.orig 2026-04-21 21:01:11 UTC -+++ JuceLibraryCode/modules/juce_core/juce_core.cpp -@@ -119,6 +119,11 @@ - - #undef check - -+/* workaround for defining dumb things on arm */ -+#ifdef mb -+#undef mb -+#endif -+ - //============================================================================== - #include "containers/juce_AbstractFifo.cpp" - #include "containers/juce_ArrayBase.cpp" diff --git a/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h b/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h new file mode 100644 index 000000000000..e140139159df --- /dev/null +++ b/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h @@ -0,0 +1,10 @@ +--- JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h.orig 2026-07-15 09:36:34 UTC ++++ JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h +@@ -243,7 +243,6 @@ + #include + #include + #include +- #include + #include + #include + #include diff --git a/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__SystemStats__linux.cpp b/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__SystemStats__linux.cpp index 747510df7b3a..0ef8f7ce962d 100644 --- a/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__SystemStats__linux.cpp +++ b/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__SystemStats__linux.cpp @@ -1,38 +1,49 @@ ---- JuceLibraryCode/modules/juce_core/native/juce_SystemStats_linux.cpp.orig 2024-12-21 22:21:33 UTC +--- JuceLibraryCode/modules/juce_core/native/juce_SystemStats_linux.cpp.orig 2026-03-16 17:51:52 UTC +++ JuceLibraryCode/modules/juce_core/native/juce_SystemStats_linux.cpp -@@ -56,7 +56,11 @@ SystemStats::OperatingSystemType SystemStats::getOpera +@@ -20,6 +20,10 @@ + ============================================================================== + */ + ++#if JUCE_BSD ++#include ++#endif ++ + #if JUCE_BELA + extern "C" int cobalt_thread_mode(); + #endif +@@ -56,7 +60,11 @@ String SystemStats::getOperatingSystemName() String SystemStats::getOperatingSystemName() { +#ifdef __FreeBSD__ + return "FreeBSD"; +#else return "Linux"; +#endif } bool SystemStats::isOperatingSystem64Bit() -@@ -318,18 +322,17 @@ String SystemStats::getUniqueDeviceID() +@@ -318,18 +326,17 @@ String SystemStats::getUniqueDeviceID() return {}; }; - auto data = call ("cat /sys/class/dmi/id/board_serial"); + auto data = call ("kenv smbios.planar.serial"); // 'board_serial' is enough on its own, fallback to bios stuff if we can't find it. if (data.isEmpty()) { - data = call ("cat /sys/class/dmi/id/bios_date") - + call ("cat /sys/class/dmi/id/bios_release") - + call ("cat /sys/class/dmi/id/bios_vendor") - + call ("cat /sys/class/dmi/id/bios_version"); + data = call ("kenv smbios.bios.reldate") + + call ("kenv smbios.bios.vendor") + + call ("kenv smbios.bios.version"); } - auto cpuData = call ("lscpu"); + auto cpuData = String {}; if (cpuData.isNotEmpty()) {