From 05316f8e86b0138f742b8e4d07ee634b672d73ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Apr 2024 18:59:23 +0700 Subject: [PATCH 1/2] libopenshot: update to 0.3.2. --- common/shlibs | 2 +- srcpkgs/libopenshot/patches/musl.patch | 56 ++++++++++++++++++++++++++ srcpkgs/libopenshot/template | 11 ++--- 3 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/libopenshot/patches/musl.patch diff --git a/common/shlibs b/common/shlibs index 61a28fdc5b7436..79469c412c4301 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2547,7 +2547,7 @@ libmill.so.18 libmill-1.14_1 libges-1.0.so.0 gst1-editing-services-1.6.2_1 libykneomgr.so.0 libykneomgr-0.1.8_1 libopenshot-audio.so.9 libopenshot-audio-0.3.0_1 -libopenshot.so.23 libopenshot-0.3.0_1 +libopenshot.so.25 libopenshot-0.3.2_1 libpqxx-6.3.so libpqxx-6.3.3_1 libndpi.so.3 ndpi-3.4_1 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1 diff --git a/srcpkgs/libopenshot/patches/musl.patch b/srcpkgs/libopenshot/patches/musl.patch new file mode 100644 index 00000000000000..b1a105ddea3fe5 --- /dev/null +++ b/srcpkgs/libopenshot/patches/musl.patch @@ -0,0 +1,56 @@ +--- a/src/CrashHandler.cpp ++++ b/src/CrashHandler.cpp +@@ -16,6 +16,14 @@ + #include + #include + ++#ifdef __MINGW32__ ++ #include ++ #include ++ #include ++#elif defined(__GLIBC__) ++ #include ++#endif ++ + using namespace std; + using namespace openshot; + +@@ -34,7 +42,7 @@ CrashHandler *CrashHandler::Instance() + // TODO: Windows exception handling methods + signal(SIGSEGV, CrashHandler::abortHandler); + +-#else ++#elif defined(__GLIBC__) + struct sigaction sa; + sa.sa_flags = SA_SIGINFO; + sa.sa_sigaction = CrashHandler::abortHandler; +@@ -111,6 +119,7 @@ void CrashHandler::abortHandler( int sig + + void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames) + { ++#ifdef __GLIBC__ + fprintf(out, "---- Unhandled Exception: Stack Trace ----\n"); + ZmqLogger::Instance()->LogToFile("---- Unhandled Exception: Stack Trace ----\n"); + stringstream stack_output; +@@ -306,4 +315,5 @@ void CrashHandler::printStackTrace(FILE + + fprintf(out, "---- End of Stack Trace ----\n"); + ZmqLogger::Instance()->LogToFile("---- End of Stack Trace ----\n"); ++#endif // __GLIBC__ + } +--- a/src/CrashHandler.h ++++ b/src/CrashHandler.h +@@ -16,13 +16,6 @@ + #include + #include + #include +-#ifdef __MINGW32__ +- #include +- #include +- #include +-#else +- #include +-#endif + #include + #include + #include "ZmqLogger.h" diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 8e57c5f592169c..fc45a258057079 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot -version=0.3.0 -revision=3 +version=0.3.2 +revision=1 build_style=cmake # Builds fail with Ruby-2.4.1 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" @@ -16,12 +16,7 @@ maintainer="Orphaned " license="LGPL-3.0-or-later" homepage="https://github.com/OpenShot/libopenshot" distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz" -checksum=5b289432b1209f11fe60c17c07e9365ab62e3074dcc7d50996fc816dfe54a282 - -if [ "$XBPS_TARGET_LIBC" = musl ]; then - makedepends+=" libexecinfo-devel" - LIBS="-lexecinfo" -fi +checksum=58765cfc8aec199814346e97ce31a5618a261260b380670a6fb2bf6f68733638 libopenshot-devel_package() { short_desc+=" - development files" From 8ee3d5a541e7312ab951fd6576d45c41a4cdfbc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 22 Apr 2024 19:18:10 +0700 Subject: [PATCH 2/2] libopenshot-audio: update to 0.3.2. --- srcpkgs/libopenshot-audio/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template index 3a62ca9728c486..7398853c612b19 100644 --- a/srcpkgs/libopenshot-audio/template +++ b/srcpkgs/libopenshot-audio/template @@ -1,17 +1,17 @@ # Template file for 'libopenshot-audio' pkgname=libopenshot-audio -version=0.3.0 +version=0.3.2 revision=1 build_style=cmake hostmakedepends="doxygen" makedepends="alsa-lib-devel libXcursor-devel libXinerama-devel libXrandr-devel - xorg-server-devel" + xorg-server-devel zlib-devel" short_desc="OpenShot audio library" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/OpenShot/libopenshot-audio" distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz" -checksum=007ba6ee812a58506341dd66055dba575b3907e5274a0e7416f99c2fbb80021c +checksum=f09d5251c934e6c14d98217b44574c508318c8575e47f5c48ffaf54d9bbce3e9 libopenshot-audio-devel_package() { short_desc+=" - development files"