Accepting request 538430 from home:Mailaender:branches:games

new upstream release

OBS-URL: https://build.opensuse.org/request/show/538430
OBS-URL: https://build.opensuse.org/package/show/games/cdogs-sdl?expand=0&rev=8

cdogs-sdl-0.6.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73fcba62fe929dc52347c27f715dc3081ea995987d5eb9cf8028f29cdbcd949e
-size 19670035

cdogs-sdl-0.6.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5552327ed7ca358acfbb20e9cf4d92443e70f624ca356c744724478cb7e9eb21
+size 20252238

cdogs-sdl.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Thu Nov  2 15:20:50 UTC 2017 - mailaender@opensuse.org
+
+- update to version 0.6.6 (New campaigns and HUD improvements)
+  * New campaign, Grave Intent
+  * New campaign, AI Insurgency 2
+  * Update Sand campaign, new weapons
+  * Update Doom campaign, new map items
+  * Fix AI line-of-sight algorithm (#227)
+  * Fix logging colours in Linux (#523)
+  * Fix blood splatter speed (#489)
+  * Fix audio panning (#507)
+  * Fix recording high scores for co-op AI (#386)
+  * Fix loading static wrecks in some older campaigns
+  * Add new character heads - evil ogre, bones, big bones
+  * Add second window (#383)
+  * Add floating text for pickups (#380)
+  * Add low ammo notifications (#362)
+  * Add QWERTY layout name entry (#517)
+  * Improve spectator HUD, show HUD (#382)
+  * Improve health gauge, add animations (#360)
+  * Improve co-op AI by avoiding friendly lines of fire (#295)
+  * Fix copy pasting static levels (#525)
+  * Fix incorrect objective counts when adding static objectives (#527)
+  * Fix rescue/kill objectives not using access flags
+  * Improve cave map type, add rooms, squares
+- drop system-enet.patch (included upstream)
+
 -------------------------------------------------------------------
 Mon Jun  5 10:50:24 UTC 2017 - mailaender@opensuse.org
 

cdogs-sdl.spec

@@ -17,15 +17,13 @@
 
 
 Name:           cdogs-sdl
-Version:        0.6.5
+Version:        0.6.6
 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/503
-Patch1:         system-enet.patch
 BuildRequires:  cmake >= 2.8.2
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -44,8 +42,8 @@ from up to 11 weapons, and try over 100 user-created campaigns. Have fun!
 
 %prep
 %setup -q
-%patch1 -p1
 
+# use system enet
 rm -rf src/cdogs/enet
 
 dos2unix doc/original_readme.txt

system-enet.patch

@@ -1,61 +0,0 @@
-From 122361af3bc603f96748da0d1c541c72c1c53c26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
- <Mailaender@users.noreply.github.com>
-Date: Mon, 5 Jun 2017 13:06:56 +0200
-Subject: [PATCH 1/2] Add USE_SHARED_ENET variable
-
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 24852972..671044d5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,7 @@ SET(WEBSITE "http://cxong.github.io/cdogs-sdl/")
- 
- option(DEBUG "Enable debug build" OFF)
- option(DEBUG_PROFILE "Enable debug profile build" OFF)
-+option(USE_SHARED_ENET "Use system installed copy of enet" OFF)
- 
- # check for crosscompiling (defined when using a toolchain file)
- if(CMAKE_CROSSCOMPILING)
-@@ -81,7 +82,10 @@ IF(WIN32)
- ELSE()
-     SET(ENet_LIBRARIES ${ENet_LIBRARY})
- ENDIF()
--INCLUDE_DIRECTORIES(src/cdogs/enet/include)
-+
-+IF(NOT USE_SHARED_ENET)
-+    INCLUDE_DIRECTORIES(src/cdogs/enet/include)
-+ENDIF()
- 
- add_definitions(-DPB_FIELD_16BIT)	# Allow larger field numbers in nanopb
- include_directories(src/cdogs/proto/nanopb)
-
-From 6dc94d32c86348ee7abfe86b17c036f795b9ed95 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
- <Mailaender@users.noreply.github.com>
-Date: Mon, 5 Jun 2017 13:09:32 +0200
-Subject: [PATCH 2/2] Don't include the enet src when shared is wanted
-
----
- src/cdogs/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/cdogs/CMakeLists.txt b/src/cdogs/CMakeLists.txt
-index 94a8d95c..0ca5cd18 100644
---- a/src/cdogs/CMakeLists.txt
-+++ b/src/cdogs/CMakeLists.txt
-@@ -217,8 +217,9 @@ set(NANOPB_HEADERS
-     proto/nanopb/pb_encode.h
- )
- 
--# enet
--ADD_SUBDIRECTORY(enet)
-+IF(NOT USE_SHARED_ENET)
-+    ADD_SUBDIRECTORY(enet)
-+ENDIF()
- 
- # proto
- include_directories(proto/nanopb)