From nobody Tue Nov 25 10:04:05 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dFyvn3hJtz6HtYT for ; Tue, 25 Nov 2025 10:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFyvn1bnTz472Z for ; Tue, 25 Nov 2025 10:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764065045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dNp9lGdfk5qFWor4IN1PDFNJlkUYGwXD5d5/zXbpnZ0=; b=ZbS4L2oPfBAvAtgn9KXANIRYWVwBSRAotMznCJ/pncte7NffHRyeQpWZyMUqWJnZz/0gm6 QaHMhCHieR2QMc3PL+C9RiIBQPvmjj0pjdBOLdG5yUk10p8qapGMGszdLoQ8uWRoS3pSN0 YMlw4IllSgWvYZc4Qi9MWmGf/NVXjdEcbXMuyJvI2Uq2hb5qm5LJ0bjQ44/BOXJSloqkIs moP/M4livy+ZOzuqRK9BEswLUYfHDeBM5jQsomtbbECvxEStWssQkvwXQu4bWZMqij5B8s wrf462mYpGMnBRrHoIiw2oyf+Mb02gt8jWKUrVoJQRc5PYWkXCoDkR52S+xXAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764065045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dNp9lGdfk5qFWor4IN1PDFNJlkUYGwXD5d5/zXbpnZ0=; b=FUeHtwaqCPff3QAlkxZMSAq2aYaKlNDftEZgtwW30ksUAarKqO/pDrkaAnn44K1GiAHOpJ LncondajtPW9/1yP5EfMpwhninUjJTqzFWlO+cP8W//UzJMaLMlbNi0n2r23raklbW85e3 41KMUNbuVO0WfaqrpNX7HZxnU61eaX4OUAkHuEY8duJLn11+yNNvXnSNzsst+SaFcNjARf j1qu+CsLv8lLTXOEz9LJlM+9+fbqk2xWcwz4WkiOlFW2U5974pZ7bBfgC9I73vyzXmHBJt L48KX9vRqam9obCIVZoRMRbe1gVnRg/j6bNFJ1hIFPnFVer0Je+nViJdMJJuKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764065045; a=rsa-sha256; cv=none; b=SNxrDFXl0ZWARAaqgQGvq71xJYK7RFFyVgJTyb/74f7WU/x5kHiGYhIBiSfA9IaajQey8a 7DoiMXtq8dD9uKciuKF69lCopKgVrPoFyvq79lSDd6XykaCp01YPYBCpzTCsctjrzq4EZI ZjDjxCunY8ymHOidO0r/p/mvVSRk7PMhGhZKxa6VJR5oS9+PkRMSGgLeoySlF8zGYolMSt /C+eMlOf/MzL4W6D3YdFYtWRLnUsJYSkNpU7d9xYHoT8KrQPEyLqfrSWp777B0hlgH+2nD I+1G67Lqjz3/vwrvaNOt8SUGlIDw8C6RLZV3tjCdID/vBFn5AwD3c9/dOedKzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFyvn0PCjzwjH for ; Tue, 25 Nov 2025 10:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35549 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 10:04:05 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 571fcc5330da - main - multimedia/libopenshot: fix build with ffmpeg8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 571fcc5330da6e5ab4e3f9893206d6f08bc71cc6 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 10:04:05 +0000 Message-Id: <69257f15.35549.3f2a7fb4@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=571fcc5330da6e5ab4e3f9893206d6f08bc71cc6 commit 571fcc5330da6e5ab4e3f9893206d6f08bc71cc6 Author: Baptiste Daroussin AuthorDate: 2025-11-25 10:02:53 +0000 Commit: Baptiste Daroussin 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);