Attachment 879225 Details for Bug 1081241 – Build with system compat-lua instead of bundled one

[patch] Build with system compat-lua instead of bundled one

Build-with-system-compat-lua-instead-of-bundled-on.patch (text/plain), 12.15 KB, created by Ville Skyttä on 2014-03-26 20:41:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-26 20:41:32 UTC

Size: 12.15 KB

patch

obsolete

>From 2a3078604cc70900e2fcff7eb1683120e81e495e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Wed, 26 Mar 2014 22:38:24 +0200
>Subject: [PATCH] Build with system compat-lua instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1081241
>---
> netpanzer-0.8.4-syslibs.patch       | 101 ++++++++++++++++++++++++++++++++
> netpanzer-0.8.4-system-physfs.patch | 114 ------------------------------------
> netpanzer.spec                      |  10 +++-
> 3 files changed, 108 insertions(+), 117 deletions(-)
> create mode 100644 netpanzer-0.8.4-syslibs.patch
> delete mode 100644 netpanzer-0.8.4-system-physfs.patch
>
>diff --git a/netpanzer-0.8.4-syslibs.patch b/netpanzer-0.8.4-syslibs.patch
>new file mode 100644
>index 0000000..f7993d1
>--- /dev/null
>+++ b/netpanzer-0.8.4-syslibs.patch
>@@ -0,0 +1,101 @@
>+diff --git a/SConstruct b/SConstruct
>+index 732009c..83411cd 100644
>+--- a/SConstruct
>++++ b/SConstruct
>+@@ -205,7 +205,7 @@ print 'Building version ' + NPVERSION + ' in ' + sys.platform
>+ # Configure Environments
>+ ################################################################
>+ 
>+-env.Append(           CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
>++env.Append(           CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', '/usr/include/lua-5.1'] )
>+ crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
>+ crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
>+ 
>+@@ -269,14 +269,12 @@ MakeStaticLib(crosslinuxnetworkenv, 'npnetwork', 'Network', '*.cpp')
>+ luaenv.Append(           CPPPATH = [ 'src/Lib/lua'] )
>+ crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua'] )
>+ crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua'] )
>+-MakeStaticLib(          luaenv, 'nplua', 'lua', '*.c')
>+ MakeStaticLib(crossmingwluaenv, 'nplua', 'lua', '*.c')
>+ MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua', '*.c')
>+ 
>+ # BUILDS PHYSFS
>+ physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
>+ physfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
>+-MakeStaticLib(physfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
>+ 
>+ crossmingwphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
>+ crossmingwphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
>+@@ -323,7 +321,7 @@ if crossmingwenv.has_key('WINICON'):
>+     
>+ crosslinuxenv.Append( NPSOURCES = globSources(crosslinuxenv, 'src/NetPanzer', npdirs, "*.cpp") )
>+ 
>+-env.Append(           NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
>++env.Append(           NPLIBS = ['lua-5.1','np2d','npnetwork','nplibs','physfs'] )
>+ crossmingwenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
>+ crosslinuxenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
>+ 
>+diff --git a/src/Lib/2D/Palette.cpp b/src/Lib/2D/Palette.cpp
>+index d05c9a1..d0be9a6 100644
>+--- a/src/Lib/2D/Palette.cpp
>++++ b/src/Lib/2D/Palette.cpp
>+@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>+ #include "Util/Exception.hpp"
>+ #include "Util/UtilInterface.hpp"
>+ 
>+-#include "lua/lua.hpp"
>++#include <lua.hpp>
>+ 
>+ float Palette::brightness = 1.0f;
>+ 
>+diff --git a/src/Lib/Util/FileSystem.cpp b/src/Lib/Util/FileSystem.cpp
>+index 1deae2d..a951119 100644
>+--- a/src/Lib/Util/FileSystem.cpp
>++++ b/src/Lib/Util/FileSystem.cpp
>+@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>+ #include "Exception.hpp"
>+ #include "Log.hpp"
>+ #include "FileSystem.hpp"
>+-#include "physfs/physfs.h"
>+ 
>+ namespace filesystem
>+ {
>+diff --git a/src/Lib/Util/FileSystem.hpp b/src/Lib/Util/FileSystem.hpp
>+index 244d075..8bda26e 100644
>+--- a/src/Lib/Util/FileSystem.hpp
>++++ b/src/Lib/Util/FileSystem.hpp
>+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>+ #include "SDL.h"
>+ #include <string>
>+ #include <stdlib.h>
>+-#include "physfs/physfs.h"
>++#include <physfs.h>
>+ 
>+ namespace filesystem
>+ {
>+diff --git a/src/NetPanzer/Core/main.cpp b/src/NetPanzer/Core/main.cpp
>+index 4443640..bc0f939 100644
>+--- a/src/NetPanzer/Core/main.cpp
>++++ b/src/NetPanzer/Core/main.cpp
>+@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>+ 
>+ #include "Scripts/ScriptManager.hpp"
>+ 
>+-#include "lua/lua.hpp"
>++#include <lua.hpp>
>+ 
>+ #ifdef WIN32
>+ #include <windows.h>
>+diff --git a/src/NetPanzer/Scripts/ScriptHelper.hpp b/src/NetPanzer/Scripts/ScriptHelper.hpp
>+index 2a10693..1920781 100644
>+--- a/src/NetPanzer/Scripts/ScriptHelper.hpp
>++++ b/src/NetPanzer/Scripts/ScriptHelper.hpp
>+@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>+ #ifndef _SCRIPTHELPER_HPP
>+ #define	_SCRIPTHELPER_HPP
>+ 
>+-#include "lua/lua.hpp"
>++#include <lua.hpp>
>+ 
>+ #define GETSVTYPE_BYTE ScriptHelper::get_byte
>+ #define SETSVTYPE_BYTE ScriptHelper::set_byte
>diff --git a/netpanzer-0.8.4-system-physfs.patch b/netpanzer-0.8.4-system-physfs.patch
>deleted file mode 100644
>index 987477e..0000000
>--- a/netpanzer-0.8.4-system-physfs.patch
>+++ /dev/null
>@@ -1,114 +0,0 @@
>-diff --git a/SConstruct b/SConstruct
>-index 1ffaa27..c344024 100644
>---- a/SConstruct
>-+++ b/SConstruct
>-@@ -155,15 +155,12 @@ crossmingwenv.BuildDir(crossmingwenv['FINALBUILDDIR'],'.',duplicate=0)
>- crosslinuxenv.BuildDir(crosslinuxenv['FINALBUILDDIR'],'.',duplicate=0)
>- 
>- luaenv = env.Clone()
>--physfsenv = env.Clone()
>- networkenv = env.Clone()
>- 
>- crossmingwluaenv = crossmingwenv.Clone()
>--crossmingwphysfsenv = crossmingwenv.Clone()
>- crossmingwnetworkenv = crossmingwenv.Clone()
>- 
>- crosslinuxluaenv = crosslinuxenv.Clone()
>--crosslinuxphysfsenv = crosslinuxenv.Clone()
>- crosslinuxnetworkenv = crosslinuxenv.Clone()
>- 
>- ################################################################
>-@@ -205,9 +202,9 @@ print 'Building version ' + NPVERSION + ' in ' + sys.platform
>- # Configure Environments
>- ################################################################
>- 
>--env.Append(           CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
>--crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
>--crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
>-+env.Append(           CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] )
>-+crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] )
>-+crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/lua'] )
>- 
>- # for this platform
>- if thisplatform == 'darwin':
>-@@ -217,13 +214,11 @@ if thisplatform == 'darwin':
>-     if env['universal'] != 'false':
>- 		env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
>- 		luaenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
>--		physfsenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
>- 		networkenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
>- 		env.Append( LINKFLAGS = [ '-mmacosx-version-min=10.4', '-arch', 'ppc', '-arch', 'i386' ] )
>-     else:
>-         env.Append( CCFLAGS = [ '-arch', 'i386' ] )
>-         luaenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
>--        physfsenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
>-         networkenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
>-         env.Append( LINKFLAGS = [ '-arch', 'i386' ] )
>- 	
>-@@ -273,28 +268,12 @@ MakeStaticLib(          luaenv, 'nplua', 'lua', '*.c')
>- MakeStaticLib(crossmingwluaenv, 'nplua', 'lua', '*.c')
>- MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua', '*.c')
>- 
>--# BUILDS PHYSFS
>--physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
>--physfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
>--MakeStaticLib(physfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
>--
>--crossmingwphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
>--crossmingwphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
>--MakeStaticLib(crossmingwphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
>--
>--crosslinuxphysfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
>--crosslinuxphysfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
>--MakeStaticLib(crosslinuxphysfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
>--
>- # BUILDS 2D
>- env.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
>--env.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
>- MakeStaticLib(env, 'np2d', '2D 2D/libpng', '*.c*')
>- crossmingwenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
>--crossmingwenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
>- MakeStaticLib(crossmingwenv, 'np2d', '2D 2D/libpng', '*.c*')
>- crosslinuxenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
>--crosslinuxenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
>- MakeStaticLib(crosslinuxenv, 'np2d', '2D 2D/libpng', '*.c*')
>- 
>- # BUILDS REST OF LIBRARIES
>-@@ -323,9 +302,9 @@ if crossmingwenv.has_key('WINICON'):
>-     
>- crosslinuxenv.Append( NPSOURCES = globSources(crosslinuxenv, 'src/NetPanzer', npdirs, "*.cpp") )
>- 
>--env.Append(           NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
>--crossmingwenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
>--crosslinuxenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','npphysfs'] )
>-+env.Append(           NPLIBS = ['nplua','np2d','npnetwork','nplibs','physfs'] )
>-+crossmingwenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','physfs'] )
>-+crosslinuxenv.Append( NPLIBS = ['nplua','np2d','npnetwork','nplibs','physfs'] )
>- 
>- if env.has_key('LIBS'):
>-     env.Append( NPLIBS = env['LIBS'] )
>-diff --git a/src/Lib/Util/FileSystem.cpp b/src/Lib/Util/FileSystem.cpp
>-index 1deae2d..a951119 100644
>---- a/src/Lib/Util/FileSystem.cpp
>-+++ b/src/Lib/Util/FileSystem.cpp
>-@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>- #include "Exception.hpp"
>- #include "Log.hpp"
>- #include "FileSystem.hpp"
>--#include "physfs/physfs.h"
>- 
>- namespace filesystem
>- {
>-diff --git a/src/Lib/Util/FileSystem.hpp b/src/Lib/Util/FileSystem.hpp
>-index 244d075..8bda26e 100644
>---- a/src/Lib/Util/FileSystem.hpp
>-+++ b/src/Lib/Util/FileSystem.hpp
>-@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>- #include "SDL.h"
>- #include <string>
>- #include <stdlib.h>
>--#include "physfs/physfs.h"
>-+#include <physfs.h>
>- 
>- namespace filesystem
>- {
>diff --git a/netpanzer.spec b/netpanzer.spec
>index 2b85cad..0fa9512 100644
>--- a/netpanzer.spec
>+++ b/netpanzer.spec
>@@ -1,6 +1,6 @@
> Name:           netpanzer
> Version:        0.8.4
>-Release:        6%{?dist}
>+Release:        7%{?dist}
> Summary:        An Online Multiplayer Tactical Warfare Game
> 
> Group:          Amusements/Games
>@@ -17,11 +17,12 @@ Patch4:         netpanzer-0.8.2-MapSelectionView-memory.patch
> #Patch5:         netpanzer-0.8.3-scons-fixes.patch
> Patch6:         netpanzer-0.8.3-optflags-580241.patch
> Patch7:		netpanzer-0.8.4-gcc470.patch
>-Patch8:		netpanzer-0.8.4-system-physfs.patch
>+Patch8:		netpanzer-0.8.4-syslibs.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  physfs-devel >= 0.1.9, desktop-file-utils, doxygen, scons
> BuildRequires:  SDL-devel >= 1.2.5, SDL_mixer-devel >= 1.2, SDL_image-devel >= 1.2
>+BuildRequires:  compat-lua-devel
> Obsoletes:      netpanzer-data <= 0.8
> Provides:       netpanzer-data = %{version}-%{release}
> Requires(post): coreutils
>@@ -53,7 +54,7 @@ sed -i 's/\r//' RELNOTES
> %patch6 -p1
> %patch7 -p0
> %patch8 -p1
>-rm -r src/Lib/physfs
>+rm -r src/Lib/lua src/Lib/physfs
> 
> %build
> scons datadir=%{_datadir}/netpanzer %{?_smp_mflags}
>@@ -109,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_datadir}/netpanzer
> 
> %changelog
>+* Wed Mar 26 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.8.4-7
>+- Build with system compat-lua instead of bundled one
>+
> * Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.8.4-6
> - Build with system physfs instead of bundled one (#1076808)
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1081241: 879225