From nobody Mon Dec 18 16:31:56 2023 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 4Sv5251p3qz54jSb; Mon, 18 Dec 2023 16:31:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sv5244HMPz3Kws; Mon, 18 Dec 2023 16:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702917116; 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=M75pBLJvwpyt/fkAiHKnNagToPTlx8yPMqm7vVmhXSI=; b=NRLNhPky/c0h69t/RNFLDDrq7IVfREdEQiR3G9sWMVnXjzlL3hrfFu0l2mi8PALcoGYpR0 xY0yIGvNyKB0Dv/k+C1LyHOOZaLhi69BoIfnlsc8RDejjEWtppjNKFWqHCW2wwLbyCF0Li K/2RyIfEiEvGof5FgGSnD6PcCrRatS5bUW12HpgyxW8PYHGpOdz2cTyYdRWnA+5sJC6wKe yjAUcJPZAoAlSEbCfPmjG0xsd32TN9pyYn0TGZx8Z9xPHnYA+CKfSYtSyzlCt10QlXMbHM UAJY5MCsK4+eOPUuHQEiiHSlIF7le1wj+hQF7cUCi2BmdhCzKTvp6r7wFmNCMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702917117; a=rsa-sha256; cv=none; b=B743/gvEg56lPIxJhvzGCnBHuZoejlAqQYgq74qydXgqKZladoLXB2ysOzmMOUu5iWhfD1 e1/jfIx+kM8ZeC2/3ROUaN9gqCQKbkDrUFGd9u/mb276Baw8fyf23VU3e3PDc/toc5TM0m CY5QfD2d9dTGZAlWDmitG1qrtoLwOVzTaNpw+oSNTz7mt/eYMiRZleSCt3aal0BfHy75wP 7QMqPpKU9rjQy4a2W7iUUAXSZJ+Cx5KKVCAS9ZS44WCQL+kLtF2+uJoFvQI2d9sqUXrEh6 Au3Y3L2rm1I6zLb8eD/p5/CWKoq98tLmQACVlIjtHVW3wcxAVqki+epm8yogIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702917117; 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=M75pBLJvwpyt/fkAiHKnNagToPTlx8yPMqm7vVmhXSI=; b=PbdWEqJ2iNU5LJg2PGB5aXjM2usm9zQ915Ek/iHbfoDVrIHIBS03aHm35Gv7SrLypnt4+u 4kFJE58qgKZkiFf35O1XyZ6Lg9Zv7eFuzVfHbNDBuYtNai/PI8pZuQFcsh5VDaKmv+/TCP MaMu20A4WZj2Xtzwdpa0nrALmvjbkiypif0ruWxo2kd01OdQ4frNDe1EwsB+3fs9fCAnov /tE5R4bSyBEWXzSBDg3Oe5HeYet8C4xiFlNQEK574Cq2VO7krBPnsUUa9B2V94wY+Nx42V UhVYLSRXgB0w+y0g50Iw85hP8Bhz+sD6pV9qtt9ur5B64L6CHYbcd8xxeO9+qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sv5241wKwzDJ3; Mon, 18 Dec 2023 16:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BIGVuCZ016582; Mon, 18 Dec 2023 16:31:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BIGVuU4016579; Mon, 18 Dec 2023 16:31:56 GMT (envelope-from git) Date: Mon, 18 Dec 2023 16:31:56 GMT Message-Id: <202312181631.3BIGVuU4016579@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: 4a9eb2b55c70 - main - multimedia/x265: include before 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a9eb2b55c70f3057a82966c77542484ab434373 Auto-Submitted: auto-generated The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a9eb2b55c70f3057a82966c77542484ab434373 commit 4a9eb2b55c70f3057a82966c77542484ab434373 Author: Mikhail Teterin AuthorDate: 2023-12-18 16:28:44 +0000 Commit: Mikhail Teterin CommitDate: 2023-12-18 16:31:48 +0000 multimedia/x265: include before Though it worked on some releases, where another header quietly drags-in the types.h, it was broken on FreeBSD-12.x. Suggested by: John Hein PR: 274526 --- multimedia/x265/files/patch-md5 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/multimedia/x265/files/patch-md5 b/multimedia/x265/files/patch-md5 index 7bc99e1423a3..0c7837b8f9ec 100644 --- a/multimedia/x265/files/patch-md5 +++ b/multimedia/x265/files/patch-md5 @@ -1,15 +1,16 @@ --- source/common/picyuv.h 2023-06-27 10:11:49.000000000 -0400 +++ source/common/picyuv.h 2023-10-22 21:14:09.423270000 -0400 -@@ -26,5 +26,5 @@ +@@ -26,5 +26,6 @@ #include "common.h" -#include "md5.h" ++#include +#include #include "x265.h" struct x265_picyuv {}; --- source/encoder/frameencoder.h 2023-06-27 10:11:49.000000000 -0400 +++ source/encoder/frameencoder.h 2023-10-22 21:14:52.414503000 -0400 -@@ -31,5 +31,4 @@ +@@ -31,5 +31,4 @@ #include "frame.h" #include "picyuv.h" -#include "md5.h" @@ -17,16 +18,17 @@ #include "analysis.h" --- source/encoder/sei.h 2023-06-27 10:11:49.000000000 -0400 +++ source/encoder/sei.h 2023-10-22 21:15:50.862452000 -0400 -@@ -29,5 +29,5 @@ +@@ -29,5 +29,6 @@ #include "slice.h" #include "nal.h" -#include "md5.h" ++#include +#include namespace X265_NS { --- source/encoder/frameencoder.cpp 2023-06-27 10:11:49.000000000 -0400 +++ source/encoder/frameencoder.cpp 2023-10-22 21:27:55.363979000 -0400 -@@ -426,5 +426,5 @@ +@@ -426,5 +426,5 @@ m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5; for (int i = 0; i < planes; i++) - MD5Final(&m_seiReconPictureDigest.m_state[i], m_seiReconPictureDigest.m_digest[i]); @@ -35,7 +37,7 @@ } --- source/CMakeLists.txt 2023-06-27 10:11:49.000000000 -0400 +++ source/CMakeLists.txt 2023-10-22 21:54:36.900303000 -0400 -@@ -96,4 +96,5 @@ +@@ -96,4 +96,5 @@ if(UNIX) list(APPEND PLATFORM_LIBS pthread) + list(APPEND PLATFORM_LIBS md) @@ -43,7 +45,7 @@ if(LIBRT) --- source/common/CMakeLists.txt 2023-06-27 10:11:49.000000000 -0400 +++ source/common/CMakeLists.txt 2023-10-22 21:21:56.177834000 -0400 -@@ -156,5 +156,4 @@ +@@ -156,5 +156,4 @@ threadpool.cpp threadpool.h wavefront.h wavefront.cpp - md5.cpp md5.h