From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1715660-garchives=archives.gentoo.org@lists.gentoo.org>
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 finch.gentoo.org (Postfix) with ESMTPS id 588AF158B20
	for <garchives@archives.gentoo.org>; Fri, 07 Feb 2025 17:50:37 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
	(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)
	(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
	by smtp.gentoo.org (Postfix) with ESMTPSA id 45948343097
	for <garchives@archives.gentoo.org>; Fri, 07 Feb 2025 17:50:37 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
	by bobolink.gentoo.org (Postfix) with ESMTP id 70A02110473;
	Fri, 07 Feb 2025 17:50:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 bobolink.gentoo.org (Postfix) with ESMTPS id 5DF97110471
	for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 17:50:30 +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) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 09731343051
	for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 17:50:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A8062693
	for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 17:50:28 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1738950561.be1d7efe4b2d013134f2df4e7bb9922a4d85735e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/libraw/libraw-0.21.1-r1.ebuild media-libs/libraw/libraw-0.21.2.ebuild
X-VCS-Directories: media-libs/libraw/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: be1d7efe4b2d013134f2df4e7bb9922a4d85735e
X-VCS-Branch: master
Date: Fri, 07 Feb 2025 17:50:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 90da5e08-ace1-4841-b590-a49032855d48
X-Archives-Hash: c5f3f260354ceeb30589df0778c217a5

commit:     be1d7efe4b2d013134f2df4e7bb9922a4d85735e
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Wed Feb  5 10:09:47 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  7 17:49:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1d7efe

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 <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40444
Signed-off-by: Sam James <sam <AT> gentoo.org>

 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 46378358646f..9c21307b42d2 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 500650195963..b45f1cb997a4 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