rpms/teeworlds/F-11 teeworlds-0.5.2-extlibs.patch, NONE, 1.1 teeworlds-0.5.2-optflags.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources, 1.5, 1.6 teeworlds.spec, 1.4, 1.5 teeworlds-0.5.1-extlibs.patch, 1.1, NONE teeworlds-0.5.1-optflags.patch, 1.1, NONE
Simon Wesp
cassmodiah at fedoraproject.org
Thu Dec 24 18:10:21 UTC 2009
- Previous message (by thread): rpms/teeworlds/F-12 teeworlds-0.5.2-extlibs.patch, NONE, 1.1 teeworlds-0.5.2-optflags.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources, 1.5, 1.6 teeworlds.spec, 1.5, 1.6 teeworlds-0.5.1-extlibs.patch, 1.1, NONE teeworlds-0.5.1-optflags.patch, 1.1, NONE
- Next message (by thread): rpms/teeworlds/devel import.log,1.2,1.3 teeworlds.spec,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cassmodiah
Update of /cvs/pkgs/rpms/teeworlds/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8444/F-11
Modified Files:
.cvsignore import.log sources teeworlds.spec
Added Files:
teeworlds-0.5.2-extlibs.patch teeworlds-0.5.2-optflags.patch
Removed Files:
teeworlds-0.5.1-extlibs.patch teeworlds-0.5.1-optflags.patch
Log Message:
0.5.1 -> 0.5.2
teeworlds-0.5.2-extlibs.patch:
default.bam | 27 +++++++++++++++++++++++++--
src/engine/client/ec_gfx.c | 2 +-
src/engine/client/ec_snd.c | 26 +++++---------------------
src/tools/dilate.c | 5 ++++-
src/tools/tileset_borderfix.c | 5 ++++-
5 files changed, 39 insertions(+), 26 deletions(-)
--- NEW FILE teeworlds-0.5.2-extlibs.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam 2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam 2009-12-24 18:57:43.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.2-src.orig/src/engine/client/ec_gfx.c teeworlds-0.5.2-src/src/engine/client/ec_gfx.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_gfx.c 2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_gfx.c 2009-12-24 18:57:43.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.2-src.orig/src/engine/client/ec_snd.c teeworlds-0.5.2-src/src/engine/client/ec_snd.c
--- teeworlds-0.5.2-src.orig/src/engine/client/ec_snd.c 2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/engine/client/ec_snd.c 2009-12-24 18:57:43.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.2-src.orig/src/tools/dilate.c teeworlds-0.5.2-src/src/tools/dilate.c
--- teeworlds-0.5.2-src.orig/src/tools/dilate.c 2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/dilate.c 2009-12-24 18:57:43.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.2-src.orig/src/tools/tileset_borderfix.c teeworlds-0.5.2-src/src/tools/tileset_borderfix.c
--- teeworlds-0.5.2-src.orig/src/tools/tileset_borderfix.c 2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/src/tools/tileset_borderfix.c 2009-12-24 18:57:43.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.2-optflags.patch:
default.bam | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE teeworlds-0.5.2-optflags.patch ---
diff -Naur teeworlds-0.5.2-src.orig/default.bam teeworlds-0.5.2-src/default.bam
--- teeworlds-0.5.2-src.orig/default.bam 2009-10-26 19:04:31.000000000 +0100
+++ teeworlds-0.5.2-src/default.bam 2009-12-24 18:55:37.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/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 9 Mar 2009 16:05:31 -0000 1.5
+++ .cvsignore 24 Dec 2009 18:10:21 -0000 1.6
@@ -1 +1 @@
-teeworlds-0.5.1-src.tar.gz
+teeworlds-0.5.2-src.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 9 Mar 2009 16:05:31 -0000 1.1
+++ import.log 24 Dec 2009 18:10:21 -0000 1.2
@@ -1 +1,2 @@
teeworlds-0_5_1-1_fc10:HEAD:teeworlds-0.5.1-1.fc10.src.rpm:1236614659
+teeworlds-0_5_2-1_fc12:F-11:teeworlds-0.5.2-1.fc12.src.rpm:1261678128
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 9 Mar 2009 16:05:31 -0000 1.5
+++ sources 24 Dec 2009 18:10:21 -0000 1.6
@@ -1 +1 @@
-5f96e73ff4c3d552de55902da9255606 teeworlds-0.5.1-src.tar.gz
+f605f6df9f1714dcda4cba1d281cc757 teeworlds-0.5.2-src.tar.gz
Index: teeworlds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/teeworlds/F-11/teeworlds.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- teeworlds.spec 9 Mar 2009 16:05:31 -0000 1.4
+++ teeworlds.spec 24 Dec 2009 18:10:21 -0000 1.5
@@ -1,5 +1,5 @@
Name: teeworlds
-Version: 0.5.1
+Version: 0.5.2
Release: 1%{?dist}
Summary: Online multi-player platform 2D shooter
@@ -9,12 +9,12 @@ URL: http://www.teeworlds.com
Source0: http://www.teeworlds.com/files/%{name}-%{version}-src.tar.gz
Source1: %{name}.png
Source2: %{name}.desktop
-Patch1: %{name}-0.5.1-extlibs.patch
-Patch2: %{name}-0.5.1-optflags.patch
+Patch1: %{name}-0.5.2-extlibs.patch
+Patch2: %{name}-0.5.2-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mesa-libGLU-devel
-BuildRequires: bam >= 0.2.0
+BuildRequires: bam
BuildRequires: python-devel
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
@@ -55,13 +55,13 @@ rm -rf src/engine/external
%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
+#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
@@ -117,6 +117,12 @@ rm -rf %{buildroot}
%changelog
+* Thu Dec 24 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.2-1
+- New upstream release
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Mon Mar 09 2009 Simon Wesp <cassmodiah at fedoraproject.org> 0.5.1-1
- New upstream release
--- teeworlds-0.5.1-extlibs.patch DELETED ---
--- teeworlds-0.5.1-optflags.patch DELETED ---
- Previous message (by thread): rpms/teeworlds/F-12 teeworlds-0.5.2-extlibs.patch, NONE, 1.1 teeworlds-0.5.2-optflags.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 import.log, 1.1, 1.2 sources, 1.5, 1.6 teeworlds.spec, 1.5, 1.6 teeworlds-0.5.1-extlibs.patch, 1.1, NONE teeworlds-0.5.1-optflags.patch, 1.1, NONE
- Next message (by thread): rpms/teeworlds/devel import.log,1.2,1.3 teeworlds.spec,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list