From nobody Sun Feb 20 13:37:03 2022 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 3B2A019E633D; Sun, 20 Feb 2022 13:37:04 +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 4K1mgh1B9nz3Cql; Sun, 20 Feb 2022 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645364224; 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=fxnPInM4rLnKVcGKXHUlFvO/qMmBhXF8eqGZC6Zfx9k=; b=Cnae0/7F3qqH9JVAttylA8HM9J4ZQ7D3ErkzE1APKng19GAFeBYjMwCOXHgUtwzsXmvY6Z NuTJ3UnRXTMSlL6Fs2Evc+ZN6Wc+/HjepsunI5pM5dvXBA4ZTMmGjprd/QaXzQmt6pKRLH E4fAiNss6lMKs431a95t3cNoQgHm37SoUVNvXZ9IMOD0i0+TTFdOc5D9KneIJBwJftEkyT q6+nQk9Z05xXdg7U0rp2rXZ3RNuTc8Zjddr779PNkOK5bCDEQKOD7nO7dOj7NcvOCrEw7P WoLpUXL5ioI54xq2D0a81ny0azIEf5JnxzYlgyU7iX+TVdYN0GoVf4ru3Er1mA== 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 055151D837; Sun, 20 Feb 2022 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21KDb3D0038643; Sun, 20 Feb 2022 13:37:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KDb394038642; Sun, 20 Feb 2022 13:37:03 GMT (envelope-from git) Date: Sun, 20 Feb 2022 13:37:03 GMT Message-Id: <202202201337.21KDb394038642@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: e337ba9d6725 - main - multimedia/av1an: merge ffmpeg fix from f6e17b1726ba into one file 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: e337ba9d6725bb7950c83e26453c7a499218e440 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645364224; 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=fxnPInM4rLnKVcGKXHUlFvO/qMmBhXF8eqGZC6Zfx9k=; b=lhMVXzkmpdoHOcvAOu5S74Nupd5QkmXX8q2ojI3LW0qYJQx9vWm/0YyOqtMNL4zR8z6uuu +nlZkxxwJGABnQuoQ791ikFvlnFpCFe+rxrkpZb6TM0o5vJExc0JLaJ1ZuJc+8Be3VbiT4 odj5H34Rw04Keb1V3QqENHhY7jWvH4H5NOJJce+xfqfIfygzewiArT0PBuQcpzeXA5Mv8W u85WXhqw77Fr+A2udjThk8tyai72IaSfkdfj327lHxU3AT17m+yA3wblUPz/NGaa4UlxRz 5bpj8BUHZlKFCCTBsS1qnFUTLFrkxv+1d4MpXaPgmNWBRAPut5aCUOo26EBrDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645364224; a=rsa-sha256; cv=none; b=otfWF2xMtySWAZYSpGVhBmXTzAajvciASV8s9+OKtOEiY0Bo06wVvTWU+k5qsQKy44AeYu +fnESj8qYSoCY0WHVzFro5g0PSWkcNKD3QaO/l5rocmOQcvhUq7Q8fZZMJK+icvFu5VJ6i qgrTn9PMMl5VblNeNvK4l1owvijBk7YByqgyb7Vm7Z9kEVx3XVhqdT1y1WW310VH3BRqqc FUiCy/5Dg7PvoAB8nirknJMo4JewBCixu9rGEdZTYY5JNmGkROVlqSBeJ+i+KQnBWr6pRl 63Dgd71y8bGzmHZ3yaVPQjWBbo/RkZAmpmPAuodzRDmzN/IUsGD4JRZBKf2zUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e337ba9d6725bb7950c83e26453c7a499218e440 commit e337ba9d6725bb7950c83e26453c7a499218e440 Author: Jan Beich AuthorDate: 2022-02-20 13:24:00 +0000 Commit: Jan Beich CommitDate: 2022-02-20 13:36:10 +0000 multimedia/av1an: merge ffmpeg fix from f6e17b1726ba into one file In my Rust-based ports patches are usually split "by topic" (large changes) or "by crate" (many small changes). The important details are "whether/when it landed upstream?" and "what error is being fixed?" --- ...ates_ffmpeg-sys-next-4.4.0_src_avutil_pixfmt.rs | 10 ---------- multimedia/av1an/files/patch-ffmpeg | 23 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/multimedia/av1an/files/patch-cargo-crates_ffmpeg-sys-next-4.4.0_src_avutil_pixfmt.rs b/multimedia/av1an/files/patch-cargo-crates_ffmpeg-sys-next-4.4.0_src_avutil_pixfmt.rs deleted file mode 100644 index b567c08cd69f..000000000000 --- a/multimedia/av1an/files/patch-cargo-crates_ffmpeg-sys-next-4.4.0_src_avutil_pixfmt.rs +++ /dev/null @@ -1,10 +0,0 @@ ---- cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs.orig 2022-01-03 20:02:01 UTC -+++ cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs -@@ -35,6 +35,7 @@ pub const AV_PIX_FMT_BGR555: AVPixelFormat = AV_PIX_FM - #[cfg(target_endian = "little")] - pub const AV_PIX_FMT_BGR444: AVPixelFormat = AV_PIX_FMT_BGR444LE; - -+#[cfg(target_endian = "little")] - pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9LE; - #[cfg(target_endian = "little")] - pub const AV_PIX_FMT_YUV422P9: AVPixelFormat = AV_PIX_FMT_YUV422P9LE; diff --git a/multimedia/av1an/files/patch-ffmpeg b/multimedia/av1an/files/patch-ffmpeg index b8ab02548b34..a6972269c04d 100644 --- a/multimedia/av1an/files/patch-ffmpeg +++ b/multimedia/av1an/files/patch-ffmpeg @@ -35,6 +35,19 @@ help: change the type of the numeric literal from `i8` to `u8` 205 | [[0_u8; AV_ERROR_MAX_STRING_SIZE]; 27]; | ~~~~ +https://github.com/zmwangx/rust-ffmpeg-sys/commit/b9382c010ab2 + +error[E0428]: the name `AV_PIX_FMT_YUV420P9` is defined multiple times + --> cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs:155:1 + | +38 | pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9LE; + | --------------------------------------------------------------------- previous definition of the value `AV_PIX_FMT_YUV420P9` here +... +155 | pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9BE; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `AV_PIX_FMT_YUV420P9` redefined here + | + = note: `AV_PIX_FMT_YUV420P9` must be defined only once in the value namespace of this module + --- cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs.orig 1970-01-01 00:00:00 UTC +++ cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs @@ -17,10 +17,10 @@ pub use libc::{ @@ -61,3 +74,13 @@ help: change the type of the numeric literal from `i8` to `u8` pub fn register_all() { unsafe { +--- cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/ffmpeg-sys-next-4.4.0/src/avutil/pixfmt.rs +@@ -35,6 +35,7 @@ pub const AV_PIX_FMT_BGR555: AVPixelFormat = AV_PIX_FM + #[cfg(target_endian = "little")] + pub const AV_PIX_FMT_BGR444: AVPixelFormat = AV_PIX_FMT_BGR444LE; + ++#[cfg(target_endian = "little")] + pub const AV_PIX_FMT_YUV420P9: AVPixelFormat = AV_PIX_FMT_YUV420P9LE; + #[cfg(target_endian = "little")] + pub const AV_PIX_FMT_YUV422P9: AVPixelFormat = AV_PIX_FMT_YUV422P9LE;