Date: Tue, 25 Nov 2025 10:04:05 +0000 From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 571fcc5330da - main - multimedia/libopenshot: fix build with ffmpeg8 Message-ID: <69257f15.35549.3f2a7fb4@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=571fcc5330da6e5ab4e3f9893206d6f08bc71cc6 commit 571fcc5330da6e5ab4e3f9893206d6f08bc71cc6 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2025-11-25 10:02:53 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2025-11-25 10:04:00 +0000 multimedia/libopenshot: fix build with ffmpeg8 PR: 289065 --- multimedia/libopenshot/Makefile | 2 +- .../libopenshot/files/patch-src_FFmpegWriter.cpp | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index 224458362db3..104d8e09d0b7 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -1,7 +1,7 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp index 825de6eb04b3..64e3d4628e0d 100644 --- a/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp +++ b/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp @@ -1,4 +1,4 @@ ---- src/FFmpegWriter.cpp.orig 2024-06-20 01:25:10 UTC +--- src/FFmpegWriter.cpp.orig 2024-12-21 22:27:30 UTC +++ src/FFmpegWriter.cpp @@ -166,7 +166,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std const AVCodec *new_codec; @@ -35,7 +35,7 @@ } #endif // FFmpeg 4.0+ } else { -@@ -1434,21 +1437,25 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1434,22 +1437,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) { @@ -58,8 +58,18 @@ +#if defined(__unix__) if( adapter_ptr != NULL && access( adapter_ptr, W_OK ) == 0 ) { #elif defined(_WIN32) || defined(__APPLE__) -+ if( adapter_ptr != NULL ) { -+#else if( adapter_ptr != NULL ) { ++#else ++ if( adapter_ptr != NULL ) { #endif ZmqLogger::Instance()->AppendDebugMethod( + "Encode Device present using device", +@@ -1511,7 +1518,7 @@ 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; ++ video_codec_ctx->profile = AV_PROFILE_H264_BASELINE | AV_PROFILE_H264_CONSTRAINED; + 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69257f15.35549.3f2a7fb4>