Date: Sun, 8 Mar 2020 10:28:12 +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: r528022 - in head/multimedia/libopenshot: . files Message-ID: <202003081028.028ASCD8017684@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Mar 8 10:28:12 2020 New Revision: 528022 URL: https://svnweb.freebsd.org/changeset/ports/528022 Log: multimedia/libopenshot: Update to 0.2.5 PR: 244622 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_FFmpegWriter.cpp head/multimedia/libopenshot/pkg-plist Modified: head/multimedia/libopenshot/Makefile ============================================================================== --- head/multimedia/libopenshot/Makefile Sun Mar 8 10:26:38 2020 (r528021) +++ head/multimedia/libopenshot/Makefile Sun Mar 8 10:28:12 2020 (r528022) @@ -2,8 +2,8 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.4-29 -DISTVERSIONSUFFIX= -g9bb5d93 +DISTVERSION= 0.2.5-4 +DISTVERSIONSUFFIX= -gf1e5c9c CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -28,11 +28,12 @@ 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_OFF= ENABLE_COVERAGE\ + ENABLE_DOCS\ + ENABLE_TESTS CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON OPTIONS_DEFAULT= FFMPEG OPTIONS_RADIO= IMAGEMAGICK @@ -46,6 +47,7 @@ IMAGEMAGICK6_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Im 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 .if !exists(/usr/lib/libomp.so) Modified: head/multimedia/libopenshot/distinfo ============================================================================== --- head/multimedia/libopenshot/distinfo Sun Mar 8 10:26:38 2020 (r528021) +++ head/multimedia/libopenshot/distinfo Sun Mar 8 10:28:12 2020 (r528022) @@ -1,3 +1,3 @@ -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 +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 Modified: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt ============================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Mar 8 10:26:38 2020 (r528021) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Mar 8 10:28:12 2020 (r528022) @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig 2020-02-10 17:52:00 UTC +--- src/CMakeLists.txt.orig 2020-03-03 09:00:23 UTC +++ src/CMakeLists.txt -@@ -364,7 +364,13 @@ if (TARGET RESVG::resvg) +@@ -363,7 +363,13 @@ if (TARGET RESVG::resvg) set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") endif() Modified: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp ============================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Mar 8 10:26:38 2020 (r528021) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Mar 8 10:28:12 2020 (r528022) @@ -1,9 +1,9 @@ ---- src/FFmpegWriter.cpp.orig 2019-12-19 13:04:31 UTC +--- src/FFmpegWriter.cpp.orig 2020-03-03 09:00:23 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 IS_FFMPEG_3_2 + #if HAVE_HW_ACCEL -#if defined(__linux__) +#if defined(__unix__) if (strstr(codec.c_str(), "_vaapi") != NULL) { @@ -14,23 +14,14 @@ hw_en_supported = 0; } - #else // is FFmpeg 3 but not linux -+#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 //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); -@@ -1352,7 +1352,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS + #endif // HAVE_HW_ACCEL +@@ -1367,7 +1367,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) { @@ -39,7 +30,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; -@@ -1360,17 +1360,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1375,17 +1375,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_ptr = NULL; #elif defined(__APPLE__) adapter_ptr = NULL; Modified: head/multimedia/libopenshot/pkg-plist ============================================================================== --- head/multimedia/libopenshot/pkg-plist Sun Mar 8 10:26:38 2020 (r528021) +++ head/multimedia/libopenshot/pkg-plist Sun Mar 8 10:28:12 2020 (r528022) @@ -73,7 +73,7 @@ include/libopenshot/effects/Saturation.h include/libopenshot/effects/Shift.h include/libopenshot/effects/Wave.h lib/libopenshot.so -lib/libopenshot.so.0.2.4 -lib/libopenshot.so.18 +lib/libopenshot.so.0.2.5 +lib/libopenshot.so.19 %%PYTHON_SITELIBDIR%%/_openshot.so %%PYTHON_SITELIBDIR%%/openshot.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003081028.028ASCD8017684>