pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/libopenshot: Update to 0.4.0



Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Wed Dec 25 00:40:06 2024 +0900
Changeset:	5cc2a67a433f2db29baa85d775b2aba88b8b552f

Modified Files:
	libopenshot/DESCR
	libopenshot/Makefile
	libopenshot/PLIST
	libopenshot/distinfo
Added Files:
	libopenshot/patches/patch-src_AudioWaveformer.cpp
	libopenshot/patches/patch-src_FFmpegReader.cpp
	libopenshot/patches/patch-src_FFmpegWriter.cpp
	libopenshot/patches/patch-src_ImageReader.cpp

Log Message:
wip/libopenshot: Update to 0.4.0

And fix build.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5cc2a67a433f2db29baa85d775b2aba88b8b552f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libopenshot/DESCR                                 | 23 +++++++-----------
 libopenshot/Makefile                              | 21 +++++++++++++---
 libopenshot/PLIST                                 | 20 ++++------------
 libopenshot/distinfo                              | 10 +++++---
 libopenshot/patches/patch-src_AudioWaveformer.cpp | 12 ++++++++++
 libopenshot/patches/patch-src_FFmpegReader.cpp    | 29 +++++++++++++++++++++++
 libopenshot/patches/patch-src_FFmpegWriter.cpp    | 26 ++++++++++++++++++++
 libopenshot/patches/patch-src_ImageReader.cpp     | 13 ++++++++++
 8 files changed, 117 insertions(+), 37 deletions(-)

diffs:
diff --git a/libopenshot/DESCR b/libopenshot/DESCR
index 4754f1ce3e..9d8e49067e 100644
--- a/libopenshot/DESCR
+++ b/libopenshot/DESCR
@@ -1,23 +1,16 @@
-TODO: Adjust the following lines from README.md
-
-OpenShot Video Library (libopenshot) is a free, open-source C++ library dedicated to
-delivering high quality video editing, animation, and playback solutions to the 
-world.
-
-## Build Status
-
-[![Build Status](https://img.shields.io/travis/OpenShot/libopenshot/develop.svg?label=libopenshot)](https://travis-ci.org/OpenShot/libopenshot) [![Build Status](https://img.shields.io/travis/OpenShot/libopenshot-audio/develop.svg?label=libopenshot-audio)](https://travis-ci.org/OpenShot/libopenshot-audio)
-
-## Features
+OpenShot Video Library (libopenshot) is a free, open-source C++
+library dedicated to delivering high quality video editing, animation,
+and playback solutions to the world.
 
 * Cross-Platform (Linux, Mac, and Windows)
 * Multi-Layer Compositing
-* Video and Audio Effects (Chroma Key, Color Adjustment, Grayscale, etc…)
-* Animation Curves (Bézier, Linear, Constant)
+* Video and Audio Effects (Chroma Key, Color Adjustment, Grayscale,
+  etc...)
+* Animation Curves (Bezier, Linear, Constant)
 * Time Mapping (Curve-based Slow Down, Speed Up, Reverse)
 * Audio Mixing & Resampling (Curve-based)
 * Audio Plug-ins (VST & AU)
-* Audio Drivers (ASIO, WASAPI, DirectSound, CoreAudio, iPhone Audio, ALSA, JACK, and Android)
+* Audio Drivers (ASIO, WASAPI, DirectSound, CoreAudio, iPhone Audio,
+  ALSA, JACK, and Android)
 * Telecine and Inverse Telecine (Film to TV, TV to Film)
 * Frame Rate Conversions
-...
diff --git a/libopenshot/Makefile b/libopenshot/Makefile
index b07f02c140..d1dd889f55 100644
--- a/libopenshot/Makefile
+++ b/libopenshot/Makefile
@@ -1,8 +1,9 @@
 # $NetBSD$
 
-DISTNAME=	libopenshot-0.2.7
+DISTNAME=	libopenshot-0.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenShot/}
+GITHUB_PROJECT=	libopenshot
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	root%zta.lk@localhost
@@ -10,24 +11,38 @@ HOMEPAGE=	https://www.openshot.org/libopenshot/
 COMMENT=	Powerful, cross-platform open-source C++ video editing library
 LICENSE=	gnu-lgpl-v3
 
-USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
+FORCE_CXX_STD=	gnu++17
+
+USE_TOOLS+=	pkg-config
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DEPENDS+=	swig4>=4.0.0:../../wip/swig4
 
+CMAKE_CONFIGURE_ARGS+=	-DRUBY_EXECUTABLE=${RUBY}
+
+# for tests
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/src
+
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../devel/catch2/buildlink3.mk"
+.include "../../multimedia/ffmpeg7/buildlink3.mk"
 .include "../../audio/alsa-lib/buildlink3.mk"
+.include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../net/cppzmq/buildlink3.mk"
+.include "../../net/zeromq/buildlink3.mk"
 .include "../../wip/libopenshot-audio/buildlink3.mk"
+.include "../../graphics/babl/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
+.include "../../textproc/jsoncpp/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../devel/unittest-cpp/buildlink3.mk"
 
+.include "../../devel/cmake/build.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/ruby/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libopenshot/PLIST b/libopenshot/PLIST
index ce97403886..6e0bdcc144 100644
--- a/libopenshot/PLIST
+++ b/libopenshot/PLIST
@@ -1,8 +1,10 @@
 @comment $NetBSD$
 include/libopenshot/AudioBufferSource.h
-include/libopenshot/AudioDeviceInfo.h
+include/libopenshot/AudioDevices.h
+include/libopenshot/AudioLocation.h
 include/libopenshot/AudioReaderSource.h
 include/libopenshot/AudioResampler.h
+include/libopenshot/AudioWaveformer.h
 include/libopenshot/CVObjectDetection.h
 include/libopenshot/CVStabilization.h
 include/libopenshot/CVTracker.h
@@ -18,10 +20,6 @@ include/libopenshot/ClipProcessingJobs.h
 include/libopenshot/Color.h
 include/libopenshot/Coordinate.h
 include/libopenshot/CrashHandler.h
-include/libopenshot/DecklinkInput.h
-include/libopenshot/DecklinkOutput.h
-include/libopenshot/DecklinkReader.h
-include/libopenshot/DecklinkWriter.h
 include/libopenshot/DummyReader.h
 include/libopenshot/EffectBase.h
 include/libopenshot/EffectInfo.h
@@ -97,21 +95,11 @@ include/libopenshot/effects/Shift.h
 include/libopenshot/effects/Stabilizer.h
 include/libopenshot/effects/Tracker.h
 include/libopenshot/effects/Wave.h
-include/libopenshot/openshot_autogen/moc_predefs.h
 include/libopenshot/sort_filter/Hungarian.h
 include/libopenshot/sort_filter/KalmanTracker.h
 lib/libopenshot.${RUBY_DLEXT}
 lib/libopenshot.so.${PKGVERSION}
-lib/libopenshot.so.21
+lib/libopenshot.so.27
 ${PYSITELIB}/_openshot.${RUBY_DLEXT}
 ${PYSITELIB}/openshot.py
 ${RUBY_VENDORARCHLIB}/openshot.${RUBY_DLEXT}
-@pkgdir include/libopenshot/protobuf_messages
-@pkgdir include/libopenshot/openshot_autogen/include
-@pkgdir include/libopenshot/openshot_autogen/4DVC4UZSMN
-@pkgdir include/libopenshot/CMakeFiles/openshot_autogen.dir
-@pkgdir include/libopenshot/CMakeFiles/openshot.dir/openshot_autogen
-@pkgdir include/libopenshot/CMakeFiles/openshot.dir/effects
-@pkgdir include/libopenshot/CMakeFiles/openshot.dir/audio_effects
-@pkgdir include/libopenshot/CMakeFiles/openshot.dir/Qt
-@pkgdir include/libopenshot/CMakeFiles/jsoncpp_lib.dir/__/thirdparty/jsoncpp
diff --git a/libopenshot/distinfo b/libopenshot/distinfo
index e381819fd8..9b0088ee20 100644
--- a/libopenshot/distinfo
+++ b/libopenshot/distinfo
@@ -1,5 +1,9 @@
 $NetBSD$
 
-BLAKE2s (libopenshot-0.2.7.tar.gz) = d55b34d4f8c7548f29ddf9a2a20950d1336c58f94e6924f1804e70c2437308b0
-SHA512 (libopenshot-0.2.7.tar.gz) = 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
-Size (libopenshot-0.2.7.tar.gz) = 22472544 bytes
+BLAKE2s (libopenshot-0.4.0.tar.gz) = f8e28c02006a7549ffd1d76e43810cc49f06f38b4aebd7503b3687895315a950
+SHA512 (libopenshot-0.4.0.tar.gz) = e5aa91e2ec3f64952a60e069e3c843d3ac59c3f896d81dccd789e52244f442ceed2e62374b6aeeb2514a8b88557edd60faca33cadb06c297ff400aebc83f98a6
+Size (libopenshot-0.4.0.tar.gz) = 26131657 bytes
+SHA1 (patch-src_AudioWaveformer.cpp) = b858f71bee62d4e83a9e4304ea8a2320d41e766e
+SHA1 (patch-src_FFmpegReader.cpp) = 386fe35077b4a51d92de12e98dedce6326a49315
+SHA1 (patch-src_FFmpegWriter.cpp) = bca8455b860b9100f117e1eeb011dfc20936067b
+SHA1 (patch-src_ImageReader.cpp) = 6d030bcb8890810dd226a4c0c19c63cf486a1cc6
diff --git a/libopenshot/patches/patch-src_AudioWaveformer.cpp b/libopenshot/patches/patch-src_AudioWaveformer.cpp
new file mode 100644
index 0000000000..1aaae67e9d
--- /dev/null
+++ b/libopenshot/patches/patch-src_AudioWaveformer.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/AudioWaveformer.cpp.orig	2024-12-24 10:42:51.855734280 +0000
++++ src/AudioWaveformer.cpp
+@@ -10,6 +10,7 @@
+ //
+ // SPDX-License-Identifier: LGPL-3.0-or-later
+ 
++#include <cmath>
+ #include "AudioWaveformer.h"
+ 
+ 
diff --git a/libopenshot/patches/patch-src_FFmpegReader.cpp b/libopenshot/patches/patch-src_FFmpegReader.cpp
new file mode 100644
index 0000000000..4dd44fe6f1
--- /dev/null
+++ b/libopenshot/patches/patch-src_FFmpegReader.cpp
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- src/FFmpegReader.cpp.orig	2024-12-21 22:27:30.000000000 +0000
++++ src/FFmpegReader.cpp
+@@ -286,12 +286,12 @@ void FFmpegReader::Open() {
+ 
+ 				// Init options
+ 				av_dict_set(&opts, "strict", "experimental", 0);
++				char *adapter_ptr = NULL;
+ #if USE_HW_ACCEL
+ 				if (hw_de_on && hw_de_supported) {
+ 					// Open Hardware Acceleration
+ 					int i_decoder_hw = 0;
+ 					char adapter[256];
+-					char *adapter_ptr = NULL;
+ 					int adapter_num;
+ 					adapter_num = openshot::Settings::Instance()->HW_DE_DEVICE_SET;
+ 					fprintf(stderr, "Hardware decoding device number: %d\n", adapter_num);
+@@ -365,9 +365,7 @@ void FFmpegReader::Open() {
+ 					// Check if it is there and writable
+ #if defined(__linux__)
+ 					if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) {
+-#elif defined(_WIN32)
+-					if( adapter_ptr != NULL ) {
+-#elif defined(__APPLE__)
++#else
+ 					if( adapter_ptr != NULL ) {
+ #endif
+ 						ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device");
diff --git a/libopenshot/patches/patch-src_FFmpegWriter.cpp b/libopenshot/patches/patch-src_FFmpegWriter.cpp
new file mode 100644
index 0000000000..39fc356d66
--- /dev/null
+++ b/libopenshot/patches/patch-src_FFmpegWriter.cpp
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- src/FFmpegWriter.cpp.orig	2024-12-21 22:27:30.000000000 +0000
++++ src/FFmpegWriter.cpp
+@@ -1424,11 +1424,11 @@ void FFmpegWriter::open_video(AVFormatCo
+ 	// Set number of threads equal to number of processors (not to exceed 16)
+ 	video_codec_ctx->thread_count = std::min(FF_NUM_PROCESSORS, 16);
+ 
++	char *adapter_ptr = NULL;
+ #if USE_HW_ACCEL
+ 	if (hw_en_on && hw_en_supported) {
+ 		//char *dev_hw = NULL;
+ 		char adapter[256];
+-		char *adapter_ptr = NULL;
+ 		int adapter_num;
+ 		// Use the hw device given in the environment variable HW_EN_DEVICE_SET or the default if not set
+ 		adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET;
+@@ -1448,7 +1448,7 @@ void FFmpegWriter::open_video(AVFormatCo
+ // Check if it is there and writable
+ #if defined(__linux__)
+ 		if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) {
+-#elif defined(_WIN32) || defined(__APPLE__)
++#else
+ 		if( adapter_ptr != NULL ) {
+ #endif
+ 			ZmqLogger::Instance()->AppendDebugMethod(
diff --git a/libopenshot/patches/patch-src_ImageReader.cpp b/libopenshot/patches/patch-src_ImageReader.cpp
new file mode 100644
index 0000000000..df0fb09ec8
--- /dev/null
+++ b/libopenshot/patches/patch-src_ImageReader.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/ImageReader.cpp.orig	2024-12-24 11:07:39.461867765 +0000
++++ src/ImageReader.cpp
+@@ -10,6 +10,8 @@
+ //
+ // SPDX-License-Identifier: LGPL-3.0-or-later
+ 
++#include <cmath>
++
+ // Require ImageMagick support
+ #ifdef USE_IMAGEMAGICK
+ 


Home | Main Index | Thread Index | Old Index