[Enigma-devel] Updated Debian packages, a few small building bugs

[Erich Schubert]

Thanks for that christmas present! ;)

I'm preparing an updated Debian package right now.

There are a few issues with packaging:
- libtolua is available in debian (but using (char *) not (const char *)
  in a few calls, so the cast isn't necessary)
  and i'd prefer using that version.
- debian lua 4.0 includes are in /usr/include/lua40
  this probably could be handled by configure
- some of the binaries (.png etc.) are marked executeable.

Here's a few diffs from the debian package diff:

### Different syntax for tolua:
--- enigma-0.60.orig/enigma-lua.cc
+++ enigma-0.60/enigma-lua.cc
@@ -608,7 +608,7 @@
  {
  int i;
  for(i=0; i<n;i++)
- tolua_pushfieldstring(tolua_S,3,i+1,(const char*) names[i]);
+ tolua_pushfieldstring(tolua_S,3,i+1,(char*) names[i]);
  }
  free(names);
  }
@@ -674,7 +674,7 @@
  {
  int i;
  for(i=0; i<n;i++)
- tolua_pushfieldstring(tolua_S,3,i+1,(const char*) images[i]);
+ tolua_pushfieldstring(tolua_S,3,i+1,(char*) images[i]);
  }
  free(images);
  }


### Fix for levels/Makefile.am
--- enigma-0.60.orig/levels/Makefile.am
+++ enigma-0.60/levels/Makefile.am
@@ -3,7 +3,7 @@

 install-data-local:
        $(INSTALL) -d -m 0755 $(pkgdatadir)
-       cp -fp $(srcdir)/*.lua $(srcdir)/*.png *.txt $(pkgdatadir)
+       cp -fp $(srcdir)/*.lua $(srcdir)/*.png $(srcdir)/*.txt $(pkgdatadir)

 uninstall-local:
        rm -f $(pkgdatadir)/*.lua $(pkgdatadir)/*.png $(pkgdatadir)/*.txt

### detecting lua (hack, not clean code)
--- enigma-0.60.orig/configure.in
+++ enigma-0.60/configure.in
@@ -68,18 +68,26 @@

 if test "$have_newlua" = no; then
     AC_MSG_CHECKING(for Lua 4.0)
-    AC_CHECK_LIB(lua, lua_open, have_lua="yes", have_lua="no")
+    AC_CHECK_LIB(lua40, lua_open, have_lua="yes", have_lua="no")
     if test "$have_lua" = no; then
         AC_MSG_ERROR([You must have Lua installed to compile Enigma.])
     fi
+       LIBS="$LIBS -llua40 -llualib40 -ltolua"
 else
     AC_DEFINE(HAVE_NEWLUA)
+       LIBS="$LIBS -llua -llualib -ltolua"
 fi
+
+dnl Check for lua includes in /usr/include/lua40, as for debian
+AC_CHECK_HEADER(lua40/lua.h, HAVE_LUAPATH="yes", HAVE_LUAPATH="no")
+if test "x$HAVE_LUAPATH" != "xno"; then
+       CXXFLAGS="$CXXFLAGS -I/usr/include/lua40"
+fi


Well, that's it for the moment... now i'll try if the package actually works
and i can enjoy playing the game ;)

Gruss,
Erich Schubert
-- 
        erich@(mucl.de|debian.org)        --        GPG Key ID: 4B3A135C
        To understand recursion you first need to understand recursion.
     Man kann sich auch in Gesellschaft anderer einsam fühlen. - Weizsäcker
               Humor sollte immmer dabeisein, auch bei Problemen.