From 2964ce84affa86f1e20358d0eb2d13fe651015e9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 16 Apr 2023 11:48:21 +1000 Subject: [PATCH] libopenshot: bump version --- ...-0.3.0.recipe => libopenshot-0.3.1.recipe} | 20 +++---- ....0.patchset => libopenshot-0.3.1.patchset} | 52 ++++++++----------- 2 files changed, 31 insertions(+), 41 deletions(-) rename media-libs/libopenshot/{libopenshot-0.3.0.recipe => libopenshot-0.3.1.recipe} (92%) rename media-libs/libopenshot/patches/{libopenshot-0.3.0.patchset => libopenshot-0.3.1.patchset} (83%) diff --git a/media-libs/libopenshot/libopenshot-0.3.0.recipe b/media-libs/libopenshot/libopenshot-0.3.1.recipe similarity index 92% rename from media-libs/libopenshot/libopenshot-0.3.0.recipe rename to media-libs/libopenshot/libopenshot-0.3.1.recipe index 672b5f62b..e4dbd5466 100644 --- a/media-libs/libopenshot/libopenshot-0.3.0.recipe +++ b/media-libs/libopenshot/libopenshot-0.3.1.recipe @@ -4,11 +4,11 @@ dedicated to delivering high quality video editing, animation, and playback \ solutions to the world. This is the same library which powers \ OpenShot Video Editor (version 2.0+). C++, Python are fully supported." HOMEPAGE="https://www.openshot.org/" -COPYRIGHT="2008-2022 OpenShot Studios, LLC" +COPYRIGHT="2008-2023 OpenShot Studios, LLC" LICENSE="GNU LGPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="5b289432b1209f11fe60c17c07e9365ab62e3074dcc7d50996fc816dfe54a282" +CHECKSUM_SHA256="239f9df1f5b547257d5e76062c3177ff3ff372b8cda336637d752141a5a8e625" SOURCE_FILENAME="libopenshot-$portVersion.tar.gz" PATCHES="libopenshot-$portVersion.patchset" @@ -16,7 +16,7 @@ ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" PYTHON_VERSION="3.9" -libVersion="23" +libVersion="24" PROVIDES=" libopenshot$secondaryArchSuffix = $portVersion @@ -81,10 +81,10 @@ REQUIRES_python39_debuginfo=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel unittest++${secondaryArchSuffix}_devel - devel:libavcodec$secondaryArchSuffix - devel:libavdevice$secondaryArchSuffix - devel:libavformat$secondaryArchSuffix - devel:libavutil$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix >= 59 + devel:libavdevice$secondaryArchSuffix >= 59 + devel:libavformat$secondaryArchSuffix >= 59 + devel:libavutil$secondaryArchSuffix >= 57 devel:libbabl_0.1$secondaryArchSuffix devel:libexecinfo$secondaryArchSuffix devel:libjsoncpp$secondaryArchSuffix @@ -97,8 +97,8 @@ BUILD_REQUIRES=" devel:libQt5Gui$secondaryArchSuffix devel:libQt5Multimedia$secondaryArchSuffix devel:libQt5MultimediaWidgets$secondaryArchSuffix - devel:libswresample$secondaryArchSuffix - devel:libswscale$secondaryArchSuffix + devel:libswresample$secondaryArchSuffix >= 4 + devel:libswscale$secondaryArchSuffix >= 6 devel:libzmq$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/media-libs/libopenshot/patches/libopenshot-0.3.0.patchset b/media-libs/libopenshot/patches/libopenshot-0.3.1.patchset similarity index 83% rename from media-libs/libopenshot/patches/libopenshot-0.3.0.patchset rename to media-libs/libopenshot/patches/libopenshot-0.3.1.patchset index 51252be10..5f3351425 100644 --- a/media-libs/libopenshot/patches/libopenshot-0.3.0.patchset +++ b/media-libs/libopenshot/patches/libopenshot-0.3.1.patchset @@ -1,11 +1,11 @@ -From fc7e22c401e09fe1143785b0de6d78bb781bbfc7 Mon Sep 17 00:00:00 2001 +From fa400d9426fb781fdfaeb6db9ae1e7b5865ae113 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 19 Dec 2022 20:53:52 +1000 +Date: Sun, 16 Apr 2023 11:15:33 +1000 Subject: Fix build for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca1ecf9..bf91ed9 100644 +index f85da20..a1f4111 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ For more information, please visit . @@ -15,7 +15,7 @@ index ca1ecf9..bf91ed9 100644 +include(GNUInstallDirs) ################ PROJECT VERSION #################### - set(PROJECT_VERSION_FULL "0.3.0") + set(PROJECT_VERSION_FULL "0.3.1") diff --git a/src/AudioBufferSource.h b/src/AudioBufferSource.h index 173ccf4..919c2b0 100644 --- a/src/AudioBufferSource.h @@ -28,6 +28,19 @@ index 173ccf4..919c2b0 100644 #include #include +diff --git a/src/AudioDevices.cpp b/src/AudioDevices.cpp +index 0d1f1eb..2caf1f5 100644 +--- a/src/AudioDevices.cpp ++++ b/src/AudioDevices.cpp +@@ -11,6 +11,8 @@ + // + // SPDX-License-Identifier: LGPL-3.0-or-later + ++#include ++ + #include "AudioDevices.h" + + using namespace openshot; diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp index 26018cc..6e24f96 100644 --- a/src/CrashHandler.cpp @@ -42,7 +55,7 @@ index 26018cc..6e24f96 100644 // Storage array for stack trace address data void* addrlist[max_frames+1]; diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp -index 7ad9a91..cbfdcaf 100644 +index 01d468a..57a1b0c 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -367,7 +367,7 @@ void FFmpegReader::Open() { @@ -55,10 +68,10 @@ index 7ad9a91..cbfdcaf 100644 #endif ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device"); diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp -index cc6f121..9001e69 100644 +index 273afdb..3513056 100644 --- a/src/FFmpegWriter.cpp +++ b/src/FFmpegWriter.cpp -@@ -1463,7 +1463,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { +@@ -1474,7 +1474,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); // Maybe 127 is better because the first card would be 1?! adapter_ptr = adapter; @@ -67,7 +80,7 @@ index cc6f121..9001e69 100644 adapter_ptr = NULL; #endif } -@@ -1473,7 +1473,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { +@@ -1484,7 +1484,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { // Check if it is there and writable #if defined(__linux__) if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) { @@ -76,29 +89,6 @@ index cc6f121..9001e69 100644 if( adapter_ptr != NULL ) { #endif ZmqLogger::Instance()->AppendDebugMethod( --- -2.37.3 - - -From eab76308d4d7e041f71cbe24bc44fef4b05e14d1 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 19 Dec 2022 21:10:22 +1000 -Subject: Fix - - -diff --git a/src/AudioDevices.cpp b/src/AudioDevices.cpp -index b004877..c833da2 100644 ---- a/src/AudioDevices.cpp -+++ b/src/AudioDevices.cpp -@@ -12,7 +12,7 @@ - // SPDX-License-Identifier: LGPL-3.0-or-later - - #include "AudioDevices.h" -- -+#include - #include - - using namespace openshot; diff --git a/src/Qt/VideoPlaybackThread.cpp b/src/Qt/VideoPlaybackThread.cpp index b8c53e5..8622613 100644 --- a/src/Qt/VideoPlaybackThread.cpp