Index: head/multimedia/libopenshot/Makefile =================================================================== --- head/multimedia/libopenshot/Makefile (revision 522346) +++ head/multimedia/libopenshot/Makefile (revision 522347) @@ -1,42 +1,53 @@ # $FreeBSD$ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.3-490 -DISTVERSIONSUFFIX= -gc271352 +DISTVERSION= 0.2.3-595 +DISTVERSIONSUFFIX= -ga1158ee CATEGORIES= multimedia 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 \ - libomp.so:devel/openmp \ 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_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_ImageMagick\ CMAKE_DISABLE_FIND_PACKAGE_RESVG\ CMAKE_DISABLE_FIND_PACKAGE_Ruby +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 +.endif .include Index: head/multimedia/libopenshot/distinfo =================================================================== --- head/multimedia/libopenshot/distinfo (revision 522346) +++ head/multimedia/libopenshot/distinfo (revision 522347) @@ -1,3 +1,3 @@ -TIMESTAMP = 1573527600 -SHA256 (OpenShot-libopenshot-v0.2.3-490-gc271352_GH0.tar.gz) = f996b0f36311306e51eabebdc1dc11ee82986c3a98a0d631b9cfbba64b908965 -SIZE (OpenShot-libopenshot-v0.2.3-490-gc271352_GH0.tar.gz) = 10290775 +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 Index: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt =================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 522346) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt (revision 522347) @@ -1,34 +1,34 @@ ---- src/CMakeLists.txt.orig 2019-11-04 12:14:04 UTC +--- src/CMakeLists.txt.orig 2019-12-19 13:04:31 UTC +++ src/CMakeLists.txt -@@ -340,6 +340,11 @@ if (TARGET cppzmq) +@@ -358,6 +358,11 @@ if (TARGET cppzmq) endif() +find_library(EXECINFO_LIBRARY NAMES execinfo) +if(NOT EXECINFO_LIBRARY) + message(FATAL_ERROR "${EXECINFO_LIBRARY}") +endif(NOT EXECINFO_LIBRARY) + ############### LINK LIBRARY ################# - SET ( REQUIRED_LIBRARIES - ${LIBOPENSHOT_AUDIO_LIBRARIES} -@@ -386,9 +391,11 @@ target_compile_definitions(openshot-example PRIVATE + # 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 -@@ -396,6 +403,7 @@ add_executable(openshot-player Qt/demo/main.cpp) +@@ -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) Index: head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp =================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (revision 522346) +++ head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp (revision 522347) @@ -1,35 +1,35 @@ ---- src/FFmpegReader.cpp.orig 2019-11-04 12:14:04 UTC +--- src/FFmpegReader.cpp.orig 2019-12-19 13:04:31 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() { 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() { } // 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/files/patch-src_FFmpegWriter.cpp =================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (revision 522346) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp (revision 522347) @@ -1,64 +1,64 @@ ---- src/FFmpegWriter.cpp.orig 2019-11-04 12:14:04 UTC +--- src/FFmpegWriter.cpp.orig 2019-12-19 13:04:31 UTC +++ src/FFmpegWriter.cpp -@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str +@@ -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 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, str +@@ -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 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); -@@ -1351,7 +1351,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1352,7 +1352,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; -@@ -1359,17 +1359,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1360,17 +1360,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-message =================================================================== --- head/multimedia/libopenshot/pkg-message (nonexistent) +++ head/multimedia/libopenshot/pkg-message (revision 522347) @@ -0,0 +1,12 @@ +[ +{ + type: install + message: <