From nobody Sat Jun 1 22:35:59 2024 X-Original-To: dev-commits-ports-main@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 4VsFFX0M5Sz5LSqN; Sat, 01 Jun 2024 22:36:00 +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 4VsFFW6pkQz3xTL; Sat, 1 Jun 2024 22:35:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717281360; 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=T1U7lLRBUJtxTpUEqH3/ojly2dfSL6/4x5UDSlPvZ1w=; b=nYL1cIYirDbKBk8SOBIxXA/1epwb5Bs7S5m5AXSVB9Yx3DhKr8TNd5QmJZvQvN+qWjkYGB fQ5jv7jLIGAoQT6TK5HYQFahFdfZEPvekYEa1YKDF5qKISxRggYEbBPFYv3YK6QPLc0ZWq WnhjLntGf3yPERPgDN1eQB1Qr7htPfsPvrHN1/TDhd6EEeYOLoDw384MNDnBtPjpq16rCw KDtKXfzhd100dSaO94KpzmBfvWfLauJLRDjoyplSQKa1E6MTYrgcoRsYcc7YHOIis8Wp31 Cl+57CkWCcqXHGRFfekOqOFxYlaEnZtIzsm0vfW8C4c+/DZXfchophT63Xw3Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717281360; a=rsa-sha256; cv=none; b=BNTi438qwfQfbyMkMfdqa3MUCBZ/XYY2s6EH21uGVjufKSvPeNZtC4LLtN3c49rHKerKwM 6v/5PAACCq8G1vKTEVDYlOH5eaTcGAopvjNh0Bmdc3T1dHYCySfhHS8R5nHMOAm58FjQAZ Oiv36G8itvTWmnbzi39MuSb8hV9Zc8Sdht8g2Ij8UcaHtjSA6JmrjriKC8QCqurGqZTk0m b2qfBS0v5K3lFQApvPl/cSFs3rgM/G/vYP1rG9jFhvFxRcGWoz0STpkT4UnkJAuqxz9UDm Mb/PpdQjtfhNHNn88VDA2ji7KJib50+1tMKoOnzcrVXTHmMVjwE3jHBUcYwSkg== 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=1717281360; 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=T1U7lLRBUJtxTpUEqH3/ojly2dfSL6/4x5UDSlPvZ1w=; b=WVQhEfDS7wZdAVA32F3ddACXl7hststBax+FF/H91311sjUdBpJ7svNObFSXqVHzsc0901 RdxLmoBs1nNdrYbeunlQ5PHncbQMtBGJhDlE/reFGSAvdSgnuzp32eeYH8kzqSnYFqrAFO QIhSRzTM1hRavePrN1DwXFVjaFd0lauXG7mQeysI4/WEXsqnHkX5TuzdqijC/vWJoZPbOZ WvQBA67vA/xgwBX1c4CsN2d56mEQ9Ot+PsmAegaMH+o0D7faMwnW8v1iaBM9ZUUR8WxijP X+UVGAIhHfV1gm+9jTBGszFIz5s08IaSwy+a3qD8PDyVVAgMaqvvXWwvGfrABQ== 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 4VsFFW6PrszR3Y; Sat, 1 Jun 2024 22:35:59 +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 451MZxTt004427; Sat, 1 Jun 2024 22:35:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451MZxpc004424; Sat, 1 Jun 2024 22:35:59 GMT (envelope-from git) Date: Sat, 1 Jun 2024 22:35:59 GMT Message-Id: <202406012235.451MZxpc004424@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 334143acb01f - main - multimedia/av1an: unbreak on arch(7) with unsigned char List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 334143acb01f04aed48d296ba57f6c3dbfb5e0c0 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=334143acb01f04aed48d296ba57f6c3dbfb5e0c0 commit 334143acb01f04aed48d296ba57f6c3dbfb5e0c0 Author: Jan Beich AuthorDate: 2024-06-01 22:33:19 +0000 Commit: Jan Beich CommitDate: 2024-06-01 22:35:08 +0000 multimedia/av1an: unbreak on arch(7) with unsigned char --- multimedia/av1an/Makefile | 3 -- multimedia/av1an/files/patch-ffmpeg7-unsigned-char | 55 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/multimedia/av1an/Makefile b/multimedia/av1an/Makefile index e8278788ba5b..63cadf3f69f6 100644 --- a/multimedia/av1an/Makefile +++ b/multimedia/av1an/Makefile @@ -10,9 +10,6 @@ WWW= https://github.com/master-of-zen/Av1an LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BROKEN_aarch64= https://github.com/shssoichiro/ffmpeg-the-third/issues/63 -BROKEN_armv7= https://github.com/shssoichiro/ffmpeg-the-third/issues/63 - BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ diff --git a/multimedia/av1an/files/patch-ffmpeg7-unsigned-char b/multimedia/av1an/files/patch-ffmpeg7-unsigned-char new file mode 100644 index 000000000000..707b9850b80e --- /dev/null +++ b/multimedia/av1an/files/patch-ffmpeg7-unsigned-char @@ -0,0 +1,55 @@ +https://github.com/shssoichiro/ffmpeg-the-third/pull/64 + +--- cargo-crates/ffmpeg-sys-the-third-2.0.0+ffmpeg-7.0/src/avutil/channel_layout.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/ffmpeg-sys-the-third-2.0.0+ffmpeg-7.0/src/avutil/channel_layout.rs +@@ -311,6 +311,7 @@ mod test { + #[cfg(test)] + mod test { + use super::*; ++ use libc::c_char; + + // TODO: Missing: Ambisonic layout + +@@ -330,15 +331,15 @@ mod test { + }; + + // TODO: Replace with cstr literals when MSRV is 1.77 +- const fn c_string(byte_str: &[u8; N]) -> [i8; K] { ++ const fn c_string(byte_str: &[u8; N]) -> [c_char; K] { + // Need at least one NUL byte at the end + assert!(N < K, "input string is too long (max 15 char)"); + +- let mut result = [0i8; K]; ++ let mut result = [0; K]; + let mut i = 0; + + while i < N { +- result[i] = byte_str[i] as i8; ++ result[i] = byte_str[i] as c_char; + i += 1; + } + +--- cargo-crates/ffmpeg-the-third-2.0.1+ffmpeg-7.0/src/util/channel_layout/channel_custom.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/ffmpeg-the-third-2.0.1+ffmpeg-7.0/src/util/channel_layout/channel_custom.rs +@@ -1,3 +1,5 @@ ++use libc::c_char; ++ + use crate::ffi::{AVChannel, AVChannelCustom}; + + use super::Channel; +@@ -30,12 +32,12 @@ impl ChannelCustom { + } + } + +-fn to_char_array(bytes: &[u8]) -> [i8; 16] { +- let mut result = [0i8; 16]; ++fn to_char_array(bytes: &[u8]) -> [c_char; 16] { ++ let mut result = [0; 16]; + + // Only take the first 15 bytes, leaving at least one NUL byte + for (b, r) in bytes.iter().take(15).zip(&mut result) { +- *r = *b as i8; ++ *r = *b as c_char; + } + + result