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 @@ -1,41 +1,63 @@ https://github.com/zmwangx/rust-ffmpeg/issues/63 error[E0432]: unresolved imports `libc::ENODATA`, `libc::ENOSR`, `libc::ENOSTR`, `libc::ETIME` --> cargo-crates/ffmpeg-next-4.4.0/src/util/error.rs:20:22 | 20 | ENFILE, ENOBUFS, ENODATA, ENODEV, ENOENT, ENOEXEC, ENOLCK, ENOLINK, ENOMEM, ENOMSG, | ^^^^^^^ no `ENODATA` in the root 21 | ENOPROTOOPT, ENOSPC, ENOSR, ENOSTR, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE, | ^^^^^ ^^^^^^ no `ENOSTR` in the root | | | no `ENOSR` in the root 22 | ENOTSOCK, ENOTSUP, ENOTTY, ENXIO, EOPNOTSUPP, EOVERFLOW, EOWNERDEAD, EPERM, EPIPE, EPROTO, 23 | EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, ETIME, ETIMEDOUT, ETXTBSY, | ^^^^^ no `ETIME` in the root | help: a similar name exists in the module | 21 | ENOPROTOOPT, ENOSPC, ENOSR, NOSTR, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE, | ~~~~~ 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 @@ -17,10 +17,10 @@ pub use libc::{ EBUSY, ECANCELED, ECHILD, ECONNABORTED, ECONNREFUSED, ECONNRESET, EDEADLK, EDESTADDRREQ, EDOM, EEXIST, EFAULT, EFBIG, EHOSTUNREACH, EIDRM, EILSEQ, EINPROGRESS, EINTR, EINVAL, EIO, EISCONN, EISDIR, ELOOP, EMFILE, EMLINK, EMSGSIZE, ENAMETOOLONG, ENETDOWN, ENETRESET, ENETUNREACH, - ENFILE, ENOBUFS, ENODATA, ENODEV, ENOENT, ENOEXEC, ENOLCK, ENOLINK, ENOMEM, ENOMSG, - ENOPROTOOPT, ENOSPC, ENOSR, ENOSTR, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE, + ENFILE, ENOBUFS, ENODEV, ENOENT, ENOEXEC, ENOLCK, ENOLINK, ENOMEM, ENOMSG, + ENOPROTOOPT, ENOSPC, ENOSYS, ENOTCONN, ENOTDIR, ENOTEMPTY, ENOTRECOVERABLE, ENOTSOCK, ENOTSUP, ENOTTY, ENXIO, EOPNOTSUPP, EOVERFLOW, EOWNERDEAD, EPERM, EPIPE, EPROTO, - EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, ETIME, ETIMEDOUT, ETXTBSY, + EPROTONOSUPPORT, EPROTOTYPE, ERANGE, EROFS, ESPIPE, ESRCH, ETIMEDOUT, ETXTBSY, 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 {