Hello community, here is the log from the commit of package cdogs-sdl for openSUSE:Factory checked in at 2017-08-24 18:30:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdogs-sdl (Old) and /work/SRC/openSUSE:Factory/.cdogs-sdl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdogs-sdl" Thu Aug 24 18:30:06 2017 rev:2 rq:503226 version:0.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cdogs-sdl/cdogs-sdl.changes 2017-02-03 17:34:04.771456737 +0100 +++ /work/SRC/openSUSE:Factory/.cdogs-sdl.new/cdogs-sdl.changes 2017-08-24 18:30:26.139034861 +0200 @@ -1,0 +2,26 @@ +Mon Jun 5 10:50:24 UTC 2017 - mailaen...@opensuse.org + +- update to version 0.6.5 + * Add Harmful Crysalis campaign + * Add hitscan weapons, continuous collision detection (#372) + * Add scream sounds for females and other races (#371) + * Add sound effect for opening/closing map (#468) + * Add random seed to game start options + * Fix editor crash on startup (#488) + * Fix destroyed map objects dropping unavailable weapons (#493) + * Fix missing custom hitsounds + * Fix console window shown in Windows (#229) + * Improve character editor (#462) + * Improve Doom campaign with gun spawners, chainsaw, hitscan weapons + * Add pickups from destroyed map objects (#367) + * Add gas leak sound effect + * Add pitch variations to some sound effects (#369) + * Add some animated map objects to AI Insurgency campaign + * Fix mission time not synced over network (#405) + * Improve walk animation (#18) + * Change command line option to allow arbitrary config settings (#473) +- drop upstreamed datadir.patch install-prefix.patch copying.patch +- drop cdogs-sdl-0.6.1-mga-unbundle-yajl.patch as lib is customized +- replace cdogs-sdl-0.6.0-mga-unbundle-enet.patch with system-enet.patch + +------------------------------------------------------------------- Old: ---- cdogs-sdl-0.6.0-mga-unbundle-enet.patch cdogs-sdl-0.6.1-mga-unbundle-yajl.patch cdogs-sdl-0.6.3.tar.gz copying.patch datadir.patch install-prefix.patch New: ---- cdogs-sdl-0.6.5.tar.gz system-enet.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdogs-sdl.spec ++++++ --- /var/tmp/diff_new_pack.8otJGK/_old 2017-08-24 18:30:29.134612828 +0200 +++ /var/tmp/diff_new_pack.8otJGK/_new 2017-08-24 18:30:29.138612264 +0200 @@ -1,7 +1,7 @@ # # spec file for package cdogs-sdl # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,15 @@ Name: cdogs-sdl -Version: 0.6.3 +Version: 0.6.5 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/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-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 +# 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,7 +36,6 @@ 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 @@ -53,19 +44,17 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 rm -rf src/cdogs/enet -rm -rf src/cdogs/yajl dos2unix doc/original_readme.txt +# disable -Werror (aborts build on mere warnings) +sed 's| -Werror||' -i CMakeLists.txt + %build -%cmake -DCDOGS_DATA_DIR=%{_datadir}/%{name}/ +%cmake -DCDOGS_DATA_DIR=%{_datadir}/%{name}/ -DUSE_SHARED_ENET=ON make %{?_smp_mflags} %install ++++++ cdogs-sdl-0.6.3.tar.gz -> cdogs-sdl-0.6.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/cdogs-sdl/cdogs-sdl-0.6.3.tar.gz /work/SRC/openSUSE:Factory/.cdogs-sdl.new/cdogs-sdl-0.6.5.tar.gz differ: char 12, line 1 ++++++ system-enet.patch ++++++ >From 122361af3bc603f96748da0d1c541c72c1c53c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <mailaen...@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?= <mailaen...@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)
