[arch-commits] Commit in vlc/trunk (PKGBUILD lua53_compat.patch)

Anatol Pomozov anatolik at archlinux.org
Wed May 6 18:09:15 UTC 2015


    Date: Wednesday, May 6, 2015 @ 20:09:15
  Author: anatolik
Revision: 238554

Add lua 5.3 compatibility patch

Currently the package cannot be compiled on i686 because of
  https://bugzilla.redhat.com/show_bug.cgi?id=1215630

Added:
  vlc/trunk/lua53_compat.patch
Modified:
  vlc/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    8 ++++++--
 lua53_compat.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-06 16:06:03 UTC (rev 238553)
+++ PKGBUILD	2015-05-06 18:09:15 UTC (rev 238554)
@@ -56,8 +56,10 @@
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!emptydirs')
 install=vlc.install
-source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('42273945758b521c408fabc7fd6d9946')
+source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        "lua53_compat.patch")
+md5sums=('42273945758b521c408fabc7fd6d9946'
+         '96d3b346d9149ffb1b430066dfb6249a')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -64,6 +66,8 @@
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
+
+  patch -p1 < "${srcdir}/lua53_compat.patch"
 }
 
 build() {

Added: lua53_compat.patch
===================================================================
--- lua53_compat.patch	                        (rev 0)
+++ lua53_compat.patch	2015-05-06 18:09:15 UTC (rev 238554)
@@ -0,0 +1,30 @@
+commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
+Author: Vinson Lee <vlee at freedesktop.org>
+Date:   Thu Feb 5 14:48:53 2015 -0800
+
+    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
+    
+    In Lua 5.3.0, luaL_checkint was deprecated.
+    
+    This patch fixes this build error with Lua 5.3.0.
+    
+    lua/demux.c: In function ‘vlclua_demux_peek’:
+    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+         int n = luaL_checkint( L, 1 );
+         ^
+    
+    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
+    Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+ 
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h>        /* Low level lua C API */
+ #include <lauxlib.h>    /* Higher level C API */



More information about the arch-commits mailing list