Date: Thu, 6 Jan 2022 23:20:02 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: b1fc025f12d8 - 2022Q1 - multimedia/av1an: unbreak on i386 after fef20e00fa00 Message-ID: <202201062320.206NK26J090026@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1fc025f12d82c386d2612befd13946924373c94 commit b1fc025f12d82c386d2612befd13946924373c94 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-06 22:49:02 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-01-06 23:19:52 +0000 multimedia/av1an: unbreak on i386 after fef20e00fa00 (cherry picked from commit 504f51dcf1ecad8bf988bd87d7bac786d42daebc) --- multimedia/av1an/Makefile | 2 -- multimedia/av1an/files/patch-i386 | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/multimedia/av1an/Makefile b/multimedia/av1an/Makefile index 81a4c3af7cee..cd91c81aa210 100644 --- a/multimedia/av1an/Makefile +++ b/multimedia/av1an/Makefile @@ -8,8 +8,6 @@ COMMENT= Command-line encoding framework with per scene quality LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BROKEN_i386= https://github.com/GuillaumeGomez/sysinfo/issues/668 - BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm diff --git a/multimedia/av1an/files/patch-i386 b/multimedia/av1an/files/patch-i386 new file mode 100644 index 000000000000..9d9253605dea --- /dev/null +++ b/multimedia/av1an/files/patch-i386 @@ -0,0 +1,34 @@ +https://github.com/GuillaumeGomez/sysinfo/pull/669 + +--- cargo-crates/sysinfo-0.22.4/src/freebsd/disk.rs.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/sysinfo-0.22.4/src/freebsd/disk.rs +@@ -62,8 +62,10 @@ unsafe fn refresh_disk(disk: &mut Disk, vfs: &mut libc + if libc::statvfs(disk.c_mount_point.as_ptr() as *const _, vfs) < 0 { + return false; + } +- disk.total_space = vfs.f_blocks * vfs.f_frsize; +- disk.available_space = vfs.f_favail * vfs.f_frsize; ++ let f_frsize: u64 = vfs.f_frsize as _; ++ ++ disk.total_space = vfs.f_blocks * f_frsize; ++ disk.available_space = vfs.f_favail * f_frsize; + true + } + +@@ -125,12 +127,14 @@ pub unsafe fn get_all_disks() -> Vec<Disk> { + let is_removable = + [b"USB", b"usb"].iter().any(|b| b == &fs_type) || fs_type.starts_with(b"/dev/cd"); + ++ let f_frsize: u64 = vfs.f_frsize as _; ++ + disks.push(Disk { + name, + c_mount_point: fs_info.f_mntonname.to_vec(), + mount_point: PathBuf::from(mount_point), +- total_space: vfs.f_blocks * vfs.f_frsize, +- available_space: vfs.f_favail * vfs.f_frsize, ++ total_space: vfs.f_blocks * f_frsize, ++ available_space: vfs.f_favail * f_frsize, + file_system: fs_type.to_vec(), + is_removable, + });
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201062320.206NK26J090026>