Index: head/multimedia/libopenshot/Makefile =================================================================== --- head/multimedia/libopenshot/Makefile (revision 526334) +++ head/multimedia/libopenshot/Makefile (revision 526335) @@ -1,54 +1,55 @@ # $FreeBSD$ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.3-595 -PORTREVISION= 2 -DISTVERSIONSUFFIX= -ga1158ee +DISTVERSION= 0.2.4-29 +DISTVERSIONSUFFIX= -g9bb5d93 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= noflavors +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_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_LIB_DEPENDS= libavformat.so:multimedia/libav .if !exists(/usr/lib/libomp.so) -LIB_DEPENDS+= libomp.so:devel/openmp +IGNORE= openmp of base system is required .endif .include Index: head/multimedia/libopenshot/distinfo =================================================================== --- head/multimedia/libopenshot/distinfo (revision 526334) +++ head/multimedia/libopenshot/distinfo (revision 526335) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577502000 -SHA256 (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = b924dea93cfe4cf067ea1beba76ad1c57a385531b92d221de5e4da35111213e7 -SIZE (OpenShot-libopenshot-v0.2.3-595-ga1158ee_GH0.tar.gz) = 10290486 +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 Index: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt =================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 526334) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 526335) @@ -1,34 +1,16 @@ ---- src/CMakeLists.txt.orig 2019-12-19 13:04:31 UTC +--- src/CMakeLists.txt.orig 2020-02-10 17:52:00 UTC +++ src/CMakeLists.txt -@@ -358,6 +358,11 @@ if (TARGET cppzmq) +@@ -364,7 +364,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 -@@ -396,9 +401,11 @@ target_compile_definitions(openshot-example PRIVATE - - # Link test executable to the new library - target_link_libraries(openshot-example openshot) -+target_link_libraries(openshot-example ${EXECINFO_LIBRARY}) - - add_executable(openshot-html-test examples/ExampleHtml.cpp) - target_link_libraries(openshot-html-test openshot Qt5::Gui) -+target_link_libraries(openshot-html-test ${EXECINFO_LIBRARY}) - - ############### PLAYER EXECUTABLE ################ - # Create test executable -@@ -406,6 +413,7 @@ add_executable(openshot-player Qt/demo/main.cpp) - - # Link test executable to the new library - target_link_libraries(openshot-player openshot) -+target_link_libraries(openshot-player ${EXECINFO_LIBRARY}) - - ############### TEST BLACKMAGIC CAPTURE APP ################ - IF (BLACKMAGIC_FOUND) + ${LIBOPENSHOT_AUDIO_LIBRARIES} Index: head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp =================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (revision 526334) +++ head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (revision 526335) @@ -1,35 +1,35 @@ ---- src/FFmpegReader.cpp.orig 2019-12-19 13:04:31 UTC +--- src/FFmpegReader.cpp.orig 2020-02-10 17:52:00 UTC +++ src/FFmpegReader.cpp @@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { switch (*p) { -#if defined(__linux__) +#if defined(__unix__) // Linux pix formats case AV_PIX_FMT_VAAPI: hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI; -@@ -315,7 +315,7 @@ void FFmpegReader::Open() { +@@ -318,7 +318,7 @@ void FFmpegReader::Open() { pCodecCtx->get_format = get_hw_dec_format; if (adapter_num < 3 && adapter_num >=0) { -#if defined(__linux__) +#if defined(__unix__) snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); adapter_ptr = adapter; i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER; -@@ -378,11 +378,13 @@ void FFmpegReader::Open() { +@@ -381,11 +381,13 @@ void FFmpegReader::Open() { } // 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("Decode Device present using device"); Index: head/multimedia/libopenshot/pkg-plist =================================================================== --- head/multimedia/libopenshot/pkg-plist (revision 526334) +++ head/multimedia/libopenshot/pkg-plist (revision 526335) @@ -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.3 -lib/libopenshot.so.17 +lib/libopenshot.so.0.2.4 +lib/libopenshot.so.18 %%PYTHON_SITELIBDIR%%/_openshot.so %%PYTHON_SITELIBDIR%%/openshot.py