[teeworlds] 0.6.0, sound may have issues, could be my machine. . .
Jon Ciesla
limb at fedoraproject.org
Thu Jun 2 14:40:09 UTC 2011
commit ef8e76c14557ad56b27a6b0933ff04ac75e91dd1
Author: Jon Ciesla <limb at jcomserv.net>
Date: Thu Jun 2 09:39:20 2011 -0500
0.6.0, sound may have issues, could be my machine. . .
.gitignore | 1 +
sources | 2 +-
teeworlds-0.6.0-cstddef.patch | 10 +++
teeworlds-0.6.0-extlibs.patch | 144 ++++++++++++++++++++++++++++++++++++++++
teeworlds-0.6.0-optflags.patch | 17 +++++
teeworlds.spec | 33 +++++----
6 files changed, 191 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69bb98f..57a8922 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
teeworlds-0.5.2-src.tar.gz
+/teeworlds-0.6.0-src.tar.gz
diff --git a/sources b/sources
index 157bdeb..21ba8b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f605f6df9f1714dcda4cba1d281cc757 teeworlds-0.5.2-src.tar.gz
+4d6e5d0fb1b5f0bdf6c5c49714045ef1 teeworlds-0.6.0-src.tar.gz
diff --git a/teeworlds-0.6.0-cstddef.patch b/teeworlds-0.6.0-cstddef.patch
new file mode 100644
index 0000000..211d3ca
--- /dev/null
+++ b/teeworlds-0.6.0-cstddef.patch
@@ -0,0 +1,10 @@
+--- teeworlds-0.6.0-source.orig/src/game/server/entity.h 2011-04-09 14:15:25.000000000 -0500
++++ teeworlds-0.6.0-source/src/game/server/entity.h 2011-04-26 13:28:01.556440593 -0500
+@@ -6,6 +6,7 @@
+ #include <new>
+ #include <base/vmath.h>
+ #include <game/server/gameworld.h>
++#include <cstddef>
+
+ #define MACRO_ALLOC_HEAP() \
+ public: \
diff --git a/teeworlds-0.6.0-extlibs.patch b/teeworlds-0.6.0-extlibs.patch
new file mode 100644
index 0000000..ebb6488
--- /dev/null
+++ b/teeworlds-0.6.0-extlibs.patch
@@ -0,0 +1,144 @@
+diff -U3 teeworlds-0.6.0-source.orig/src/engine/client/graphics.cpp teeworlds-0.6.0-source/src/engine/client/graphics.cpp
+--- teeworlds-0.6.0-source.orig/src/engine/client/graphics.cpp 2011-04-09 14:15:25.000000000 -0500
++++ teeworlds-0.6.0-source/src/engine/client/graphics.cpp 2011-04-26 13:07:44.443440997 -0500
+@@ -19,7 +19,7 @@
+ #endif
+
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ #include <engine/shared/config.h>
+ #include <engine/graphics.h>
+diff -U3 teeworlds-0.6.0-source.orig/src/engine/client/sound.cpp teeworlds-0.6.0-source/src/engine/client/sound.cpp
+--- teeworlds-0.6.0-source.orig/src/engine/client/sound.cpp 2011-04-09 14:15:25.000000000 -0500
++++ teeworlds-0.6.0-source/src/engine/client/sound.cpp 2011-04-26 13:09:36.005441312 -0500
+@@ -10,7 +10,7 @@
+ #include "sound.h"
+
+ extern "C" { // wavpack
+- #include <engine/external/wavpack/wavpack.h>
++ #include <wavpack/wavpack.h>
+ }
+ #include <math.h>
+
+#@@ -395,9 +395,6 @@
+# dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
+# }
+#
+#- io_close(ms_File);
+#- ms_File = NULL;
+#-
+# if(g_Config.m_Debug)
+# dbg_msg("sound/wv", "loaded %s", pFilename);
+#
+diff -U3 teeworlds-0.6.0-source.orig/src/tools/dilate.cpp teeworlds-0.6.0-source/src/tools/dilate.cpp
+--- teeworlds-0.6.0-source.orig/src/tools/dilate.cpp 2011-04-09 14:15:25.000000000 -0500
++++ teeworlds-0.6.0-source/src/tools/dilate.cpp 2011-04-26 13:10:12.820441195 -0500
+@@ -2,7 +2,11 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com. */
+ #include <base/system.h>
+ #include <base/math.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <sys/types.h>
++#include <string.h>
++#include <stdio.h>
++#include <pnglite.h>
++
+
+ typedef struct
+ {
+diff -U3 teeworlds-0.6.0-source.orig/bam.lua teeworlds-0.6.0-source/bam.lua
+--- teeworlds-0.6.0-source.orig/bam.lua 2011-04-09 14:15:25.000000000 -0500
++++ teeworlds-0.6.0-source/bam.lua 2011-04-26 13:17:48.483440965 -0500
+@@ -9,6 +9,8 @@
+ config:Add(OptCCompiler("compiler"))
+ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
+ config:Add(OptLibrary("zlib", "zlib.h", false))
++config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
++config:Add(OptLibrary("pnglite", "sys/types.h", false))
+ config:Add(SDL.OptFind("sdl", true))
+ config:Add(FreeType.OptFind("freetype", true))
+ config:Finalize("config.lua")
+@@ -177,8 +179,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()
+--- teeworlds-0.6.0-source.orig/src/tools/tileset_borderfix.cpp 2011-04-09 14:15:25.000000000 -0500
++++ teeworlds-0.6.0-source/src/tools/tileset_borderfix.cpp 2011-04-26 13:21:35.141440910 -0500
+@@ -2,7 +2,10 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com. */
+ #include <stdlib.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <sys/types.h>
++#include <string.h>
++#include <stdio.h>
++#include <pnglite.h>
+
+ typedef struct
+ {
+--- teeworlds-0.6.0-source.orig/src/engine/client/sound.cpp 2011-04-26 14:11:17.267441002 -0500
++++ teeworlds-0.6.0-source/src/engine/client/sound.cpp 2011-04-26 14:11:02.897441026 -0500
+@@ -315,6 +315,7 @@
+ CSample *pSample;
+ int SampleID = -1;
+ char aError[100];
++ char completefilename[102400];
+ WavpackContext *pContext;
+
+ // don't waste memory on sound when we are stress testing
+@@ -340,7 +341,9 @@
+ return -1;
+ pSample = &m_aSamples[SampleID];
+
+- pContext = WavpackOpenFileInput(ReadData, aError);
++ //GetPath(completefilename, sizeof(completefilename), pFilename, IOFLAG_READ);
++ pContext = WavpackOpenFileInput(completefilename, aError, 0, 0);
++
+ if (pContext)
+ {
+ int m_aSamples = WavpackGetNumSamples(pContext);
+--- teeworlds-0.6.0-source.orig/src/engine/client/sound.cpp 2011-04-09 14:15:25.000000000 -0500
++++ teeworlds-0.6.0-source/src/engine/client/sound.cpp 2011-04-27 13:36:48.745660009 -0500
+@@ -328,7 +329,11 @@
+ if(!m_pStorage)
+ return -1;
+
+- ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
++ //char longname[50];
++ //strncpy(longname, pFilename, strlen(pFilename));
++ strncat(completefilename, "/usr/share/teeworlds/data/", 50);
++ strncat(completefilename, pFilename, strlen(pFilename));
++ ms_File = m_pStorage->OpenFile(completefilename, IOFLAG_READ, IStorage::TYPE_ALL);
+ if(!ms_File)
+ {
+ dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
diff --git a/teeworlds-0.6.0-optflags.patch b/teeworlds-0.6.0-optflags.patch
new file mode 100644
index 0000000..2f8198c
--- /dev/null
+++ b/teeworlds-0.6.0-optflags.patch
@@ -0,0 +1,17 @@
+--- teeworlds-0.6.0-source/bam.lua~ 2011-04-26 13:22:16.000000000 -0500
++++ teeworlds-0.6.0-source/bam.lua 2011-04-26 13:24:47.412441073 -0500
+@@ -134,6 +134,14 @@
+ 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'))
++ settings.link.libs:Add("wavpack")
++ settings.link.libs:Add("z")
++ settings.link.libs:Add("pnglite")
++ settings.link.flags:Add('-lpng12')
++
+
+ if config.compiler.driver == "cl" then
+ settings.cc.flags:Add("/wd4244")
diff --git a/teeworlds.spec b/teeworlds.spec
index 165058a..bee0bcd 100644
--- a/teeworlds.spec
+++ b/teeworlds.spec
@@ -1,6 +1,6 @@
Name: teeworlds
-Version: 0.5.2
-Release: 3%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
Summary: Online multi-player platform 2D shooter
Group: Amusements/Games
@@ -9,13 +9,13 @@ 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.2-extlibs.patch
-Patch2: %{name}-0.5.2-optflags.patch
-Patch3: %{name}-0.5.2-cstddef.patch
+Patch1: %{name}-0.6.0-extlibs.patch
+Patch2: %{name}-0.6.0-optflags.patch
+Patch3: %{name}-0.6.0-cstddef.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mesa-libGLU-devel
-BuildRequires: bam
+BuildRequires: bam >= 0.4.0
BuildRequires: python-devel
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
@@ -52,19 +52,19 @@ Data-files for %{name}, an online multi-player platform 2D shooter.
%prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n %{name}-%{version}-source
rm -rf src/engine/external
%patch1 -p1
%patch2 -p1
-%patch3 -p0
+%patch3 -p1
-for f in ./readme.txt ./src/game/editor/array.hpp
-do
- iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
- touch -c -r $f $f.utf8
- mv $f.utf8 $f
-done
+#for f in ./readme.txt ./src/game/editor/array.hpp
+#do
+# iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
+# touch -c -r $f $f.utf8
+# mv $f.utf8 $f
+#done
%build
@@ -83,7 +83,7 @@ install -D -m 0755 %{name}_srv \
%{buildroot}%{_bindir}/%{name}-srv
cp -pr data/* \
- %{buildroot}%{_datadir}/%{name}
+ %{buildroot}%{_datadir}/%{name}/data/
install -p -m 0644 %{SOURCE1} \
%{buildroot}%{_datadir}/pixmaps/%{name}.png
@@ -121,6 +121,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Apr 26 2011 Jon Ciesla <limb at jcomserv.net> - 0.6.0-1
+- New upstream release
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list