From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C82E15802F for ; Sat, 4 Mar 2023 07:18:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC115E0920; Sat, 4 Mar 2023 07:18:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A373DE0920 for ; Sat, 4 Mar 2023 07:18:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4FCD341230 for ; Sat, 4 Mar 2023 07:18:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66C38865 for ; Sat, 4 Mar 2023 07:18:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1677914280.5144d808593265a34d9765555f2a2d98360ba040.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/, media-libs/lcms/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/lcms/files/lcms-2.15-meson-big-endian.patch media-libs/lcms/files/lcms-2.15-meson-psicc-man-page.patch media-libs/lcms/files/lcms-2.15-meson-samples.patch media-libs/lcms/lcms-2.15.ebuild X-VCS-Directories: media-libs/lcms/ media-libs/lcms/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5144d808593265a34d9765555f2a2d98360ba040 X-VCS-Branch: master Date: Sat, 4 Mar 2023 07:18:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 454c2178-adf4-4095-b7df-c7b7b9485a1c X-Archives-Hash: 373224805642f66ef53f21a79c803e04 commit: 5144d808593265a34d9765555f2a2d98360ba040 Author: Sam James gentoo org> AuthorDate: Sat Mar 4 06:48:38 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 4 07:18:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5144d808 media-libs/lcms: backpot build fixes to 2.15 Signed-off-by: Sam James gentoo.org> .../lcms/files/lcms-2.15-meson-big-endian.patch | 21 +++++++++++++++++ .../files/lcms-2.15-meson-psicc-man-page.patch | 15 +++++++++++++ .../lcms/files/lcms-2.15-meson-samples.patch | 26 ++++++++++++++++++++++ media-libs/lcms/lcms-2.15.ebuild | 6 +++++ 4 files changed, 68 insertions(+) diff --git a/media-libs/lcms/files/lcms-2.15-meson-big-endian.patch b/media-libs/lcms/files/lcms-2.15-meson-big-endian.patch new file mode 100644 index 000000000000..a40690862d6b --- /dev/null +++ b/media-libs/lcms/files/lcms-2.15-meson-big-endian.patch @@ -0,0 +1,21 @@ +https://github.com/mm2/Little-CMS/pull/360 + +From 4e55c55802e4aee5f65be120291f5f4785483d98 Mon Sep 17 00:00:00 2001 +From: psykose +Date: Thu, 2 Mar 2023 02:22:01 +0000 +Subject: [PATCH] meson: fix big endian cargs + +otherwise they are a string and appending with + [""] +later fails in +plugins/fast_float/testbed/meson.build:5:0: ERROR: The `+` operator of str does not accept objects of type list (['-DPROFILES_DIR="/home/buildozer/aports/main/lcms2/src/lcms2-2.15/plugins/test_profiles/"']) +--- a/meson.build ++++ b/meson.build +@@ -27,7 +27,7 @@ if cc.has_function_attribute('visibility:hidden') + endif + + if host_machine.endian() == 'big' +- cargs = '-DWORDS_BIGENDIAN=1' ++ cargs += '-DWORDS_BIGENDIAN=1' + endif + + diff --git a/media-libs/lcms/files/lcms-2.15-meson-psicc-man-page.patch b/media-libs/lcms/files/lcms-2.15-meson-psicc-man-page.patch new file mode 100644 index 000000000000..665f53d8a594 --- /dev/null +++ b/media-libs/lcms/files/lcms-2.15-meson-psicc-man-page.patch @@ -0,0 +1,15 @@ +https://github.com/mm2/Little-CMS/pull/361 + +From a88767e99bc1b856946229796faf780ec2d5cbef Mon Sep 17 00:00:00 2001 +From: Biswapriyo Nath +Date: Thu, 2 Mar 2023 15:16:45 +0530 +Subject: [PATCH] meson: Install psicc man page + +--- a/utils/psicc/meson.build ++++ b/utils/psicc/meson.build +@@ -12,3 +12,5 @@ psicc_exe = executable( + psicc_man = files( + 'psicc.1', + ) ++ ++install_man(psicc_man) diff --git a/media-libs/lcms/files/lcms-2.15-meson-samples.patch b/media-libs/lcms/files/lcms-2.15-meson-samples.patch new file mode 100644 index 000000000000..0b451c3922ef --- /dev/null +++ b/media-libs/lcms/files/lcms-2.15-meson-samples.patch @@ -0,0 +1,26 @@ +https://github.com/mm2/Little-CMS/pull/362 + +From 8849dd87ae44216b56c48db2b441f3906e085596 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Thu, 2 Mar 2023 11:54:46 +0000 +Subject: [PATCH] Fix compiling the samples using meson + +--- a/utils/samples/meson.build ++++ b/utils/samples/meson.build +@@ -5,7 +5,7 @@ wtpt_srcs = files( + wtpt_exe = executable( + 'wtpt', + wtpt_srcs, +- dependencies: [liblcms2_dep, common_dep], ++ dependencies: [liblcms2_dep, common_dep, m_dep], + ) + + wtpt_man = files( +@@ -28,6 +28,6 @@ foreach exe, srcs : examples + executable( + exe, + srcs, +- dependencies: [liblcms2_dep], ++ dependencies: [liblcms2_dep, m_dep], + ) + endforeach diff --git a/media-libs/lcms/lcms-2.15.ebuild b/media-libs/lcms/lcms-2.15.ebuild index 4cd2c96a2439..20c12e472a27 100644 --- a/media-libs/lcms/lcms-2.15.ebuild +++ b/media-libs/lcms/lcms-2.15.ebuild @@ -24,6 +24,12 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-2.15-meson-big-endian.patch + "${FILESDIR}"/${PN}-2.15-meson-samples.patch + "${FILESDIR}"/${PN}-2.15-meson-psicc-man-page.patch +) + multilib_src_configure() { local emesonargs=( -Ddefault_library=$(multilib_native_usex static-libs both shared)