| 1 |
commit: e66f190c46afda2894b841d8e0f11fefe2ce8f24 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 14 14:10:29 2020 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 14 14:11:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66f190c |
| 7 |
|
| 8 |
media-libs/libprojectm: Remove bashisms |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=714098 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/libprojectm-3.1.3-bashisms.patch | 47 ++++++++++++++++++++++ |
| 15 |
media-libs/libprojectm/libprojectm-3.1.3.ebuild | 4 ++ |
| 16 |
2 files changed, 51 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..8d84ece802c |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch |
| 23 |
@@ -0,0 +1,47 @@ |
| 24 |
+From 8a522d975890a4512be0f04285f356c6db653a57 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Lars Wendler <polynomial-c@g.o> |
| 26 |
+Date: Thu, 14 May 2020 11:46:50 +0200 |
| 27 |
+Subject: [PATCH] configure.ac: Avoid bashisms |
| 28 |
+ |
| 29 |
+or else we end up like this: |
| 30 |
+ |
| 31 |
+ ./configure: 18902: ./configure: Syntax error: redirection unexpected |
| 32 |
+ |
| 33 |
+or |
| 34 |
+ |
| 35 |
+ ./configure: 20152: ./configure: my_CFLAGS+=-DDATADIR_PATH=\""$(pkgdatadir)"\" : not found |
| 36 |
+ ./configure: 20153: ./configure: my_CFLAGS+=-I$(top_srcdir)/vendor : not found |
| 37 |
+ |
| 38 |
+Gentoo-bug: https://bugs.gentoo.org/714098 |
| 39 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 40 |
+--- |
| 41 |
+ configure.ac | 8 ++++---- |
| 42 |
+ 1 file changed, 4 insertions(+), 4 deletions(-) |
| 43 |
+ |
| 44 |
+diff --git a/configure.ac b/configure.ac |
| 45 |
+index 5fa53eca5..ecf85e076 100644 |
| 46 |
+--- a/configure.ac |
| 47 |
++++ b/configure.ac |
| 48 |
+@@ -163,7 +163,7 @@ AC_PREFIX_DEFAULT([/usr/local]) |
| 49 |
+ |
| 50 |
+ AC_PROG_MKDIR_P |
| 51 |
+ |
| 52 |
+-AS_IF([grep android <<< ${host}], [], |
| 53 |
++AS_IF([echo ${host} | grep -Fq android], [], |
| 54 |
+ [AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [ |
| 55 |
+ CXXFLAGS="$CXXFLAGS -stdlib=libc++"]) |
| 56 |
+ ]) |
| 57 |
+@@ -237,10 +237,10 @@ AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"]) |
| 58 |
+ AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes"]) |
| 59 |
+ |
| 60 |
+ |
| 61 |
+-my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits " |
| 62 |
++my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits" |
| 63 |
+ #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer " |
| 64 |
+-my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" ' |
| 65 |
+-my_CFLAGS+='-I$(top_srcdir)/vendor ' |
| 66 |
++my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\"" |
| 67 |
++my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor" |
| 68 |
+ AC_SUBST([my_CFLAGS]) |
| 69 |
+ |
| 70 |
+ |
| 71 |
|
| 72 |
diff --git a/media-libs/libprojectm/libprojectm-3.1.3.ebuild b/media-libs/libprojectm/libprojectm-3.1.3.ebuild |
| 73 |
index 1dc01b43566..8a83145eb81 100644 |
| 74 |
--- a/media-libs/libprojectm/libprojectm-3.1.3.ebuild |
| 75 |
+++ b/media-libs/libprojectm/libprojectm-3.1.3.ebuild |
| 76 |
@@ -22,6 +22,10 @@ LICENSE="LGPL-2" |
| 77 |
SLOT="0/2" |
| 78 |
IUSE="gles2 jack qt5 sdl" |
| 79 |
|
| 80 |
+PATCHES=( |
| 81 |
+ "${FILESDIR}/${P}-bashisms.patch" |
| 82 |
+) |
| 83 |
+ |
| 84 |
RDEPEND="gles2? ( media-libs/mesa[gles2] ) |
| 85 |
media-libs/glm |
| 86 |
media-libs/mesa[X(+)] |
Archives