[PR PATCH] Libopenshot

[PR PATCH] Libopenshot

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1188 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages libopenshot
https://github.com/void-linux/void-packages/pull/49983

Libopenshot
No idea how to test, openshot can start

#49973 

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49983.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libopenshot-49983.patch --]
[-- Type: text/x-diff, Size: 5117 bytes --]

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?=
 <congdanhqx@gmail.com>
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 <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 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 <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"

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?=
 <congdanhqx@gmail.com>
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 <orphan@voidlinux.org>"
 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"

Re: [PR PATCH] [Merged]: Libopenshot

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1041 bytes --]

There's a merged pull request on the void-packages repository

Libopenshot
https://github.com/void-linux/void-packages/pull/49983

Description:
No idea how to test, openshot can start

#49973 

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->