diff --git a/general/prog/lua.xml b/general/prog/lua.xml
index be007d7a42..d8ade80b6e 100644
--- a/general/prog/lua.xml
+++ b/general/prog/lua.xml
@@ -119,40 +119,10 @@
Installation of Lua
-
- Install Lua by running the following
- commands:
-
-
-patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &&
-
-sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &&
-
-make MYCFLAGS="-DLUA_COMPAT_5_1" linux
-
-
- To test the results, issue: make test.
- This will run the interpreter and print its version.
.
- More comprehensive tests can be performed if you downloaded the "Test
- suite" tarball. Those tests need to be executed after the package is
- installed, thus we defer to describe then below.
-
-
-
- Now, as the root user:
-
-
-make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
- INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &&
-
-mkdir -pv /usr/share/doc/lua-&lua-version; &&
-cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version;
-
Some packages check for the pkg-config file
- for Lua. As the
- root user:
+ for Lua, wich is created with:
-cat > /usr/lib/pkgconfig/lua.pc << "EOF"
+cat > lua.pc << "EOF"
V=5.3
R=&lua-version;
@@ -175,6 +145,37 @@ Libs: -L${libdir} -llua -lm
Cflags: -I${includedir}
EOF
+
+ Install Lua by running the following
+ commands:
+
+
+patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &&
+
+sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &&
+
+make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux
+
+
+ To test the results, issue: make test.
+ This will run the interpreter and print its version.
.
+ More comprehensive tests can be performed if you downloaded the "Test
+ suite" tarball. Those tests need to be executed after the package is
+ installed, thus we defer to describe then below.
+
+
+
+ Now, as the root user:
+
+
+make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
+ INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &&
+
+mkdir -pv /usr/share/doc/lua-&lua-version; &&
+cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version; &&
+
+install -v -m644 -D lua.pc /usr/lib/pkgconfig/lua.pc
+
We are going to describe only the "Basic tests". Untar the tarball and
change to the
@@ -196,10 +197,9 @@ EOF
- MYCFLAGS="-DLUA_COMPAT_5_1": This parameter
- enables building of the Lua 5.1
- functions into the shared library to allow applications which
- still require them to function properly.
+ MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1": This
+ environment variable includes compatibility layers with Lua 5.1 and 5.2
+ in the build.
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4d87562ce0..92f35d80a7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -48,9 +48,10 @@
February 14th, 2016
- [krejzi] - Fixed Lua instructions to enable
- building of the Lua 5.1 compatibility functions. Fixes
- #7462.
+ [fernando] - Lua-5.3.2 and VLC-2.2.2 need to be compiled with
+ Lua compat 5.1. Fixes
+ #7462 and
+ #7465.
[fernando] - Update to thunderbird-38.6.0. Fixes
diff --git a/multimedia/videoutils/vlc.xml b/multimedia/videoutils/vlc.xml
index c42da1dcff..d30f1ec17d 100644
--- a/multimedia/videoutils/vlc.xml
+++ b/multimedia/videoutils/vlc.xml
@@ -219,6 +219,12 @@
PKG_CONFIG_PATH="\
`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"
+
+ If you wish to avoid thousands of annoying warnings, issue:
+
+
+sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac
+
Install VLC by running the following commands:
@@ -241,9 +247,13 @@ OPENCV_LIBS="-L/usr/share/OpenCV" \
./configure --prefix=/usr &&
sed -e '/seems to be moved/s/^/#/' \
- -i autotools/ltmain.sh libtool &&
+ -i autotools/ltmain.sh libtool &&
-make
+
+ In order to build with Lua 5.1 compatiblity, issue:
+
+
+CFLAGS='-fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_1' make
Again, if both Qt4 and 5 are installed, restore