From be1d7efe4b2d013134f2df4e7bb9922a4d85735e Mon Sep 17 00:00:00 2001 From: "Z. Liu" Date: Wed, 5 Feb 2025 18:09:47 +0800 Subject: [PATCH] media-libs/libraw: fix undefined symbol: __kmpc_xxx quick workaround, for same reason in media-libs/libsountch upstream fix should be handled in autotools, still working Closes: https://bugs.gentoo.org/881311 Closes: https://bugs.gentoo.org/896220 Closes: https://bugs.gentoo.org/915833 Signed-off-by: Z. Liu Closes: https://github.com/gentoo/gentoo/pull/40444 Signed-off-by: Sam James --- media-libs/libraw/libraw-0.21.1-r1.ebuild | 15 +++++++++++---- media-libs/libraw/libraw-0.21.2.ebuild | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/media-libs/libraw/libraw-0.21.1-r1.ebuild b/media-libs/libraw/libraw-0.21.1-r1.ebuild index 46378358646f2..9c21307b42d25 100644 --- a/media-libs/libraw/libraw-0.21.1-r1.ebuild +++ b/media-libs/libraw/libraw-0.21.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multilib-minimal toolchain-funcs +inherit flag-o-matic multilib-minimal toolchain-funcs MY_PN=LibRaw MY_PV="${PV/_b/-B}" @@ -12,6 +12,7 @@ MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw" SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1 CDDL" # SONAME isn't exactly the same as PV but it does correspond and @@ -28,8 +29,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${MY_P}" - DOCS=( Changelog.txt README.md ) PATCHES=( "${FILESDIR}/${P}-CVE-2023-1729.patch" ) @@ -42,6 +41,14 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } +src_prepare() { + default + + if tc-is-clang && use openmp ; then + append-libs omp + fi +} + multilib_src_configure() { local myeconfargs=( --disable-jasper diff --git a/media-libs/libraw/libraw-0.21.2.ebuild b/media-libs/libraw/libraw-0.21.2.ebuild index 5006501959630..b45f1cb997a45 100644 --- a/media-libs/libraw/libraw-0.21.2.ebuild +++ b/media-libs/libraw/libraw-0.21.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multilib-minimal toolchain-funcs +inherit flag-o-matic multilib-minimal toolchain-funcs MY_PN=LibRaw MY_PV="${PV/_b/-B}" @@ -12,6 +12,7 @@ MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras" HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw" SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1 CDDL" # SONAME isn't exactly the same as PV but it does correspond and @@ -28,8 +29,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${MY_P}" - DOCS=( Changelog.txt README.md ) pkg_pretend() { @@ -40,6 +39,14 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } +src_prepare() { + default + + if tc-is-clang && use openmp ; then + append-libs omp + fi +} + multilib_src_configure() { local myeconfargs=( --disable-jasper