Index: head/multimedia/libopenshot/Makefile =================================================================== --- head/multimedia/libopenshot/Makefile (revision 540619) +++ head/multimedia/libopenshot/Makefile (revision 540620) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.5-4 -DISTVERSIONSUFFIX= -gf1e5c9c +DISTVERSION= 0.2.5-106 +DISTVERSIONSUFFIX= -g517f289 CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= tatsuki_makino@hotmail.com COMMENT= OpenShot Video Library LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= swig:devel/swig \ 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\ CMAKE_DISABLE_FIND_PACKAGE_Doxygen\ CMAKE_DISABLE_FIND_PACKAGE_RESVG\ CMAKE_DISABLE_FIND_PACKAGE_Ruby 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 .include Index: head/multimedia/libopenshot/distinfo =================================================================== --- head/multimedia/libopenshot/distinfo (revision 540619) +++ head/multimedia/libopenshot/distinfo (revision 540620) @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1592888400 +SHA256 (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = e8cce2ce90a16798519522cb0bca21a8b1367bca3608694552d951bf03350aaa +SIZE (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = 10303100 Index: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt =================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 540619) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 540620) @@ -1,16 +1,16 @@ ---- src/CMakeLists.txt.orig 2020-03-03 09:00:23 UTC +--- src/CMakeLists.txt.orig 2020-06-18 10:04:32 UTC +++ src/CMakeLists.txt -@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg) +@@ -361,7 +361,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 540619) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (revision 540620) @@ -1,55 +1,72 @@ ---- src/FFmpegWriter.cpp.orig 2020-03-03 09:00:23 UTC +--- src/FFmpegWriter.cpp.orig 2020-06-18 10:04:32 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 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 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 // HAVE_HW_ACCEL -@@ -1367,7 +1367,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s + else { + av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0); + } ++ break; + case AV_CODEC_ID_HEVC : + c->bit_rate = 0; + if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) { +@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s + av_opt_set_int(c->priv_data, "forced-idr",1,0); + } + break; ++ default: ++ break; + } + #endif + } else { +@@ -1447,7 +1450,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; -@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1455,17 +1458,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);