| 1 |
commit: 9b58b43511a8bee125a758df926024d29a54b017 |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 31 19:06:43 2021 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 31 19:06:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b58b435 |
| 7 |
|
| 8 |
media-video/vlc: Update lua patch |
| 9 |
|
| 10 |
Thanks-to: Sven Eden |
| 11 |
Closes: https://bugs.gentoo.org/795378 |
| 12 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 13 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
| 14 |
|
| 15 |
.../vlc/files/vlc-configure_lua_version.patch | 55 ++++++++++++++++++++++ |
| 16 |
media-video/vlc/vlc-9999.ebuild | 2 +- |
| 17 |
2 files changed, 56 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/media-video/vlc/files/vlc-configure_lua_version.patch b/media-video/vlc/files/vlc-configure_lua_version.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..2628075535a |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-video/vlc/files/vlc-configure_lua_version.patch |
| 24 |
@@ -0,0 +1,55 @@ |
| 25 |
+Only look for one single version of Lua: the one pointed to by the |
| 26 |
+pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care |
| 27 |
+of the rest. |
| 28 |
+ |
| 29 |
+--- a/configure.ac 2021-06-11 12:20:01.222417096 +0200 |
| 30 |
++++ b/configure.ac 2021-06-11 12:21:00.257419197 +0200 |
| 31 |
+@@ -1907,44 +1907,10 @@ |
| 32 |
+ [disable LUA scripting support (default enabled)])) |
| 33 |
+ if test "${enable_lua}" != "no" |
| 34 |
+ then |
| 35 |
+- PKG_CHECK_MODULES(LUA, lua5.2, [ have_lua=yes ], [:]) |
| 36 |
+- |
| 37 |
+- AS_IF([test "${have_lua}" != "yes"], [ |
| 38 |
+- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead]) |
| 39 |
+- PKG_CHECK_MODULES(LUA, lua5.1, [ have_lua=yes ], [:]) ]) |
| 40 |
+- |
| 41 |
+- AS_IF([test "${have_lua}" != "yes"], [ |
| 42 |
+- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) |
| 43 |
+- PKG_CHECK_MODULES(LUA, lua >= 5.1, [ have_lua=yes ], [:]) ]) |
| 44 |
+- |
| 45 |
+- AS_IF([test "${have_lua}" != "yes"], [ |
| 46 |
+- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead]) |
| 47 |
+- have_lua_lib=no |
| 48 |
+- AC_CHECK_LIB( lua5.2 , luaL_newstate, [ |
| 49 |
+- LUA_LIBS="-llua5.2" |
| 50 |
+- have_lua_lib=yes], []) |
| 51 |
+- |
| 52 |
+- AS_IF([test "${have_lua_lib}" != "yes"], [ |
| 53 |
+- AC_CHECK_LIB( lua5.1 , luaL_newstate, [ |
| 54 |
+- LUA_LIBS="-llua5.1" |
| 55 |
+- have_lua_lib=yes], [] ) ]) |
| 56 |
+- |
| 57 |
+- AS_IF([test "${have_lua_lib}" != "yes"], [ |
| 58 |
+- AC_CHECK_LIB( lua51 , luaL_newstate, [ |
| 59 |
+- LUA_LIBS="-llua51" |
| 60 |
+- have_lua_lib=yes], [] ) ]) |
| 61 |
+- |
| 62 |
+- AS_IF([test "${have_lua_lib}" != "yes"], [ |
| 63 |
+- AC_CHECK_LIB( lua , luaL_newstate, |
| 64 |
+- [LUA_LIBS="-llua" |
| 65 |
+- have_lua_lib=yes], |
| 66 |
+- [ have_lua=no ], [-lm] ) ]) |
| 67 |
+- |
| 68 |
+- dnl If we found any lib, check that we have the headers too |
| 69 |
+- AS_IF([test "${have_lua_lib}" = "yes"], [ |
| 70 |
+- AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], [ have_lua=yes ], []) ]) |
| 71 |
+- ]) |
| 72 |
+- |
| 73 |
++ PKG_CHECK_MODULES(LUA, lua, |
| 74 |
++ [ have_lua=yes ], |
| 75 |
++ [ have_lua=no ] |
| 76 |
++ ) |
| 77 |
+ if test "x${have_lua}" != "xyes" ; then |
| 78 |
+ AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.]) |
| 79 |
+ fi |
| 80 |
|
| 81 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 82 |
index 09a8d54ca6e..88345ff41a5 100644 |
| 83 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 84 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 85 |
@@ -233,7 +233,7 @@ DEPEND="${RDEPEND} |
| 86 |
PATCHES=( |
| 87 |
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system |
| 88 |
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 |
| 89 |
- "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch |
| 90 |
+ "${FILESDIR}"/${PN}-configure_lua_version.patch |
| 91 |
) |
| 92 |
|
| 93 |
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) |
Archives