| 1 |
commit: c9b822a38d0e71539ab4fef429027ec11f75e3b6 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 12 11:59:51 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 12 12:26:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b822a3 |
| 7 |
|
| 8 |
media-sound/aqualung: respect LUA_SINGLE_TARGET value |
| 9 |
|
| 10 |
Default upstream behaviour is to prefer 5.2 over all others if |
| 11 |
present, and if neither 5.2 nor 5.1 can be found try the newest version |
| 12 |
available. |
| 13 |
|
| 14 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 15 |
|
| 16 |
media-sound/aqualung/aqualung-1.1-r101.ebuild | 6 +++++ |
| 17 |
.../files/aqualung-1.1-configure-lua-version.patch | 31 ++++++++++++++++++++++ |
| 18 |
2 files changed, 37 insertions(+) |
| 19 |
|
| 20 |
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild |
| 21 |
index 3f49bddce79..af782eb7015 100644 |
| 22 |
--- a/media-sound/aqualung/aqualung-1.1-r101.ebuild |
| 23 |
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild |
| 24 |
@@ -55,6 +55,7 @@ DEPEND=" |
| 25 |
" |
| 26 |
|
| 27 |
PATCHES=( |
| 28 |
+ "${FILESDIR}/${P}-configure-lua-version.patch" |
| 29 |
"${FILESDIR}/${P}-ifp.patch" |
| 30 |
"${FILESDIR}/${P}-var-collision.patch" |
| 31 |
) |
| 32 |
@@ -63,6 +64,11 @@ pkg_setup() { |
| 33 |
use lua && lua-single_pkg_setup |
| 34 |
} |
| 35 |
|
| 36 |
+src_prepare() { |
| 37 |
+ default |
| 38 |
+ eautoreconf |
| 39 |
+} |
| 40 |
+ |
| 41 |
src_configure() { |
| 42 |
econf \ |
| 43 |
--disable-rpath \ |
| 44 |
|
| 45 |
diff --git a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch |
| 46 |
new file mode 100644 |
| 47 |
index 00000000000..a88839728c5 |
| 48 |
--- /dev/null |
| 49 |
+++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch |
| 50 |
@@ -0,0 +1,31 @@ |
| 51 |
+--- a/configure.ac |
| 52 |
++++ b/configure.ac |
| 53 |
+@@ -401,24 +401,11 @@ |
| 54 |
+ ]) |
| 55 |
+ |
| 56 |
+ AQUALUNG_DETECT([lua], [Lua Extension], |
| 57 |
+- [PKG_CHECK_MODULES([lua], [lua5.2], |
| 58 |
++ [PKG_CHECK_MODULES([lua], [lua], |
| 59 |
+ [AQUALUNG_FOUND([lua])], |
| 60 |
+- [PKG_CHECK_MODULES([lua], [lua-5.2], |
| 61 |
+- [AQUALUNG_FOUND([lua])], |
| 62 |
+- [PKG_CHECK_MODULES([lua], [lua52], |
| 63 |
+- [AQUALUNG_FOUND([lua])], |
| 64 |
+- [PKG_CHECK_MODULES([lua], [lua5.1], |
| 65 |
+- [AQUALUNG_FOUND([lua])], |
| 66 |
+- [PKG_CHECK_MODULES([lua], [lua-5.1], |
| 67 |
+- [AQUALUNG_FOUND([lua])], |
| 68 |
+- [PKG_CHECK_MODULES([lua], [lua51], |
| 69 |
+- [AQUALUNG_FOUND([lua])], |
| 70 |
+- [PKG_CHECK_MODULES([lua], [lua >= 5.2], |
| 71 |
+- [AQUALUNG_FOUND([lua])], |
| 72 |
+- [PKG_CHECK_MODULES([lua], [lua >= 5.1], |
| 73 |
+- [AQUALUNG_FOUND([lua])], |
| 74 |
+- [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])]) |
| 75 |
+- |
| 76 |
++ [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])] |
| 77 |
++ )] |
| 78 |
++) |
| 79 |
+ |
| 80 |
+ # Compiler and linker variables. |
| 81 |
+ AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"]) |
Archives