rpms/KoboDeluxe/devel KoboDeluxe-0.4pre10-audio.patch, NONE, 1.1 KoboDeluxe-cpp-fixes.patch, NONE, 1.1 KoboDeluxe-defaults.patch, NONE, 1.1 KoboDeluxe.desktop, NONE, 1.1 KoboDeluxe.png, NONE, 1.1 KoboDeluxe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Fri Feb 23 13:39:40 UTC 2007


Author: jwrdegoede

Update of /cvs/extras/rpms/KoboDeluxe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28087/devel

Modified Files:
	.cvsignore sources 
Added Files:
	KoboDeluxe-0.4pre10-audio.patch KoboDeluxe-cpp-fixes.patch 
	KoboDeluxe-defaults.patch KoboDeluxe.desktop KoboDeluxe.png 
	KoboDeluxe.spec 
Log Message:
auto-import KoboDeluxe-0.4-0.3.pre10.fc7 on branch devel from KoboDeluxe-0.4-0.3.pre10.fc7.src.rpm

KoboDeluxe-0.4pre10-audio.patch:

--- NEW FILE KoboDeluxe-0.4pre10-audio.patch ---
--- KoboDeluxe-0.4pre10.orig/sound/audio.c	2003-05-03 04:05:19.000000000 +0200
+++ KoboDeluxe-0.4pre10/sound/audio.c	2007-02-19 16:41:27.000000000 +0100
@@ -344,7 +344,7 @@
 #else
 #define	TS(x)
 #endif
-	unsigned frames, bufs;
+	unsigned frames, bufs, rest;
 	Sint16 *outbuf = (Sint16 *)stream;
 	float dbt;
 
@@ -354,11 +354,18 @@
 		return;
 	}
 
-	bufs = len / (a_settings.buffersize * sizeof(Sint16) * 2);
+	bufs = len / (a_settings.buffersize * sizeof(Sint16) * 2) + 1;
 	frames = len / sizeof(Sint16) / 2 / bufs;
+	rest = (len - frames * bufs * sizeof(Sint16) * 2) / (sizeof(Sint16) * 2);
+	if (rest)
+	  bufs++;
+	else
+	  rest = frames;
 	dbt = ceil((float)frames / (float)a_settings.samplerate);
 	while(bufs--)
 	{
+	  if (bufs == 0)
+	    frames = rest;
 	  TS(0);
 	  TS(1);
 		aev_client("_run_commands()");

KoboDeluxe-cpp-fixes.patch:

--- NEW FILE KoboDeluxe-cpp-fixes.patch ---
--- KoboDeluxe-0.4pre10/gamestate.h~	2007-02-12 20:33:15.000000000 +0100
+++ KoboDeluxe-0.4pre10/gamestate.h	2007-02-12 20:33:15.000000000 +0100
@@ -24,6 +24,8 @@
 
 #include "window.h"
 
+class gamestatemanager_t;
+
 class gamestate_t
 {
 	friend class gamestatemanager_t;
--- KoboDeluxe-0.4pre10/scenes.h~	2007-02-12 20:32:45.000000000 +0100
+++ KoboDeluxe-0.4pre10/scenes.h	2007-02-12 20:32:45.000000000 +0100
@@ -39,7 +39,7 @@
     int x, y, h, v;
 } _base;
 
-typedef const struct {
+typedef struct {
     int ratio;
     int startx;
     int starty;

KoboDeluxe-defaults.patch:

--- NEW FILE KoboDeluxe-defaults.patch ---
--- KoboDeluxe-0.4pre10/prefs.cpp~	2007-02-13 14:54:16.000000000 +0100
+++ KoboDeluxe-0.4pre10/prefs.cpp	2007-02-13 14:54:57.000000000 +0100
@@ -67,13 +67,13 @@
 	key("release", release, 50); desc("Limiter Speed");
 
 	comment("--- Video settings -------------------------");
-	yesno("fullscreen", fullscreen, 0); desc("Fullscreen Display");
+	yesno("fullscreen", fullscreen, 1); desc("Fullscreen Display");
 	key("videodriver", videodriver, GFX_DRIVER_SDL2D);
 			desc("Display Driver");
-	key("width", width, 320); desc("Horizontal Resolution");
-	key("height", height, 240); desc("Vertical Resolution");
+	key("width", width, 640); desc("Horizontal Resolution");
+	key("height", height, 480); desc("Vertical Resolution");
 	key("depth", depth, 0); desc("Display Depth");
-	key("maxfps", max_fps, 0); desc("Maximum FPS");
+	key("maxfps", max_fps, 50); desc("Maximum FPS");
 	key("buffer", buffermode, GFX_BUFFER_SEMITRIPLE);
 			desc("Display Buffer Mode");
 	key("internalres", internalres, 1); desc("Texture Resolution");


--- NEW FILE KoboDeluxe.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Kobo Deluxe
Comment=3'rd person scrolling 2D shooter
Exec=kobodl
Icon=KoboDeluxe
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;ArcadeGame;


--- NEW FILE KoboDeluxe.spec ---
%define prever pre10

Name:           KoboDeluxe
Version:        0.4
Release:        0.3.%{prever}%{?dist}
Summary:        3'rd person scrolling 2D shooter
Group:          Amusements/Games
License:        GPL
URL:            http://olofson.net/kobodl/
Source0:        http://olofson.net/kobodl/download/%{name}-%{version}%{prever}.tar.gz
Source1:        %{name}.png
Source2:        %{name}.desktop
Patch0:         KoboDeluxe-cpp-fixes.patch
Patch1:         KoboDeluxe-defaults.patch
Patch2:         KoboDeluxe-0.4pre10-audio.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_image-devel desktop-file-utils
Requires:       hicolor-icon-theme
Requires(pre):  /usr/sbin/groupadd

%description
Kobo Deluxe is a 3'rd person  scrolling 2D shooter with a simple
and responsive control system  - which you'll need to tackle the
tons of enemy ships that shoot at you,  chase you, circle around
you shooting,  or even  launch other ships at you,  while you're
trying to  destroy the  labyrinth  shaped  bases.  There  are 50
action packed  levels with  smoothly increasing  difficulty, and
different combinations of enemies that require different tactics
to be dealt with successfully.


%prep
%setup -q -n %{name}-%{version}%{prever}
%patch0 -p1 -z .cpp
%patch1 -p1 -z .defaults
%patch2 -p1 -z .audio
sed -i -e 's|$(datadir)/games/kobo-deluxe|$(datadir)/kobo-deluxe|g' \
  -e 's|$(prefix)/games/kobo-deluxe/scores|%{_var}/games/kobo-deluxe|g' \
  configure data/Makefile.in
iconv -f ISO-8859-1 -t UTF8 README > tmp;         mv tmp README
iconv -f ISO-8859-1 -t UTF8 ChangeLog > tmp;      mv tmp ChangeLog
iconv -f ISO2022JP -t UTF8 README.jp > tmp;       mv tmp README.jp
iconv -f ISO2022JP -t UTF8 README.xkobo.jp > tmp; mv tmp README.xkobo.jp



%build
%configure --disable-dependency-tracking --enable-opengl
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

# 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 \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE1} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%clean
rm -rf $RPM_BUILD_ROOT


%pre
/usr/sbin/groupadd kobodl 2> /dev/null || :

%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING* README README.jp README.xkobo.jp README.sfont 
%doc README.xkobo TODO
%attr(2755,root,kobodl) %{_bindir}/kobodl
%{_datadir}/kobo-deluxe
%{_mandir}/man6/kobodl.6.gz
%config(noreplace) %attr(0775,root,kobodl) %{_var}/games/kobo-deluxe
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Mon Feb 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4-0.3.pre10
- Some last small specfile improvements from review (bz 228707)

* Mon Feb 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4-0.2.pre10
- various specfile improvements from review (bz 228707)
- install (do not remove after make install) kobosfx.h, its not a stray header
  file it actually gets loaded runtime by the game

* Mon Feb 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4-0.1.pre10
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/KoboDeluxe/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Feb 2007 12:48:32 -0000	1.1
+++ .cvsignore	23 Feb 2007 13:39:08 -0000	1.2
@@ -0,0 +1 @@
+KoboDeluxe-0.4pre10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/KoboDeluxe/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Feb 2007 12:48:32 -0000	1.1
+++ sources	23 Feb 2007 13:39:08 -0000	1.2
@@ -0,0 +1 @@
+6c075837ae680bf5490c1fc4279dcc8b  KoboDeluxe-0.4pre10.tar.gz




More information about the scm-commits mailing list