| 1 |
commit: 8e82bd7a497db607c05f1367417b844dc6a55412 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 1 18:42:27 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 1 18:44:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e82bd7a |
| 7 |
|
| 8 |
media-libs/mlt: Fix build with musl libc |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/713938 |
| 11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/mlt/files/mlt-6.20.0-musl-locale.patch | 34 +++++++++++++++++++++++ |
| 15 |
media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 + |
| 16 |
2 files changed, 35 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..ed206108d2e |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/mlt/files/mlt-6.20.0-musl-locale.patch |
| 23 |
@@ -0,0 +1,34 @@ |
| 24 |
+From d02611584d4b2f693469c72272fe369413139394 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Carlo Landmeter <clandmeter@×××××.com> |
| 26 |
+Date: Sun, 6 Nov 2016 00:45:44 +0100 |
| 27 |
+Subject: testing/mlt: new aport |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ testing/mlt/musl-locale.patch | 13 +++++++++++++ |
| 31 |
+ 1 file changed, 13 insertions(+) |
| 32 |
+ create mode 100644 testing/mlt/musl-locale.patch |
| 33 |
+ |
| 34 |
+(limited to 'testing/mlt/musl-locale.patch') |
| 35 |
+ |
| 36 |
+diff --git a/testing/mlt/musl-locale.patch b/testing/mlt/musl-locale.patch |
| 37 |
+new file mode 100644 |
| 38 |
+index 0000000000..030bb781d1 |
| 39 |
+--- /dev/null |
| 40 |
++++ b/testing/mlt/musl-locale.patch |
| 41 |
+@@ -0,0 +1,13 @@ |
| 42 |
++--- ./src/framework/mlt_property.h.orig |
| 43 |
+++++ ./src/framework/mlt_property.h |
| 44 |
++@@ -30,8 +30,8 @@ |
| 45 |
++ #include <sys/param.h> |
| 46 |
++ #endif |
| 47 |
++ |
| 48 |
++-#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) |
| 49 |
++-#include <xlocale.h> |
| 50 |
+++#if defined(__linux__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) |
| 51 |
+++#include <locale.h> |
| 52 |
++ #else |
| 53 |
++ typedef char* locale_t; |
| 54 |
++ #endif |
| 55 |
+-- |
| 56 |
+cgit v1.2.1 |
| 57 |
+ |
| 58 |
|
| 59 |
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 60 |
index 7c449e85101..2d15f57bfc5 100644 |
| 61 |
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 62 |
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 63 |
@@ -91,6 +91,7 @@ PATCHES=( |
| 64 |
"${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch |
| 65 |
"${FILESDIR}"/${P}-crash-in-composite.patch |
| 66 |
"${FILESDIR}"/${P}-opencv-double-del-crash.patch |
| 67 |
+ "${FILESDIR}"/${P}-musl-locale.patch # from Alpine, pending upstream |
| 68 |
) |
| 69 |
|
| 70 |
pkg_setup() { |
Archives