From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
Date: Sun, 26 Jun 2022 20:09:52 +0000 (UTC) [thread overview]
Message-ID: <1656274105.1ff80614a9657203b3d50042bd266e7e90f6812f.sam@gentoo> (raw)
commit: 1ff80614a9657203b3d50042bd266e7e90f6812f
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Sun Jun 26 19:14:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 20:08:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff80614
media-libs/mlt: fix build for musl
There is no gurantee that either HAVE_STRTOD_L or HAVE_LOCALE_H will be
defined at compile-time. Try for example building this project :)
The locale usage is now defined in POSIX and therefore we can now
assume it will be available on Linux, except for ancient systems.
https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/locale.h.html
Another way of dealing with this would be to have a global mlt_config.h
where HAVE_LOCALE_H and HAVE_STRTOD_L are defined to values determined
when mlt is installed.
See-also:
https://git.alpinelinux.org/aports/tree/community/mlt/musl-locale.patch, https://github.com/mltframework/mlt/pull/803
Closes: https://bugs.gentoo.org/829608
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/26083
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mlt/files/mlt-7.8.0-linux_locale_h.patch | 37 ++++++++++++++++++++++
media-libs/mlt/mlt-7.8.0.ebuild | 1 +
2 files changed, 38 insertions(+)
diff --git a/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch b/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch
new file mode 100644
index 000000000000..43822c446654
--- /dev/null
+++ b/media-libs/mlt/files/mlt-7.8.0-linux_locale_h.patch
@@ -0,0 +1,37 @@
+From 7d82553a00e74af77e69cc74645e0a3ec6bb3aa1 Mon Sep 17 00:00:00 2001
+From: alfredfo <98554039+alfredfo@users.noreply.github.com>
+Date: Sat, 25 Jun 2022 01:00:11 +0000
+Subject: [PATCH] Fix building for musl (#803)
+
+reverts: https://github.com/mltframework/mlt/pull/298.
+There is no gurantee that either HAVE_STRTOD_L or HAVE_LOCALE_H will be
+defined at compile-time. Try for example building this project :)
+
+The locale usage is now defined in POSIX and therefore we can now
+assume it will be available on Linux, except for ancient systems.
+https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/locale.h.html
+
+Another way of dealing with this would be to have a global mlt_config.h
+where HAVE_LOCALE_H and HAVE_STRTOD_L are defined to values determined
+when mlt is installed.
+
+https://git.alpinelinux.org/aports/tree/community/mlt/musl-locale.patch
+https://bugs.gentoo.org/829608
+https://github.com/mltframework/mlt/pull/803
+---
+ src/framework/mlt_property.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 85d550ac0..be61c23c2 100644
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -30,7 +30,7 @@
+ #include <sys/param.h>
+ #endif
+
+-#if (defined(__GLIBC__) && !defined(__APPLE__)) || defined(HAVE_LOCALE_H)
++#if (defined(__linux__) && !defined(__APPLE__))
+ # include <locale.h>
+ #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 900506)
+ # include <xlocale.h>
diff --git a/media-libs/mlt/mlt-7.8.0.ebuild b/media-libs/mlt/mlt-7.8.0.ebuild
index 0415d23c4499..badcf2ff5bcd 100644
--- a/media-libs/mlt/mlt-7.8.0.ebuild
+++ b/media-libs/mlt/mlt-7.8.0.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
+ "${FILESDIR}"/${PN}-7.8.0-linux_locale_h.patch
)
pkg_setup() {
next reply other threads:[~2022-06-26 20:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-26 20:09 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-31 15:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/ Andreas Sturmlechner
2024-08-15 19:40 Andreas Sturmlechner
2023-08-20 14:49 Andreas Sturmlechner
2021-11-29 14:51 Andreas Sturmlechner
2021-01-27 19:54 Andreas Sturmlechner
2020-11-02 14:14 Andreas Sturmlechner
2020-07-01 18:45 Andreas Sturmlechner
2020-06-30 21:44 Andreas Sturmlechner
2020-06-30 21:44 Andreas Sturmlechner
2020-06-30 21:44 Andreas Sturmlechner
2020-04-21 9:22 Andreas Sturmlechner
2019-07-22 12:18 Andreas Sturmlechner
2019-06-29 21:34 Andreas Sturmlechner
2018-09-07 20:34 Andreas Sturmlechner
2018-07-22 21:50 Andreas Sturmlechner
2018-07-22 21:50 Andreas Sturmlechner
2017-10-28 20:50 Andreas Hüttel
2017-08-05 11:54 Andreas Sturmlechner
2016-08-21 20:08 Michael Palimaka
2016-06-23 15:12 Michael Palimaka
2015-08-19 14:19 Michael Palimaka
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=1656274105.1ff80614a9657203b3d50042bd266e7e90f6812f.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