From nobody Thu Jan 6 23:20:02 2022 X-Original-To: dev-commits-ports-all@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 86DEF1943F80; Thu, 6 Jan 2022 23:20:03 +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 4JVMl63GvPz4Ttp; Thu, 6 Jan 2022 23:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 36D1D287D2; Thu, 6 Jan 2022 23:20:02 +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 206NK2DZ090029; Thu, 6 Jan 2022 23:20:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206NK26J090026; Thu, 6 Jan 2022 23:20:02 GMT (envelope-from git) Date: Thu, 6 Jan 2022 23:20:02 GMT Message-Id: <202201062320.206NK26J090026@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b1fc025f12d8 - 2022Q1 - multimedia/av1an: unbreak on i386 after fef20e00fa00 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: b1fc025f12d82c386d2612befd13946924373c94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641511202; 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=9gqXJLUyXAbDT7vpPiqRv24gSvFzyS86TCHthCE2vRc=; b=GptBVx5fZ4ZAWZyotykHt4jEFfPsRQGxR5ovS11R3I7zVju01G3KaiahyKrCvO8wMvlJSx nKEg+zcSS9RYqKO2U2kENt9OX9d8fuRm3UY/X9PRCF+y/C0Euk8K5wJGM0dMsoWndhTF28 qhItqllAWM36D9Fh5TmK7LoqZSs3giZIfgp+JMA0gyrzGQVy+4IvAxGCfyX52d7LFQSwki OTvaw9/3MyyvCLuhAHFAwyWynQwcjPjVsRvDl2Z9wbWS/XZ+DEoUaZpmkXMqNNbwAx3vqa ItGqC0HRJg6GuIg8HCz+mC5jnIRI5kL7KxdzPratRiJfNt67BRgvZEEhCqWhNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641511202; a=rsa-sha256; cv=none; b=BNIyDk/DDEQoxSqlcUG61imX2iyxzQA8PzGLXPKMjJgNRvXj5GZ8yIzxHixIty8wY6rVHc Yn+JlN9qup+hBt1T/+Obish89mXnXJZFx3rWj9ZBZjFB6zTvNXvLP9r07nnPJCmG35k2Jl BKVeSg8x1l76ysCe6CEcM0cKwywDuHtSEJuYm87W9EgkLQ7huXdP0EywSr0ri4N28Hxrzt SPVmBJWOkr34QnA7a7Xho69rOn/8ngHd16D2eA2iygB+XndP+fyGvkO9wzIjoQQlDoiVM5 KGhdOdN5dkAYhJgW0ptgnTFIySWvLws/LK+CvxM8oQ+a+hF6HoVGlpdsNOHvdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1fc025f12d82c386d2612befd13946924373c94 commit b1fc025f12d82c386d2612befd13946924373c94 Author: Jan Beich AuthorDate: 2022-01-06 22:49:02 +0000 Commit: Jan Beich 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 { + 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, + });