rpms/raidem/devel raidem-0.3-datapath.patch, NONE, 1.1 raidem-0.3-no-mp3.patch, NONE, 1.1 raidem-0.3-syslibs.patch, NONE, 1.1 raidem-0.3-warn.patch, NONE, 1.1 raidem.desktop, NONE, 1.1 raidem.png, NONE, 1.1 raidem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Mar 15 18:43:34 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/raidem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32246/devel
Modified Files:
.cvsignore sources
Added Files:
raidem-0.3-datapath.patch raidem-0.3-no-mp3.patch
raidem-0.3-syslibs.patch raidem-0.3-warn.patch raidem.desktop
raidem.png raidem.spec
Log Message:
auto-import raidem-0.3-1 on branch devel from raidem-0.3-1.src.rpm
raidem-0.3-datapath.patch:
--- NEW FILE raidem-0.3-datapath.patch ---
--- raidem-0.3/src/init.m.orig 2006-03-12 21:50:32.000000000 +0100
+++ raidem-0.3/src/init.m 2006-03-12 21:59:44.000000000 +0100
@@ -115,6 +115,8 @@
tiles_init();
set_colour_conversion_keep_alpha();
+ /* so that Sebum will find our files */
+ chdir(RAIDEM_DATA_DIR);
base_sebum = [SebFile new];
if (not [base_sebum loadSebumDirectory:"data/base"]) {
base_sebum = nil;
raidem-0.3-no-mp3.patch:
--- NEW FILE raidem-0.3-no-mp3.patch ---
diff -urN raidem-0.3-src.orig/src/music.m raidem-0.3-src/src/music.m
--- raidem-0.3-src.orig/src/music.m 2006-01-21 09:24:01.000000000 +0100
+++ raidem-0.3-src/src/music.m 2006-03-12 20:42:31.000000000 +0100
@@ -3,6 +3,8 @@
* This file handles music stuff using AllegroMP3.
*/
+#ifndef NO_MP3
+
#include <allegro.h>
#include <assert.h>
#include <pthread.h>
@@ -287,3 +289,47 @@
free(music_data);
music_data = NULL;
}
+
+/*--------------------------------------------------------------*/
+
+#else /* ifndef NO_MP3 */
+
+int music_vol = 255;
+
+void play_music(const char *directory)
+{
+}
+
+void poll_music(void)
+{
+}
+
+void free_music(void)
+{
+}
+
+void adjust_music_volume(void)
+{
+}
+
+void play_mp3(const char *filename)
+{
+}
+
+void start_autopoll_music(void)
+{
+}
+
+void stop_autopoll_music(void)
+{
+}
+
+void music_init(void)
+{
+}
+
+void music_shutdown(void)
+{
+}
+
+#endif
diff -urN raidem-0.3-src.orig/src/seborrhea/mp3.m raidem-0.3-src/src/seborrhea/mp3.m
--- raidem-0.3-src.orig/src/seborrhea/mp3.m 2005-09-01 18:55:28.000000000 +0200
+++ raidem-0.3-src/src/seborrhea/mp3.m 2006-03-12 20:42:31.000000000 +0100
@@ -1,3 +1,4 @@
+#ifndef NO_MP3
/* seborrhea-mp3.m,
*
* This is for music lumps.
@@ -76,3 +77,5 @@
[parent addToList:seb];
return YES;
}
+
+#endif
diff -urN raidem-0.3-src.orig/include/seborrhea/seborrhea.h raidem-0.3-src/include/seborrhea/seborrhea.h
--- raidem-0.3-src.orig/include/seborrhea/seborrhea.h 2005-09-01 18:52:37.000000000 +0200
+++ raidem-0.3-src/include/seborrhea/seborrhea.h 2006-03-12 20:42:31.000000000 +0100
@@ -16,7 +16,9 @@
#include "seborrhea/container-queue.h"
#include "seborrhea/container-shuffle.h"
+#ifndef NO_MP3
#include "seborrhea/mp3.h"
+#endif
#include "seborrhea/spline.h"
raidem-0.3-syslibs.patch:
--- NEW FILE raidem-0.3-syslibs.patch ---
diff -urN raidem-0.3-src.orig/Makefile raidem-0.3-src/Makefile
--- raidem-0.3-src.orig/Makefile 2006-01-31 06:33:08.000000000 +0100
+++ raidem-0.3-src/Makefile 2006-03-12 20:42:31.000000000 +0100
@@ -208,10 +208,7 @@
spline.o \
strdup.o \
token.o \
- zzpk.o) \
- lib/alrand/alrand.o \
- lib/alrand/lcg.o \
- lib/alrand/mersenne.o
+ zzpk.o)
UNITS := $(addprefix obj/units/,\
all-units.o \
diff -urN raidem-0.3-src.orig/include/alrand/alrand.h raidem-0.3-src/include/alrand/alrand.h
--- raidem-0.3-src.orig/include/alrand/alrand.h 1970-01-01 01:00:00.000000000 +0100
+++ raidem-0.3-src/include/alrand/alrand.h 2006-03-12 20:43:25.000000000 +0100
@@ -0,0 +1,30 @@
+/* (partial) alrand emulation file for glibc */
+#ifndef __alrand_h
+#define __alrand_h
+
+#include <stdlib.h>
+
+#define alrand_init()
+#define alrand_exit()
+#define alrand_set_global_generator_type(x)
+
+
+#define alrand_rand() random()
+#define alrand_srand(seed) srandom(seed)
+
+
+#define alrand_create(a, b) calloc(1, sizeof(struct drand48_data))
+#define alrand_destroy(state) free(state)
+#define alrand_seed(state, seed) srand48_r(seed, state)
+
+typedef unsigned int alrand_uint32_t;
+typedef struct drand48_data alrand_state;
+
+static inline alrand_uint32_t alrand_generate(alrand_state *state)
+{
+ long ret;
+ lrand48_r(state, &ret);
+ return ret;
+}
+
+#endif
diff -urN raidem-0.3-src.orig/include/seborrhea/font-glyphkeeper.h raidem-0.3-src/include/seborrhea/font-glyphkeeper.h
--- raidem-0.3-src.orig/include/seborrhea/font-glyphkeeper.h 2005-09-01 17:18:13.000000000 +0200
+++ raidem-0.3-src/include/seborrhea/font-glyphkeeper.h 2006-03-12 20:42:31.000000000 +0100
@@ -2,7 +2,7 @@
#ifndef _seb_included_font_glyphkeeper_h
#define _seb_included_font_glyphkeeper_h
-#include "glyph-keeper/include/glyph.h"
+#include <glyph.h>
#include "seborrhea/font.h"
@interface SebFontGlyphKeeper: AbstractSebFont
diff -urN raidem-0.3-src.orig/src/map-editor/map-proc.m raidem-0.3-src/src/map-editor/map-proc.m
--- raidem-0.3-src.orig/src/map-editor/map-proc.m 2006-01-20 03:33:33.000000000 +0100
+++ raidem-0.3-src/src/map-editor/map-proc.m 2006-03-12 20:42:31.000000000 +0100
@@ -4,7 +4,7 @@
#include <allegro.h>
#include <assert.h>
#include <math.h>
-#include "adime/include/adime.h"
+#include <adime.h>
#include "common.h"
#include "group.h"
#include "gui/gui-clip.h"
diff -urN raidem-0.3-src.orig/src/map-editor/redit.m raidem-0.3-src/src/map-editor/redit.m
--- raidem-0.3-src.orig/src/map-editor/redit.m 2005-12-06 00:38:24.000000000 +0100
+++ raidem-0.3-src/src/map-editor/redit.m 2006-03-12 20:42:31.000000000 +0100
@@ -7,7 +7,7 @@
#include <allegro.h>
#include <assert.h>
#include <objc/Object.h>
-#include "adime/include/adime.h"
+#include <adime.h>
#include "common.h"
#include "game.h"
#include "group.h"
diff -urN raidem-0.3-src.orig/src/seborrhea/font-glyphkeeper.m raidem-0.3-src/src/seborrhea/font-glyphkeeper.m
--- raidem-0.3-src.orig/src/seborrhea/font-glyphkeeper.m 2006-01-10 05:39:43.000000000 +0100
+++ raidem-0.3-src/src/seborrhea/font-glyphkeeper.m 2006-03-12 20:42:31.000000000 +0100
@@ -4,7 +4,7 @@
*/
#include <assert.h>
-#include "glyph-keeper/include/glyph.h"
+#include <glyph.h>
#include "seborrhea/font-glyphkeeper.h"
#include "seborrhea/seborrhea-common.h"
#include "seborrhea/seborrhea-debug.h"
raidem-0.3-warn.patch:
--- NEW FILE raidem-0.3-warn.patch ---
diff -urN raidem-0.3-src.orig/src/map.m raidem-0.3-src/src/map.m
--- raidem-0.3-src.orig/src/map.m 2005-11-29 23:13:43.000000000 +0100
+++ raidem-0.3-src/src/map.m 2006-03-12 20:42:31.000000000 +0100
@@ -390,7 +390,7 @@
dirname = strrchr(temp, '/');
if (dirname)
- *dirname++;
+ dirname++;
}
music_dirname = strdup(dirname);
--- NEW FILE raidem.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Raidem
GenericName=2d top-down shoot'em up
Comment=Inspired by Raptor
Exec=raidem
Icon=raidem.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;
Version=0.3
--- NEW FILE raidem.spec ---
Name: raidem
Version: 0.3
Release: 1%{?dist}
Summary: 2d top-down shoot'em up
Group: Amusements/Games
License: zlib License
URL: http://home.exetel.com.au/tjaden/raidem/
# This is an exacy copy of the upstream src except that lib/almp3 which is
# an included mp3 decoder has been removed.
Source0: %{name}-%{version}-src.zip
Source1: raidem.png
Source2: raidem.desktop
Patch0: raidem-0.3-no-mp3.patch
Patch1: raidem-0.3-syslibs.patch
Patch2: raidem-0.3-datapath.patch
Patch3: raidem-0.3-warn.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel
BuildRequires: zziplib-devel libpng-devel
%description
Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II
(abandoned long ago), which was inspired by Raptor, but has turned out very
differently. Features: Neat looking graphics, LOTS of explosions and scrap
metal, Eye candy a-plenty, Many different powerups, A desert. And a space
platform. And some snow, 2 player mode, Demo recording and playback, Loads of
fun.
%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1 -z .no_mp3
%patch1 -p1 -z .syslibs
%patch2 -p1 -z .datapath
%patch3 -p1 -z .warn
# remove all included system libs, to avoid using the included system headers.
mv lib/loadpng .
rm -fr lib/*
mv loadpng lib
%build
make %{?_smp_mflags} lib/loadpng/libldpng.a raid \
CFLAGS="-Iinclude -Ilib -DNO_MP3 -DNO_ID3TAGS -DNO_FBLEND \
-DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \
-DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \
LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \
-lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc"
%install
rm -rf $RPM_BUILD_ROOT
#DIY, since the Makefile uses hardcoded ( := assigned) paths.
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root,-)
%doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-raidem.desktop
%{_datadir}/icons/hicolor/48x48/apps/raidem.png
%changelog
* Sat Mar 12 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-1
- Initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Mar 2006 18:38:34 -0000 1.1
+++ .cvsignore 15 Mar 2006 18:43:34 -0000 1.2
@@ -0,0 +1 @@
+raidem-0.3-src.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Mar 2006 18:38:34 -0000 1.1
+++ sources 15 Mar 2006 18:43:34 -0000 1.2
@@ -0,0 +1 @@
+7a8de682a0fe122e784cc192b19ece4e raidem-0.3-src.zip
More information about the scm-commits
mailing list