Date: Sun, 8 Dec 2019 11:28:16 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519292 - in head/multimedia/libopenshot: . files Message-ID: <201912081128.xB8BSGX1064076@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Dec 8 11:28:16 2019 New Revision: 519292 URL: https://svnweb.freebsd.org/changeset/ports/519292 Log: multimedia/libopenshot: Update to 0.2.3.490 PR: 241912 Submitted by: Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer) Modified: head/multimedia/libopenshot/Makefile head/multimedia/libopenshot/distinfo head/multimedia/libopenshot/files/patch-src_CMakeLists.txt head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp head/multimedia/libopenshot/pkg-plist Modified: head/multimedia/libopenshot/Makefile ============================================================================== --- head/multimedia/libopenshot/Makefile Sun Dec 8 11:27:14 2019 (r519291) +++ head/multimedia/libopenshot/Makefile Sun Dec 8 11:28:16 2019 (r519292) @@ -2,9 +2,8 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.3-178 -DISTVERSIONSUFFIX= -g17a2258 -PORTREVISION= 3 +DISTVERSION= 0.2.3-490 +DISTVERSIONSUFFIX= -gc271352 CATEGORIES= multimedia MAINTAINER= tatsuki_makino@hotmail.com @@ -25,13 +24,14 @@ USES= cmake compiler:c++11-lang pkgconfig python:3.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_TESTS \ - CMAKE_DISABLE_FIND_PACKAGE_Doxygen \ - CMAKE_DISABLE_FIND_PACKAGE_ImageMagick \ - CMAKE_DISABLE_FIND_PACKAGE_RESVG \ +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 OPTIONS_DEFAULT= FFMPEG OPTIONS_SINGLE= LIBAVCODEC Modified: head/multimedia/libopenshot/distinfo ============================================================================== --- head/multimedia/libopenshot/distinfo Sun Dec 8 11:27:14 2019 (r519291) +++ head/multimedia/libopenshot/distinfo Sun Dec 8 11:28:16 2019 (r519292) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557457200 -SHA256 (OpenShot-libopenshot-v0.2.3-178-g17a2258_GH0.tar.gz) = c0b59d59a12a40c0f8723ce77f5cfff745e4f8cab31664223d26822320845df9 -SIZE (OpenShot-libopenshot-v0.2.3-178-g17a2258_GH0.tar.gz) = 10266083 +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 Modified: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt ============================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Dec 8 11:27:14 2019 (r519291) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Dec 8 11:28:16 2019 (r519292) @@ -1,19 +1,34 @@ ---- src/CMakeLists.txt.orig 2019-05-08 19:16:50 UTC +--- src/CMakeLists.txt.orig 2019-11-04 12:14:04 UTC +++ src/CMakeLists.txt -@@ -45,6 +45,8 @@ IF (APPLE) - SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES "-framework Carbon -framework Cocoa -framework CoreFoundation -framework CoreAudio -framework CoreMidi -framework IOKit -framework AGL -framework AudioToolbox -framework QuartzCore -lobjc -framework Accelerate") - ENDIF(APPLE) +@@ -340,6 +340,11 @@ if (TARGET cppzmq) + endif() + +find_library(EXECINFO_LIBRARY NAMES execinfo) ++if(NOT EXECINFO_LIBRARY) ++ message(FATAL_ERROR "${EXECINFO_LIBRARY}") ++endif(NOT EXECINFO_LIBRARY) + - ################ IMAGE MAGICK ################## - # Set the Quantum Depth that ImageMagick was built with (default to 16 bits) - IF (MAGICKCORE_QUANTUM_DEPTH) -@@ -312,6 +314,7 @@ SET ( REQUIRED_LIBRARIES - ${PROFILER} - ${JSONCPP_LIBRARY} - ${ZMQ_LIBRARIES} -+ ${EXECINFO_LIBRARY} - ) + ############### LINK LIBRARY ################# + SET ( REQUIRED_LIBRARIES + ${LIBOPENSHOT_AUDIO_LIBRARIES} +@@ -386,9 +391,11 @@ target_compile_definitions(openshot-example PRIVATE - IF (AVCODEC_FOUND) + # 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) + + # 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) Modified: head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp ============================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Sun Dec 8 11:27:14 2019 (r519291) +++ head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Sun Dec 8 11:28:16 2019 (r519292) @@ -1,6 +1,6 @@ ---- src/FFmpegReader.cpp.orig 2019-05-08 19:16:50 UTC +--- src/FFmpegReader.cpp.orig 2019-11-04 12:14:04 UTC +++ src/FFmpegReader.cpp -@@ -159,7 +159,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon +@@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { switch (*p) { @@ -9,7 +9,7 @@ // Linux pix formats case AV_PIX_FMT_VAAPI: hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI; -@@ -312,7 +312,7 @@ void FFmpegReader::Open() { +@@ -315,7 +315,7 @@ void FFmpegReader::Open() { pCodecCtx->get_format = get_hw_dec_format; if (adapter_num < 3 && adapter_num >=0) { @@ -18,7 +18,7 @@ snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); adapter_ptr = adapter; i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER; -@@ -375,11 +375,13 @@ void FFmpegReader::Open() { +@@ -378,11 +378,13 @@ void FFmpegReader::Open() { } // Check if it is there and writable @@ -32,4 +32,4 @@ +#else if( adapter_ptr != NULL ) { #endif - ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1); + ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device"); Modified: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp ============================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Dec 8 11:27:14 2019 (r519291) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Dec 8 11:28:16 2019 (r519292) @@ -1,33 +1,36 @@ ---- src/FFmpegWriter.cpp.orig 2019-05-08 19:16:50 UTC +--- src/FFmpegWriter.cpp.orig 2019-11-04 12:14:04 UTC +++ src/FFmpegWriter.cpp -@@ -166,7 +166,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str +@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str AVCodec *new_codec; // Check if the codec selected is a hardware accelerated codec #if IS_FFMPEG_3_2 -- #if defined(__linux__) +-#if defined(__linux__) +#if defined(__unix__) - if ( (strcmp(codec.c_str(),"h264_vaapi") == 0)) { + if (strstr(codec.c_str(), "_vaapi") != NULL) { new_codec = avcodec_find_encoder_by_name(codec.c_str()); hw_en_on = 1; -@@ -225,7 +225,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str +@@ -220,9 +220,9 @@ void FFmpegWriter::SetVideoOptions(bool has_video, str + 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 linux new_codec = avcodec_find_encoder_by_name(codec.c_str()); --#endif //__linux__ +- #endif //__linux__ +#endif //__unix__ #else // not ffmpeg 3 new_codec = avcodec_find_encoder_by_name(codec.c_str()); #endif //IS_FFMPEG_3_2 -@@ -888,7 +888,7 @@ void FFmpegWriter::close_video(AVFormatContext *oc, AV - AV_FREE_CONTEXT(video_codec); - video_codec = NULL; +@@ -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); -@@ -1290,7 +1290,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1351,7 +1351,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) { @@ -36,7 +39,7 @@ 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; -@@ -1298,17 +1298,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1359,17 +1359,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_ptr = NULL; #elif defined(__APPLE__) adapter_ptr = NULL; @@ -58,4 +61,4 @@ +#else if( adapter_ptr != NULL ) { #endif - ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "", -1, "", -1, "", -1, "", -1, "", -1, "", -1); + ZmqLogger::Instance()->AppendDebugMethod("Encode Device present using device", "adapter", adapter_num); Modified: head/multimedia/libopenshot/pkg-plist ============================================================================== --- head/multimedia/libopenshot/pkg-plist Sun Dec 8 11:27:14 2019 (r519291) +++ head/multimedia/libopenshot/pkg-plist Sun Dec 8 11:28:16 2019 (r519292) @@ -33,8 +33,10 @@ 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 @@ -45,15 +47,15 @@ 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/Tests.h include/libopenshot/TextReader.h include/libopenshot/Timeline.h -include/libopenshot/Version.h include/libopenshot/WriterBase.h include/libopenshot/ZmqLogger.h include/libopenshot/effects/Bars.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912081128.xB8BSGX1064076>