From ce6bcc6d3474b38ca88caf24fb863cfc85d7ec3d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 2 May 2023 15:32:01 +0200 Subject: [PATCH] libopenshot: bump version switch to imagemagick7 --- ...bopenshot-0.3.1.recipe => libopenshot-0.3.2.recipe} | 10 +++++----- ...nshot-0.3.1.patchset => libopenshot-0.3.2.patchset} | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) rename media-libs/libopenshot/{libopenshot-0.3.1.recipe => libopenshot-0.3.2.recipe} (95%) rename media-libs/libopenshot/patches/{libopenshot-0.3.1.patchset => libopenshot-0.3.2.patchset} (95%) diff --git a/media-libs/libopenshot/libopenshot-0.3.1.recipe b/media-libs/libopenshot/libopenshot-0.3.2.recipe similarity index 95% rename from media-libs/libopenshot/libopenshot-0.3.1.recipe rename to media-libs/libopenshot/libopenshot-0.3.2.recipe index 256493994..7e1597201 100644 --- a/media-libs/libopenshot/libopenshot-0.3.1.recipe +++ b/media-libs/libopenshot/libopenshot-0.3.2.recipe @@ -6,9 +6,9 @@ OpenShot Video Editor (version 2.0+). C++, Python are fully supported." HOMEPAGE="https://www.openshot.org/" 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="239f9df1f5b547257d5e76062c3177ff3ff372b8cda336637d752141a5a8e625" +CHECKSUM_SHA256="58765cfc8aec199814346e97ce31a5618a261260b380670a6fb2bf6f68733638" SOURCE_FILENAME="libopenshot-$portVersion.tar.gz" PATCHES="libopenshot-$portVersion.patchset" @@ -31,8 +31,8 @@ REQUIRES=" lib:libgomp$secondaryArchSuffix lib:libjsoncpp$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix - lib:libMagick++_6.Q16$secondaryArchSuffix - lib:libMagickCore_6.Q16$secondaryArchSuffix + lib:libMagick++_7.Q16HDRI$secondaryArchSuffix + lib:libMagickCore_7.Q16HDRI$secondaryArchSuffix lib:libopencv_core$secondaryArchSuffix lib:libopenshot_audio$secondaryArchSuffix lib:libprotobuf$secondaryArchSuffix @@ -89,7 +89,7 @@ BUILD_REQUIRES=" devel:libexecinfo$secondaryArchSuffix devel:libjsoncpp$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix - devel:libMagick++_6.Q16$secondaryArchSuffix + devel:libMagick++_7.Q16HDRI$secondaryArchSuffix devel:libopencv_core$secondaryArchSuffix devel:libopenshot_audio$secondaryArchSuffix devel:libprotobuf$secondaryArchSuffix diff --git a/media-libs/libopenshot/patches/libopenshot-0.3.1.patchset b/media-libs/libopenshot/patches/libopenshot-0.3.2.patchset similarity index 95% rename from media-libs/libopenshot/patches/libopenshot-0.3.1.patchset rename to media-libs/libopenshot/patches/libopenshot-0.3.2.patchset index 5f3351425..cf95e1d6f 100644 --- a/media-libs/libopenshot/patches/libopenshot-0.3.1.patchset +++ b/media-libs/libopenshot/patches/libopenshot-0.3.2.patchset @@ -1,11 +1,11 @@ -From fa400d9426fb781fdfaeb6db9ae1e7b5865ae113 Mon Sep 17 00:00:00 2001 +From 42aae85e3c8f8357ce0f6385981cd0f55eb7354c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 16 Apr 2023 11:15:33 +1000 Subject: Fix build for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index f85da20..a1f4111 100644 +index a8f8aa9..1800598 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ For more information, please visit . @@ -15,7 +15,7 @@ index f85da20..a1f4111 100644 +include(GNUInstallDirs) ################ PROJECT VERSION #################### - set(PROJECT_VERSION_FULL "0.3.1") + set(PROJECT_VERSION_FULL "0.3.2") diff --git a/src/AudioBufferSource.h b/src/AudioBufferSource.h index 173ccf4..919c2b0 100644 --- a/src/AudioBufferSource.h @@ -55,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 01d468a..57a1b0c 100644 +index 291f585..8a45ef8 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -367,7 +367,7 @@ void FFmpegReader::Open() {