[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

["Pacho Ramos" <pacho@gentoo.org>]

commit:     9b58b43511a8bee125a758df926024d29a54b017
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 31 19:06:43 2021 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Aug 31 19:06:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b58b435

media-video/vlc: Update lua patch

Thanks-to: Sven Eden
Closes: https://bugs.gentoo.org/795378
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../vlc/files/vlc-configure_lua_version.patch      | 55 ++++++++++++++++++++++
 media-video/vlc/vlc-9999.ebuild                    |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/media-video/vlc/files/vlc-configure_lua_version.patch b/media-video/vlc/files/vlc-configure_lua_version.patch
new file mode 100644
index 00000000000..2628075535a
--- /dev/null
+++ b/media-video/vlc/files/vlc-configure_lua_version.patch
@@ -0,0 +1,55 @@
+Only look for one single version of Lua: the one pointed to by the
+pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care
+of the rest.
+
+--- a/configure.ac	2021-06-11 12:20:01.222417096 +0200
++++ b/configure.ac	2021-06-11 12:21:00.257419197 +0200
+@@ -1907,44 +1907,10 @@
+     [disable LUA scripting support (default enabled)]))
+ if test "${enable_lua}" != "no"
+ then
+-  PKG_CHECK_MODULES(LUA, lua5.2, [ have_lua=yes ], [:])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-    AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
+-    PKG_CHECK_MODULES(LUA, lua5.1, [ have_lua=yes ], [:]) ])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-    AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead])
+-    PKG_CHECK_MODULES(LUA, lua >= 5.1, [ have_lua=yes ], [:]) ])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-     AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead])
+-     have_lua_lib=no
+-     AC_CHECK_LIB( lua5.2 , luaL_newstate, [
+-       LUA_LIBS="-llua5.2"
+-       have_lua_lib=yes], [])
+-
+-     AS_IF([test "${have_lua_lib}" != "yes"], [
+-       AC_CHECK_LIB( lua5.1 , luaL_newstate, [
+-         LUA_LIBS="-llua5.1"
+-         have_lua_lib=yes], [] ) ])
+-
+-     AS_IF([test "${have_lua_lib}" != "yes"], [
+-       AC_CHECK_LIB( lua51 , luaL_newstate, [
+-         LUA_LIBS="-llua51"
+-         have_lua_lib=yes], [] ) ])
+-
+-     AS_IF([test "${have_lua_lib}" != "yes"], [
+-       AC_CHECK_LIB( lua , luaL_newstate,
+-         [LUA_LIBS="-llua"
+-          have_lua_lib=yes],
+-         [ have_lua=no ], [-lm] ) ])
+-
+-     dnl If we found any lib, check that we have the headers too
+-     AS_IF([test "${have_lua_lib}" = "yes"], [
+-       AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], [ have_lua=yes ], []) ])
+-  ])
+-
++  PKG_CHECK_MODULES(LUA, lua,
++    [ have_lua=yes ],
++    [ have_lua=no ]
++    )
+   if test "x${have_lua}" != "xyes" ;  then
+       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.])
+   fi

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 09a8d54ca6e..88345ff41a5 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -233,7 +233,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-configure_lua_version.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )