[mame] 07/13: Add lua_pkgconfig.patch: use system lua 5.2.

[Jordi Mallach]

This is an automated email from the git hooks/post-receive script.

jordi pushed a commit to branch master
in repository mame.

commit eaf273c8000055cf659157677dcf47bfa8a0a90a
Author: Jordi Mallach <jordi at debian.org>
Date:   Tue Mar 22 23:45:51 2016 +0100

    Add lua_pkgconfig.patch: use system lua 5.2.
    
    Make the build system use Lua 5.2 if requested.
    Currently, the build fails if system Lua is used
    along with system libsqlite3, though.
---
 debian/changelog                   |  3 +++
 debian/patches/lua_pkgconfig.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 382188d..4da9aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ mame (0.171-1) UNRELEASED; urgency=medium
   * Add date_timestamp.patch: remove date of build, which is pointless and
     makes the binary non-reproducible.
   * Make the build verbose and remove obsolete define SDL_LIBVER.
+  * Add lua_pkgconfig.patch: make the build system use Lua 5.2 if requested.
+    Currently, the build fails if system Lua is used along with system
+    libsqlite3, though.
 
  -- Jordi Mallach <jordi at debian.org>  Thu, 10 Mar 2016 23:38:43 +0100
 
diff --git a/debian/patches/lua_pkgconfig.patch b/debian/patches/lua_pkgconfig.patch
new file mode 100644
index 0000000..628a515
--- /dev/null
+++ b/debian/patches/lua_pkgconfig.patch
@@ -0,0 +1,27 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: Adapt to versioned Lua pkg-config files in Debian
+ MAME assumes lua's pkg-config modules are named "lua", unversioned.
+ Hardcode lua5.2 for now.
+
+--- mame-0.171.orig/3rdparty/lsqlite3/Makefile
++++ mame-0.171/3rdparty/lsqlite3/Makefile
+@@ -3,8 +3,8 @@
+ ifneq "$(shell pkg-config --version)" ""
+   # automagic setup (OS X fink, Linux apt-get, ..)
+   #
+-  LUAINC= $(shell pkg-config --cflags lua)
+-  LUALIB= $(shell pkg-config --libs lua)
++  LUAINC= $(shell pkg-config --cflags lua5.2)
++  LUALIB= $(shell pkg-config --libs lua5.2)
+   LUAEXE= lua
+   # Now, we actually want to _not_ push in stuff to the distro Lua CMOD directory,
+   # way better to play within /usr/local/lib/lua/5.1/
+@@ -22,7 +22,7 @@ else
+ #  LUALIB= -L$(BASE)/lib -llua51
+ #  LUACMOD= $(BASE)/lib/lua/5.1/
+ #  Windows' LUA_CDIR and LUALIB are both the same as the Lua executable's directory...
+-  LUALIB= -L$(BASE)/bin -llua51
++  LUALIB= -L$(BASE)/bin -llua52
+   LUACMOD= $(BASE)/bin
+   #
+   SQLITE3INC= -I$(BASE)/include
diff --git a/debian/patches/series b/debian/patches/series
index d854efc..8d5592b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 date_timestamp.patch
+lua_pkgconfig.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git