svn commit: r566554 - in head: audio/libopenshot-audio multimedia/libopenshot multimedia/libopenshot/files
Neel Chauhan
nc at FreeBSD.org
Thu Feb 25 18:57:43 UTC 2021
Author: nc
Date: Thu Feb 25 18:57:40 2021
New Revision: 566554
URL: https://svnweb.freebsd.org/changeset/ports/566554
Log:
Add the openshot updates I somehow missed.
PR: 253643, 253645
Added:
head/multimedia/libopenshot/files/patch-src_CVTracker.cpp (contents, props changed)
Modified:
head/audio/libopenshot-audio/Makefile
head/audio/libopenshot-audio/distinfo
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/audio/libopenshot-audio/Makefile
==============================================================================
--- head/audio/libopenshot-audio/Makefile Thu Feb 25 18:54:50 2021 (r566553)
+++ head/audio/libopenshot-audio/Makefile Thu Feb 25 18:57:40 2021 (r566554)
@@ -2,8 +2,8 @@
PORTNAME= libopenshot-audio
DISTVERSIONPREFIX= v
-DISTVERSION= 0.2.0-14
-DISTVERSIONSUFFIX= -g12ddb3d
+DISTVERSION= 0.2.0-29
+DISTVERSIONSUFFIX= -gcdfe5a1
CATEGORIES= audio multimedia
MAINTAINER= tatsuki_makino at hotmail.com
Modified: head/audio/libopenshot-audio/distinfo
==============================================================================
--- head/audio/libopenshot-audio/distinfo Thu Feb 25 18:54:50 2021 (r566553)
+++ head/audio/libopenshot-audio/distinfo Thu Feb 25 18:57:40 2021 (r566554)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599883200
-SHA256 (OpenShot-libopenshot-audio-v0.2.0-14-g12ddb3d_GH0.tar.gz) = 59a9afaca1eb52bb9a89fb3825b9cb45e833b4ecaed785b4e61f2621920bc632
-SIZE (OpenShot-libopenshot-audio-v0.2.0-14-g12ddb3d_GH0.tar.gz) = 1720267
+TIMESTAMP = 1613703600
+SHA256 (OpenShot-libopenshot-audio-v0.2.0-29-gcdfe5a1_GH0.tar.gz) = ac50e8f79440b365121e9c59644e33f25c174e4d2c5418b7e8fa9b011b7b5723
+SIZE (OpenShot-libopenshot-audio-v0.2.0-29-gcdfe5a1_GH0.tar.gz) = 1720976
Modified: head/multimedia/libopenshot/Makefile
==============================================================================
--- head/multimedia/libopenshot/Makefile Thu Feb 25 18:54:50 2021 (r566553)
+++ head/multimedia/libopenshot/Makefile Thu Feb 25 18:57:40 2021 (r566554)
@@ -2,8 +2,8 @@
PORTNAME= libopenshot
DISTVERSIONPREFIX= v
-DISTVERSION= 0.2.5-172
-DISTVERSIONSUFFIX= -gac8966a
+DISTVERSION= 0.2.5-517
+DISTVERSIONSUFFIX= -gdd2735e
CATEGORIES= multimedia
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -18,6 +18,7 @@ BUILD_DEPENDS= swig:devel/swig \
${LOCALBASE}/include/zmq.hpp:net/cppzmq
LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \
libjsoncpp.so:devel/jsoncpp \
+ libavformat.so:multimedia/ffmpeg \
libzmq.so:net/libzmq4
USES= cmake compiler:c++11-lang pkgconfig python:3.5+ qt:5
@@ -29,25 +30,21 @@ USE_QT= core gui network multimedia widgets qmake_bui
CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\
CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
- CMAKE_DISABLE_FIND_PACKAGE_RESVG\
+ 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
+OPTIONS_DEFINE= IMAGEMAGICK OPENCV
+OPTIONS_DEFAULT= IMAGEMAGICK
+OPTIONS_SUB= yes
+IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
+OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv \
+ libprotobuf.so:devel/protobuf
+OPENCV_CMAKE_ON= -DOpenCV_DIR:STRING=${LOCALBASE:Q}/cmake/opencv4
+OPENCV_CMAKE_BOOL= ENABLE_OPENCV
+OPENCV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenCV\
+ CMAKE_DISABLE_FIND_PACKAGE_Protobuf
.include <bsd.port.mk>
Modified: head/multimedia/libopenshot/distinfo
==============================================================================
--- head/multimedia/libopenshot/distinfo Thu Feb 25 18:54:50 2021 (r566553)
+++ head/multimedia/libopenshot/distinfo Thu Feb 25 18:57:40 2021 (r566554)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599886800
-SHA256 (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = d90d146d167108eab98dbf1aadce564267c2f6741e2836501e25f3037f4b3b9c
-SIZE (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = 10305575
+TIMESTAMP = 1613703600
+SHA256 (OpenShot-libopenshot-v0.2.5-517-gdd2735e_GH0.tar.gz) = 9802d9cf3fbd32d899828a1c0175053953f513300fdc426606a8d10fe510a42c
+SIZE (OpenShot-libopenshot-v0.2.5-517-gdd2735e_GH0.tar.gz) = 22454598
Modified: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt
==============================================================================
--- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Thu Feb 25 18:54:50 2021 (r566553)
+++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Thu Feb 25 18:57:40 2021 (r566554)
@@ -1,16 +1,15 @@
---- src/CMakeLists.txt.orig 2020-09-11 02:37:02 UTC
+--- src/CMakeLists.txt.orig 2021-02-18 07:59:16 UTC
+++ src/CMakeLists.txt
-@@ -384,7 +384,13 @@ if (TARGET RESVG::resvg)
-
+@@ -415,6 +415,12 @@ if(ENABLE_OPENCV)
endif()
+ add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms")
+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 LIBRARY #################
# Link remaining dependency libraries
- target_link_libraries(openshot PUBLIC
- ${LIBOPENSHOT_AUDIO_LIBRARIES}
+ if(DEFINED PROFILER)
Added: head/multimedia/libopenshot/files/patch-src_CVTracker.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/libopenshot/files/patch-src_CVTracker.cpp Thu Feb 25 18:57:40 2021 (r566554)
@@ -0,0 +1,48 @@
+--- src/CVTracker.cpp.orig 2021-02-18 07:59:16 UTC
++++ src/CVTracker.cpp
+@@ -46,20 +46,20 @@ CVTracker::CVTracker(std::string processInfoJson, Proc
+
+ // Set desirable tracker method
+ cv::Ptr<cv::Tracker> CVTracker::selectTracker(std::string trackerType){
+- cv::Ptr<cv::Tracker> t;
++ cv::Ptr<cv::Tracker> t = nullptr;
+
+- if (trackerType == "BOOSTING")
+- t = cv::TrackerBoosting::create();
++// if (trackerType == "BOOSTING")
++// t = cv::TrackerBoosting::create();
+ if (trackerType == "MIL")
+ t = cv::TrackerMIL::create();
+ if (trackerType == "KCF")
+ t = cv::TrackerKCF::create();
+- if (trackerType == "TLD")
+- t = cv::TrackerTLD::create();
+- if (trackerType == "MEDIANFLOW")
+- t = cv::TrackerMedianFlow::create();
+- if (trackerType == "MOSSE")
+- t = cv::TrackerMOSSE::create();
++// if (trackerType == "TLD")
++// t = cv::TrackerTLD::create();
++// if (trackerType == "MEDIANFLOW")
++// t = cv::TrackerMedianFlow::create();
++// if (trackerType == "MOSSE")
++// t = cv::TrackerMOSSE::create();
+ if (trackerType == "CSRT")
+ t = cv::TrackerCSRT::create();
+
+@@ -163,12 +163,14 @@ bool CVTracker::initTracker(cv::Mat &frame, size_t fra
+ // Update the object tracker according to frame
+ bool CVTracker::trackFrame(cv::Mat &frame, size_t frameId){
+ // Update the tracking result
+- bool ok = tracker->update(frame, bbox);
++ cv::Rect bboxi = bbox;
++ bool ok = tracker->update(frame, bboxi);
+
+ // Add frame number and box coords if tracker finds the object
+ // Otherwise add only frame number
+ if (ok)
+ {
++ bbox = bboxi;
+ float fw = frame.size().width;
+ float fh = frame.size().height;
+
Modified: head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp
==============================================================================
--- head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Thu Feb 25 18:54:50 2021 (r566553)
+++ head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Thu Feb 25 18:57:40 2021 (r566554)
@@ -1,6 +1,6 @@
---- src/FFmpegReader.cpp.orig 2020-09-11 02:37:02 UTC
+--- src/FFmpegReader.cpp.orig 2021-02-18 07:59:16 UTC
+++ src/FFmpegReader.cpp
-@@ -165,7 +165,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon
+@@ -150,7 +150,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;
-@@ -321,7 +321,7 @@ void FFmpegReader::Open() {
+@@ -306,7 +306,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;
-@@ -384,11 +384,13 @@ void FFmpegReader::Open() {
+@@ -369,11 +369,13 @@ void FFmpegReader::Open() {
}
// Check if it is there and writable
Modified: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp
==============================================================================
--- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Thu Feb 25 18:54:50 2021 (r566553)
+++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Thu Feb 25 18:57:40 2021 (r566554)
@@ -1,6 +1,6 @@
---- src/FFmpegWriter.cpp.orig 2020-09-11 02:37:02 UTC
+--- src/FFmpegWriter.cpp.orig 2021-02-18 07:59:16 UTC
+++ src/FFmpegWriter.cpp
-@@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
+@@ -181,7 +181,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
@@ -9,19 +9,16 @@
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;
+@@ -231,7 +231,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std
}
-- #else // is FFmpeg 3 but not linux
-+#else // is FFmpeg 3 but not unix
+ #else // unknown OS
new_codec = avcodec_find_encoder_by_name(codec.c_str());
-- #endif //__linux__
-+#endif //__unix__
- #else // not ffmpeg 3
+-#endif //__linux__/_WIN32/__APPLE__
++#endif //__unix__/_WIN32/__APPLE__
+ #else // HAVE_HW_ACCEL
new_codec = avcodec_find_encoder_by_name(codec.c_str());
#endif // HAVE_HW_ACCEL
-@@ -556,6 +556,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
+@@ -580,6 +580,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
else {
av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0);
}
@@ -29,28 +26,26 @@
case AV_CODEC_ID_HEVC :
c->bit_rate = 0;
if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) {
-@@ -564,6 +565,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
+@@ -588,6 +589,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s
av_opt_set_int(c->priv_data, "forced-idr",1,0);
}
break;
+ default:
+ break;
}
- #endif
+ #endif // FFmpeg 4.0+
} else {
-@@ -1456,7 +1459,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
+@@ -1438,21 +1441,25 @@ 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);
+ std::clog << "Encoding Device Nr: " << adapter_num << "\n";
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;
-@@ -1464,17 +1467,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS
+ #elif defined(_WIN32) || defined(__APPLE__)
adapter_ptr = NULL;
- #elif defined(__APPLE__)
- adapter_ptr = NULL;
+#else
+ adapter_ptr = NULL;
#endif
@@ -62,9 +57,7 @@
-#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__)
+ #elif defined(_WIN32) || defined(__APPLE__)
+ if( adapter_ptr != NULL ) {
+#else
if( adapter_ptr != NULL ) {
Modified: head/multimedia/libopenshot/pkg-plist
==============================================================================
--- head/multimedia/libopenshot/pkg-plist Thu Feb 25 18:54:50 2021 (r566553)
+++ head/multimedia/libopenshot/pkg-plist Thu Feb 25 18:57:40 2021 (r566554)
@@ -2,6 +2,9 @@ include/libopenshot/AudioBufferSource.h
include/libopenshot/AudioDeviceInfo.h
include/libopenshot/AudioReaderSource.h
include/libopenshot/AudioResampler.h
+include/libopenshot/CVObjectDetection.h
+include/libopenshot/CVStabilization.h
+include/libopenshot/CVTracker.h
include/libopenshot/CacheBase.h
include/libopenshot/CacheDisk.h
include/libopenshot/CacheMemory.h
@@ -10,6 +13,7 @@ include/libopenshot/ChunkReader.h
include/libopenshot/ChunkWriter.h
include/libopenshot/Clip.h
include/libopenshot/ClipBase.h
+include/libopenshot/ClipProcessingJobs.h
include/libopenshot/Color.h
include/libopenshot/Coordinate.h
include/libopenshot/CrashHandler.h
@@ -39,6 +43,7 @@ include/libopenshot/OpenShot.h
include/libopenshot/OpenShotVersion.h
include/libopenshot/PlayerBase.h
include/libopenshot/Point.h
+include/libopenshot/ProcessingController.h
include/libopenshot/Profiles.h
include/libopenshot/Qt/AudioPlaybackThread.h
include/libopenshot/Qt/PlayerDemo.h
@@ -57,11 +62,13 @@ include/libopenshot/RendererBase.h
include/libopenshot/Settings.h
include/libopenshot/TextReader.h
include/libopenshot/Timeline.h
+include/libopenshot/TimelineBase.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/Caption.h
include/libopenshot/effects/ChromaKey.h
include/libopenshot/effects/ColorShift.h
include/libopenshot/effects/Crop.h
@@ -69,12 +76,24 @@ include/libopenshot/effects/Deinterlace.h
include/libopenshot/effects/Hue.h
include/libopenshot/effects/Mask.h
include/libopenshot/effects/Negate.h
+include/libopenshot/effects/ObjectDetection.h
include/libopenshot/effects/Pixelate.h
include/libopenshot/effects/Saturation.h
include/libopenshot/effects/Shift.h
+include/libopenshot/effects/Stabilizer.h
+include/libopenshot/effects/Tracker.h
include/libopenshot/effects/Wave.h
+%%OPENCV%%include/libopenshot/protobuf_messages/objdetectdata.pb.h
+%%OPENCV%%include/libopenshot/protobuf_messages/stabilizedata.pb.h
+%%OPENCV%%include/libopenshot/protobuf_messages/trackerdata.pb.h
+include/libopenshot/sort_filter/Hungarian.h
+include/libopenshot/sort_filter/KalmanTracker.h
lib/libopenshot.so
lib/libopenshot.so.0.2.5
lib/libopenshot.so.19
+%%OPENCV%%lib/libopenshot_protobuf.so
+%%OPENCV%%lib/libopenshot_protobuf.so.0.2.5
+%%OPENCV%%lib/libopenshot_protobuf.so.19
%%PYTHON_SITELIBDIR%%/_openshot.so
%%PYTHON_SITELIBDIR%%/openshot.py
+ at dir include/libopenshot/protobuf_messages
More information about the svn-ports-head
mailing list