switching from lua52 to current lua (5.3)

3 files changed, 76 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebc666bb32ae..b149593e7e13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jan 30 10:13:36 UTC 2016
+# Sun Jan 31 07:03:54 UTC 2016
 pkgbase = ryzom-client
 	pkgdesc = Ryzom is a Free to Play MMORPG .This version is for playing on an official server
-	pkgver = 0.12.0.r7090
+	pkgver = 0.12.0.r7104
 	pkgrel = 1
 	url = http://www.ryzom.com/
 	install = install
@@ -22,7 +22,7 @@ pkgbase = ryzom-client
 	depends = giflib
 	depends = rrdtool
 	depends = boost
-	depends = lua52bind
+	depends = lua53bind
 	depends = libsquish
 	depends = libxrandr
 	depends = libxcursor
@@ -34,8 +34,10 @@ pkgbase = ryzom-client
 	conflicts = ryzom-client-hg
 	source = hg+https://bitbucket.org/ryzom/ryzomcore#branch=compatibility-develop
 	source = ryzom.sh
+	source = findlua53bind.patch
 	md5sums = SKIP
 	md5sums = a5ca7dfae7b9073f78cd1b0b7380755f
+	md5sums = b5b01746543648f646421f190759a886
 
 pkgname = ryzom-client
 
diff --git a/PKGBUILD b/PKGBUILD
index af8a43ea98d5..c2d69a5dc95f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 # Maintainer: PitBall
 
 pkgname=ryzom-client
-pkgver=0.12.0.r7090
+pkgver=0.12.0.r7104
 pkgrel=1
 pkgdesc="Ryzom is a Free to Play MMORPG .This version is for playing on an official server"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
 depends=('ryzom-data' 'curl' 'freealut' 'libvorbis' 'libjpeg' 'giflib' 'rrdtool'
-         'boost' 'lua52bind' 'libsquish' 'libxrandr' 'libxcursor' 'hicolor-icon-theme')
-conflicts=('ryzom-client-latest-hg' 'ryzom-client-hg') #lua52
+         'boost' 'lua53bind' 'libsquish' 'libxrandr' 'libxcursor' 'hicolor-icon-theme')
+conflicts=('ryzom-client-latest-hg' 'ryzom-client-hg')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'mesa')
 provides=('libnel' 'ryzom' 'ryzomcore')
 _hg_name='ryzomcore'
 install=install                                     #branch=compatibility
 source=( "hg+https://bitbucket.org/ryzom/${_hg_name}#branch=compatibility-develop"
-         'ryzom.sh')
-md5sums=('SKIP' 'a5ca7dfae7b9073f78cd1b0b7380755f')
+         'ryzom.sh' 'findlua53bind.patch')
+md5sums=('SKIP' 'a5ca7dfae7b9073f78cd1b0b7380755f' 'b5b01746543648f646421f190759a886')
 
 
 pkgver() {
@@ -31,37 +31,43 @@ pkgver() {
   "$(hg identify -n)"
 }
 
-build() {
+prepare() {
 
     mkdir -p $srcdir/$_hg_name/build
-    cd $srcdir/$_hg_name/build
+    cd $srcdir/$_hg_name
 
+    patch -Np0 -i $srcdir/findlua53bind.patch
     sed '/o_xml.h/i#include <libxml/tree.h>' -i \
-         ../code/nel/include/nel/logic/logic_state.h 
+         code/nel/include/nel/logic/logic_state.h 
+
+} 
+
+build() {
+
+    cd $srcdir/$_hg_name
 
-   cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON \
-    -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_PCH=OFF \
-    -DWITH_NEL_SAMPLES=OFF -DWITH_LUA51=OFF -DWITH_LUA52=ON \
+    cmake -Hcode -Bbuild -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release \
+    -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_PCH=OFF \
+    -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF \
+    -DWITH_LUA53=ON -DWITH_LUA51=OFF -DWITH_LUA52=OFF \
     -DWITH_RYZOM_TOOLS=OFF -DCMAKE_INSTALL_PREFIX=/usr \
     -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom \
-    -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin \
-    -DLUA_INCLUDE_DIR=/usr/include/lua5.2 ../code
+    -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
 
-   make
-   # VERBOSE=1
+    cmake --build build
 
 }
 
 package() {
-  cd "$srcdir/$_hg_name/build"
-  make DESTDIR="$pkgdir/" install
-  sed 's/\/usr\/bin\/ryzom_client/ryzom/' \
-  -i ${pkgdir}/usr/share/applications/ryzom_client.desktop
-  install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom
-  #correct config file
-  sed -r -e 's|^(PatchServer\s*=\s*).*|\1"";|' \
-         -e '/PatchServer/aPatchWanted = 0;' \
-         -e 's|^(PatchletUrl\s*=\s*).*|\1"";|' \
-         -i ${pkgdir}/etc/ryzom/client_default.cfg
+    cd "$srcdir/$_hg_name/build"
+    make DESTDIR="$pkgdir/" install
+    sed 's/\/usr\/bin\/ryzom_client/ryzom/' \
+    -i ${pkgdir}/usr/share/applications/ryzom_client.desktop
+    install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom
+    #correct config file for playing on an official server
+    sed -r -e 's|^(PatchServer\s*=\s*).*|\1"";|' \
+           -e '/PatchServer/aPatchWanted = 0;' \
+           -e 's|^(PatchletUrl\s*=\s*).*|\1"";|' \
+           -i ${pkgdir}/etc/ryzom/client_default.cfg
 }
+
diff --git a/findlua53bind.patch b/findlua53bind.patch
new file mode 100644
index 000000000000..032d0a798426
--- /dev/null
+++ b/findlua53bind.patch
@@ -0,0 +1,39 @@
+--- code/CMakeModules/FindLuabind.cmake.old	2016-01-31 07:27:45.890212020 +0100
++++ code/CMakeModules/FindLuabind.cmake	2016-01-31 07:07:40.000000000 +0100
+@@ -9,16 +9,24 @@
+   IF(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
+     INCLUDE(CheckDepends)
+ 
+-    SET(LUA52_LIBRARY "liblua5.2")
+-    CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
++    SET(LUA53_LIBRARY "liblua")
++    CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
++ 
+     
+     IF(NOT LUALIB_FOUND)
+       # fedora (v20)
+-      SET(LUA52_LIBRARY "liblua-5.2")
+-      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
++      SET(LUA53_LIBRARY "liblua")
++      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
+     ENDIF(NOT LUALIB_FOUND)
+ 
+     IF(LUALIB_FOUND)
++      MESSAGE(STATUS "Luabind is using Lua 5.3")
++      FIND_PACKAGE(Lua53 REQUIRED)
++    ELSE(LUALIB_FOUND)
++      SET(LUA52_LIBRARY "liblua5.2")
++      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
++
++    IF(LUALIB_FOUND)
+       MESSAGE(STATUS "Luabind is using Lua 5.2")
+       FIND_PACKAGE(Lua52 REQUIRED)
+     ELSE(LUALIB_FOUND)
+@@ -40,6 +48,7 @@
+         ENDIF(LUALIB_FOUND)
+       ENDIF(LUALIB_FOUND)
+     ENDIF(LUALIB_FOUND)
++  ENDIF(LUALIB_FOUND)
+   ELSE(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
+     # TODO: find a way to detect Lua version
+     IF(WITH_LUA53)