From nobody Tue Feb 11 13:30:37 2025 X-Original-To: dev-commits-ports-branches@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 4Ysj4Z2lYhz5nb08; Tue, 11 Feb 2025 13:30:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ysj4Y4gwyz3xhZ; Tue, 11 Feb 2025 13:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739280637; 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=v8jrbF3hw0bEHgchVsDVPnym/Le2D66vv+8SHO5K2Bc=; b=AXSQ+pyhUeExE16pU+nc12pTr6chgZZLwYpM+ip1e5sfaisYMrUeZLj+L+FZcLHZH3ClVq oidRJBZWzrL4UI/Ls/+nXvMCzKu81PfSI280QjVJlk6ydnP5HgReahJ5wAfYsVXb4blL9E azvx6pxsO8Hc+oajmthXhogpd/BVi4oREKuI0SKurAxgUssEIbHcCdfFqWz3fHzIlu0vJ0 s7gP9vUozbGMdIpEgn9crk7x/dDWUtvQ6znDKd8LHokF8bor8ELLvnQ7jX9fy2lFXAhp0t 2zXkyVcfdCgcpiOrWkG81LExiD65+xUpLbBkwMZNa6cV8CHh8Sui1q979Tfu9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739280637; 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=v8jrbF3hw0bEHgchVsDVPnym/Le2D66vv+8SHO5K2Bc=; b=nRIRqoDiIewSua6JNaIFJeXaOu3GlKtX5gqKFjOc2UvbvP626/MXZW7NpdI0DILQJNUzbe EETFGgMG4mISkL/0MUUZzo3vcRTPMswG/wFv06Fe16EdWAmgZHM673ksGmx7U04mMj4rDI erJt14vn5kNTfErmPailuayPR3uPot2Yn6aI2Q4LrtjJc3XFYkC6WvHtLXt1qstPTPUAiI +Lk9njt1Bg4yDdzgvtqgL3+yZKbamdcRzGfgXQEJ2kitDJZm3ZJoHq6zFQVf7Dw5zhu5vK kPtf04QtPeboMaM/nI8c8k+ln3c7Hhbly83Sq05tUlMGbH4EnpxZLKbMe2NHLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739280637; a=rsa-sha256; cv=none; b=ESnChWV6LCiFUOmQE7+XcaQVCsieXu695hhxbWOTi9UD8T78/kpCcqYGAMIFGa4z+9F/jg 1G+hU8bL7QEDHm5jaBnNRPXh84aIVpHJamzMY15QJtmWzbl4GwuGrlToMiI3Vj90MA44rs qOAET39fCm9KxQnC0AMg8meMajU8jvK2f+X05C+1Q09u2eJ5B4ZtQibso4wyQCMyoTD9Mw iuO+K5devYI8kygHM8h10XohjfuzV1o3rBMm+uzBTZMOzfUOH7wt8R1GAU1mTEId7lHgBj Si9MsdQ6Nfin5dbidfQnPk8/qWLDHE/TFwyk3K8izfTQBx/yr87Davr+1uothA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ysj4Y4HkNz4X; Tue, 11 Feb 2025 13:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BDUbbL075372; Tue, 11 Feb 2025 13:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BDUbtV075369; Tue, 11 Feb 2025 13:30:37 GMT (envelope-from git) Date: Tue, 11 Feb 2025 13:30:37 GMT Message-Id: <202502111330.51BDUbtV075369@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 07a93393cdae - 2025Q1 - graphics/timg: fix build on 32-bit architectures List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 07a93393cdae6e2ee3666d4178d31b0d894826ed Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=07a93393cdae6e2ee3666d4178d31b0d894826ed commit 07a93393cdae6e2ee3666d4178d31b0d894826ed Author: Robert Clausecker AuthorDate: 2025-01-30 13:47:39 +0000 Commit: Robert Clausecker CommitDate: 2025-02-11 13:29:50 +0000 graphics/timg: fix build on 32-bit architectures Add a bunch of missing casts. Approved by: portmgr (build fix blanket) MFH: 2025Q1 (cherry picked from commit bf83a6ced2e0a5be4040df05c400930cffcb042b) --- graphics/timg/Makefile | 3 --- graphics/timg/files/patch-src_timg-time.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/graphics/timg/Makefile b/graphics/timg/Makefile index 798c98bf0721..79f6f8b10af4 100644 --- a/graphics/timg/Makefile +++ b/graphics/timg/Makefile @@ -10,9 +10,6 @@ WWW= https://github.com/hzeller/timg LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= non-constant-expression cannot be narrowed from type 'int64_t' (aka 'long long') to 'long' in initializer list - LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libdeflate.so:archivers/libdeflate \ libexif.so:graphics/libexif \ diff --git a/graphics/timg/files/patch-src_timg-time.h b/graphics/timg/files/patch-src_timg-time.h new file mode 100644 index 000000000000..d25219cb8bcc --- /dev/null +++ b/graphics/timg/files/patch-src_timg-time.h @@ -0,0 +1,19 @@ +--- src/timg-time.h.orig 2025-01-30 13:44:32 UTC ++++ src/timg-time.h +@@ -50,13 +50,13 @@ class Duration { (public) + } + + static constexpr Duration Millis(int64_t ms) { +- return {ms / 1000, (ms % 1000) * 1000000}; ++ return {static_cast(ms / 1000), static_cast((ms % 1000) * 1000000)}; + } + static constexpr Duration Micros(int64_t usec) { +- return {usec / 1000, (usec % 1000000) * 1000}; ++ return {static_cast(usec / 1000), static_cast((usec % 1000000) * 1000)}; + } + static constexpr Duration Nanos(int64_t nanos) { +- return {nanos / 1000000000, nanos % 1000000000}; ++ return {static_cast(nanos / 1000000000), static_cast(nanos % 1000000000)}; + } + static constexpr Duration InfiniteFuture() { + return {1000000000, 0}; // a few years; infinite enough :)