diff --git a/media-libs/libopenshot/libopenshot-0.2.7.recipe b/media-libs/libopenshot/libopenshot-0.3.0.recipe similarity index 91% rename from media-libs/libopenshot/libopenshot-0.2.7.recipe rename to media-libs/libopenshot/libopenshot-0.3.0.recipe index 35949b47d..74357c8a9 100644 --- a/media-libs/libopenshot/libopenshot-0.2.7.recipe +++ b/media-libs/libopenshot/libopenshot-0.3.0.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-2021 OpenShot Studios, LLC" +COPYRIGHT="2008-2022 OpenShot Studios, LLC" LICENSE="GNU LGPL v3" REVISION="1" SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="568eab6d69d469c5f745f0e25387ca5e000f7c28be48417b0d7770577ac74a28" +CHECKSUM_SHA256="5b289432b1209f11fe60c17c07e9365ab62e3074dcc7d50996fc816dfe54a282" SOURCE_FILENAME="libopenshot-$portVersion.tar.gz" PATCHES="libopenshot-$portVersion.patchset" @@ -16,7 +16,7 @@ ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" PYTHON_VERSION="3.8" -libVersion="20" +libVersion="23" PROVIDES=" libopenshot$secondaryArchSuffix = $portVersion @@ -27,12 +27,15 @@ REQUIRES=" lib:libavcodec$secondaryArchSuffix lib:libavformat$secondaryArchSuffix lib:libavutil$secondaryArchSuffix + lib:libbabl_0.1$secondaryArchSuffix lib:libgomp$secondaryArchSuffix lib:libjsoncpp$secondaryArchSuffix + lib:liblcms2$secondaryArchSuffix lib:libMagick++_6.Q16$secondaryArchSuffix lib:libMagickCore_6.Q16$secondaryArchSuffix lib:libopencv_core$secondaryArchSuffix lib:libopenshot_audio$secondaryArchSuffix + lib:libprotobuf$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix @@ -82,11 +85,14 @@ BUILD_REQUIRES=" devel:libavdevice$secondaryArchSuffix devel:libavformat$secondaryArchSuffix devel:libavutil$secondaryArchSuffix + devel:libbabl_0.1$secondaryArchSuffix devel:libexecinfo$secondaryArchSuffix devel:libjsoncpp$secondaryArchSuffix + devel:liblcms2$secondaryArchSuffix devel:libMagick++_6.Q16$secondaryArchSuffix devel:libopencv_core$secondaryArchSuffix devel:libopenshot_audio$secondaryArchSuffix + devel:libprotobuf$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Multimedia$secondaryArchSuffix @@ -120,11 +126,15 @@ BUILD() cmake . $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DLIBOPENSHOT_AUDIO_INCLUDE_DIR=/system/$relativeIncludeDir/libopenshot-audio/JuceLibraryCode \ + -DProtobuf_IMPORT_DIRS=/system/$relativeIncludeDir \ -DPYTHON_MODULE_PATH=$installLocation \ + -DENABLE_OPENCV=ON \ -DENABLE_RUBY=OFF \ -DENABLE_TESTS=OFF \ -DENABLE_DOCS=OFF \ + -DUSE_HW_ACCEL=OFF \ -DUSE_SYSTEM_JSONCPP=ON + make $jobArgs } diff --git a/media-libs/libopenshot/patches/libopenshot-0.2.7.patchset b/media-libs/libopenshot/patches/libopenshot-0.3.0.patchset similarity index 57% rename from media-libs/libopenshot/patches/libopenshot-0.2.7.patchset rename to media-libs/libopenshot/patches/libopenshot-0.3.0.patchset index 3e3ab1cc7..51252be10 100644 --- a/media-libs/libopenshot/patches/libopenshot-0.2.7.patchset +++ b/media-libs/libopenshot/patches/libopenshot-0.3.0.patchset @@ -1,38 +1,38 @@ -From 16ed2ece98e28f5af6c3be682061faec1102b794 Mon Sep 17 00:00:00 2001 +From fc7e22c401e09fe1143785b0de6d78bb781bbfc7 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 13 Dec 2021 18:34:51 +1000 +Date: Mon, 19 Dec 2022 20:53:52 +1000 Subject: Fix build for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3eb2717..fc8ad25 100644 +index ca1ecf9..bf91ed9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -38,6 +38,7 @@ For more information, please visit . +@@ -22,6 +22,7 @@ For more information, please visit . ################ ADD CMAKE MODULES ################## set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") +include(GNUInstallDirs) ################ PROJECT VERSION #################### - set(PROJECT_VERSION_FULL "0.2.7") + set(PROJECT_VERSION_FULL "0.3.0") diff --git a/src/AudioBufferSource.h b/src/AudioBufferSource.h -index a899d8d..225de2e 100644 +index 173ccf4..919c2b0 100644 --- a/src/AudioBufferSource.h +++ b/src/AudioBufferSource.h -@@ -32,6 +32,7 @@ +@@ -13,6 +13,7 @@ + #ifndef OPENSHOT_AUDIOBUFFERSOURCE_H #define OPENSHOT_AUDIOBUFFERSOURCE_H - #include +#include - #include + #include + #include - /// This namespace is the default namespace for all code in the openshot library diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp -index 7b6c4e7..6acb8df 100644 +index 26018cc..6e24f96 100644 --- a/src/CrashHandler.cpp +++ b/src/CrashHandler.cpp -@@ -200,7 +200,7 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames) +@@ -186,7 +186,7 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames) } SymCleanup(process); @@ -41,18 +41,11 @@ index 7b6c4e7..6acb8df 100644 // Linux and Mac stack unwinding // Storage array for stack trace address data void* addrlist[max_frames+1]; -@@ -320,4 +320,4 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames) - - fprintf(out, "---- End of Stack Trace ----\n"); - ZmqLogger::Instance()->LogToFile("---- End of Stack Trace ----\n"); --} -\ No newline at end of file -+} diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp -index c1eaa74..6d676ad 100644 +index 7ad9a91..cbfdcaf 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp -@@ -362,7 +362,7 @@ void FFmpegReader::Open() { +@@ -367,7 +367,7 @@ void FFmpegReader::Open() { if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) { #elif defined(_WIN32) if( adapter_ptr != NULL ) { @@ -62,10 +55,10 @@ index c1eaa74..6d676ad 100644 #endif ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device"); diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp -index 8707756..6631950 100644 +index cc6f121..9001e69 100644 --- a/src/FFmpegWriter.cpp +++ b/src/FFmpegWriter.cpp -@@ -1404,7 +1404,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { +@@ -1463,7 +1463,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; @@ -74,7 +67,7 @@ index 8707756..6631950 100644 adapter_ptr = NULL; #endif } -@@ -1414,7 +1414,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { +@@ -1473,7 +1473,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 ) { @@ -82,7 +75,43 @@ index 8707756..6631950 100644 +#elif defined(_WIN32) || defined(__APPLE__) || defined(__HAIKU__) if( adapter_ptr != NULL ) { #endif - ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "adapter", adapter_num); + ZmqLogger::Instance()->AppendDebugMethod( -- -2.30.2 +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 ++++ b/src/Qt/VideoPlaybackThread.cpp +@@ -11,6 +11,8 @@ + // + // SPDX-License-Identifier: LGPL-3.0-or-later + ++#include ++ + #include "VideoPlaybackThread.h" + #include "ZmqLogger.h" + +-- +2.37.3