From nobody Fri Jun 24 18:38:53 2022 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 08C1487CE5F; Fri, 24 Jun 2022 18:38:54 +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 4LV5Vj4TGzz4Rkc; Fri, 24 Jun 2022 18:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656095933; 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=8qkV55ZZc4vwpsYV2XnRjYOnK+ljS6GDMILCbVCLs3A=; b=HCkBb9qMWDo/ahGC0nwq3p+lS5dQJbSgZCXnZ4NlkLY8xd5zLrS/rPdaA1mjxycSCWEKrP 1hmhS/a3m/abVplKNk9jDBYg8cdlj5H1fUIMt/fKqQ8BIff+r0d3tZpe8cjmcUvQ83awRW lQMRXgkyYArJeIRsYLqj5XnENQ/ivkYXNYS9FwiRbpJS6ijJKdVsDeVj5AMs3kZzzwuAP4 wu3oRMmPcYRFh5ljhT/3UPt2G3Tqj2B5mjUMe0c7fqQLO+RVND6z/123SZMQkB7rexZKB+ E3SuFuDk77U3LIshORCHMi/8nD4M24kPk1pD66l7SkPm2tBiZ+jnqLwp+t6yCw== 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 7157415251; Fri, 24 Jun 2022 18:38:53 +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 25OIcrfp001891; Fri, 24 Jun 2022 18:38:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OIcr5A001890; Fri, 24 Jun 2022 18:38:53 GMT (envelope-from git) Date: Fri, 24 Jun 2022 18:38:53 GMT Message-Id: <202206241838.25OIcr5A001890@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: c8cc97dbaae8 - main - x11/kickoff: fix build on big-endian architectures 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: c8cc97dbaae84014e481da2bcb3b52e3f3d562c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656095933; 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=8qkV55ZZc4vwpsYV2XnRjYOnK+ljS6GDMILCbVCLs3A=; b=q5riBxm3fEtB96YoCQdQsEuANcgU3DM2PSbfLAbzhL4R8LQap6sqchYNVp54fudZ1w3sDd LZtXsHpWJoQFpDeAE2Esrc/KHFSP6g6Vx7u/lutPithU8yEnIOKhA4R8Z2KO/0HuouMPdb cLkKp+fVTFpcZzHyOBwQCdLsLvofFjqHCntHBkLVmZ8ihn9H1Uy19W5/U6xdjafl9H4ivX 9A5QX+Nu98cQSwvGhSy8YaD7jovUJLZsrPLVHhChA1VSLxD72dbSyUpQZ5umLV/rKaWZzq u2hbP3IT/so9uKzvYk/5C1wzdsQ6EZxn7XDOffTbHJS/zmajzWL9pUgIJHLy4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656095933; a=rsa-sha256; cv=none; b=wXPpHPvKlVhg820a9NzoGhsQV4oQsm+Gmd8zeaK5WOoT0DjxdYNT0YgH4+uuDNbjcCyizb 23gvHcFKuc83mZ2ysCc74IodKSxQQhSOmAMQDGEMfLmNuSlej+y3KH5WsixhPPGYm+W7y5 /+ikXugTojWT9vVsWnE6NAEDmNYgWAVmWRImIgmjM/zdo4CV59W8deYlsYg3agaNzTp4oT +aT9lc2XTWRLzvrWDiC5BdGjzqEKBM2+3Sqg0aeAggUTtlkpMX9dGZYX2n39qMx01rkrtU QNTpqaPE1b6A189qg+FvnIVBoi0ntrK8js1s8N+534LuC40k3DqJHiVBvD675w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8cc97dbaae84014e481da2bcb3b52e3f3d562c7 commit c8cc97dbaae84014e481da2bcb3b52e3f3d562c7 Author: Piotr Kubaj AuthorDate: 2022-06-24 18:36:37 +0000 Commit: Piotr Kubaj CommitDate: 2022-06-24 18:38:36 +0000 x11/kickoff: fix build on big-endian architectures Backport https://github.com/image-rs/image/commit/ed8337afc795571795482882236acf14196e10db to fix build. Approved by: Tier 2 blanket --- .../patch-cargo-crates_image-0.24.2_Cargo.toml | 11 +++++++++++ ...cargo-crates_image-0.24.2_src_codecs_openexr.rs | 11 +++++++++++ .../patch-cargo-crates_image-0.24.2_src_image.rs | 22 ++++++++++++++++++++++ ...o-crates_image-0.24.2_src_io_free__functions.rs | 22 ++++++++++++++++++++++ .../patch-cargo-crates_image-0.24.2_src_lib.rs | 12 ++++++++++++ 5 files changed, 78 insertions(+) diff --git a/x11/kickoff/files/patch-cargo-crates_image-0.24.2_Cargo.toml b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_Cargo.toml new file mode 100644 index 000000000000..493e1258c9b5 --- /dev/null +++ b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_Cargo.toml @@ -0,0 +1,11 @@ +--- cargo-crates/image-0.24.2/Cargo.toml.orig 1970-01-01 00:00:01 UTC ++++ cargo-crates/image-0.24.2/Cargo.toml +@@ -60,7 +60,7 @@ optional = true + version = "0.4.0" + optional = true + +-[dependencies.exr] ++[target.'cfg(target_endian = "little")'.dependencies.exr] + version = "1.4.2" + optional = true + diff --git a/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_codecs_openexr.rs b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_codecs_openexr.rs new file mode 100644 index 000000000000..7809869caacc --- /dev/null +++ b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_codecs_openexr.rs @@ -0,0 +1,11 @@ +--- cargo-crates/image-0.24.2/src/codecs/openexr.rs.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/image-0.24.2/src/codecs/openexr.rs +@@ -20,8 +20,6 @@ + //! - meta data is lost + //! - dwaa/dwab compressed images not supported yet by the exr library + //! - (chroma) subsampling not supported yet by the exr library +- +-extern crate exr; + use exr::prelude::*; + + use crate::error::{DecodingError, EncodingError, ImageFormatHint}; diff --git a/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_image.rs b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_image.rs new file mode 100644 index 000000000000..0411aa804519 --- /dev/null +++ b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_image.rs @@ -0,0 +1,22 @@ +--- cargo-crates/image-0.24.2/src/image.rs.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/image-0.24.2/src/image.rs +@@ -290,7 +290,8 @@ pub enum ImageOutputFormat { + /// An Image in TGA Format + Tga, + +- #[cfg(feature = "openexr")] ++ #[cfg(feature = "exr")] ++ #[cfg(target_endian = "little")] + /// An Image in OpenEXR Format + OpenExr, + +@@ -327,7 +328,8 @@ impl From for ImageOutputFormat { + ImageFormat::Farbfeld => ImageOutputFormat::Farbfeld, + #[cfg(feature = "tga")] + ImageFormat::Tga => ImageOutputFormat::Tga, +- #[cfg(feature = "openexr")] ++ #[cfg(feature = "exr")] ++ #[cfg(target_endian = "little")] + ImageFormat::OpenExr => ImageOutputFormat::OpenExr, + #[cfg(feature = "tiff")] + ImageFormat::Tiff => ImageOutputFormat::Tiff, diff --git a/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_io_free__functions.rs b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_io_free__functions.rs new file mode 100644 index 000000000000..464899d7a12f --- /dev/null +++ b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_io_free__functions.rs @@ -0,0 +1,22 @@ +--- cargo-crates/image-0.24.2/src/io/free_functions.rs.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/image-0.24.2/src/io/free_functions.rs +@@ -72,7 +72,8 @@ pub(crate) fn load_decoder visitor.visit_decoder(ico::IcoDecoder::new(r)?), + #[cfg(feature = "hdr")] + image::ImageFormat::Hdr => visitor.visit_decoder(hdr::HdrAdapter::new(BufReader::new(r))?), +- #[cfg(feature = "openexr")] ++ #[cfg(feature = "exr")] ++ #[cfg(target_endian = "little")] + image::ImageFormat::OpenExr => visitor.visit_decoder(openexr::OpenExrDecoder::new(r)?), + #[cfg(feature = "pnm")] + image::ImageFormat::Pnm => visitor.visit_decoder(pnm::PnmDecoder::new(r)?), +@@ -230,7 +231,8 @@ pub(crate) fn write_buffer_impl { + tga::TgaEncoder::new(buffered_write).write_image(buf, width, height, color) + } +- #[cfg(feature = "openexr")] ++ #[cfg(feature = "exr")] ++ #[cfg(target_endian = "little")] + ImageOutputFormat::OpenExr => { + openexr::OpenExrEncoder::new(buffered_write).write_image(buf, width, height, color) + } diff --git a/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_lib.rs b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_lib.rs new file mode 100644 index 000000000000..c5a56924cdd3 --- /dev/null +++ b/x11/kickoff/files/patch-cargo-crates_image-0.24.2_src_lib.rs @@ -0,0 +1,12 @@ +--- cargo-crates/image-0.24.2/src/lib.rs.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/image-0.24.2/src/lib.rs +@@ -234,7 +234,8 @@ pub mod codecs { + pub mod ico; + #[cfg(feature = "jpeg")] + pub mod jpeg; +- #[cfg(feature = "openexr")] ++ #[cfg(feature = "exr")] ++ #[cfg(target_endian = "little")] + pub mod openexr; + #[cfg(feature = "png")] + pub mod png;