commit: 5144d808593265a34d9765555f2a2d98360ba040 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Mar 4 06:48:38 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <al...@ayaya.dev> +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 <nathbap...@gmail.com> +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 <rich...@hughsie.com> +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)
