r12151 - packages/trunk/naev/debian/patches
Vincent Cheng
vincentc-guest at alioth.debian.org
Sat Apr 23 10:28:22 UTC 2011
Author: vincentc-guest
Date: 2011-04-23 10:28:11 +0000 (Sat, 23 Apr 2011)
New Revision: 12151
Added:
packages/trunk/naev/debian/patches/src_csparse.patch
Modified:
packages/trunk/naev/debian/patches/series
packages/trunk/naev/debian/patches/src_lua.patch
packages/trunk/naev/debian/patches/use_system_libs.patch
Log:
Further patches for naev to use system libs.
Modified: packages/trunk/naev/debian/patches/series
===================================================================
--- packages/trunk/naev/debian/patches/series 2011-04-22 08:55:58 UTC (rev 12150)
+++ packages/trunk/naev/debian/patches/series 2011-04-23 10:28:11 UTC (rev 12151)
@@ -1,3 +1,3 @@
+src_lua.patch
+src_csparse.patch
use_system_libs.patch
-makefile_am.patch
-src_lua.patch
Added: packages/trunk/naev/debian/patches/src_csparse.patch
===================================================================
--- packages/trunk/naev/debian/patches/src_csparse.patch (rev 0)
+++ packages/trunk/naev/debian/patches/src_csparse.patch 2011-04-23 10:28:11 UTC (rev 12151)
@@ -0,0 +1,11 @@
+--- a/src/economy.c
++++ b/src/economy.c
+@@ -21,7 +21,7 @@
+ #include <string.h>
+ #include <stdint.h>
+
+-#include "cs.h"
++#include <suitesparse/cs.h>
+
+ #include "nxml.h"
+ #include "ndata.h"
Modified: packages/trunk/naev/debian/patches/src_lua.patch
===================================================================
--- packages/trunk/naev/debian/patches/src_lua.patch 2011-04-22 08:55:58 UTC (rev 12150)
+++ packages/trunk/naev/debian/patches/src_lua.patch 2011-04-23 10:28:11 UTC (rev 12151)
@@ -637,3 +637,91 @@
#include "log.h"
#include "pilot.h"
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -14,7 +14,7 @@
+ #include <getopt.h> /* getopt_long */
+
+ #include "nlua.h"
+-#include "lauxlib.h" /* luaL_dofile */
++#include <lua5.1/lauxlib.h> /* luaL_dofile */
+
+ #include "log.h"
+ #include "player.h"
+--- a/src/nlua.c
++++ b/src/nlua.c
+@@ -12,7 +12,7 @@
+
+ #include "naev.h"
+
+-#include "lauxlib.h"
++#include <lua5.1/lauxlib.h>
+
+ #include "nluadef.h"
+ #include "log.h"
+--- a/src/nlua_bkg.c
++++ b/src/nlua_bkg.c
+@@ -12,7 +12,7 @@
+
+ #include "naev.h"
+
+-#include "lauxlib.h"
++#include <lua5.1/lauxlib.h>
+
+ #include "nlua.h"
+ #include "nluadef.h"
+--- a/src/nlua_camera.c
++++ b/src/nlua_camera.c
+@@ -12,7 +12,7 @@
+
+ #include "naev.h"
+
+-#include "lauxlib.h"
++#include <lua5.1/lauxlib.h>
+
+ #include "nlua.h"
+ #include "nluadef.h"
+--- a/src/nlua_cli.c
++++ b/src/nlua_cli.c
+@@ -12,7 +12,7 @@
+
+ #include "naev.h"
+
+-#include "lauxlib.h"
++#include <lua5.1/lauxlib.h>
+
+ #include "nlua.h"
+ #include "nluadef.h"
+--- a/src/nlua_col.c
++++ b/src/nlua_col.c
+@@ -12,7 +12,7 @@
+
+ #include "naev.h"
+
+-#include "lauxlib.h"
++#include <lua5.1/lauxlib.h>
+
+ #include "nlua.h"
+ #include "nluadef.h"
+--- a/src/nlua_commodity.c
++++ b/src/nlua_commodity.c
+@@ -12,7 +12,7 @@
+
+ #include "naev.h"
+
+-#include "lauxlib.h"
++#include <lua5.1/lauxlib.h>
+
+ #include "nlua.h"
+ #include "nluadef.h"
+--- a/src/nlua_faction.c
++++ b/src/nlua_faction.c
+@@ -14,7 +14,7 @@
+
+ #include "naev.h"
+
+-#include "lauxlib.h"
++#include <lua5.1/lauxlib.h>
+
+ #include "log.h"
+ #include "nlua.h"
Modified: packages/trunk/naev/debian/patches/use_system_libs.patch
===================================================================
--- packages/trunk/naev/debian/patches/use_system_libs.patch 2011-04-22 08:55:58 UTC (rev 12150)
+++ packages/trunk/naev/debian/patches/use_system_libs.patch 2011-04-23 10:28:11 UTC (rev 12151)
@@ -1,60 +1,44 @@
-Use system version of lua and csparse instead of the embedded ones.
--- a/configure.ac
+++ b/configure.ac
-@@ -317,11 +317,9 @@
- # naev
+@@ -252,6 +252,25 @@
+ AC_ERROR([libpng not found])
+ ])
+
++# luajit
++PKG_CHECK_MODULES([LUA], [luajit], [
++ have_luajit=yes
++ have_lua=no
++ ], [
++ PKG_CHECK_MODULES([LUA], [lua], [
++ have_luajit=no
++ have_lua=yes
++ ], [
++ PKG_CHECK_MODULES([LUA], [lua5.1], [
++ have_luajit=no
++ have_lua=yes
++ ], [
++ have_luajit=no
++ have_lua=no
++ ])
++ ])
++])
++
+ # OpenAL
+ AS_IF([test "$with_openal" = "yes"], [
+ AM_PATH_OPENAL([have_openal=yes], [have_openal=no])
+@@ -318,10 +337,9 @@
WIDGET_LIBS="\$(top_builddir)/src/tk/widget/libwidget.a"
--CSPARSE_CFLAGS="-I\"\$(top_srcdir)/lib/csparse\""
+ CSPARSE_CFLAGS="-I\"\$(top_srcdir)/lib/csparse\""
-CSPARSE_LIBS="\$(top_builddir)/lib/csparse/libcsparse.a"
-+CSPARSE_LIBS="/usr/lib/libcsparse.a"
++CSPARSE_LIBS="-lcsparse"
--LUA_CFLAGS="-I\"\$(top_srcdir)/lib/lua\""
+ LUA_CFLAGS="-I\"\$(top_srcdir)/lib/lua\""
-LUA_LIBS="\$(top_builddir)/lib/lua/liblua.a"
-+LUA_LIBS="/usr/lib/liblua5.1.a"
NAEV_CFLAGS="$GLOBAL_CFLAGS"
NAEV_LIBS="$GLOBAL_LIBS $WIDGET_LIBS"
-@@ -342,12 +340,12 @@
- AC_DEFINE([DEBUG_PARANOID], 1, [Define to 1 to enable paranoid debug code])
- ])
-
--NAEV_CFLAGS="$NAEV_CFLAGS $CSPARSE_CFLAGS $SDL_CFLAGS"
--NAEV_CFLAGS="$NAEV_CFLAGS $XML_CFLAGS $FREETYPE_CFLAGS $LUA_CFLAGS"
-+NAEV_CFLAGS="$NAEV_CFLAGS $SDL_CFLAGS"
-+NAEV_CFLAGS="$NAEV_CFLAGS $XML_CFLAGS $FREETYPE_CFLAGS"
- NAEV_CFLAGS="$NAEV_CFLAGS $VORBISFILE_CFLAGS $OPENGL_CFLAGS $PNG_CFLAGS"
-
--NAEV_LIBS="$NAEV_LIBS $CSPARSE_LIBS $SDL_LIBS $XML_LIBS"
--NAEV_LIBS="$NAEV_LIBS $FREETYPE_LIBS $LUA_LIBS"
-+NAEV_LIBS="$NAEV_LIBS $SDL_LIBS $XML_LIBS"
-+NAEV_LIBS="$NAEV_LIBS $FREETYPE_LIBS"
- NAEV_LIBS="$NAEV_LIBS $VORBISFILE_LIBS $OPENGL_LIBS $PNG_LIBS"
-
- AS_IF([test "$have_openal" = "yes"], [
-@@ -375,21 +373,6 @@
- AC_SUBST([NAEV_LIBS])
- AC_SUBST([NAEV_DEPENDENCIES])
-
--# liblua
--LIBLUA_CFLAGS="$GLOBAL_CFLAGS"
--
--case "$host" in
-- *-mingw*)
-- LIBLUA_CFLAGS="$LIBLUA_CFLAGS -DLUA_ANSI"
-- ;;
-- *)
-- LIBLUA_CFLAGS="$LIBLUA_CFLAGS -DLUA_USE_POSIX"
-- ;;
--esac
--
--AC_SUBST([LIBLUA_CFLAGS])
--
--
- PACK_CFLAGS="$GLOBAL_CFLAGS $SDL_CFLAGS -DNOLOGPRINTFCONSOLE"
- PACK_LIBS="$GLOBAL_LIBS $SDL_LIBS"
- AC_SUBST([PACK_CFLAGS])
-@@ -518,9 +501,6 @@
+@@ -518,9 +536,6 @@
#
SHAVE_INIT([build], [enable])
AC_CONFIG_FILES([Makefile
@@ -64,3 +48,15 @@
src/Makefile
src/tk/Makefile
src/tk/widget/Makefile
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = --install -I m4
+
+-SUBDIRS = lib src
+-DIST_SUBDIRS = lib src
++SUBDIRS = src
++DIST_SUBDIRS = src
+
+ if HAVE_UTILS
+ SUBDIRS += utils
More information about the Pkg-games-commits
mailing list