Date: Mon, 30 Mar 2026 09:49:36 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Tatsuki Makino <tatsuki_makino@hotmail.com> Subject: git: c4afe898f056 - main - multimedia/libopenshot: Update 0.5.0 => 0.6.0 Message-ID: <69ca4730.30bb9.473fed5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4afe898f0566b9be97745477e0df1c363c4b7d5 commit c4afe898f0566b9be97745477e0df1c363c4b7d5 Author: Tatsuki Makino <tatsuki_makino@hotmail.com> AuthorDate: 2026-03-30 09:46:07 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-03-30 09:46:07 +0000 multimedia/libopenshot: Update 0.5.0 => 0.6.0 Changelog: https://github.com/OpenShot/libopenshot/releases/tag/v0.6.0 PR: 294111 Sponsored by: UNIS Labs --- multimedia/libopenshot/Makefile | 3 +-- multimedia/libopenshot/distinfo | 6 +++--- .../files/patch-bindings_python_CMakeLists.txt | 11 +++++++++++ .../libopenshot/files/patch-src_FFmpegReader.cpp | 12 ++++++------ .../libopenshot/files/patch-src_FFmpegWriter.cpp | 21 ++++++++++++--------- multimedia/libopenshot/pkg-plist | 2 +- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index 63a0e53bb50e..0c7389dcbfbd 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -1,7 +1,6 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 -PORTREVISION= 1 +DISTVERSION= 0.6.0 CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/libopenshot/distinfo b/multimedia/libopenshot/distinfo index f759c730774a..119c17ee1d18 100644 --- a/multimedia/libopenshot/distinfo +++ b/multimedia/libopenshot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1767150000 -SHA256 (OpenShot-libopenshot-v0.5.0_GH0.tar.gz) = 471fcc87e3b7c272a779a59e96d7f2559fadc8188570b2aebc0d2bda96439e7e -SIZE (OpenShot-libopenshot-v0.5.0_GH0.tar.gz) = 27007684 +TIMESTAMP = 1774234800 +SHA256 (OpenShot-libopenshot-v0.6.0_GH0.tar.gz) = 01c6510c92d7ec430f013cdaff3e65063fee4c1e4461fa1e87fcf80a892dddee +SIZE (OpenShot-libopenshot-v0.6.0_GH0.tar.gz) = 27055244 diff --git a/multimedia/libopenshot/files/patch-bindings_python_CMakeLists.txt b/multimedia/libopenshot/files/patch-bindings_python_CMakeLists.txt new file mode 100644 index 000000000000..99df36c003ea --- /dev/null +++ b/multimedia/libopenshot/files/patch-bindings_python_CMakeLists.txt @@ -0,0 +1,11 @@ +--- bindings/python/CMakeLists.txt.orig 2026-03-20 19:34:28 UTC ++++ bindings/python/CMakeLists.txt +@@ -117,7 +117,7 @@ if (NOT DEFINED PYTHON_MODULE_PATH) + if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${PYTHON_MODULE_PATH}") + ### Calculate the python module path (prefer sysconfig, fallback to distutils for compatibility) + execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; p=sysconfig.get_path('platlib', scheme='posix_prefix'); p=p[5:] if p.startswith('/usr/') else p.lstrip('/'); print(p)" ++ COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; p=sysconfig.get_path('platlib', scheme='posix_prefix'); d = sysconfig.get_path('data', scheme='posix_prefix'); p = p[len(d):].lstrip('/') if p.startswith(d) else p.lstrip('/'); print(p)" + OUTPUT_VARIABLE PYTHON_MODULE_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() diff --git a/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp b/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp index 67db735bbc68..216a07c120e5 100644 --- a/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp +++ b/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp @@ -1,6 +1,6 @@ ---- src/FFmpegReader.cpp.orig 2025-12-16 05:34:48 UTC +--- src/FFmpegReader.cpp.orig 2026-03-20 19:34:28 UTC +++ src/FFmpegReader.cpp -@@ -137,7 +137,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon +@@ -171,7 +171,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { switch (*p) { @@ -8,8 +8,8 @@ +#if defined(__unix__) // Linux pix formats case AV_PIX_FMT_VAAPI: - hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI; -@@ -307,7 +307,7 @@ void FFmpegReader::Open() { + if (selected == 1) { +@@ -358,7 +358,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; -@@ -370,12 +370,14 @@ void FFmpegReader::Open() { +@@ -421,12 +421,14 @@ void FFmpegReader::Open() { } // Check if it is there and writable @@ -34,7 +34,7 @@ #endif ZmqLogger::Instance()->AppendDebugMethod("Decode Device present using device"); } -@@ -566,8 +568,13 @@ void FFmpegReader::Open() { +@@ -682,8 +684,13 @@ void FFmpegReader::Open() { AVStream* st = pFormatCtx->streams[i]; if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { // Only inspect the first video stream diff --git a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp index a358e00aafc5..5f905d9dbe24 100644 --- a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp +++ b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp @@ -1,6 +1,6 @@ ---- src/FFmpegWriter.cpp.orig 2025-12-16 05:34:48 UTC +--- src/FFmpegWriter.cpp.orig 2026-03-20 19:34:28 UTC +++ src/FFmpegWriter.cpp -@@ -167,7 +167,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std +@@ -168,7 +168,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std const AVCodec *new_codec; // Check if the codec selected is a hardware accelerated codec #if USE_HW_ACCEL @@ -9,7 +9,7 @@ if (strstr(codec.c_str(), "_vaapi") != NULL) { new_codec = avcodec_find_encoder_by_name(codec.c_str()); hw_en_on = 1; -@@ -217,7 +217,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std +@@ -218,7 +218,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std } #else // unknown OS new_codec = avcodec_find_encoder_by_name(codec.c_str()); @@ -18,7 +18,7 @@ #else // USE_HW_ACCEL new_codec = avcodec_find_encoder_by_name(codec.c_str()); #endif // USE_HW_ACCEL -@@ -558,6 +558,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s +@@ -564,6 +564,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s else { av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0); } @@ -26,7 +26,7 @@ case AV_CODEC_ID_HEVC : c->bit_rate = 0; if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) { -@@ -566,6 +567,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s +@@ -572,6 +573,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s av_opt_set_int(c->priv_data, "forced-idr",1,0); } break; @@ -35,7 +35,7 @@ } #endif // FFmpeg 4.0+ } else { -@@ -1423,22 +1426,26 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1429,22 +1432,26 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET; std::clog << "Encoding Device Nr: " << adapter_num << "\n"; if (adapter_num < 3 && adapter_num >=0) { @@ -64,16 +64,19 @@ #endif ZmqLogger::Instance()->AppendDebugMethod( "Encode Device present using device", -@@ -1500,7 +1507,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1510,7 +1517,11 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS switch (video_codec_ctx->codec_id) { case AV_CODEC_ID_H264: video_codec_ctx->max_b_frames = 0; // At least this GPU doesn't support b-frames -- video_codec_ctx->profile = FF_PROFILE_H264_BASELINE | FF_PROFILE_H264_CONSTRAINED; ++#if LIBAVFORMAT_VERSION_MAJOR >= 61 + video_codec_ctx->profile = AV_PROFILE_H264_BASELINE | AV_PROFILE_H264_CONSTRAINED; ++#else + video_codec_ctx->profile = FF_PROFILE_H264_BASELINE | FF_PROFILE_H264_CONSTRAINED; ++#endif av_opt_set(video_codec_ctx->priv_data, "preset", "slow", 0); av_opt_set(video_codec_ctx->priv_data, "tune", "zerolatency", 0); av_opt_set(video_codec_ctx->priv_data, "vprofile", "baseline", AV_OPT_SEARCH_CHILDREN); -@@ -2390,6 +2397,12 @@ void FFmpegWriter::AddSphericalMetadata(const std::str +@@ -2400,6 +2411,12 @@ void FFmpegWriter::AddSphericalMetadata(const std::str map->pitch = static_cast<int32_t>(pitch_deg * (1 << 16)); map->roll = static_cast<int32_t>(roll_deg * (1 << 16)); diff --git a/multimedia/libopenshot/pkg-plist b/multimedia/libopenshot/pkg-plist index d4368d7c962c..3cb1f388361b 100644 --- a/multimedia/libopenshot/pkg-plist +++ b/multimedia/libopenshot/pkg-plist @@ -107,7 +107,7 @@ include/libopenshot/sort_filter/Hungarian.h include/libopenshot/sort_filter/KalmanTracker.h lib/libopenshot.so lib/libopenshot.so.%%VERSION%% -lib/libopenshot.so.28 +lib/libopenshot.so.29 %%PYTHON_SITELIBDIR%%/_openshot.so %%PYTHON_SITELIBDIR%%/openshot.py %%RUBY%%%%RUBY_VENDORARCHLIBDIR%%/openshot.sohome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ca4730.30bb9.473fed5>