rpms/teeworlds/devel import.log, NONE, 1.1 teeworlds-0.5.1-extlibs.patch, NONE, 1.1 teeworlds-0.5.1-optflags.patch, NONE, 1.1 teeworlds.png, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 teeworlds.spec, 1.3, 1.4 teeworlds-0.5.0-extlibs.patch, 1.1, NONE teeworlds-0.5.0-optflags.patch, 1.1, NONE teeworlds-0.5.0-segv.patch, 1.1, NONE
Simon Wesp
cassmodiah at fedoraproject.org
Mon Mar 9 16:06:01 UTC 2009
Author: cassmodiah
Update of /cvs/pkgs/rpms/teeworlds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15803/devel
Modified Files:
.cvsignore sources teeworlds.spec
Added Files:
import.log teeworlds-0.5.1-extlibs.patch
teeworlds-0.5.1-optflags.patch teeworlds.png
Removed Files:
teeworlds-0.5.0-extlibs.patch teeworlds-0.5.0-optflags.patch
teeworlds-0.5.0-segv.patch
Log Message:
--- NEW FILE import.log ---
teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
teeworlds-0.5.1-extlibs.patch:
--- NEW FILE teeworlds-0.5.1-extlibs.patch ---
diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam
--- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100
+++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:48:10.000000000 +0100
@@ -7,6 +7,8 @@
config:Add(OptFindCompiler())
config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
config:Add(OptFindLibrary("zlib", "zlib.h", false))
+config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+config:Add(OptFindLibrary("pnglite", "sys/types.h", false))
config:Add(SDL.OptFind("sdl", true))
config:Finalize("config.bam")
@@ -151,8 +153,29 @@
end
-- build the small libraries
- wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
- pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+ -- compile wavpack if needed
+ if config.wavpack.value == 1 then
+ settings.link.libs:Add("wavpack")
+ if config.wavpack.include_path then
+ settings.cc.includes:Add(config.wavpack.include_path)
+ end
+ wavpack = {}
+ else
+ wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+ settings.cc.includes:Add("src/engine/external")
+ end
+
+ -- compile pnglite if needed
+ if config.pnglite.value == 1 then
+ settings.link.libs:Add("pnglite")
+ if config.pnglite.include_path then
+ settings.cc.includes:Add(config.pnglite.include_path)
+ end
+ pnglite = {}
+ else
+ pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+ settings.cc.includes:Add("src/engine/external/pnglite")
+ end
-- build game components
engine_settings = settings:Copy()
diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.1-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.1-src.orig/src/engine/client/ec_gfx.c 2009-01-25 14:50:33.000000000 +0100
+++ teeworlds-0.5.1-src/src/engine/client/ec_gfx.c 2009-03-09 12:48:39.000000000 +0100
@@ -18,7 +18,7 @@
#endif
#include <base/system.h>
-#include <engine/external/pnglite/pnglite.h>
+#include <pnglite.h>
#include <engine/e_client_interface.h>
#include <engine/e_engine.h>
diff -Naur teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.1-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.1-src.orig/src/engine/client/ec_snd.c 2009-01-25 14:50:33.000000000 +0100
+++ teeworlds-0.5.1-src/src/engine/client/ec_snd.c 2009-03-09 12:55:19.000000000 +0100
@@ -6,7 +6,7 @@
#include "SDL.h"
-#include <engine/external/wavpack/wavpack.h>
+#include <wavpack/wavpack.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -358,19 +358,12 @@
snd->num_frames = num_frames;
}
-
-static IOHANDLE file = NULL;
-
-static int read_data(void *buffer, int size)
-{
- return io_read(file, buffer, size);
-}
-
int snd_load_wv(const char *filename)
{
SAMPLE *snd;
int sid = -1;
char error[100];
+ char completefilename[512];
WavpackContext *context;
/* don't waste memory on sound when we are stress testing */
@@ -381,19 +374,13 @@
if(!sound_enabled)
return 1;
- file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h stuff for this */
- if(!file)
- {
- dbg_msg("sound/wv", "failed to open %s", filename);
- return -1;
- }
-
sid = snd_alloc_id();
if(sid < 0)
return -1;
snd = &samples[sid];
- context = WavpackOpenFileInput(read_data, error);
+ engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
+ context = WavpackOpenFileInput(completefilename, error, 0, 0);
if (context)
{
int samples = WavpackGetNumSamples(context);
@@ -410,7 +397,7 @@
if(snd->channels > 2)
{
- dbg_msg("sound/wv", "file is not mono or stereo. filename='%s'", filename);
+ dbg_msg("sound/wv", "failed to open %s: %s", completefilename, error);
return -1;
}
@@ -448,9 +435,6 @@
dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
}
- io_close(file);
- file = NULL;
-
if(config.debug)
dbg_msg("sound/wv", "loaded %s", filename);
diff -Naur teeworlds-0.5.1-src.orig/src/game/client/render.hpp teeworlds-0.5.1-src/src/game/client/render.hpp
--- teeworlds-0.5.1-src.orig/src/game/client/render.hpp 2009-01-25 14:50:33.000000000 +0100
+++ teeworlds-0.5.1-src/src/game/client/render.hpp 2009-03-09 12:56:19.000000000 +0100
@@ -37,7 +37,7 @@
TILERENDERFLAG_EXTEND=4,
};
-typedef struct SPRITE;
+struct SPRITE;
void select_sprite(SPRITE *spr, int flags=0, int sx=0, int sy=0);
void select_sprite(int id, int flags=0, int sx=0, int sy=0);
diff -Naur teeworlds-0.5.1-src.orig/src/tools/dilate.c teeworlds-0.5.1-src/src/tools/dilate.c
--- teeworlds-0.5.1-src.orig/src/tools/dilate.c 2009-01-25 14:50:33.000000000 +0100
+++ teeworlds-0.5.1-src/src/tools/dilate.c 2009-03-09 12:56:50.000000000 +0100
@@ -1,6 +1,9 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
typedef struct pixel_t
{
diff -Naur teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.1-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.1-src.orig/src/tools/tileset_borderfix.c 2009-01-25 14:50:33.000000000 +0100
+++ teeworlds-0.5.1-src/src/tools/tileset_borderfix.c 2009-03-09 12:57:14.000000000 +0100
@@ -1,6 +1,9 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../engine/external/pnglite/pnglite.c"
+#include <sys/types.h>
+#include <string.h>
+#include <stdio.h>
+#include <pnglite.h>
typedef struct pixel_t
{
teeworlds-0.5.1-optflags.patch:
--- NEW FILE teeworlds-0.5.1-optflags.patch ---
diff -Naur teeworlds-0.5.1-src.orig/default.bam teeworlds-0.5.1-src/default.bam
--- teeworlds-0.5.1-src.orig/default.bam 2009-01-25 14:50:33.000000000 +0100
+++ teeworlds-0.5.1-src/default.bam 2009-03-09 12:14:32.000000000 +0100
@@ -106,6 +106,9 @@
function build(settings)
--settings.objdir = Path("objs")
settings.cc.Output = Intermediate_Output
+ settings.cc.flags:Add(os.getenv ('CFLAGS'))
+ settings.cc.flags:Add(os.getenv ('CPPFLAGS'))
+ settings.cc.flags:Add(os.getenv ('LDFLAGS'))
if config.compiler.value == "cl" then
settings.cc.flags:Add("/wd4244")
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 18 Jan 2009 18:40:37 -0000 1.4
+++ .cvsignore 9 Mar 2009 16:05:31 -0000 1.5
@@ -1,2 +1 @@
-teeworlds-0.5.0-src.tar.gz
-teeworlds.png
+teeworlds-0.5.1-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 18 Jan 2009 18:30:52 -0000 1.4
+++ sources 9 Mar 2009 16:05:31 -0000 1.5
@@ -1,2 +1 @@
-39d7b5d41c2c7250201214a4ab6844ed teeworlds-0.5.0-src.tar.gz
-d541e3afa7809bd73bb64adb0795cb65 teeworlds.png
+5f96e73ff4c3d552de55902da9255606 teeworlds-0.5.1-src.tar.gz
Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/devel/teeworlds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- teeworlds.spec 25 Feb 2009 19:30:59 -0000 1.3
+++ teeworlds.spec 9 Mar 2009 16:05:31 -0000 1.4
@@ -1,6 +1,6 @@
Name: teeworlds
-Version: 0.5.0
-Release: 2%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
Summary: Online multi-player platform 2D shooter
Group: Amusements/Games
@@ -9,9 +9,8 @@
Source0: http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
Source1: %{name}.png
Source2: %{name}.desktop
-Patch1: %{name}-0.5.0-extlibs.patch
-Patch2: %{name}-0.5.0-optflags.patch
-Patch3: %{name}-0.5.0-segv.patch
+Patch1: %{name}-0.5.1-extlibs.patch
+Patch2: %{name}-0.5.1-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mesa-libGLU-devel
@@ -24,7 +23,7 @@
BuildRequires: pnglite-devel
BuildRequires: SDL-devel
Requires: %{name}-data
-
+
%description
The game features cartoon-themed graphics and physics,
@@ -53,14 +52,17 @@
%setup -q -n %{name}-%{version}-src
rm -rf src/engine/external
-%patch1 -p1 -b .extlibs
-%patch2 -p1 -b .optflags
-%patch3 -p1 -b .segv
+%patch1 -p1
+%patch2 -p1
iconv -f iso-8859-1 -t utf-8 readme.txt |sed 's|\r||g' > readme.txt.utf8
touch -c -r readme.txt readme.txt.utf8
mv readme.txt.utf8 readme.txt
+iconv -f iso-8859-1 -t utf-8 src/game/editor/array.hpp |sed 's|\r||g' > src/game/editor/array.hpp.utf8
+touch -c -r src/game/editor/array.hpp src/game/editor/array.hpp.utf8
+mv src/game/editor/array.hpp.utf8 src/game/editor/array.hpp
+
%build
CFLAGS="%{optflags}" bam -v release
@@ -115,6 +117,9 @@
%changelog
+* Mon Mar 09 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.1-1
+- New upstream release
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--- teeworlds-0.5.0-extlibs.patch DELETED ---
--- teeworlds-0.5.0-optflags.patch DELETED ---
--- teeworlds-0.5.0-segv.patch DELETED ---
More information about the fedora-extras-commits
mailing list