[d1x] Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026) Merge d1x-shareware pac

commit fd87998823c873e21aa2c2fc624fdd33779d1aa1 Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Mon Dec 17 21:59:40 2018 +0100 Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026) Merge d1x-shareware package into the main-package so that installing d1x from e.g. gnome-software always results in a functional game Add appdata New upstream includes d2x, add a d2x sub-package, including d2x demo levels Trim changelog .gitignore | 2 + d1x-rebirth.appdata.xml | 33 +++++++ d1x-rebirth.sh | 14 ++- d1x.spec | 235 ++++++++++++++++++++++-------------------------- d2x-rebirth.appdata.xml | 40 +++++++++ d2x-rebirth.sh | 34 +++++++ sources | 3 +- 7 files changed, 221 insertions(+), 140 deletions(-) --- diff --git a/.gitignore b/.gitignore index 66be814..18bd213 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ d1swdf.tar.gz d1x-rebirth_v0.58.1-src.tar.gz +/d2shar10.tar.gz +/stable-0.60.x.zip diff --git a/d1x-rebirth.appdata.xml b/d1x-rebirth.appdata.xml new file mode 100644 index 0000000..e2d78d7 --- /dev/null +++ b/d1x-rebirth.appdata.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<component type="desktop"> + <id>d1x-rebirth.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <name>Descent</name> + <summary>3D spacecraft-based first person shooter</summary> + <description> + <p> + Descent is a classic first person shooter. You control a space-ship which + is flying through a mine where the AI controlled robots have gone rogue. + Your task is to fight the robots and rescue the human workers. + </p> + <p> + Descent is the first game featuring a full 3D environment. In Descent + you control your space-ship with six degrees of freedom movement. + </p> + <p> + This version of Descent comes with the shareware version of the game. + If you want to play the full (registered/commercial) version of the game, + place the descent.hog and descent.pig data-files from your registered + Descent version in /usr/share/d1x/full; or in $HOME/.d1x-rebirth. + </p> + </description> + <url type="homepage">https://www.dxx-rebirth.com/</url> + <screenshots> + <screenshot type="default">https://www.dxx-rebirth.com/wp-content/galler... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d1x-rebirth_... + </screenshots> + <updatecontact>j.w.r.degoede_at_gmail.com</updatecontact> +</component> diff --git a/d1x-rebirth.sh b/d1x-rebirth.sh index bb8fc57..7cbd346 100644 --- a/d1x-rebirth.sh +++ b/d1x-rebirth.sh @@ -8,15 +8,11 @@ else D1X=/usr/bin/d1x-rebirth-sdl fi -if [ -f /usr/share/d1x/full/descent.hog -a \ - -f /usr/share/d1x/full/descent.pig ]; then +if [ '(' -f /usr/share/d1x/full/descent.hog -a \ + -f /usr/share/d1x/full/descent.pig ')' -o \ + '(' -f $HOME/.d1x-rebirth/descent.hog -a \ + -f $HOME/.d1x-rebirth/descent.pig ')' ]; then exec $D1X "$@" -elif [ -f /usr/share/d1x/d1shar/descent.hog -a \ - -f /usr/share/d1x/d1shar/descent.pig ]; then - exec $D1X -hogdir /usr/share/d1x/d1shar/ "$@" else - zenity --error --text="No Descent 1 data files found, either place the \ -full (registered/commercial) version data-files (descent.hog and descent.pig) \ -in /usr/share/d1x/full/descent.pig; or install the d1x-shareware package." - exit 1 + exec $D1X -hogdir /usr/share/d1x/d1shar/ "$@" fi diff --git a/d1x.spec b/d1x.spec index 1d61715..c41d639 100644 --- a/d1x.spec +++ b/d1x.spec @@ -1,105 +1,159 @@ -%global rebirth_version 0.58.1 +%global rebirth_version 0.60 -Summary: Descent 1 game engine (d1x-rebirth version) +Summary: Descent 1 game and shareware data files (d1x-rebirth version) Name: d1x Version: 1.43 -Release: 18.rebirth_v%{rebirth_version}%{?dist} +Release: 19.rebirth_v%{rebirth_version}%{?dist} License: non-commercial -Group: Amusements/Games -Source0: http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v%{rebirth_version}-s... +# stable-0.60.x branch snapshot downloaded from +# https://github.com/dxx-rebirth/dxx-rebirth/archive/stable-0.60.x.zip +# on 16-12-2018, git hash of HEAD b43a351aa90d125a034e68e8b5762ea2dd8bcb93 +Source0: stable-0.60.x.zip Source1: d1x-rebirth.sh -Source2: d1swdf.tar.gz -URL: http://www.dxx-rebirth.com/ +Source2: d2x-rebirth.sh +Source3: d1swdf.tar.gz +Source4: https://www.icculus.org/d2x/data/d2shar10.tar.gz +Source5: d1x-rebirth.appdata.xml +Source6: d2x-rebirth.appdata.xml +URL: https://www.dxx-rebirth.com/ BuildRequires: SDL-devel SDL_mixer-devel mesa-libGL-devel mesa-libGLU-devel BuildRequires: physfs-devel scons desktop-file-utils dos2unix +BuildRequires: ImageMagick libappstream-glib Requires: opengl-games-utils >= 0.2 Requires: hicolor-icon-theme Provides: %{name}-full = %{version}-%{release} Obsoletes: %{name}-full < %{version}-%{release} +Provides: %{name}-shareware = %{version}-%{release} +Obsoletes: %{name}-shareware < %{version}-%{release} %description D1X is a modification of the Descent 1 source that was released by Parallax. It's mostly compatible with the Descent 1 v1.5, both in multiplayer and on the local machine. -To play Descent1 you need to either need the full (registered/commercial) -version of the game and place the full version data-files in -%{_datadir}/%{name}/full; or install the d1x-shareware package. +This package comes with the shareware version of the game. If you want to +play the full (registered/commercial) version of the game, place the +descent.hog and descent.pig data-files from your registered descent version +in %{_datadir}/d1x/full; or in $HOME/.d1x-rebirth. -%package shareware -Summary: Shareware version of Descent 1 -Group: Amusements/Games -Requires: %{name} = %{version}-%{release} +%package -n d2x +Summary: Descent 2 game and shareware data files (d2x-rebirth version) +Requires: opengl-games-utils >= 0.2 +Requires: hicolor-icon-theme -%description shareware -D1X is a modification of the Descent 1 source that was released by -Parallax. It's mostly compatible with the Descent 1 v1.5, both in -multiplayer and on the local machine. +%description -n d2x +D2X is a modification of the Descent 2 source that was released by Parallax. +It's mostly compatible with the original Descent 2, both in multiplayer and +on the local machine. + +This package comes with the shareware version of the game. If you want to +play the full (registered/commercial) version of the game, place the +alien1.pig, alien2.pig, fire.pig, groupa.pig, ice.pig, water.pig, descent2.hog, +descent2.ham, descent2.s11 and descent2.s22 data-files from your registered +descent version in %{_datadir}/d2x/full; or in $HOME/.d2x-rebirth. -This package contains the shareware version of the game. +If you want to have the movies also add the intro-h.mvl, other-h.mvl and +robots-h.mvl files to the dir. %prep -%setup -q -n d1x-rebirth_v%{rebirth_version}-src -dos2unix -k *.txt +%setup -q -n dxx-rebirth-stable-%{rebirth_version}.x -a 3 -a 4 +# Fixup encoding and CTRL+Z at the end of the orderfrm.txt files +iconv -f CP850 -t UTF-8 d1shar/ORDERFRM.TXT | head -n-3 > ORDERFRM.TXT +touch -r d1shar/ORDERFRM.TXT ORDERFRM.TXT +mv ORDERFRM.TXT d1shar/ORDERFRM.TXT +cat d2shar10/orderfrm.txt | head -n-1 > orderfrm.txt +touch -r d2shar10/orderfrm.txt orderfrm.txt +mv orderfrm.txt d2shar10/orderfrm.txt +# Prepare txt files for %%doc +dos2unix -k d?x-rebirth/*.txt d1shar/*.TXT d1shar/README d2shar10/*.txt +mkdir descent1-shareware-readmes descent2-shareware-readmes +mv d1shar/*.TXT d1shar/README descent1-shareware-readmes +mv d2shar10/*.txt descent2-shareware-readmes +# Prepare the icons for installation +convert d1x-rebirth/d1x-rebirth.xpm d1x-rebirth.png +convert d2x-rebirth/d2x-rebirth.xpm d2x-rebirth.png %build -COMMON_FLAGS="prefix=/usr sharepath=%{_datadir}/%{name}/full ipv6=1 verbosebuild=1" -export CFLAGS="$RPM_OPT_FLAGS" +COMMON_FLAGS="prefix=/usr d1x_sharepath=%{_datadir}/d1x/full d2x_sharepath=%{_datadir}/d2x/full ipv6=1 verbosebuild=1" +export CXXFLAGS="$RPM_OPT_FLAGS" scons $COMMON_FLAGS opengl=0 -mv d1x-rebirth d1x-rebirth-sdl +mv d1x-rebirth/d1x-rebirth d1x-rebirth-sdl +mv d2x-rebirth/d2x-rebirth d2x-rebirth-sdl scons $COMMON_FLAGS opengl=1 -mv d1x-rebirth d1x-rebirth-gl +mv d1x-rebirth/d1x-rebirth d1x-rebirth-gl +mv d2x-rebirth/d2x-rebirth d2x-rebirth-gl %install mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/d1x/full mkdir -p $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar +mkdir -p $RPM_BUILD_ROOT%{_datadir}/d2x/full +mkdir -p $RPM_BUILD_ROOT%{_datadir}/d2x/d2shar install -m 755 d1x-rebirth-sdl $RPM_BUILD_ROOT%{_bindir} install -m 755 d1x-rebirth-gl $RPM_BUILD_ROOT%{_bindir} +install -m 755 d2x-rebirth-sdl $RPM_BUILD_ROOT%{_bindir} +install -m 755 d2x-rebirth-gl $RPM_BUILD_ROOT%{_bindir} install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/d1x-rebirth -tar x -z -C $RPM_BUILD_ROOT%{_datadir}/d1x -f %{SOURCE2} -# fixup permissions from tarbal -chmod 644 $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar/README +install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/d2x-rebirth +# Install descent 1 shareware files +install -p -m 644 d1shar/descent.* $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar +# Install descent 2 shareware files +install -p -m 644 d2shar10/d2demo.{pig,hog,ham} \ + $RPM_BUILD_ROOT%{_datadir}/d2x/d2shar # below is the desktop file and icon stuff. +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor "" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - d1x-rebirth.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps -install -p -m 644 d1x-rebirth.xpm \ +desktop-file-install \ + --remove-key="Version" \ + --set-key="Keywords" --set-value="game;fps;first;person;shooter;descent;" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + d1x-rebirth/d1x-rebirth.desktop +desktop-file-install \ + --remove-key="Version" \ + --set-key="Keywords" --set-value="game;fps;first;person;shooter;descent;" \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + d2x-rebirth/d2x-rebirth.desktop +install -m 644 d1x-rebirth.png d2x-rebirth.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps - - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +install -p -m 644 %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet \ + $RPM_BUILD_ROOT%{_datadir}/appdata/d1x-rebirth.appdata.xml \ + $RPM_BUILD_ROOT%{_datadir}/appdata/d2x-rebirth.appdata.xml %files -%doc COPYING.txt README.txt RELEASE-NOTES.txt +%doc d1x-rebirth/README.txt d1x-rebirth/RELEASE-NOTES.txt +%license COPYING.txt GPL-3.txt descent1-shareware-readmes %{_bindir}/d1x-rebirth* -%dir %{_datadir}/d1x -%dir %{_datadir}/d1x/full +%{_datadir}/d1x +%{_datadir}/appdata/d1x-rebirth.appdata.xml %{_datadir}/applications/d1x-rebirth.desktop -%{_datadir}/icons/hicolor/128x128/apps/d1x-rebirth.xpm +%{_datadir}/icons/hicolor/128x128/apps/d1x-rebirth.png -%files shareware -%{_datadir}/d1x/d1shar +%files -n d2x +%doc d2x-rebirth/README.txt d2x-rebirth/RELEASE-NOTES.txt +%license COPYING.txt GPL-3.txt descent2-shareware-readmes +%{_bindir}/d2x-rebirth* +%{_datadir}/d2x +%{_datadir}/appdata/d2x-rebirth.appdata.xml +%{_datadir}/applications/d2x-rebirth.desktop +%{_datadir}/icons/hicolor/128x128/apps/d2x-rebirth.png %changelog +* Sun Dec 16 2018 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.43-19.rebirth_v0.60 +- Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026) +- Merge d1x-shareware package into the main-package so that installing d1x + from e.g. gnome-software always results in a functional game +- Add appdata +- New upstream includes d2x, add a d2x sub-package, including d2x demo levels +- Trim changelog + * Sun Aug 19 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.43-18.rebirth_v0.58.1 - Rebuilt for Fedora 29 Mass Rebuild binutils issue @@ -136,82 +190,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - Make the main package obsolete the -full subpackage - Make the -shareware package only contain the shareware data files - Add a desktop file and icon - -* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.43-8 -- rebuild for new F11 features - -* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-7 -- Rebuild for buildsys cflags issue - -* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-6 -- Release bump for rpmfusion build - -* Sat Oct 14 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-5 -- Fix reading of player file (playerfile compat code) when using addon missions - -* Tue Sep 26 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-4 -- Fix building with newer SDL lib which is not directly linked against libX11 - -* Sun Sep 24 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-3 -- Rebuild for FC-6 -- Tried switching to d1x-rebirth sources but didn't because they are unstable - instead the following d1x-rebirth features were lifted: - -scaleable cockpits in opengl mode - -support for highres briefingscreens (download them from the dxx-rebirth web) - -mouselook support - -16:9 monitor support - -store the resolution you're playing at in playername.dlx -- Add/restore music playback, now you can enjoy the original descent music! -- The player and other descent config files are now stored in ~/.d1x, so - if you've got a player you want to keep move its files to ~/.d1x -- The shareware version now uses the same game load/save code as the registered - version allowing in game saving (ALT-F2 saves, ALT-F3 restores) -- The shareware version can now properly read player files written by the - registered version and vica versa - -* Sat Mar 18 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.43-2 -- Increase release after fixing BRs once more - -* Fri Mar 17 2006 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-1 -- Fix BuidRequires for FC-5 - -* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> -- switch to new release field - -* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> -- add dist - -* Wed Aug 10 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-0.lvn.4 -- Remove -Wno-pointer-sign from CFLAGS, this option is not valid for gcc 3.4 . - -* Sun Aug 7 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-0.lvn.3 -- Drop Patch 13, intergrate into Patch 0. -- Add new Patch 13 which introduces some fixes from CVS. -- Added Patch 14 which fixes: - -a few buffer overflows caught by gcc 4 and an uninitialised var warning. - -the sliders in the menus with newer gcc / glibc - (or x86_64, but doesn't seem 64 bit related) - -the 2 initial screens with opengl - -made /usr/share/d1x/d1shar or /full the default mission dir - -don't use descent2 fonts, these aren't in the hog file instead use fonts - from d1bigfnt.zip . -- Add d1bigfnt.zip and install the fonts in /usr/share/d1x/d1shar or /full. -- Build without -fomit-framepointer to allow debugging (DEBUGABLE = 1). -- Add Patch 15 to fix i386 (asm) compile. - -* Fri Apr 29 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-0.lvn.2 -- Added Patch 13 which fixes compilation with gcc4 - -* Mon Jan 3 2005 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.43-0.lvn.1 -- First Livna release, based on PLD SRPM. -- Patches 0-10 are from PLD, have been reviewed and are all compilation fixes. -- Patch 11 fixes 2 issues with the shareware version: - -Pressing F1 no longer causes a segfault. - -Saving now works. -- Patch 12 brings in various fixes from the d1x cvs version. -- Plans: - -Save settings/games in ~/.d1x instead of in wd. - -Search for custom levels in /usr/share/d1x/full,~/.d1x and a - user configurable dir. - -Fix/add music playback. - -DesktopEntries diff --git a/d2x-rebirth.appdata.xml b/d2x-rebirth.appdata.xml new file mode 100644 index 0000000..15a548a --- /dev/null +++ b/d2x-rebirth.appdata.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<component type="desktop"> + <id>d2x-rebirth.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <name>Descent 2</name> + <summary>3D spacecraft-based first person shooter</summary> + <description> + <p> + Descent 2 is a classic first person shooter. You control a space-ship which + is flying through a mine where the AI controlled robots have gone rogue. + Your task is to fight the robots and rescue the human workers. + </p> + <p> + Descent 2 is the sequel to the classic Descent, the first game featuring a + full 3D environment. In Descent 2 you control your space-ship with six + degrees of freedom movement. + </p> + <p> + This version of Descent 2 comes with the demo levels of the game. + If you want to play the full (registered/commercial) version of the game, + place the alien1.pig, alien2.pig, fire.pig, groupa.pig, ice.pig, water.pig, + descent2.hog, descent2.ham, descent2.s11 and descent2.s22 data-files from + your registered Descent 2 version in /usr/share/d2x/full; + or in $HOME/.d2x-rebirth. + </p> + <p> + If you want to have the movies also add the intro-h.mvl, other-h.mvl and + robots-h.mvl files to the dir. + </p> + </description> + <url type="homepage">https://www.dxx-rebirth.com/</url> + <screenshots> + <screenshot type="default">https://www.dxx-rebirth.com/wp-content/galler... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_... + <screenshot>https://www.dxx-rebirth.com/wp-content/gallery/d2x-rebirth_... + </screenshots> + <updatecontact>j.w.r.degoede_at_gmail.com</updatecontact> +</component> diff --git a/d2x-rebirth.sh b/d2x-rebirth.sh new file mode 100644 index 0000000..0f95c7d --- /dev/null +++ b/d2x-rebirth.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +. /usr/share/opengl-games-utils/opengl-game-functions.sh + +if hasDri; then + D2X=/usr/bin/d2x-rebirth-gl +else + D2X=/usr/bin/d2x-rebirth-sdl +fi + +if [ '(' -f /usr/share/d2x/full/descent2.hog -a \ + -f /usr/share/d2x/full/descent2.ham -a \ + -f /usr/share/d2x/full/descent2.s11 -a \ + -f /usr/share/d2x/full/descent2.s22 -a \ + -f /usr/share/d2x/full/alien1.pig -a \ + -f /usr/share/d2x/full/alien2.pig -a \ + -f /usr/share/d2x/full/fire.pig -a \ + -f /usr/share/d2x/full/groupa.pig -a \ + -f /usr/share/d2x/full/ice.pig -a \ + -f /usr/share/d2x/full/water.pig ')' -o \ + '(' -f $HOME/.d2x-rebirth/descent2.hog -a \ + -f $HOME/.d2x-rebirth/descent2.ham -a \ + -f $HOME/.d2x-rebirth/descent2.s11 -a \ + -f $HOME/.d2x-rebirth/descent2.s22 -a \ + -f $HOME/.d2x-rebirth/alien1.pig -a \ + -f $HOME/.d2x-rebirth/alien2.pig -a \ + -f $HOME/.d2x-rebirth/fire.pig -a \ + -f $HOME/.d2x-rebirth/groupa.pig -a \ + -f $HOME/.d2x-rebirth/ice.pig -a \ + -f $HOME/.d2x-rebirth/water.pig ')' ]; then + exec $D2X "$@" +else + exec $D2X -hogdir /usr/share/d2x/d2shar/ "$@" +fi diff --git a/sources b/sources index 5843aae..fad4e76 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 8112d6127a7a81a36735f5a9c3175ec2 d1swdf.tar.gz -8f43e66191fdedd0c7ff9278719accf1 d1x-rebirth_v0.58.1-src.tar.gz +1b952cc4a4419e24d230589027d73490 d2shar10.tar.gz +b94994c64922d152a3f3a317184c061e stable-0.60.x.zip