rpms/wolf4sdl/devel Wolf4SDL-1.6-shareware.patch, NONE,
1.1 wolf4sdl-1.7-svn255-debian.patch, NONE,
1.1 wolf4sdl-1.7-svn255.patch, NONE,
1.1 Wolf4SDL-1.6-registered-apogee.patch, 1.1,
1.2 Wolf4SDL-1.6-spear.patch, 1.1,
1.2 Wolf4SDL-1.6-speardemo.patch, 1.1, 1.2 sources, 1.2,
1.3 wolf4sdl.spec, 1.1, 1.2 01-shareware-version.patch, 1.1,
NONE 02-enable-shading.patch, 1.1, NONE 10-datadir.patch, 1.1,
NONE 11-configdir.patch, 1.1, NONE 21-compiler-warnings.patch,
1.1, NONE Wolf4SDL-1.6-compile-fixes.patch, 1.1, NONE wolf4sdl.6,
1.1, NONE wolf4sdl.xpm, 1.1, NONE
Hans de Goede
jwrdegoede at rpmfusion.org
Thu Apr 28 13:59:44 CEST 2011
- Previous message: rpms/audacity-freeworld/F-14 audacity-1.3.13-desktop.in.patch, NONE,
1.1 .cvsignore, 1.7, 1.8 audacity-freeworld.spec, 1.19,
1.20 sources, 1.7, 1.8 audacity-1.3.10-desktop.patch, 1.1,
NONE audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch,
1.1, NONE audacity-1.3.12-ffmpeg-fix-ufile_write.patch, 1.1,
NONE audacity-1.3.12-fix-minimum-playspeed.patch, 1.1,
NONE audacity-1.3.12-portmixer-autoreconf.patch, 1.1,
NONE audacity.desktop, 1.3, NONE audacity.png, 1.1, NONE
- Next message: rpms/guvcview/devel .cvsignore, 1.7, 1.8 guvcview.spec, 1.6,
1.7 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/nonfree/rpms/wolf4sdl/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11715
Modified Files:
Wolf4SDL-1.6-registered-apogee.patch Wolf4SDL-1.6-spear.patch
Wolf4SDL-1.6-speardemo.patch sources wolf4sdl.spec
Added Files:
Wolf4SDL-1.6-shareware.patch wolf4sdl-1.7-svn255-debian.patch
wolf4sdl-1.7-svn255.patch
Removed Files:
01-shareware-version.patch 02-enable-shading.patch
10-datadir.patch 11-configdir.patch 21-compiler-warnings.patch
Wolf4SDL-1.6-compile-fixes.patch wolf4sdl.6 wolf4sdl.xpm
Log Message:
* Wed Apr 27 2011 Hans de Goede <hdegoede at redhat.com> 1.6-2
- Original upstream is back
- Rebase to new (original) 1.6 src zip
- Add a number of patches from upstream svn (bring version up to svn255 commit)
- Rebase patches borrowed from Debian to the latest Debian package
Wolf4SDL-1.6-shareware.patch:
version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE Wolf4SDL-1.6-shareware.patch ---
Subject: Build for the Wolf3d Shareware v1.4 version.
Author: Fabian Greffrath <fabian+debian at greffrath.com>
--- wolf4sdl-1.6.orig/version.h
+++ wolf4sdl-1.6/version.h
@@ -7,7 +7,7 @@
//#define SPEAR
//#define SPEARDEMO
-//#define UPLOAD
+#define UPLOAD
//#define GOODTIMES
#define CARMACIZED
//#define APOGEE_1_0
wolf4sdl-1.7-svn255-debian.patch:
README.Debian | 30 +
applications/wolf4sdl.desktop | 8
changelog | 87 ++++
clean | 3
compat | 1
control | 34 +
copyright | 180 +++++++++
gbp.conf | 3
man/wolf4sdl.6 | 118 ++++++
patches/02-enable-shading.patch | 24 +
patches/10-datadir.patch | 181 +++++++++
patches/21-compiler-warnings.patch | 681 +++++++++++++++++++++++++++++++++++++
patches/31-pc-speaker.patch | 288 +++++++++++++++
patches/32-mingw.patch | 24 +
patches/series | 5
pixmaps/wolf4sdl.xpm | 118 ++++++
rules | 61 +++
source/format | 1
source/local-options | 2
watch | 2
wolf4sdl.docs | 1
wolf4sdl.install | 3
wolf4sdl.links | 5
wolf4sdl.lintian-overrides | 3
wolf4sdl.manpages | 1
wolf4sdl.menu | 5
wolf4sdl.postinst | 13
wolf4sdl.prerm | 9
28 files changed, 1891 insertions(+)
--- NEW FILE wolf4sdl-1.7-svn255-debian.patch ---
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/README.Debian wolf4sdl/debian/README.Debian
--- Wolf4SDL-1.6-src/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/README.Debian 2011-04-27 19:58:18.547203098 +0200
@@ -0,0 +1,30 @@
+Wolf4SDL for Debian
+-------------------
+
+ * The wolf4sdl game requires additional data files which are not available
+ under a free license and cannot be distributed by Debian. Thus, this package
+ contains no data files, but future releases of `game-data-packager' are
+ expected to be able to generate suitable data packages for wolf4sdl.
+ .
+ For the time being, it is required to obtain the data files from external
+ ressources (hint: WolfGL home page, Files section) and copy them into the
+ `/usr/share/games/wolf3d' directory.
+
+ * The wolf4sdl package in Debian supports five variants of the game:
+ Wolf3d Full v1.4 Apogee (with ReadThis), Wolf3d Full v1.4 GT/ID/Activision,
+ Wolf3d Shareware v1.4, Spear of Destiny Full and Mission Disks, Spear of
+ Destiny Demo. The corresponding binaries are named 'wolf4sdl-wl6a',
+ 'wolf4sdl-wl6', 'wolf4sdl-wl1', 'wolf4sdl-sod' and 'wolf4sdl-sdm',
+ respectively. In order to select which variant is started by the 'wolf4sdl'
+ command and the desktop and menu files, Debian's 'update-alternatives'
+ mechanism is used:
+ .
+ $ update-alternatives --config wolf4sdl
+ .
+ By default, the 'wolf4sdl-wl1' alternative is preferred.
+ .
+ The game expects its data files in the '/usr/share/games/wolf3d' directory
+ (with lower case file names), so make sure to also copy the appropriate data
+ files into this directory when changing the 'wolf4sdl' alternative.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 03 Jan 2011 15:10:21 +0100
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/applications/wolf4sdl.desktop wolf4sdl/debian/applications/wolf4sdl.desktop
--- Wolf4SDL-1.6-src/debian/applications/wolf4sdl.desktop 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/applications/wolf4sdl.desktop 2011-04-27 19:58:18.547203098 +0200
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Wolf4SDL
+Comment=SDL-Port of Wolfenstein 3-D and Spear of Destiny
+Icon=wolf4sdl
+TryExec=wolf4sdl
+Exec=wolf4sdl
+Categories=Game;ActionGame;
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/changelog wolf4sdl/debian/changelog
--- Wolf4SDL-1.6-src/debian/changelog 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/changelog 2011-04-27 19:58:18.547203098 +0200
@@ -0,0 +1,87 @@
+wolf4sdl (1.7~svn255-1) experimental; urgency=low
+
+ [ Jon Dowland ]
+ * spelling correction
+ * line-wrap changelog
+
+ [ Fabian Greffrath ]
+ * New upstream SVN snapshot
+ (revision 255 of <svn://tron.homeunix.org:3690/wolf3d/trunk>).
+ * Refresh all patches.
+ * Drop 11-configdir.patch, implemented differently upstream.
+ * Drop 22-compile-fixes.patch, first chucnk applied upstream,
+ second chunk unnecessary since dropping 11-configdir.patch.
+ * 31-pc-speaker.patch: New patch to enable PC speaker emulation,
+ adapt 21-compiler-warnings.patch accordingly.
+ * 32-mingw.patch: New patch to fix portability issues on MinGW.
+ * Add .gitignore, debian/gbp.conf and debian/source/local-options
+ helper files.
+ * Fix 21-compiler-warnings.patch to silence the compiler again.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 18 Apr 2011 23:50:30 +0200
+
+wolf4sdl (1.6-2) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * bump version to satisfy dak
+
+ -- Jon Dowland <jmtd at debian.org> Thu, 24 Mar 2011 15:35:12 +0000
+
+wolf4sdl (1.6-1) experimental; urgency=low
+
+ * Initial release (Closes: #615056).
+ * Target at experimental until game-data-packager is able to
+ create appropriate data packages.
+ * Set Maintainer to Debian Games Team and add myself to Uploaders.
+ * Fix upstream Homepage.
+ * Add Vcs-* fields.
+ * Play safe and run "make clean" between the builds.
+ * Fix debian/watch file.
+ * Document the missing game data files in both debian/control and
+ README.Debian.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 28 Feb 2011 13:06:25 +0100
+
+wolf4sdl (1.6-0fab3) unstable; urgency=low
+
+ * Add some "sleep 1" between the different variant builds in debian/rules
+ to avoid race conditions when e.g. version.h and wl_state.cpp have been
+ modified within the same second.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Fri, 25 Feb 2011 17:11:14 +0100
+
+wolf4sdl (1.6-0fab2) unstable; urgency=low
+
+ * Build five variants of Wolf4SDL:
+ + Wolf3d Full v1.4 Apogee (with ReadThis)
+ + Wolf3d Full v1.4 GT/ID/Activision
+ + Wolf3d Shareware v1.4
+ + Spear of Destiny Full and Mission Disks
+ + Spear of Destiny Demo
+ * Handle variants via update-alternatives, document this in the manual page
+ and in README-Debian, add symlinks for the manual pages.
+ * Add lintian overrides for desktop-command-not-in-package
+ and menu-command-not-in-package.
+ * Quit if getenv("HOME") returns NULL,
+ thanks Hans de Goede <hdegoede at redhat.com>.
+ * Add a patch to get things to build with very recent gcc/glibc,
+ thanks Hans de Goede <hdegoede at redhat.com>.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 03 Jan 2011 13:49:27 +0100
+
+wolf4sdl (1.6-0fab1) unstable; urgency=low
+
+ * Initial release.
+ * Build the Wolf3d Shareware v1.4 variant.
+ * Enable shading support (just because I like it).
+ * Use /usr/share/games/wolf3d for data files.
+ * Use ~/.wolf4sdl for config files and saved games.
+ * Rename game binary to wolf4sdl from wolf3d.
+ * Fix some compiler warnings so the code compiles cleanly with
+ g++-4.5 and CFLAGS+="-Wall -Wno-sign-compare -Wno-switch".
+ * Add and install wolf4sdl.6 manual page.
+ * Install README* documentation.
+ * Add and install wolf4sdl.xpm icon based on NewWolf.ico.
+ * Add and install wolf4sdl.menu and wolf4sdl.desktop files.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Wed, 22 Dec 2010 11:29:17 +0100
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/clean wolf4sdl/debian/clean
--- Wolf4SDL-1.6-src/debian/clean 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/clean 2011-04-27 19:58:18.547203098 +0200
@@ -0,0 +1,3 @@
+wolf3d
+wolf4sdl
+wolf4sdl-*
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/compat wolf4sdl/debian/compat
--- Wolf4SDL-1.6-src/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/compat 2011-04-27 19:58:18.547203098 +0200
@@ -0,0 +1 @@
+7
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/control wolf4sdl/debian/control
--- Wolf4SDL-1.6-src/debian/control 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/control 2011-04-27 19:58:18.547203098 +0200
@@ -0,0 +1,34 @@
+Source: wolf4sdl
+Section: non-free/games
+Priority: extra
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Fabian Greffrath <fabian+debian at greffrath.com>
+Build-Depends: debhelper (>= 7.0.50~),
+ libsdl1.2-dev,
+ libsdl-mixer1.2-dev
+Standards-Version: 3.9.1
+Homepage: http://www.chaos-software.de.vu/
+Vcs-Git: git://git.debian.org/git/pkg-games/wolf4sdl.git
+Vcs-Browser: http://git.debian.org/?p=pkg-games/wolf4sdl.git;a=summary
+
+Package: wolf4sdl
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: SDL-Port of Wolfenstein 3-D and Spear of Destiny
+ Maybe it was the fact that people got to blow away Nazis. Maybe it was the
+ sheer challenge of it all. For whatever reason, Wolfenstein 3-D and Spear of
+ Destiny, pioneered the first-person shooter genre and brought its legendary
+ creators, id Software, worldwide notoriety and numerous awards. In fact, The
+ Computer Gaming World Hall of Fame recognized Wolfenstein 3D as helping to
+ shape the overall direction of the computer gaming industry.
+ .
+ Wolf4SDL is an open-source port of id Software's classic first-person shooter
+ Wolfenstein 3-D to the cross-platform multimedia library "Simple DirectMedia
+ Layer (SDL)" (http://www.libsdl.org). It is meant to keep the original feel
+ while taking advantage of some improvements.
+ .
+ The wolf4sdl game requires additional data files which are not available
+ under a free license and cannot be distributed by Debian. Thus, this package
+ contains no data files, but future releases of `game-data-packager' are
+ expected to be able to generate suitable data packages for wolf4sdl.
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/copyright wolf4sdl/debian/copyright
--- Wolf4SDL-1.6-src/debian/copyright 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/copyright 2011-04-27 19:58:18.547203098 +0200
@@ -0,0 +1,180 @@
+Author: Moritz "Ripper" Kroll <http://www.chaos-software.de.vu>
+Download: http://www.stud.uni-karlsruhe.de/~uvaue/chaos/downloads.html
+
+Files: *
+Copyright: © 1992 Id Software, Inc.
+License: Limited Use Software License Agreement
+ LIMITED USE SOFTWARE LICENSE AGREEMENT
+ .
[...1604 lines suppressed...]
+"E c #FFD1B9",
+"F c #D18B46",
+"G c #FFA28B",
+"H c #B9A28B",
+"I c #B98B74",
+"J c #B9B9A2",
+"K c #D1B9A2",
+"L c #E8D1D1",
+"M c #E8E8E8",
+"N c #FFE8E8",
+"O c #FFD1A2",
+"P c #462E17",
+"Q c #D1A274",
+"R c #464617",
+" .+@####$##$$$$$#%+ ",
+" +&@%%%######$$$$#*+= ",
+" =-@@@@@%%%%%%#$$$$#;> ",
+" +;@@&&&,@@@*@##$''#*) ",
+" !&@@,)++)~@;))@%$'$@@; ",
+" !&,;{)+++>,-+]+%##%{;- ",
+" !+&;~^^^~;;;)))*%@;~;+/ ",
+" =/+;;~(___:<^~~)[@*~}~]| ",
+" 1/))~2345567_328~**(390| ",
+" !)~}(3a6555673<((b672>| ",
+" !)~<2c345d56a3(3:2e6(>/ ",
+" =;^<~fghij473~)}gki4:~>! ",
+" ~*^2~>!1lm((^+n1opq_rr2/ ",
+" f<~<3_stumv~}~~~wxyd5(2(/= ",
+" ~~2_6zzzA774BBBCzDEdb^~/1 ",
+" ~~(F7555G7a5d5555555_(}/ ",
+" 8~(3F6664F74AA6556aa_(~! ",
+" )~(F_7777(F__F7464_7F28 ",
+" )(76F(3_______((366_} ",
+" )(767HIFFFFFFFzA755qg ",
+" n~_77eJKKzzzzzEBa55}= ",
+" |)3_7HKLLMMMMNOB4d5)n ",
+" |)(_6745OEEEEE46d55)! ",
+" |]^365667__7a65d576)! ",
+" |P)~_655647a65d56_a)! ",
+" /P)+<_Q44_F_444Q_34)! ",
+" !>)R)~2((^~^(3(<2F6g. ",
+" =>)++++++)))~~^(_66c ",
+" >)+)))~2^<222_4557k ",
+" >))~^<(_3__F(7Gd5_c ",
+" >))~2(_a7464_7654(g ",
+" >)~^<(75765d6746_<f "};
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/rules wolf4sdl/debian/rules
--- Wolf4SDL-1.6-src/debian/rules 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/rules 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,61 @@
+#!/usr/bin/make -f
+
+CFLAGS += -Wall -Wno-sign-compare -Wno-switch
+CFLAGS += -DDATADIR=\"/usr/share/games/wolf3d/\"
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+%:
+ dh $@
+
+override_dh_auto_build:
+ # Wolf3d Full v1.4 GT/ID/Activision
+ sed -e "s/^\(\/\/\)\?\(#define SPEAR\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define SPEARDEMO\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define UPLOAD\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define GOODTIMES\)/\2/" \
+ -e "s/^\(\/\/\)\?\(#define CARMACIZED\)/\2/" \
+ -e "s/^\(\/\/\)\?\(#define APOGEE_1_0\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define APOGEE_1_1\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define APOGEE_1_2\)/\/\/\2/" \
+ -i version.h
+ dh_auto_build -- BINARY=wolf4sdl-wl6
+ $(MAKE) clean
+ # Wolf3d Full v1.4 Apogee (with ReadThis)
+ sed -e "s/^\(\/\/\)\?\(#define GOODTIMES\)/\/\/\2/" \
+ -i version.h
+ dh_auto_build -- BINARY=wolf4sdl-wl6a
+ $(MAKE) clean
+ # Wolf3d Shareware v1.4
+ sed -e "s/^\(\/\/\)\?\(#define UPLOAD\)/\2/" \
+ -i version.h
+ dh_auto_build -- BINARY=wolf4sdl-wl1
+ $(MAKE) clean
+ # Spear of Destiny Full and Mission Disks
+ # (and GOODTIMES for no FormGen quiz)
+ sed -e "s/^\(\/\/\)\?\(#define SPEAR\)/\2/" \
+ -e "s/^\(\/\/\)\?\(#define SPEARDEMO\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define UPLOAD\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define GOODTIMES\)/\2/" \
+ -i version.h
+ dh_auto_build -- BINARY=wolf4sdl-sod
+ $(MAKE) clean
+ # Spear of Destiny Demo
+ sed -e "s/^\(\/\/\)\?\(#define SPEARDEMO\)/\2/" \
+ -e "s/^\(\/\/\)\?\(#define GOODTIMES\)/\/\/\2/" \
+ -i version.h
+ dh_auto_build -- BINARY=wolf4sdl-sdm
+
+override_dh_auto_clean:
+ sed -e "s/^\(\/\/\)\?\(#define SPEAR\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define SPEARDEMO\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define UPLOAD\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define GOODTIMES\)/\2/" \
+ -e "s/^\(\/\/\)\?\(#define CARMACIZED\)/\2/" \
+ -e "s/^\(\/\/\)\?\(#define APOGEE_1_0\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define APOGEE_1_1\)/\/\/\2/" \
+ -e "s/^\(\/\/\)\?\(#define APOGEE_1_2\)/\/\/\2/" \
+ -i version.h
+ dh_auto_clean
+
+override_dh_auto_install:
+ dh_auto_install --no-act
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/source/format wolf4sdl/debian/source/format
--- Wolf4SDL-1.6-src/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/source/format 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/source/local-options wolf4sdl/debian/source/local-options
--- Wolf4SDL-1.6-src/debian/source/local-options 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/source/local-options 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/watch wolf4sdl/debian/watch
--- Wolf4SDL-1.6-src/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/watch 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,2 @@
+version=3
+http://www.alice-dsl.net/mkroll/bins/Wolf4SDL-(.*)-src\.zip
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.docs wolf4sdl/debian/wolf4sdl.docs
--- Wolf4SDL-1.6-src/debian/wolf4sdl.docs 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.docs 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1 @@
+README*
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.install wolf4sdl/debian/wolf4sdl.install
--- Wolf4SDL-1.6-src/debian/wolf4sdl.install 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.install 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,3 @@
+wolf4sdl-* usr/games
+debian/pixmaps usr/share
+debian/applications usr/share
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.links wolf4sdl/debian/wolf4sdl.links
--- Wolf4SDL-1.6-src/debian/wolf4sdl.links 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.links 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,5 @@
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl6.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl6a.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl1.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-sod.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-sdm.6.gz
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.lintian-overrides wolf4sdl/debian/wolf4sdl.lintian-overrides
--- Wolf4SDL-1.6-src/debian/wolf4sdl.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.lintian-overrides 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,3 @@
+# The /usr/games/wolf4sdl binary is handled via update-alternatives
+wolf4sdl: desktop-command-not-in-package
+wolf4sdl: menu-command-not-in-package
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.manpages wolf4sdl/debian/wolf4sdl.manpages
--- Wolf4SDL-1.6-src/debian/wolf4sdl.manpages 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.manpages 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1 @@
+debian/man/wolf4sdl.6
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.menu wolf4sdl/debian/wolf4sdl.menu
--- Wolf4SDL-1.6-src/debian/wolf4sdl.menu 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.menu 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,5 @@
+?package(wolf4sdl):needs="X11" section="Games/Action"\
+ title="Wolf4SDL"\
+ longtitle="SDL-Port of Wolfenstein 3-D and Spear of Destiny"\
+ command="/usr/games/wolf4sdl"\
+ icon="/usr/share/pixmaps/wolf4sdl.xpm"
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.postinst wolf4sdl/debian/wolf4sdl.postinst
--- Wolf4SDL-1.6-src/debian/wolf4sdl.postinst 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.postinst 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]
+then
+ update-alternatives --quiet --install /usr/games/wolf4sdl wolf4sdl /usr/games/wolf4sdl-wl1 30
+ update-alternatives --quiet --install /usr/games/wolf4sdl wolf4sdl /usr/games/wolf4sdl-wl6 20
+ update-alternatives --quiet --install /usr/games/wolf4sdl wolf4sdl /usr/games/wolf4sdl-wl6a 20
+ update-alternatives --quiet --install /usr/games/wolf4sdl wolf4sdl /usr/games/wolf4sdl-sod 20
+ update-alternatives --quiet --install /usr/games/wolf4sdl wolf4sdl /usr/games/wolf4sdl-sdm 20
+fi
+
+#DEBHELPER#
diff -urN --exclude .git Wolf4SDL-1.6-src/debian/wolf4sdl.prerm wolf4sdl/debian/wolf4sdl.prerm
--- Wolf4SDL-1.6-src/debian/wolf4sdl.prerm 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/debian/wolf4sdl.prerm 2011-04-27 19:58:18.548203098 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]
+then
+ update-alternatives --quiet --remove-all wolf4sdl
+fi
+
+#DEBHELPER#
wolf4sdl-1.7-svn255.patch:
Changes-dc.txt | 17
Changes.txt | 27
GP2X/fmopl.cpp | 818 +++++++++++++++++++++
GP2X/fmopl.h | 58 +
GP2X/fmopl_940/Makefile | 27
GP2X/fmopl_940/fmopl_core.c | 1532 +++++++++++++++++++++++++++++++++++++++++
GP2X/fmopl_940/fmopl_core.h | 32
GP2X/fmopl_940/fmopl_shared.h | 175 ++++
GP2X/fmopl_940/main.c | 54 +
GP2X/fmopl_940/memory_layout.h | 34
GP2X/gp2x.cpp | 327 ++++++++
GP2X/gp2x.h | 54 +
Makefile.dc | 10
README-dc.txt | 37
README.txt | 4
Wolf4SDL-DC.cbp | 10
Wolf4SDL-GP2X.cbp | 71 +
Wolf4SDL.VC9.vcproj | 48 -
Wolf4SDL.dsp | 606 ++++++++--------
Wolf4SDL.dsw | 58 -
dc/dc_cd.cpp | 16
dc/dc_main.cpp | 377 ++++++++++
dc/dc_main.h | 49 +
dc/dc_maple.cpp | 60 +
dc/dc_video.cpp | 37
dc/dc_vmu.cpp | 181 ++++
dc/dc_vmu.h | 1168 +++++++++++++++++++++++++++++++
dc_main.cpp | 466 ------------
dc_vmu.cpp | 148 ---
dc_vmu.h | 1167 -------------------------------
f_spear.h | 10
foreign.h | 22
gp2x.cpp | 331 --------
id_ca.cpp | 22
id_in.cpp | 5
id_in.h | 1
id_sd.cpp | 4
id_vh.cpp | 158 ++--
id_vh.h | 2
id_vl.cpp | 54 -
id_vl.h | 8
version.h | 1
wl_act2.cpp | 5
wl_agent.cpp | 5
wl_atmos.cpp | 60 +
wl_debug.cpp | 6
wl_def.h | 67 -
wl_draw.cpp | 156 ----
wl_floorceiling.cpp | 2
wl_game.cpp | 14
wl_inter.cpp | 11
wl_main.cpp | 123 ++-
wl_menu.cpp | 182 ++--
wl_parallax.cpp | 4
wl_play.cpp | 12
55 files changed, 6033 insertions(+), 2900 deletions(-)
--- NEW FILE wolf4sdl-1.7-svn255.patch ---
diff -urN --exclude .git Wolf4SDL-1.6-src/Changes-dc.txt wolf4sdl/Changes-dc.txt
--- Wolf4SDL-1.6-src/Changes-dc.txt 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/Changes-dc.txt 2011-04-27 19:58:18.540203098 +0200
@@ -0,0 +1,17 @@
+1.7 <February 01, 2009>
+- Saved game description saved to VMS header
+- Adjustments made to LCD
+- VMU loading code improved
+- Miscellaneous code clean ups
+- Work started on new disc check code
+
+1.6 <October 04, 2008>
+- Getting the DC port up-to-date
+
+1.5 <May 25, 2008>
+- Mouse support
+- Weapon switch support
+- Controllers with C & Z button support
+- Command line parameters via 'params.txt' support
+- SOD mission pack support via menu
+- Commercial CD-ROM swap support
diff -urN --exclude .git Wolf4SDL-1.6-src/Changes.txt wolf4sdl/Changes.txt
--- Wolf4SDL-1.6-src/Changes.txt 2008-09-01 02:32:04.000000000 +0200
+++ wolf4sdl/Changes.txt 2011-04-27 19:58:18.540203098 +0200
@@ -1,3 +1,30 @@
+Wolf4SDL v1.7
+ - Added support for .sd1 SOD game files as delivered by Steam
+ by changing --mission parameter slightly
+ (thanks to Pickle)
+ - Added --windowed-mouse parameter to start windowed mode with grabbed mouse
+ (thanks to Jared Breland)
+ - Rain and snow speed fix (thanks to Tricob)
+ - Floor/ceiling fix (thanks to Tricob / Adam Biser)
+ - Fixed moon out of screen bug (thanks to Tricob)
+ - Rain/snow leaking ceilings fix (thanks to Adam Biser / Tricob)
+ - Per-user configuration/savegame directories (~/.wolf4sdl) on
+ Linux like systems per default (thanks to Jared Breland)
+ - Added --configdir parameter
+ - Use SDL_DOUBLEBUF for vsync to avoid or at least reduce flickering
+ (thanks to Greg Ayrton for the hint, use --nodblbuf to disable it)
+ - Removed remainings of the frame rate counter on screen, when disabled
+ - Don't quit game when using TAB+E with --tedlevel
+ - Added --extravbls parameter
+ - Changed default for "extra VBLs" from 1 to 0
+ - Fixed missing umask parameter for open with O_CREAT
+ (bug reported by Daniel Fass)
+ - Fixed support for 1.0 shareware data files
+ (bug reported by Marcus Naylor)
+ - Fixed xtile and ytile not being valid in HitHorizWall and HitVertWall,
+ respectively. This caused problems with some tutorials.
+ - Removed unused HitHorizPWall and HitVertPWall.
+
Wolf4SDL v1.6 (released 2008-09-01, revision 233)
- Fixed songs not really supporting more than 64kb
- Try to recognize whether data files don't fit to program version
diff -urN --exclude .git Wolf4SDL-1.6-src/GP2X/fmopl.cpp wolf4sdl/GP2X/fmopl.cpp
--- Wolf4SDL-1.6-src/GP2X/fmopl.cpp 1970-01-01 01:00:00.000000000 +0100
+++ wolf4sdl/GP2X/fmopl.cpp 2011-04-27 19:58:18.541203098 +0200
@@ -0,0 +1,818 @@
+/*
+** based on:
+**
+** File: fmopl.c - software implementation of FM sound generator
+** types OPL and OPL2
+**
+** Copyright (C) 2002,2003 Jarek Burczynski (bujar at mame dot net)
+** Copyright (C) 1999,2000 Tatsuyuki Satoh , MultiArcadeMachineEmulator development
+**
+** Version 0.70
+**
+** from the dosbox 0.72 source
+*/
+
+#define LOG_MSG printf
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "fmopl.h"
+#include "fmopl_940/fmopl_shared.h"
+
+#ifndef PI
+#define PI 3.14159265358979323846
+#endif
+
+/* output final shift */
+#if (OPL_SAMPLE_BITS==16)
+ #define FINAL_SH (0)
+ #define MAXOUT (+32767)
+ #define MINOUT (-32768)
+#else
+ #define FINAL_SH (8)
+ #define MAXOUT (+127)
+ #define MINOUT (-128)
+#endif
+
+
+#define FREQ_SH 16 /* 16.16 fixed point (frequency calculations) */
+#define EG_SH 16 /* 16.16 fixed point (EG timing) */
+#define LFO_SH 24 /* 8.24 fixed point (LFO calculations) */
+#define TIMER_SH 16 /* 16.16 fixed point (timers calculations) */
+
+#define FREQ_MASK ((1<<FREQ_SH)-1)
+
+/* envelope output entries */
+#define ENV_BITS 10
+#define ENV_LEN (1<<ENV_BITS)
+#define ENV_STEP (128.0/ENV_LEN)
+
+#define MAX_ATT_INDEX ((1<<(ENV_BITS-1))-1) /*511*/
+#define MIN_ATT_INDEX (0)
+
+/* register number to channel number , slot offset */
+#define SLOT1 0
+#define SLOT2 1
+
+/* Envelope Generator phases */
+
+#define EG_ATT 4
+#define EG_DEC 3
+#define EG_SUS 2
+#define EG_REL 1
+#define EG_OFF 0
+
+#define OPL_TYPE_WAVESEL 0x01 /* waveform select */
+#define OPL_TYPE_ADPCM 0x02 /* DELTA-T ADPCM unit */
+#define OPL_TYPE_KEYBOARD 0x04 /* keyboard interface */
+#define OPL_TYPE_IO 0x08 /* I/O port */
+
+/* ---------- Generic interface section ---------- */
+#define OPL_TYPE_YM3526 (0)
+#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)
+#define OPL_TYPE_Y8950 (OPL_TYPE_ADPCM|OPL_TYPE_KEYBOARD|OPL_TYPE_IO)
+
+#define WAIT_IF_MSG_BUF_FULL while( *NSubmittedMessages - *NExecutedMessages>= MSG_BUF_SIZE){};
+
+#define WAIT_FOR_SYNC \
+ while( (*NSubmittedMessages - *NExecutedMessages) % (int) MSG_BUF_SIZE !=0 ){};
+
+#define ADD_MESSAGE(mtype, i,j,k) \
+ { \
+ int n = ((*NSubmittedMessages)+1) % ((int) MSG_BUF_SIZE); \
+ MessageBuffer[n].type=mtype; \
+ MessageBuffer[n].data1=i; \
+ MessageBuffer[n].data2=j; \
+ MessageBuffer[n].data3=k; \
+ (*NSubmittedMessages)++; \
+ }
+ //if((*NSubmittedMessages) % (int) 500 ==0)
+// LOG_MSG("OPL2: %d %d %d\n",*NSubmittedMessages,*NExecutedMessages,*NSubmittedMessages-*NExecutedMessages);
+
+
+
+
+
+typedef struct fm_opl_lite {
+ int T[2]; /* timer counters */
+ int TC[2];
+ UINT8 st[2]; /* timer enable */
+
+ UINT32 *fn_tab;
+
+ /* external event callback handlers */
+ OPL_TIMERHANDLER TimerHandler; /* TIMER handler */
+ int TimerParam; /* TIMER parameter */
+ OPL_IRQHANDLER IRQHandler; /* IRQ handler */
+ int IRQParam; /* IRQ parameter */
+ OPL_UPDATEHANDLER UpdateHandler; /* stream update handler */
+ int UpdateParam; /* stream update parameter */
+
+ UINT8 type; /* chip type */
+ UINT8 address; /* address register */
+ UINT8 status; /* status flag */
+ UINT8 statusmask; /* status mask */
+ UINT8 mode; /* Reg.08 : CSM,notesel,etc. */
+
+ int clock; /* master clock (Hz) */
+ int rate; /* sampling rate (Hz) */
+ double freqbase; /* frequency base */
+ double TimerBase; /* Timer base time (==sampling time)*/
+} FM_OPLlite;
+
+/* status set and IRQ handling */
+inline void OPL_STATUS_SET(FM_OPLlite *OPL,int flag)
+{
+ /* set status flag */
+ OPL->status |= flag;
+ if(!(OPL->status & 0x80))
+ {
+ if(OPL->status & OPL->statusmask)
+ { /* IRQ on */
+ OPL->status |= 0x80;
+ /* callback user interrupt handler (IRQ is OFF to ON) */
+ if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,1);
[...9731 lines suppressed...]
strcpy(name, SaveName);
- while((dirent = fs_readdir(dir)) && x < 10)
+ for(int i = 0; i < 10; i++)
{
- for(int i=0; i<10; i++)
+ name[7] = '0' + i;
+#ifdef _arch_dreamcast
+ // Try to unpack file
+ if(DC_LoadFromVMU(name))
{
- name[7] = '0' + i;
- if(!strcmp(name, dirent->name))
+#endif
+ if(configdir[0])
+ snprintf(savepath, sizeof(savepath), "%s/%s", configdir, name);
+ else
+ strcpy(savepath, name);
+
+ const int handle = open(savepath, O_RDONLY | O_BINARY);
+ if(handle >= 0)
{
- if(DC_LoadFromVMU(name) != -1)
- {
- const int handle = open(name, O_RDONLY);
- if (handle >= 0)
- {
- char temp[32];
+ char temp[32];
- SaveGamesAvail[i] = 1;
- read(handle, temp, 32);
- close(handle);
- strcpy(&SaveGameNames[i][0], temp);
- x++;
- }
- fs_unlink(name);
- }
+ SaveGamesAvail[i] = 1;
+ read(handle, temp, 32);
+ close(handle);
+ strcpy(&SaveGameNames[i][0], temp);
}
+#ifdef _arch_dreamcast
+ // Remove unpacked version of file
+ fs_unlink(name);
}
- }
-
- fs_close(dir);
-#else
- strcpy(name, SaveName);
- for(int i=0; i<10; i++)
- {
- name[7] = '0' + i;
- const int handle = open(name, O_RDONLY | O_BINARY);
- if (handle >= 0)
- {
- char temp[32];
-
- SaveGamesAvail[i] = 1;
- read(handle, temp, 32);
- close(handle);
- strcpy(&SaveGameNames[i][0], temp);
- }
- }
#endif
+ }
}
////////////////////////////////////////////////////////////////////
@@ -3993,6 +3989,41 @@
{
struct stat statbuf;
+ // On Linux like systems, the configdir defaults to $HOME/.wolf4sdl
+#if !defined(_WIN32) && !defined(_arch_dreamcast)
+ if(configdir[0] == 0)
+ {
+ // Set config location to home directory for multi-user support
+ char *homedir = getenv("HOME");
+ if(homedir == NULL)
+ {
+ Quit("Your $HOME directory is not defined. You must set this before playing.");
+ }
+ #define WOLFDIR "/.wolf4sdl"
+ if(strlen(homedir) + sizeof(WOLFDIR) > sizeof(configdir))
+ {
+ Quit("Your $HOME directory path is too long. It cannot be used for saving games.");
+ }
+ snprintf(configdir, sizeof(configdir), "%s" WOLFDIR, homedir);
+ }
+#endif
+
+ if(configdir[0] != 0)
+ {
+ // Ensure config directory exists and create if necessary
+ if(stat(configdir, &statbuf) != 0)
+ {
+#ifdef _WIN32
+ if(_mkdir(configdir) != 0)
+#else
+ if(mkdir(configdir, 0755) != 0)
+#endif
+ {
+ Quit("The configuration directory \"%s\" could not be created.", configdir);
+ }
+ }
+ }
+
//
// JAPANESE VERSION
//
@@ -4066,13 +4097,20 @@
#ifdef SPEAR
#ifndef SPEARDEMO
- if(param_mission == 1)
+ if(param_mission == 0)
{
if(!stat("vswap.sod", &statbuf))
strcpy (extension, "sod");
else
Quit ("NO SPEAR OF DESTINY DATA FILES TO BE FOUND!");
}
+ else if(param_mission == 1)
+ {
+ if(!stat("vswap.sd1", &statbuf))
+ strcpy (extension, "sd1");
+ else
+ Quit ("NO SPEAR OF DESTINY DATA FILES TO BE FOUND!");
+ }
else if(param_mission == 2)
{
if(!stat("vswap.sd2", &statbuf))
diff -urN --exclude .git Wolf4SDL-1.6-src/wl_parallax.cpp wolf4sdl/wl_parallax.cpp
--- Wolf4SDL-1.6-src/wl_parallax.cpp 2008-02-18 01:54:38.000000000 +0100
+++ wolf4sdl/wl_parallax.cpp 2011-04-27 19:58:18.561203098 +0200
@@ -21,8 +21,8 @@
int startTex;
switch(gamestate.episode * 10 + mapon)
{
- case 0: skyID = 20; break;
- default: skyID = 0; break;
+ case 0: startTex = 20; break;
+ default: startTex = 0; break;
}
assert(startTex >= 0 && startTex < PMSpriteStart);
return startTex;
diff -urN --exclude .git Wolf4SDL-1.6-src/wl_play.cpp wolf4sdl/wl_play.cpp
--- Wolf4SDL-1.6-src/wl_play.cpp 2008-05-27 02:06:56.000000000 +0200
+++ wolf4sdl/wl_play.cpp 2011-04-27 19:58:18.561203098 +0200
@@ -36,7 +36,7 @@
objtype *newobj, *obj, *player, *lastobj, *objfreelist, *killerobj;
boolean noclip, ammocheat;
-int godmode, singlestep, extravbls = 1; // to remove flicker (gray stuff at the bottom)
+int godmode, singlestep, extravbls = 0;
byte tilemap[MAPSIZE][MAPSIZE]; // wall values only
byte spotvis[MAPSIZE][MAPSIZE];
@@ -733,7 +733,7 @@
CA_CacheGrChunk (STARTFONT);
fontnumber = 0;
SETFONTCOLOR (0, 15);
- if (DebugKeys () && viewsize < 18)
+ if (DebugKeys () && viewsize < 20)
DrawPlayBorder (); // dont let the blue borders flash
if (MousePresent && IN_IsInputGrabbed())
@@ -1098,17 +1098,17 @@
if (red)
{
- VL_SetPalette (redshifts[red - 1]);
+ VL_SetPalette (redshifts[red - 1], false);
palshifted = true;
}
else if (white)
{
- VL_SetPalette (whiteshifts[white - 1]);
+ VL_SetPalette (whiteshifts[white - 1], false);
palshifted = true;
}
else if (palshifted)
{
- VL_SetPalette (gamepal); // back to normal
+ VL_SetPalette (gamepal, false); // back to normal
palshifted = false;
}
}
@@ -1129,7 +1129,7 @@
if (palshifted)
{
palshifted = 0;
- VL_SetPalette (gamepal);
+ VL_SetPalette (gamepal, true);
}
}
Wolf4SDL-1.6-registered-apogee.patch:
version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: Wolf4SDL-1.6-registered-apogee.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wolf4sdl/devel/Wolf4SDL-1.6-registered-apogee.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Wolf4SDL-1.6-registered-apogee.patch 9 Jan 2011 12:47:32 -0000 1.1
+++ Wolf4SDL-1.6-registered-apogee.patch 28 Apr 2011 11:59:43 -0000 1.2
@@ -1,12 +1,12 @@
--- wolf4sdl-1.6.orig/version.h
+++ wolf4sdl-1.6/version.h
@@ -7,7 +7,7 @@
-
- //#define SPEAR
- //#define SPEARDEMO
- //#define UPLOAD
--#define GOODTIMES
-+//#define GOODTIMES
- #define CARMACIZED
- //#define APOGEE_1_0
- //#define APOGEE_1_1
+
+ //#define SPEAR
+ //#define SPEARDEMO
+ //#define UPLOAD
+-#define GOODTIMES
++//#define GOODTIMES
+ #define CARMACIZED
+ //#define APOGEE_1_0
+ //#define APOGEE_1_1
Wolf4SDL-1.6-spear.patch:
version.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: Wolf4SDL-1.6-spear.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wolf4sdl/devel/Wolf4SDL-1.6-spear.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Wolf4SDL-1.6-spear.patch 9 Jan 2011 12:47:32 -0000 1.1
+++ Wolf4SDL-1.6-spear.patch 28 Apr 2011 11:59:43 -0000 1.2
@@ -2,14 +2,14 @@
--- Wolf4SDL-1.6-src/version.h~ 2010-12-27 09:18:52.000000000 +0100
+++ Wolf4SDL-1.6-src/version.h 2010-12-27 09:32:35.785486971 +0100
@@ -9,9 +9,9 @@
-
- /* Defines used for different versions */
-
--//#define SPEAR
-+#define SPEAR
- //#define SPEARDEMO
--#define UPLOAD
-+//#define UPLOAD
- //#define GOODTIMES
- #define CARMACIZED
- //#define APOGEE_1_0
+
+ /* Defines used for different versions */
+
+-//#define SPEAR
++#define SPEAR
+ //#define SPEARDEMO
+-#define UPLOAD
++//#define UPLOAD
+ //#define GOODTIMES
+ #define CARMACIZED
+ //#define APOGEE_1_0
Wolf4SDL-1.6-speardemo.patch:
version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: Wolf4SDL-1.6-speardemo.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wolf4sdl/devel/Wolf4SDL-1.6-speardemo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Wolf4SDL-1.6-speardemo.patch 9 Jan 2011 12:47:32 -0000 1.1
+++ Wolf4SDL-1.6-speardemo.patch 28 Apr 2011 11:59:43 -0000 1.2
@@ -2,11 +2,11 @@
--- Wolf4SDL-1.6-src/version.h~ 2010-12-27 09:32:35.000000000 +0100
+++ Wolf4SDL-1.6-src/version.h 2010-12-27 09:33:08.986486882 +0100
@@ -10,7 +10,7 @@
- /* Defines used for different versions */
-
- #define SPEAR
--//#define SPEARDEMO
-+#define SPEARDEMO
- //#define UPLOAD
- //#define GOODTIMES
- #define CARMACIZED
+ /* Defines used for different versions */
+
+ #define SPEAR
+-//#define SPEARDEMO
++#define SPEARDEMO
+ //#define UPLOAD
+ //#define GOODTIMES
+ #define CARMACIZED
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wolf4sdl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Jan 2011 12:47:32 -0000 1.2
+++ sources 28 Apr 2011 11:59:43 -0000 1.3
@@ -1 +1 @@
-8195dbb793b55bbc6ff3db30bbb87689 Wolf4SDL-1.6-src.zip
+61eed8ed819688663e399b5e79ed006f Wolf4SDL-1.6-src.zip
Index: wolf4sdl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wolf4sdl/devel/wolf4sdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wolf4sdl.spec 9 Jan 2011 12:47:32 -0000 1.1
+++ wolf4sdl.spec 28 Apr 2011 11:59:43 -0000 1.2
@@ -1,36 +1,27 @@
Name: wolf4sdl
Version: 1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: SDL port of id Software's Wolfenstein 3D
Group: Amusements/Games
License: Distributable
-# These url's are for a version targeted mainly at Mac OS X
-# The original wolf4sdl site was:
-# http://www.stud.uni-karlsruhe.de/~uvaue/chaos
-# But this gives 403 errors now a days.
-URL: http://chrisballinger.info/wolf4sdl/
-Source0: http://chrisballinger.info/wolf4sdl/Wolf4SDL-1.6-src.zip
-# All the below files and the package description are taken from the Debian
+URL: http://www.alice-dsl.net/mkroll/
+Source0: http://www.alice-dsl.net/mkroll/bins/Wolf4SDL-1.6-src.zip
+Source1: %{name}.desktop
+# Update to 1.7 svn snapshot
+Patch0: wolf4sdl-1.7-svn255.patch
+# The below patch and the package description are taken from the Debian
# package by Fabian Greffrath <fabian+debian at greffrath.com>
# License:
# Copying and distribution of the Debian packaging, with or without
# modification are permitted in any medium without royalty provided the
# copyright notice and this notice are preserved. The Debian packaging is
# offered as-is, without any warranty.
-Source1: %{name}.6
-Source2: %{name}.desktop
-Source3: %{name}.xpm
-Patch0: 01-shareware-version.patch
-Patch1: 02-enable-shading.patch
-Patch2: 10-datadir.patch
-Patch3: 11-configdir.patch
-Patch4: 21-compiler-warnings.patch
-# end Debian files
-Patch5: Wolf4SDL-1.6-compile-fixes.patch
-Patch6: Wolf4SDL-1.6-registered-apogee.patch
-Patch7: Wolf4SDL-1.6-spear.patch
-Patch8: Wolf4SDL-1.6-speardemo.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: wolf4sdl-1.7-svn255-debian.patch
+# Patches to create different configurations to build
+Patch2: Wolf4SDL-1.6-registered-apogee.patch
+Patch3: Wolf4SDL-1.6-shareware.patch
+Patch4: Wolf4SDL-1.6-spear.patch
+Patch5: Wolf4SDL-1.6-speardemo.patch
BuildRequires: SDL-devel SDL_mixer-devel desktop-file-utils
%global desc \
@@ -119,87 +110,74 @@
%prep
-%setup -q -c
-pushd Wolf4SDL-1.6-src
+%setup -c -T -n Wolf4SDL-1.6-src
+# Must unpack ourselves to make zip do dos2unix conversion
+pushd .. && unzip -a -q %{SOURCE0} && popd
+%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-chmod -x *.cpp *.h *.inc
-
-mkdir ../doc
-for i in Changes.txt README.txt license-*.txt; do
- cat $i | sed 's|\r||g' > ../doc/$i
- touch -r $i ../doc/$i
+for i in debian/patches/*.patch; do
+ patch -p1 < $i
done
-popd
-
%build
-pushd Wolf4SDL-1.6-src
CFLAGS="$RPM_OPT_FLAGS -Wno-sign-compare -Wno-switch -Wno-unused-result"
-CFLAGS="$CFLAGS $(sdl-config --cflags)"
+CFLAGS="$CFLAGS -fno-toplevel-reorder $(sdl-config --cflags)"
make %{?_smp_mflags} \
CFLAGS="$CFLAGS -DDATADIR=\\\"/usr/share/wolf3d/registered-id/\\\""
mv wolf3d %{name}-registered-id
-cp %{SOURCE2} %{name}-registered-id.desktop
+cp %{SOURCE1} %{name}-registered-id.desktop
sed -i 's|@NAME@|Wolfenstein 3D Registered (id)|g' \
%{name}-registered-id.desktop
sed -i 's|@VARIANT@|registered-id|g' %{name}-registered-id.desktop
make clean
-patch -p1 < %{PATCH6}
+patch -p1 < %{PATCH2}
make %{?_smp_mflags} \
CFLAGS="$CFLAGS -DDATADIR=\\\"/usr/share/wolf3d/registered-apogee/\\\""
mv wolf3d %{name}-registered-apogee
-cp %{SOURCE2} %{name}-registered-apogee.desktop
+cp %{SOURCE1} %{name}-registered-apogee.desktop
sed -i 's|@NAME@|Wolfenstein 3D Registered (Apogee)|g' \
%{name}-registered-apogee.desktop
sed -i 's|@VARIANT@|registered-apogee|g' %{name}-registered-apogee.desktop
make clean
-patch -p1 < %{PATCH0}
+patch -p1 < %{PATCH3}
make %{?_smp_mflags} \
CFLAGS="$CFLAGS -DDATADIR=\\\"/usr/share/wolf3d/shareware/\\\""
mv wolf3d %{name}-shareware
-cp %{SOURCE2} %{name}-shareware.desktop
+cp %{SOURCE1} %{name}-shareware.desktop
sed -i 's|@NAME@|Wolfenstein 3D Shareware (Apogee)|g' %{name}-shareware.desktop
sed -i 's|@VARIANT@|shareware|g' %{name}-shareware.desktop
make clean
-patch -p1 < %{PATCH7}
+patch -p1 < %{PATCH4}
make %{?_smp_mflags} \
CFLAGS="$CFLAGS -DDATADIR=\\\"/usr/share/spear/full/\\\""
mv wolf3d %{name}-spear
-cp %{SOURCE2} %{name}-spear.desktop
+cp %{SOURCE1} %{name}-spear.desktop
sed -i 's|@NAME@|Spear of Destiny|g' %{name}-spear.desktop
sed -i 's|@VARIANT@|spear|g' %{name}-spear.desktop
make clean
-patch -p1 < %{PATCH8}
+patch -p1 < %{PATCH5}
make %{?_smp_mflags} \
CFLAGS="$CFLAGS -DDATADIR=\\\"/usr/share/spear/demo/\\\""
mv wolf3d %{name}-spear-demo
-cp %{SOURCE2} %{name}-spear-demo.desktop
+cp %{SOURCE1} %{name}-spear-demo.desktop
sed -i 's|@NAME@|Spear of Destiny Demo|g' %{name}-spear-demo.desktop
sed -i 's|@VARIANT@|spear-demo|g' %{name}-spear-demo.desktop
-popd
-
%install
-pushd Wolf4SDL-1.6-src
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -p -m 644 debian/man/wolf4sdl.6 $RPM_BUILD_ROOT%{_mandir}/man6
+install -p -m 644 debian/pixmaps/wolf4sdl.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m 755 %{name}-registered-id $RPM_BUILD_ROOT%{_bindir}
ln -s wolf4sdl.6 $RPM_BUILD_ROOT%{_mandir}/man6/wolf4sdl-registered-id.6
@@ -229,8 +207,6 @@
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{name}-spear-demo.desktop
-popd
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -238,7 +214,7 @@
%files registered-id
%defattr(-,root,root,-)
-%doc doc/*
+%doc Changes.txt README.txt license-*.txt
%{_bindir}/%{name}-registered-id
%{_mandir}/man6/%{name}.6*
%{_mandir}/man6/%{name}-registered-id.6*
@@ -249,7 +225,7 @@
%files registered-apogee
%defattr(-,root,root,-)
-%doc doc/*
+%doc Changes.txt README.txt license-*.txt
%{_bindir}/%{name}-registered-apogee
%{_mandir}/man6/%{name}.6*
%{_mandir}/man6/%{name}-registered-apogee.6*
@@ -260,7 +236,7 @@
%files shareware
%defattr(-,root,root,-)
-%doc doc/*
+%doc Changes.txt README.txt license-*.txt
%{_bindir}/%{name}-shareware
%{_mandir}/man6/%{name}.6*
%{_mandir}/man6/%{name}-shareware.6*
@@ -269,7 +245,7 @@
%files spear
%defattr(-,root,root,-)
-%doc doc/*
+%doc Changes.txt README.txt license-*.txt
%{_bindir}/%{name}-spear
%{_mandir}/man6/%{name}.6*
%{_mandir}/man6/%{name}-spear.6*
@@ -280,7 +256,7 @@
%files spear-demo
%defattr(-,root,root,-)
-%doc doc/*
+%doc Changes.txt README.txt license-*.txt
%{_bindir}/%{name}-spear-demo
%{_mandir}/man6/%{name}.6*
%{_mandir}/man6/%{name}-spear-demo.6*
@@ -289,5 +265,11 @@
%changelog
+* Wed Apr 27 2011 Hans de Goede <hdegoede at redhat.com> 1.6-2
+- Original upstream is back
+- Rebase to new (original) 1.6 src zip
+- Add a number of patches from upstream svn (bring version up to svn255 commit)
+- Rebase patches borrowed from Debian to the latest Debian package
+
* Mon Dec 27 2010 Hans de Goede <hdegoede at redhat.com> 1.6-1
- Initial rpmfusion package
--- 01-shareware-version.patch DELETED ---
--- 02-enable-shading.patch DELETED ---
--- 10-datadir.patch DELETED ---
--- 11-configdir.patch DELETED ---
--- 21-compiler-warnings.patch DELETED ---
--- Wolf4SDL-1.6-compile-fixes.patch DELETED ---
--- wolf4sdl.6 DELETED ---
--- wolf4sdl.xpm DELETED ---
- Previous message: rpms/audacity-freeworld/F-14 audacity-1.3.13-desktop.in.patch, NONE,
1.1 .cvsignore, 1.7, 1.8 audacity-freeworld.spec, 1.19,
1.20 sources, 1.7, 1.8 audacity-1.3.10-desktop.patch, 1.1,
NONE audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch,
1.1, NONE audacity-1.3.12-ffmpeg-fix-ufile_write.patch, 1.1,
NONE audacity-1.3.12-fix-minimum-playspeed.patch, 1.1,
NONE audacity-1.3.12-portmixer-autoreconf.patch, 1.1,
NONE audacity.desktop, 1.3, NONE audacity.png, 1.1, NONE
- Next message: rpms/guvcview/devel .cvsignore, 1.7, 1.8 guvcview.spec, 1.6,
1.7 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list