public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/
Date: Thu, 13 Apr 2023 01:57:05 +0000 (UTC)	[thread overview]
Message-ID: <1681350967.2c5edaf73d4f2ca6894fff3fbf13088997de98e2.sam@gentoo> (raw)

commit:     2c5edaf73d4f2ca6894fff3fbf13088997de98e2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 01:56:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 01:56:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5edaf7

media-libs/lcms: fix linking with pthread

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../lcms/files/lcms-2.15-pthread-linking.patch     | 25 ++++++++++++++++++++++
 media-libs/lcms/lcms-2.15.ebuild                   |  1 +
 2 files changed, 26 insertions(+)

diff --git a/media-libs/lcms/files/lcms-2.15-pthread-linking.patch b/media-libs/lcms/files/lcms-2.15-pthread-linking.patch
new file mode 100644
index 000000000000..613d43415b3d
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.15-pthread-linking.patch
@@ -0,0 +1,25 @@
+https://github.com/mm2/Little-CMS/commit/1cb1e12fc298b86168ff5606d4ae8d5adb478021
+
+From 1cb1e12fc298b86168ff5606d4ae8d5adb478021 Mon Sep 17 00:00:00 2001
+From: Daniel Engberg <daniel.engberg.lists@pyret.net>
+Date: Sun, 19 Mar 2023 13:19:14 +0100
+Subject: [PATCH] meson: Link pthread library to threaded plugin
+
+Fixes
+```
+cc  -o plugins/threaded/src/liblcms2_threaded.so plugins/threaded/src/liblcms2_threaded.so.p/threaded_core.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_main.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_scheduler.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_split.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group -Wl,-soname,liblcms2_threaded.so -fstack-protector-strong -O2 -pipe -fstack-protector-strong -fno-strict-aliasing '-Wl,-rpath,$ORIGIN/../../../src' -Wl,-rpath-link,/usr/ports/graphics/lcms2/work/lcms2-2.15/_build/src src/liblcms2.so.2.0.15 -Wl,--end-group
+ld: error: undefined symbol: pthread_create
+```
+OS: FreeBSD 13.2-BETA1 (amd64)
+--- a/plugins/threaded/src/meson.build
++++ b/plugins/threaded/src/meson.build
+@@ -21,7 +21,7 @@ liblcms2_threaded = library(
+   'lcms2_threaded',
+   liblcms2_threaded_sources,
+   include_directories: lcms2_threaded_incdir,
+-  dependencies: liblcms2_dep,
++  dependencies: [ liblcms2_dep, threads_dep ],
+   c_args: cargs,
+   install: true,
+ )
+

diff --git a/media-libs/lcms/lcms-2.15.ebuild b/media-libs/lcms/lcms-2.15.ebuild
index 20c12e472a27..d7c7043df029 100644
--- a/media-libs/lcms/lcms-2.15.ebuild
+++ b/media-libs/lcms/lcms-2.15.ebuild
@@ -28,6 +28,7 @@ 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
+	"${FILESDIR}"/${PN}-2.15-pthread-linking.patch
 )
 
 multilib_src_configure() {


             reply	other threads:[~2023-04-13  1:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-13  1:57 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-05 10:09 [gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/files/, media-libs/lcms/ Sam James
2022-08-17 16:21 Matt Turner
2022-02-06 11:22 Sam James
2022-02-03 10:50 Sam James
2018-09-18 18:25 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1681350967.2c5edaf73d4f2ca6894fff3fbf13088997de98e2.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox