forked from pool/cdogs-sdl
Accepting request 440879 from home:Mailaender:branches:games
new upstream version OBS-URL: https://build.opensuse.org/request/show/440879 OBS-URL: https://build.opensuse.org/package/show/games/cdogs-sdl?expand=0&rev=4
This commit is contained in:
Ferdinand Thiessen
committed by
Git OBS Bridge
Git OBS Bridge
parent
d56798d891
commit
739fbfe7ee
@@ -1,44 +0,0 @@
|
||||
From ee005feadbbd90641d119f6204100a566e68d9f6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
|
||||
<Mailaender@users.noreply.github.com>
|
||||
Date: Sat, 20 Aug 2016 22:21:47 +0200
|
||||
Subject: [PATCH 1/3] Create cdogs-sdl.appdata.xml
|
||||
|
||||
---
|
||||
build/linux/cdogs-sdl.appdata.xml | 27 +++++++++++++++++++++++++++
|
||||
1 file changed, 27 insertions(+)
|
||||
create mode 100644 build/linux/cdogs-sdl.appdata.xml
|
||||
|
||||
diff --git a/build/linux/cdogs-sdl.appdata.xml b/build/linux/cdogs-sdl.appdata.xml
|
||||
new file mode 100644
|
||||
index 0000000..630762c
|
||||
--- /dev/null
|
||||
+++ b/build/linux/cdogs-sdl.appdata.xml
|
||||
@@ -0,0 +1,27 @@
|
||||
+<?xml version="1.0" encoding="utf-8"?>
|
||||
+<component type="desktop">
|
||||
+ <id>cdogs-sdl.desktop</id>
|
||||
+ <metadata_license>CC0-1.0</metadata_license>
|
||||
+ <project_license>GPL-2.0+</project_license>
|
||||
+ <name>C-Dogs</name>
|
||||
+ <summary>Classic overhead run-and-gun game</summary>
|
||||
+ <description>
|
||||
+ <p>
|
||||
+ C-Dogs is an arcade shoot-em-up which lets players work alone and
|
||||
+ cooperatively during missions or fight against each other in the
|
||||
+ “dogfight” deathmatch mode.
|
||||
+ </p>
|
||||
+ <p>
|
||||
+ Customize your player, choose from many weapons, and blast, slide and
|
||||
+ slash your way through over 100 user-created campaigns.
|
||||
+ </p>
|
||||
+ </description>
|
||||
+ <url type="homepage">http://cxong.github.io/cdogs-sdl/</url>
|
||||
+ <url type="help">https://github.com/cxong/cdogs-sdl/wiki/Walkthrough</url>
|
||||
+ <screenshots>
|
||||
+ <screenshot
|
||||
+ type="default">https://raw.githubusercontent.com/cxong/cdogs-sdl/master/wiki/images/game_screen.png</screenshot>
|
||||
+ <screenshot>https://raw.github.com/cxong/cdogs-sdl/master/wiki/images/screenshots/hqx_new.png</screenshot>
|
||||
+ <screenshot>https://raw.githubusercontent.com/cxong/cdogs-sdl/master/wiki/images/screenshots/quick_play.png</screenshot>
|
||||
+ </screenshots>
|
||||
+</component>
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d6f421c760b15b706bdfc79ed8d18802dc2e8efeefabb69a31679c9b51f328ab
|
||||
size 18770825
|
||||
3
cdogs-sdl-0.6.3.tar.gz
Normal file
3
cdogs-sdl-0.6.3.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4497e88be7ef462e1839b4396fccdf880b612074c4091956e39cd86ea15fdd03
|
||||
size 18861980
|
||||
@@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 18 16:53:22 UTC 2016 - mailaender@opensuse.org
|
||||
|
||||
- update to version 0.6.3
|
||||
* Add new character faces (#69)
|
||||
* Add new character color keys (#441, #61)
|
||||
* Add Temple of Carnage dogfight map
|
||||
* Add bullet mass attribute (#444)
|
||||
* Add animated map objects (#430)
|
||||
* Add option to turn off brass shells (#448)
|
||||
* Add highlights for gun pickups
|
||||
* Add --nohud
|
||||
* Add Splitscreen AI config
|
||||
* Add extra logging around gun pickups
|
||||
* Fix showing map when paused (#446)
|
||||
* Fix various bugs around split screen logic
|
||||
* Fix obsolete valid graphics mode check (#449)
|
||||
* Fix gun recoil animations
|
||||
- remove patches applied by upstream
|
||||
* cmake-install.patch
|
||||
* appdata.patch
|
||||
- add copying.patch to fix FSF address etc.
|
||||
- add datadir.patch and install-prefix.patch to fix the installer
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 20 20:39:12 UTC 2016 - mailaender@opensuse.org
|
||||
|
||||
|
||||
@@ -17,33 +17,34 @@
|
||||
|
||||
|
||||
Name: cdogs-sdl
|
||||
Version: 0.6.2
|
||||
Version: 0.6.3
|
||||
Release: 0
|
||||
Summary: Classic overhead run-and-gun game
|
||||
License: GPL-2.0 and BSD-2-Clause and CC-BY-3.0 and CC-BY-SA-3.0
|
||||
Group: Amusements/Games/Action/Shoot
|
||||
Url: http://cxong.github.io/cdogs-sdl
|
||||
Source: https://github.com/cxong/cdogs-sdl/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM https://github.com/cxong/cdogs-sdl/pull/453
|
||||
Patch0: cmake-install.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/cxong/cdogs-sdl/pull/469
|
||||
Patch0: copying.patch
|
||||
# PATCH-FIX-OPENSUSE borrowed from Mageia
|
||||
Patch1: cdogs-sdl-0.6.0-mga-unbundle-enet.patch
|
||||
# PATCH-FIX-OPENSUSE borrowed from Mageia
|
||||
Patch2: cdogs-sdl-0.6.1-mga-unbundle-yajl.patch
|
||||
# PATCH-FEATURE-UPSTREAM https://github.com/cxong/cdogs-sdl/pull/452
|
||||
Patch3: appdata.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/cxong/cdogs-sdl/pull/471
|
||||
Patch3: datadir.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/cxong/cdogs-sdl/pull/470
|
||||
Patch4: install-prefix.patch
|
||||
BuildRequires: cmake >= 2.8.2
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: libyajl-devel >= 2.1
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(SDL2_image)
|
||||
BuildRequires: pkgconfig(SDL2_mixer)
|
||||
BuildRequires: pkgconfig(libenet)
|
||||
BuildRequires: pkgconfig(physfs)
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
BuildRequires: pkgconfig(yajl) >= 2.1
|
||||
|
||||
%description
|
||||
C-Dogs SDL is a classic overhead run-and-gun game, supporting up to
|
||||
@@ -56,6 +57,7 @@ from up to 11 weapons, and try over 100 user-created campaigns. Have fun!
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
rm -rf src/cdogs/enet
|
||||
rm -rf src/cdogs/yajl
|
||||
@@ -69,7 +71,6 @@ make %{?_smp_mflags}
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
rm %{buildroot}%{_datadir}/icons/cdogs-sdl.png
|
||||
install -Dm0644 build/linux/cdogs-icon.16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/cdogs-sdl.png
|
||||
install -Dm0644 build/linux/cdogs-icon.22.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/cdogs-sdl.png
|
||||
install -Dm0644 build/linux/cdogs-icon.32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/cdogs-sdl.png
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
From a2c8891842daf36e009c3844265f41d1a95a5454 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
|
||||
<Mailaender@users.noreply.github.com>
|
||||
Date: Sun, 21 Aug 2016 08:17:38 +0200
|
||||
Subject: [PATCH 1/2] Install game data into the correct folder.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index aed0330..0eee887 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -189,11 +189,11 @@ INSTALL(DIRECTORY
|
||||
${CMAKE_SOURCE_DIR}/graphics
|
||||
${CMAKE_SOURCE_DIR}/music
|
||||
${CMAKE_SOURCE_DIR}/sounds
|
||||
- DESTINATION ${INSTALL_PREFIX})
|
||||
+ DESTINATION ${CDOGS_DATA_DIR})
|
||||
INSTALL(FILES
|
||||
${CMAKE_SOURCE_DIR}/cdogs_icon.bmp
|
||||
${CMAKE_SOURCE_DIR}/README.md
|
||||
- DESTINATION ${INSTALL_PREFIX})
|
||||
+ DESTINATION ${CDOGS_DATA_DIR})
|
||||
IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
|
||||
INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/cdogs-sdl.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
|
||||
INSTALL(FILES ${CMAKE_SOURCE_DIR}/cdogs-sdl.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons)
|
||||
|
||||
From daaf476b81910629a2871e47cca13e37477f09c7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
|
||||
<Mailaender@users.noreply.github.com>
|
||||
Date: Sun, 21 Aug 2016 08:19:20 +0200
|
||||
Subject: [PATCH 2/2] Avoid hard-coded directory on program install.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0eee887..6b8090d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -177,7 +177,7 @@ if(APPLE)
|
||||
USE_SOURCE_PERMISSIONS)
|
||||
else()
|
||||
install(
|
||||
- PROGRAMS src/cdogs-sdl${EXE_EXTENSION} src/cdogs-sdl-editor${EXE_EXTENSION}
|
||||
+ PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/src/cdogs-sdl${EXE_EXTENSION} ${CMAKE_CURRENT_BINARY_DIR}/src/cdogs-sdl-editor${EXE_EXTENSION}
|
||||
DESTINATION ${INSTALL_PREFIX}/bin)
|
||||
endif()
|
||||
|
||||
141
copying.patch
Normal file
141
copying.patch
Normal file
@@ -0,0 +1,141 @@
|
||||
From ccf49ee19e3971710cc53ecb31918ba5e645a0f6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
|
||||
<Mailaender@users.noreply.github.com>
|
||||
Date: Fri, 18 Nov 2016 18:02:03 +0100
|
||||
Subject: [PATCH] Update COPYING
|
||||
|
||||
from current template to fix addresses and LGPL renaming.
|
||||
---
|
||||
COPYING | 45 ++++++++++++++++++++++-----------------------
|
||||
1 file changed, 22 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/COPYING b/COPYING
|
||||
index 5b6e7c6..23cb790 100644
|
||||
--- a/COPYING
|
||||
+++ b/COPYING
|
||||
@@ -1,12 +1,12 @@
|
||||
- GNU GENERAL PUBLIC LICENSE
|
||||
- Version 2, June 1991
|
||||
+ GNU GENERAL PUBLIC LICENSE
|
||||
+ Version 2, June 1991
|
||||
|
||||
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
|
||||
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
- Preamble
|
||||
+ Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
-the GNU Library General Public License instead.) You can apply it to
|
||||
+the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
-
|
||||
- GNU GENERAL PUBLIC LICENSE
|
||||
+
|
||||
+ GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
-
|
||||
+
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
-
|
||||
+
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
@@ -225,7 +225,7 @@ impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
-
|
||||
+
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
- NO WARRANTY
|
||||
+ NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
- END OF TERMS AND CONDITIONS
|
||||
-
|
||||
- How to Apply These Terms to Your New Programs
|
||||
+ END OF TERMS AND CONDITIONS
|
||||
+
|
||||
+ How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
@@ -290,8 +290,8 @@ to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
- <one line to give the program's name and a brief idea of what it does.>
|
||||
- Copyright (C) <year> <name of author>
|
||||
+ {description}
|
||||
+ Copyright (C) {year} {fullname}
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
- You should have received a copy of the GNU General Public License
|
||||
- along with this program; if not, write to the Free Software
|
||||
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
-
|
||||
+ You should have received a copy of the GNU General Public License along
|
||||
+ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
@@ -330,11 +329,11 @@ necessary. Here is a sample; alter the names:
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
- <signature of Ty Coon>, 1 April 1989
|
||||
+ {signature of Ty Coon}, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
-library. If this is what you want to do, use the GNU Library General
|
||||
+library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
28
datadir.patch
Normal file
28
datadir.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
From 4bab3c0659896bbcf0334cceb600682afa7c4e65 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
|
||||
<Mailaender@users.noreply.github.com>
|
||||
Date: Fri, 18 Nov 2016 18:25:28 +0100
|
||||
Subject: [PATCH] Install into CDOGS_DATA_DIR again.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5d30f5a..42b1580 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -190,11 +190,11 @@ INSTALL(DIRECTORY
|
||||
${CMAKE_SOURCE_DIR}/graphics
|
||||
${CMAKE_SOURCE_DIR}/music
|
||||
${CMAKE_SOURCE_DIR}/sounds
|
||||
- DESTINATION ${INSTALL_PREFIX})
|
||||
+ DESTINATION ${CDOGS_DATA_DIR})
|
||||
INSTALL(FILES
|
||||
${CMAKE_SOURCE_DIR}/cdogs_icon.bmp
|
||||
${CMAKE_SOURCE_DIR}/README.md
|
||||
- DESTINATION ${INSTALL_PREFIX})
|
||||
+ DESTINATION ${CDOGS_DATA_DIR})
|
||||
IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
|
||||
INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/cdogs-sdl.desktop DESTINATION ${INSTALL_PREFIX}/share/applications)
|
||||
INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/cdogs-sdl.appdata.xml DESTINATION ${INSTALL_PREFIX}/share/appdata)
|
||||
22
install-prefix.patch
Normal file
22
install-prefix.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
From f8ce59cb91bae73867583eb046341f507e81386f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
|
||||
<Mailaender@users.noreply.github.com>
|
||||
Date: Fri, 18 Nov 2016 18:18:24 +0100
|
||||
Subject: [PATCH] Fix INSTALL_PREFIX for Linux.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5d30f5a..6d5908e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -170,6 +170,7 @@ elseif(APPLE)
|
||||
else()
|
||||
set(EXE_EXTENSION "")
|
||||
set(LIB_EXTENSION ".so")
|
||||
+ set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
|
||||
endif()
|
||||
if(APPLE)
|
||||
install(
|
||||
Reference in New Issue
Block a user