Files
BMLFS/patches/vlc-mlfs/configure-lua.patch
2020-11-25 23:51:53 -06:00

191 lines
6.9 KiB
Diff

--- vlc-3.0.11.1.orig/configure 2020-11-25 23:16:45.541536445 -0600
+++ vlc-3.0.11.1/configure 2020-11-20 16:30:44.808691825 -0600
@@ -30066,12 +30066,12 @@
pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "lua5.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua5.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.2" 2>/dev/null`
+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.4" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -30083,12 +30083,12 @@
pkg_cv_LUA_LIBS="$LUA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "lua5.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "lua5.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.2" 2>/dev/null`
+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.4" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -30109,9 +30109,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.2" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lua5.4" 2>&1`
else
- LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.2" 2>&1`
+ LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lua5.4" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LUA_PKG_ERRORS" >&5
@@ -30267,7 +30267,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30299,7 +30299,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
@@ -30465,7 +30465,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30497,7 +30497,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
@@ -30733,7 +30733,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30765,7 +30765,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
@@ -30931,7 +30931,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -30963,7 +30963,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
@@ -31270,7 +31270,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -31302,7 +31302,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
@@ -31468,7 +31468,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -31500,7 +31500,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
@@ -31736,7 +31736,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -31768,7 +31768,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5
@@ -31934,7 +31934,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua5.2 $LIBS"
+LIBS="-llua5.4 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -31966,7 +31966,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- LUA_LIBS="-llua5.2"
+ LUA_LIBS="-llua5.4"
else
as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1 ''_luaL_newstate" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1 " >&5