Index: head/multimedia/libopenshot/Makefile =================================================================== --- head/multimedia/libopenshot/Makefile (revision 528021) +++ head/multimedia/libopenshot/Makefile (revision 528022) @@ -1,55 +1,57 @@ # $FreeBSD$ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.4-29 -DISTVERSIONSUFFIX= -g9bb5d93 +DISTVERSION= 0.2.5-4 +DISTVERSIONSUFFIX= -gf1e5c9c CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= tatsuki_makino@hotmail.com COMMENT= OpenShot Video Library LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= swig3.0:devel/swig30 \ unittest-cpp>=0:devel/unittest-cpp \ ${LOCALBASE}/include/zmq.hpp:net/cppzmq LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \ libjsoncpp.so:devel/jsoncpp \ libzmq.so:net/libzmq4 USES= cmake compiler:c++11-lang pkgconfig python:3.5+ qt:5 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= OpenShot USE_PYTHON= flavors USE_QT= core gui network multimedia widgets qmake_build buildtools_build CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\ - DISABLE_TESTS\ CMAKE_DISABLE_FIND_PACKAGE_Doxygen\ CMAKE_DISABLE_FIND_PACKAGE_RESVG\ CMAKE_DISABLE_FIND_PACKAGE_Ruby -CMAKE_OFF= ENABLE_COVERAGE +CMAKE_OFF= ENABLE_COVERAGE\ + ENABLE_DOCS\ + ENABLE_TESTS CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON OPTIONS_DEFAULT= FFMPEG OPTIONS_RADIO= IMAGEMAGICK OPTIONS_RADIO_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7 OPTIONS_SINGLE= LIBAVCODEC OPTIONS_SINGLE_LIBAVCODEC= FFMPEG LIBAV FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg IMAGEMAGICK6_DESC= with ImageMagick6 IMAGEMAGICK6_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 IMAGEMAGICK6_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO IMAGEMAGICK7_DESC= with ImageMagick7 IMAGEMAGICK7_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7 IMAGEMAGICK7_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO +LIBAV_DESC= ${FFMPEG_DESC:S/FFmpeg/Libav/} LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav .if !exists(/usr/lib/libomp.so) IGNORE= openmp of base system is required .endif .include Index: head/multimedia/libopenshot/distinfo =================================================================== --- head/multimedia/libopenshot/distinfo (revision 528021) +++ head/multimedia/libopenshot/distinfo (revision 528022) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581390000 -SHA256 (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 5858d87556858c54de75144a40eee0f7e5e52d66d8968b7f15e36d6c1dc3242d -SIZE (OpenShot-libopenshot-v0.2.4-29-g9bb5d93_GH0.tar.gz) = 10296027 +TIMESTAMP = 1583463600 +SHA256 (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 15c17c3d8af02db5b94e18d295766d20ad59e24d041a25082a45e5d741731a98 +SIZE (OpenShot-libopenshot-v0.2.5-4-gf1e5c9c_GH0.tar.gz) = 10295823 Index: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt =================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 528021) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 528022) @@ -1,16 +1,16 @@ ---- src/CMakeLists.txt.orig 2020-02-10 17:52:00 UTC +--- src/CMakeLists.txt.orig 2020-03-03 09:00:23 UTC +++ src/CMakeLists.txt -@@ -364,7 +364,13 @@ if (TARGET RESVG::resvg) +@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg) set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") endif() +find_library(EXECINFO_LIBRARY NAMES execinfo) +if(NOT EXECINFO_LIBRARY) + message(FATAL_ERROR "${EXECINFO_LIBRARY}") +endif(NOT EXECINFO_LIBRARY) ############### LINK LIBRARY ################# +target_link_libraries(openshot PUBLIC ${EXECINFO_LIBRARY}) + # Link remaining dependency libraries target_link_libraries(openshot PUBLIC ${LIBOPENSHOT_AUDIO_LIBRARIES} Index: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp =================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (revision 528021) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (revision 528022) @@ -1,64 +1,55 @@ ---- src/FFmpegWriter.cpp.orig 2019-12-19 13:04:31 UTC +--- src/FFmpegWriter.cpp.orig 2020-03-03 09:00:23 UTC +++ src/FFmpegWriter.cpp @@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std AVCodec *new_codec; // Check if the codec selected is a hardware accelerated codec - #if IS_FFMPEG_3_2 + #if HAVE_HW_ACCEL -#if defined(__linux__) +#if defined(__unix__) if (strstr(codec.c_str(), "_vaapi") != NULL) { new_codec = avcodec_find_encoder_by_name(codec.c_str()); hw_en_on = 1; @@ -220,9 +220,9 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std hw_en_on = 0; hw_en_supported = 0; } - #else // is FFmpeg 3 but not linux -+#else // is FFmpeg 3 but not linux ++#else // is FFmpeg 3 but not unix new_codec = avcodec_find_encoder_by_name(codec.c_str()); - #endif //__linux__ +#endif //__unix__ #else // not ffmpeg 3 new_codec = avcodec_find_encoder_by_name(codec.c_str()); - #endif //IS_FFMPEG_3_2 -@@ -956,7 +956,7 @@ void FFmpegWriter::flush_encoders() { - void FFmpegWriter::close_video(AVFormatContext *oc, AVStream *st) - { - #if IS_FFMPEG_3_2 -- // #if defined(__linux__) -+ // #if defined(__unix__) - if (hw_en_on && hw_en_supported) { - if (hw_device_ctx) { - av_buffer_unref(&hw_device_ctx); -@@ -1352,7 +1352,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS + #endif // HAVE_HW_ACCEL +@@ -1367,7 +1367,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET; fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num); if (adapter_num < 3 && adapter_num >=0) { -#if defined(__linux__) +#if defined(__unix__) 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; -@@ -1360,17 +1360,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_ptr = NULL; #elif defined(__APPLE__) adapter_ptr = NULL; +#else + adapter_ptr = NULL; #endif } else { adapter_ptr = NULL; // Just to be sure } // Check if it is there and writable -#if defined(__linux__) +#if defined(__unix__) if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) { #elif defined(_WIN32) if( adapter_ptr != NULL ) { #elif defined(__APPLE__) + if( adapter_ptr != NULL ) { +#else if( adapter_ptr != NULL ) { #endif ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "adapter", adapter_num); Index: head/multimedia/libopenshot/pkg-plist =================================================================== --- head/multimedia/libopenshot/pkg-plist (revision 528021) +++ head/multimedia/libopenshot/pkg-plist (revision 528022) @@ -1,79 +1,79 @@ include/libopenshot/AudioBufferSource.h include/libopenshot/AudioDeviceInfo.h include/libopenshot/AudioReaderSource.h include/libopenshot/AudioResampler.h include/libopenshot/CacheBase.h include/libopenshot/CacheDisk.h include/libopenshot/CacheMemory.h include/libopenshot/ChannelLayouts.h include/libopenshot/ChunkReader.h include/libopenshot/ChunkWriter.h include/libopenshot/Clip.h include/libopenshot/ClipBase.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 include/libopenshot/Effects.h include/libopenshot/Enums.h include/libopenshot/Exceptions.h include/libopenshot/FFmpegReader.h include/libopenshot/FFmpegUtilities.h include/libopenshot/FFmpegWriter.h include/libopenshot/Fraction.h include/libopenshot/Frame.h include/libopenshot/FrameMapper.h include/libopenshot/ImageReader.h include/libopenshot/ImageWriter.h include/libopenshot/Json.h include/libopenshot/KeyFrame.h include/libopenshot/MagickUtilities.h include/libopenshot/OpenMPUtilities.h include/libopenshot/OpenShot.h include/libopenshot/OpenShotVersion.h include/libopenshot/PlayerBase.h include/libopenshot/Point.h include/libopenshot/Profiles.h include/libopenshot/Qt/AudioPlaybackThread.h include/libopenshot/Qt/PlayerDemo.h include/libopenshot/Qt/PlayerPrivate.h include/libopenshot/Qt/VideoCacheThread.h include/libopenshot/Qt/VideoPlaybackThread.h include/libopenshot/Qt/VideoRenderWidget.h include/libopenshot/Qt/VideoRenderer.h include/libopenshot/QtHtmlReader.h include/libopenshot/QtImageReader.h include/libopenshot/QtPlayer.h include/libopenshot/QtTextReader.h include/libopenshot/ReaderBase.h include/libopenshot/RendererBase.h include/libopenshot/Settings.h include/libopenshot/TextReader.h include/libopenshot/Timeline.h include/libopenshot/WriterBase.h include/libopenshot/ZmqLogger.h include/libopenshot/effects/Bars.h include/libopenshot/effects/Blur.h include/libopenshot/effects/Brightness.h include/libopenshot/effects/ChromaKey.h include/libopenshot/effects/ColorShift.h include/libopenshot/effects/Crop.h include/libopenshot/effects/Deinterlace.h include/libopenshot/effects/Hue.h include/libopenshot/effects/Mask.h include/libopenshot/effects/Negate.h include/libopenshot/effects/Pixelate.h include/libopenshot/effects/Saturation.h include/libopenshot/effects/Shift.h include/libopenshot/effects/Wave.h lib/libopenshot.so -lib/libopenshot.so.0.2.4 -lib/libopenshot.so.18 +lib/libopenshot.so.0.2.5 +lib/libopenshot.so.19 %%PYTHON_SITELIBDIR%%/_openshot.so %%PYTHON_SITELIBDIR%%/openshot.py