diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index acf950913ccf..726383a01f49 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -1,7 +1,6 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.3.3 -PORTREVISION= 7 +DISTVERSION= 0.4.0 CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,7 +23,6 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libzmq.so:net/libzmq4 USES= cmake pkgconfig python:build qt:5 -USE_CXXSTD= c++17 USE_GITHUB= yes GH_ACCOUNT= OpenShot USE_LDCONFIG= yes diff --git a/multimedia/libopenshot/distinfo b/multimedia/libopenshot/distinfo index 1ffb5e2a1418..4ccafa0b149f 100644 --- a/multimedia/libopenshot/distinfo +++ b/multimedia/libopenshot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1719370800 -SHA256 (OpenShot-libopenshot-v0.3.3_GH0.tar.gz) = 591b74651ddf59f83d69a592d84bbabbe7290293092a87be9c2993d5ce9a1638 -SIZE (OpenShot-libopenshot-v0.3.3_GH0.tar.gz) = 26129697 +TIMESTAMP = 1737806544 +SHA256 (OpenShot-libopenshot-v0.4.0_GH0.tar.gz) = be0e760d81275543f7fbbf87863645748c3fe8aa8f4b5b771ff45a5d026bc9cc +SIZE (OpenShot-libopenshot-v0.4.0_GH0.tar.gz) = 26131657 diff --git a/multimedia/libopenshot/files/patch-CMakeLists.txt b/multimedia/libopenshot/files/patch-CMakeLists.txt index d153e7c04337..1c523fc742a8 100644 --- a/multimedia/libopenshot/files/patch-CMakeLists.txt +++ b/multimedia/libopenshot/files/patch-CMakeLists.txt @@ -1,15 +1,6 @@ ---- CMakeLists.txt.orig 2024-03-26 18:49:53 UTC +--- CMakeLists.txt.orig 2024-12-21 22:27:30 UTC +++ CMakeLists.txt -@@ -97,7 +97,7 @@ if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND - endif() - - #### Set C++ standard level --set(CMAKE_CXX_STANDARD 14) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - -@@ -130,7 +130,7 @@ endif() +@@ -130,7 +130,7 @@ add_subdirectory(src) ### Process subdirectories ### add_subdirectory(src) diff --git a/multimedia/libopenshot/files/patch-src_CMakeLists.txt b/multimedia/libopenshot/files/patch-src_CMakeLists.txt index 4ad80fbc34a8..f50aa9b79f09 100644 --- a/multimedia/libopenshot/files/patch-src_CMakeLists.txt +++ b/multimedia/libopenshot/files/patch-src_CMakeLists.txt @@ -1,12 +1,14 @@ --- src/CMakeLists.txt.orig 2023-03-27 18:48:43 UTC +++ src/CMakeLists.txt -@@ -516,6 +516,24 @@ See https://github.com/opencv/opencv/issues/19260]]) +@@ -516,6 +516,26 @@ See https://github.com/opencv/opencv/issues/19260]]) endif() # ENABLE_OPENCV add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms") -+# EXECINFO ++# +include(CheckFunctionExists) +include(CheckLibraryExists) ++ ++# EXECINFO +check_function_exists(backtrace FUNCTION_BACKTRACE_FOUND) +if(NOT FUNCTION_BACKTRACE_FOUND) + find_library(EXECINFO_LIBRARY NAMES execinfo) diff --git a/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp b/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp index 11530ddc36d1..32d936aabd20 100644 --- a/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp +++ b/multimedia/libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp @@ -1,6 +1,6 @@ ---- src/Qt/AudioPlaybackThread.cpp.orig 2023-04-19 22:01:02 UTC +--- src/Qt/AudioPlaybackThread.cpp.orig 2024-12-21 22:27:30 UTC +++ src/Qt/AudioPlaybackThread.cpp -@@ -102,8 +102,17 @@ namespace openshot +@@ -111,8 +111,17 @@ namespace openshot // Settings for audio device playback AudioDeviceManager::AudioDeviceSetup deviceSetup = AudioDeviceManager::AudioDeviceSetup(); @@ -17,6 +17,6 @@ + deviceSetup.outputChannels.setBit(i); + } + deviceSetup.useDefaultOutputChannels = false; + deviceSetup.bufferSize = Settings::Instance()->PLAYBACK_AUDIO_BUFFER_SIZE; // Loop through common sample rates, starting with the user's requested rate - // Not all sample rates are supported by audio devices, for example, many VMs diff --git a/multimedia/libopenshot/pkg-plist b/multimedia/libopenshot/pkg-plist index 739b5e9c4872..67e2ed24b92a 100644 --- a/multimedia/libopenshot/pkg-plist +++ b/multimedia/libopenshot/pkg-plist @@ -98,7 +98,7 @@ include/libopenshot/sort_filter/Hungarian.h include/libopenshot/sort_filter/KalmanTracker.h lib/libopenshot.so lib/libopenshot.so.%%VERSION%% -lib/libopenshot.so.26 +lib/libopenshot.so.27 %%PYTHON_SITELIBDIR%%/_openshot.so %%PYTHON_SITELIBDIR%%/openshot.py %%RUBY%%%%RUBY_VENDORARCHLIBDIR%%/openshot.so