aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2024-04-22 11:59:23 +0000
committerĐoàn Trần Công Danh <sgn.danh@gmail.com>2024-04-23 23:56:04 +0000
commit9f8be2d6aedb5543ef7247f56df437c7825d0bfb (patch)
tree2381efa4cdc3048b83f505bb4f7d1d655b478a1f
parent73cff6329b7f869dd72c54ae23ef59ccf8e2006b (diff)
downloadvoid-packages-9f8be2d6aedb5543ef7247f56df437c7825d0bfb.tar
void-packages-9f8be2d6aedb5543ef7247f56df437c7825d0bfb.tar.gz
void-packages-9f8be2d6aedb5543ef7247f56df437c7825d0bfb.tar.bz2
void-packages-9f8be2d6aedb5543ef7247f56df437c7825d0bfb.tar.lz
void-packages-9f8be2d6aedb5543ef7247f56df437c7825d0bfb.tar.xz
void-packages-9f8be2d6aedb5543ef7247f56df437c7825d0bfb.tar.zst
void-packages-9f8be2d6aedb5543ef7247f56df437c7825d0bfb.zip
libopenshot: update to 0.3.2.
-rw-r--r--common/shlibs2
-rw-r--r--srcpkgs/libopenshot/patches/musl.patch56
-rw-r--r--srcpkgs/libopenshot/template11
3 files changed, 60 insertions, 9 deletions
diff --git a/common/shlibs b/common/shlibs
index 4fe3b26a2e0..62f7661d75f 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 00000000000..b1a105ddea3
--- /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 <iomanip>
+ #include <sstream>
+
++#ifdef __MINGW32__
++ #include <winsock2.h>
++ #include <windows.h>
++ #include <DbgHelp.h>
++#elif defined(__GLIBC__)
++ #include <execinfo.h>
++#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 <cstdlib>
+ #include <stdio.h>
+ #include <signal.h>
+-#ifdef __MINGW32__
+- #include <winsock2.h>
+- #include <windows.h>
+- #include <DbgHelp.h>
+-#else
+- #include <execinfo.h>
+-#endif
+ #include <errno.h>
+ #include <cxxabi.h>
+ #include "ZmqLogger.h"
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 8e57c5f5921..fc45a258057 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 <orphan@voidlinux.org>"
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"