git: ed0b385925b9 - main - multimedia/av1an: unbreak on aarch64/armv[67]/powerpc*
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Dec 2021 21:11:35 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ed0b385925b94634779c0c7cebeeee09048df653
commit ed0b385925b94634779c0c7cebeeee09048df653
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-04 21:08:15 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-04 21:10:49 +0000
multimedia/av1an: unbreak on aarch64/armv[67]/powerpc*
error[E0308]: mismatched types
--> cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs:205:7
|
205 | [[0_i8; AV_ERROR_MAX_STRING_SIZE]; 27];
| ^^^^ expected `u8`, found `i8`
|
help: change the type of the numeric literal from `i8` to `u8`
|
205 | [[0_u8; AV_ERROR_MAX_STRING_SIZE]; 27];
| ~~~~
Reported by: pkg-fallout
---
multimedia/av1an/files/patch-ffmpeg | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/multimedia/av1an/files/patch-ffmpeg b/multimedia/av1an/files/patch-ffmpeg
index ab252a6607ca..b8ab02548b34 100644
--- a/multimedia/av1an/files/patch-ffmpeg
+++ b/multimedia/av1an/files/patch-ffmpeg
@@ -22,6 +22,18 @@ help: a similar name exists in the module
23 | EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, VTIME, ETIMEDOUT, ETXTBSY,
| ~~~~~
+https://github.com/zmwangx/rust-ffmpeg/commit/d5e9f34b6a3c
+
+error[E0308]: mismatched types
+ --> cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs:205:7
+ |
+205 | [[0_i8; AV_ERROR_MAX_STRING_SIZE]; 27];
+ | ^^^^ expected `u8`, found `i8`
+ |
+help: change the type of the numeric literal from `i8` to `u8`
+ |
+205 | [[0_u8; AV_ERROR_MAX_STRING_SIZE]; 27];
+ | ~~~~
--- 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
@@ -39,3 +51,13 @@ help: a similar name exists in the module
EWOULDBLOCK, EXDEV,
};
+@@ -201,8 +201,7 @@ fn index(error: &Error) -> usize {
+ }
+
+ // XXX: the length has to be synced with the number of errors
+-static mut STRINGS: [[c_char; AV_ERROR_MAX_STRING_SIZE]; 27] =
+- [[0_i8; AV_ERROR_MAX_STRING_SIZE]; 27];
++static mut STRINGS: [[c_char; AV_ERROR_MAX_STRING_SIZE]; 27] = [[0; AV_ERROR_MAX_STRING_SIZE]; 27];
+
+ pub fn register_all() {
+ unsafe {