From nobody Sun Aug 04 12:01:16 2024 X-Original-To: dev-commits-ports-main@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 4WcJ7c70y5z5SCQX; Sun, 04 Aug 2024 12:01:16 +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 4WcJ7c3PLjz4PmW; Sun, 4 Aug 2024 12:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722772876; 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=agvH99Dm/WVF7TCC5hCte6Bygy8kTlvk/1PCQ2Lkd6A=; b=BiSnqxbKVcUUbxeLuEoQUgpxQGWNFJYFKSsQeX892Lg/NQCzJOM0/aRenwc1bQT26UQHte mpOW3BOjrt4g/0HnNvaVeUwSPbI4QD4R+v+FXAwY5dg/3ozB+j8bfZBi43HB4mj/KKHaoW 1gqx5CjgM31CZXNlxi/8qifiYvx/8Bx/TADa9cp8rXpKVTKYicOPBQuMCviZy/wV/LsgaQ ai+avLmeajR/5vgYGtabJ6T23aOczTQaJNBLNvYu7mUs71gPwhULErn8Zn8+t6nfsyJl5L PZlCd2mM7HExQ5op0cdcUPj4Dalh/pXKEsqNwNpxoi3tmp2hIjFaXUcjkRVbOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722772876; a=rsa-sha256; cv=none; b=cyieL5gdBW3Ckhus4sAQRg6e3DYF3pCit3e0hEQ/B5D5D4d1uGNNLkbJbpGfGh6+rf78V1 fJ03iT9dq0cyb8Ly6r4rwYKz9pRzTuAev8qodSkkK+Z1hiXoJB5MClyfeIeIBpnnzxaCBR gH8uzQBMbEv/CDWei5N9RhGO7S98/2IvLic3LAdVtEBnoM3G6bOX/0II1wi/B9k8rp4/U/ 0FowZWZsHlqssOpr4hW/uoO7ND7Xu5c1ZlhGrzZdqWl2+7f73ZZgk3JT+JG7tz5tJm4nfd ICGCMv8O8CWijQzTXCAGFUqVhfqq9SwXjqDd1mHzkaw68+BS+ypxtiKl/DrNEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722772876; 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=agvH99Dm/WVF7TCC5hCte6Bygy8kTlvk/1PCQ2Lkd6A=; b=q+rQNVBpvnWqJuo643zv6AH3o591TeBsDOzSvzUTFHoeOVonRqUsSRRCffXdNjd6d5YvbW Wu6IQnB/09+GLAfndzQbKRe8zZ6GGv1pT5aUXpJFgoYvHiiRj24IkqDi6nGgRccIpt5zYb AFBfUc0wjS+qcCCpyXTbQEGtwMf0NAMoVpxdQwSu8YLJJn/+zmDMRTom8BJgPQAHNIQQjF csoQ5uoMnqnGe4fAYdMkKiGNmfDJmz0ubVcTBZfKXRbmgQjkCEglM73gObAXhGRipgHsMd SeSYi8Qm9sAmP4fPs4rXK0TP+dHHPw3nRSQduQXjnd8FO3aoCHAwfYjXu9p/nA== 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 4WcJ7c31mZzv1G; Sun, 4 Aug 2024 12:01:16 +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 474C1GjY012758; Sun, 4 Aug 2024 12:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474C1GjJ012755; Sun, 4 Aug 2024 12:01:16 GMT (envelope-from git) Date: Sun, 4 Aug 2024 12:01:16 GMT Message-Id: <202408041201.474C1GjJ012755@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 296cae89fb36 - main - graphics/dssim: fix build on big-endian List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 296cae89fb3692e504c53cefe7a4c2886661b9d6 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=296cae89fb3692e504c53cefe7a4c2886661b9d6 commit 296cae89fb3692e504c53cefe7a4c2886661b9d6 Author: Piotr Kubaj AuthorDate: 2024-07-31 08:57:01 +0000 Commit: Piotr Kubaj CommitDate: 2024-08-04 12:00:32 +0000 graphics/dssim: fix build on big-endian Backport https://gitlab.com/kornelski/load_image/-/commit/e8f31164b97ba7b88ff881e8903ec13e5ddaec44 error[E0599]: the method `to_image` exists for mutable reference `&mut [RGB]`, but its trait bounds were not satisfied --> /wrkdirs/usr/ports/graphics/dssim/work/dssim-3.2.4/cargo-crates/load_image-3.0.1/src/jpeg.rs:39:55 | 39 | PixelFormat::RGB24 => pixels.as_rgb_mut().to_image(profile, width, height, true, meta), | ^^^^^^^^ method cannot be called on `&mut [RGB]` due to unsatisfied trait bounds | ::: /wrkdirs/usr/ports/graphics/dssim/work/dssim-3.2.4/cargo-crates/rgb-0.8.34/src/lib.rs:72:1 | 72 | pub struct RGB { | ----------------------------- doesn't satisfy `rgb::RGB: pixel_format::LcmsPixelFormat` | note: trait bound `rgb::RGB: pixel_format::LcmsPixelFormat` was not satisfied --> /wrkdirs/usr/ports/graphics/dssim/work/dssim-3.2.4/cargo-crates/load_image-3.0.1/src/convert.rs:68:25 | 66 | impl ToSRGBImage for [T] | ----------- --- 67 | where T: LcmsPixelFormat + LcmsPixelConversion, 68 | T::Converted: LcmsPixelFormat + Default, | ^^^^^^^^^^^^^^^ unsatisfied trait bound introduced here 69 | T::ConvertedOpaque: LcmsPixelFormat + Default, | ^^^^^^^^^^^^^^^ unsatisfied trait bound introduced here = help: items from traits can only be used if the trait is implemented and in scope note: `convert::ToSRGBImage` defines an item `to_image`, perhaps you need to implement it --> /wrkdirs/usr/ports/graphics/dssim/work/dssim-3.2.4/cargo-crates/load_image-3.0.1/src/convert.rs:43:1 | 43 | pub trait ToSRGBImage { | ^^^^^^^^^^^^^^^^^^^^^ --- ...o-crates_load__image-3.0.1_src_pixel__format.rs | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/graphics/dssim/files/patch-cargo-crates_load__image-3.0.1_src_pixel__format.rs b/graphics/dssim/files/patch-cargo-crates_load__image-3.0.1_src_pixel__format.rs new file mode 100644 index 000000000000..24a9e9854993 --- /dev/null +++ b/graphics/dssim/files/patch-cargo-crates_load__image-3.0.1_src_pixel__format.rs @@ -0,0 +1,27 @@ +--- cargo-crates/load_image-3.0.1/src/pixel_format.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/load_image-3.0.1/src/pixel_format.rs +@@ -49,24 +49,16 @@ pixel_format!{GrayAlpha, PixelFormat::GRAYA_8, Col + pixel_format!{RGBA8, PixelFormat::RGBA_8, ColorSpaceSignature::RgbData } + pixel_format!{Gray, PixelFormat::GRAY_8, ColorSpaceSignature::GrayData } + pixel_format!{GrayAlpha, PixelFormat::GRAYA_8, ColorSpaceSignature::GrayData } +-#[cfg(target_endian = "little")] + pixel_format!{RGB16, PixelFormat::RGB_16, ColorSpaceSignature::RgbData } +-#[cfg(target_endian = "little")] + pixel_format!{RGBA16, PixelFormat::RGBA_16, ColorSpaceSignature::RgbData } +-#[cfg(target_endian = "little")] + pixel_format!{Gray, PixelFormat::GRAY_16, ColorSpaceSignature::GrayData } +-#[cfg(target_endian = "little")] + pixel_format!{GrayAlpha, PixelFormat::GRAYA_16, ColorSpaceSignature::GrayData } + + pixel_conversion!{RGB8 => RGB16, RGB16} + pixel_conversion!{RGBA8 => RGBA16, RGB16} + pixel_conversion!{Gray => Gray, Gray} + pixel_conversion!{GrayAlpha => GrayAlpha, Gray} +-#[cfg(target_endian = "little")] + pixel_conversion!{RGB16 => RGB16, RGB16} +-#[cfg(target_endian = "little")] + pixel_conversion!{RGBA16 => RGBA16, RGB16} +-#[cfg(target_endian = "little")] + pixel_conversion!{Gray => Gray, Gray} +-#[cfg(target_endian = "little")] + pixel_conversion!{GrayAlpha => GrayAlpha, Gray}