[tecnoballz/f16] Adding missing patches
musuruan
musuruan at fedoraproject.org
Sat Dec 10 16:18:12 UTC 2011
commit 66160ed18e577720a7223fdb7d4a9a73953193c9
Author: Andrea Musuruane <musuruan at gmail.com>
Date: Sat Dec 10 17:17:49 2011 +0100
Adding missing patches
tecnoballz-0.92-Makefile.patch | 30 +++++++++++
tecnoballz-0.92-dependecies.patch | 39 +++++++++++++++
tecnoballz-0.92-level_data.patch | 13 +++++
tecnoballz-0.92-texts_dir.patch | 44 +++++++++++++++++
tecnoballz-0.92-tinyxml.patch | 96 +++++++++++++++++++++++++++++++++++++
5 files changed, 222 insertions(+), 0 deletions(-)
---
diff --git a/tecnoballz-0.92-Makefile.patch b/tecnoballz-0.92-Makefile.patch
new file mode 100644
index 0000000..96283f2
--- /dev/null
+++ b/tecnoballz-0.92-Makefile.patch
@@ -0,0 +1,30 @@
+diff -dur tecnoballz-0.92.orig/Makefile.am tecnoballz-0.92/Makefile.am
+--- tecnoballz-0.92.orig/Makefile.am 2005-07-21 19:43:03.000000000 +0200
++++ tecnoballz-0.92/Makefile.am 2011-11-26 17:32:23.878188098 +0100
+@@ -1,5 +1,5 @@
+
+-gamesdir = $(prefix)/games
++gamesdir = $(bindir)
+ scoredir = /var/games/tecnoballz
+ score = tecnoballz.hi
+
+diff -dur tecnoballz-0.92.orig/src/Makefile.am tecnoballz-0.92/src/Makefile.am
+--- tecnoballz-0.92.orig/src/Makefile.am 2007-10-31 08:35:29.000000000 +0100
++++ tecnoballz-0.92/src/Makefile.am 2011-11-26 17:32:38.401341341 +0100
+@@ -1,6 +1,6 @@
+
+ NULL =
+-gamesdir = $(prefix)/games
++gamesdir = $(bindir)
+ scoredir = /var/games/tecnoballz
+ score = tecnoballz.hi
+
+@@ -71,7 +71,7 @@
+ sprite_projectile.cc \
+ sprite_ship.cc \
+ sprite_wall.cc \
+- supervisor.c \
++ supervisor.cc \
+ supervisor_bricks_level.cc \
+ supervisor_main_menu.cc \
+ supervisor_map_editor.cc \
diff --git a/tecnoballz-0.92-dependecies.patch b/tecnoballz-0.92-dependecies.patch
new file mode 100644
index 0000000..daedc1c
--- /dev/null
+++ b/tecnoballz-0.92-dependecies.patch
@@ -0,0 +1,39 @@
+diff -dur tecnoballz-0.92.orig/configure.ac tecnoballz-0.92/configure.ac
+--- tecnoballz-0.92.orig/configure.ac 2007-11-19 13:44:15.000000000 +0100
++++ tecnoballz-0.92/configure.ac 2011-11-26 18:04:22.221420518 +0100
+@@ -50,23 +50,6 @@
+
+ LDFLAGS_="${LDFLAGS_save}"
+
+-AC_CHECK_LIB(vorbisfile, ov_raw_seek, [
+- MM_LIBS="${MM_LIBS} -lvorbisfile"
+-],[
+- AC_MSG_ERROR(Could not find the vorbisfile lib : -lvorbisfile)
+-])
+-AC_CHECK_LIB(ogg, ogg_stream_packetin, [
+- MM_LIBS="${MM_LIBS} -logg"
+-],[
+- AC_MSG_ERROR(Could not find the ogg lib : -logg)
+-])
+-AC_CHECK_LIB(smpeg, SMPEG_play, [
+- MM_LIBS="${MM_LIBS} -lsmpeg"
+-],[
+- AC_MSG_ERROR(Could not find the smpeg lib : -lsmpeg)
+-])
+-AC_SUBST(MM_LIBS)
+-
+ AC_CHECK_LIB(mikmod, Player_Stop, [
+ MIKMOD_LIBS="-lmikmod"
+ MIKMOD_FLAGS="-pthread -D_REENTRANT"
+diff -dur tecnoballz-0.92.orig/src/Makefile.am tecnoballz-0.92/src/Makefile.am
+--- tecnoballz-0.92.orig/src/Makefile.am 2007-10-31 08:35:29.000000000 +0100
++++ tecnoballz-0.92/src/Makefile.am 2011-11-26 18:04:44.634636369 +0100
+@@ -9,7 +9,7 @@
+ games_PROGRAMS = tecnoballz
+ tecnoballz_SOURCES = $(SOURCES_MAIN)
+ tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@
+-tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L.
++tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MIKMOD_LIBS@ -L.
+
+ SOURCES_MAIN = \
+ bitmap_data.cc \
diff --git a/tecnoballz-0.92-level_data.patch b/tecnoballz-0.92-level_data.patch
new file mode 100644
index 0000000..b042abb
--- /dev/null
+++ b/tecnoballz-0.92-level_data.patch
@@ -0,0 +1,13 @@
+#Description: Include levels-data.xml file in build.
+Index: tecnoballz-0.92/src/TecnoballZ/Makefile.am
+===================================================================
+--- tecnoballz-0.92.orig/src/TecnoballZ/Makefile.am 2009-04-16 14:41:28.000000000 -0400
++++ tecnoballz-0.92/src/TecnoballZ/Makefile.am 2009-04-16 14:41:48.000000000 -0400
+@@ -6,6 +6,7 @@
+ dist_pkgdata_DATA = \
+ cosinus128.list \
+ gard_lissa.list \
++ levels-data.xml \
+ min60map.png \
+ tableau.data \
+ tilemap-congratulation_20.data \
diff --git a/tecnoballz-0.92-texts_dir.patch b/tecnoballz-0.92-texts_dir.patch
new file mode 100644
index 0000000..21c2c76
--- /dev/null
+++ b/tecnoballz-0.92-texts_dir.patch
@@ -0,0 +1,44 @@
+#Description: Include the texts subdir in the build.
+Index: tecnoballz-0.92/configure.ac
+===================================================================
+--- tecnoballz-0.92.orig/configure.ac 2009-04-16 15:35:02.000000000 -0400
++++ tecnoballz-0.92/configure.ac 2009-04-16 15:35:33.000000000 -0400
+@@ -81,5 +81,5 @@
+
+
+ dnl Output makefiles
+-AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile)
++AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile src/TecnoballZ/texts/Makefile)
+
+Index: tecnoballz-0.92/src/TecnoballZ/Makefile.am
+===================================================================
+--- tecnoballz-0.92.orig/src/TecnoballZ/Makefile.am 2009-04-16 15:35:46.000000000 -0400
++++ tecnoballz-0.92/src/TecnoballZ/Makefile.am 2009-04-16 15:36:10.000000000 -0400
+@@ -1,6 +1,6 @@
+ NULL =
+
+-SUBDIRS = lores hires textures sounds musics
++SUBDIRS = lores hires textures sounds musics texts
+
+ pkgdatadir = $(datadir)/tecnoballz
+ dist_pkgdata_DATA = \
+Index: tecnoballz-0.92/src/TecnoballZ/texts/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ tecnoballz-0.92/src/TecnoballZ/texts/Makefile.am 2009-04-16 15:37:27.000000000 -0400
+@@ -0,0 +1,15 @@
++NULL =
++pkgdatadir = $(datadir)/tecnoballz/texts
++dist_pkgdata_DATA = \
++ main_menu_en.txt \
++ main_menu_fr.txt \
++ popup_menu_en.txt \
++ popup_menu_fr.txt \
++ scrolltext_en.txt \
++ scrolltext_fr.txt \
++ shop_en.txt \
++ shop_fr.txt \
++ short_info_messages_en.txt \
++ short_info_messages_fr.txt \
++ $(NULL)
++
diff --git a/tecnoballz-0.92-tinyxml.patch b/tecnoballz-0.92-tinyxml.patch
new file mode 100644
index 0000000..c4f55cc
--- /dev/null
+++ b/tecnoballz-0.92-tinyxml.patch
@@ -0,0 +1,96 @@
+From: Ansgar Burchardt <ansgar at debian.org>
+Date: Sun, 14 Aug 2011 14:08:35 +0200
+Subject: Use tinyxml system library
+Origin: vendor
+
+--- tecnoballz.orig/include/handler_levels.h
++++ tecnoballz/include/handler_levels.h
+@@ -32,7 +32,7 @@
+ class handler_levels;
+
+ #include "../include/tecnoballz.h"
+-#include "../include/tinyxml.h"
++#include <tinyxml.h>
+ #include <string.h>
+
+ typedef struct
+--- tecnoballz.orig/include/tinystr.h
++++ tecnoballz/include/tinystr.h
+@@ -34,6 +34,8 @@
+ * - added swap(), clear(), size(), capacity(), operator+().
+ */
+
++#error "Embedded copy of libtinyxml-dev should not be used."
++
+ #ifndef TIXML_USE_STL
+
+ #ifndef TIXML_STRING_INCLUDED
+--- tecnoballz.orig/include/tinyxml.h
++++ tecnoballz/include/tinyxml.h
+@@ -22,6 +22,7 @@
+ distribution.
+ */
+
++#error "Embedded copy of libtinyxml-dev should not be used."
+
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+--- tecnoballz.orig/src/Makefile.am
++++ tecnoballz/src/Makefile.am
+@@ -9,7 +9,7 @@
+ games_PROGRAMS = tecnoballz
+ tecnoballz_SOURCES = $(SOURCES_MAIN)
+ tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@
+-tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MIKMOD_LIBS@ -L.
++tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MIKMOD_LIBS@ -ltinyxml -L.
+
+ SOURCES_MAIN = \
+ bitmap_data.cc \
+@@ -81,9 +81,5 @@
+ tecnoballz.cc \
+ tiles_background.cc \
+ tilesmap_scrolling.cc \
+- tinyxml.cc \
+- tinyxmlerror.cc \
+- tinyxmlparser.cc \
+- tinystr.cc
+ $(NULL)
+
+--- tecnoballz.orig/src/handler_levels.cc
++++ tecnoballz/src/handler_levels.cc
+@@ -29,7 +29,7 @@
+ using namespace std;
+ #include "../include/handler_levels.h"
+ #include "../include/handler_resources.h"
+-#include "../include/tinyxml.h"
++#include <tinyxml.h>
+ #include <string.h>
+ #include <sstream>
+
+@@ -143,7 +143,7 @@
+ Sint32 type = parent->Type ();
+ switch (type)
+ {
+- case TiXmlNode::ELEMENT:
++ case TiXmlNode::TINYXML_ELEMENT:
+ {
+ string element = parent->Value ();
+ if (element == "level")
+@@ -221,7 +221,7 @@
+ string name;
+ switch (type)
+ {
+- case TiXmlNode::ELEMENT:
++ case TiXmlNode::TINYXML_ELEMENT:
+ {
+ element = parent->ToElement ();
+ last_element = parent->Value ();
+@@ -290,7 +290,7 @@
+ break;
+
+
+- case TiXmlNode::TEXT:
++ case TiXmlNode::TINYXML_TEXT:
+ text = parent->ToText ();
+ value_str = text->Value ();
+
More information about the scm-commits
mailing list