forked from pool/ddnet
Accepting request 891303 from games
OBS-URL: https://build.opensuse.org/request/show/891303 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ddnet?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
69a1cef57e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b9b60e7c8330dbb9d7911177add4f52050cf27fc7b17c8da661ac0093ed1033d
|
||||
size 27625376
|
||||
3
ddnet-15.4.tar.gz
Normal file
3
ddnet-15.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c8915d1eebe66835e776f1b78fbdea78ad0ff310d452453de0bc5300da252677
|
||||
size 32811337
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 29 12:49:54 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
|
||||
|
||||
- Update to version 15.4
|
||||
* More colors from components in consoles
|
||||
* Add dummy_reset and remove +resetdummy
|
||||
* Local ranking info viewable ingame (/top5, /rank)
|
||||
* Add swap functionality for teams (/swap)
|
||||
* Add: Menu tabs animations
|
||||
* Add: Color picker in settings
|
||||
* Add: Better sliders and lists
|
||||
* Add: Indicate strength of hook in nameplates
|
||||
* Freeview mouse moves faster when zoomed out
|
||||
* New chat look
|
||||
* Show friends on spectate tab
|
||||
* Warn new players about name with points
|
||||
* Smooth dynamic camera
|
||||
* Optimize UI rendering
|
||||
* Add menu background maps
|
||||
* Add changeable assets in settings
|
||||
* Add new renderer, looks more consistent with ingame
|
||||
* New start menu adapted from Teeworlds 0.7
|
||||
* A lot other changes, see https://ddnet.tw/downloads/
|
||||
- Drop upstream merged steam-api.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 29 13:23:28 UTC 2020 - Matthias Mailänder <mailaender@opensuse.org>
|
||||
|
||||
|
||||
32
ddnet.spec
32
ddnet.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ddnet
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,19 +16,18 @@
|
||||
#
|
||||
|
||||
Name: ddnet
|
||||
Version: 14.5.1
|
||||
Version: 15.4
|
||||
Release: 0
|
||||
Summary: DDraceNetwork, a cooperative racing mod of Teeworlds
|
||||
License: Zlib AND CC-BY-SA-3.0 AND Apache-2.0 AND MIT AND SUSE-Public-Domain
|
||||
URL: https://ddnet.tw/
|
||||
Source: https://github.com/ddnet/ddnet/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM https://github.com/ddnet/ddnet/pull/2684
|
||||
Patch0: steam-api.patch
|
||||
Group: Amusements/Games/Action/Race
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pnglite-devel
|
||||
BuildRequires: python3
|
||||
@ -76,17 +75,13 @@ Standalone server for DDraceNetwork (DDNet).
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
mkdir build && cd build
|
||||
cmake .. \
|
||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DPREFER_BUNDLED_LIBS=OFF \
|
||||
-DAUTOUPDATE=OFF \
|
||||
-DANTIBOT=ON \
|
||||
-DUPNP=ON \
|
||||
-DSTEAM=OFF \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
|
||||
%make_build
|
||||
%cmake \
|
||||
-DPREFER_BUNDLED_LIBS=OFF \
|
||||
-DAUTOUPDATE=OFF \
|
||||
-DANTIBOT=ON \
|
||||
-DUPNP=ON \
|
||||
-DSTEAM=OFF
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
@ -103,14 +98,11 @@ install -Dp -m 0644 man/DDNet-Server.6 %{buildroot}%{_mandir}/man6/DDNet-Server.
|
||||
%{_bindir}/DDNet
|
||||
%{_libdir}/%{name}/
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
%{_datadir}/metainfo/*.appdata.xml
|
||||
|
||||
%files data
|
||||
%{_datadir}/%{name}/
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
%dir %{_datadir}/icons/hicolor/
|
||||
%dir %{_datadir}/icons/hicolor/*/
|
||||
%dir %{_datadir}/icons/hicolor/*/apps/
|
||||
|
||||
%files server
|
||||
%{_mandir}/man6/DDNet-Server.6%{?ext_man}
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
From 32734aceb355458d90573ecec37c4c909aad9697 Mon Sep 17 00:00:00 2001
|
||||
From: heinrich5991 <heinrich5991@gmail.com>
|
||||
Date: Mon, 31 Aug 2020 12:25:53 +0200
|
||||
Subject: [PATCH] Make steam_api dependency static on Linux non-Steam builds
|
||||
|
||||
This allows building without rpath modifying on Linux which seems to be
|
||||
needed for openSUSE packaging.
|
||||
|
||||
Fixes #2669.
|
||||
---
|
||||
CMakeLists.txt | 22 +++++++++++++++++-----
|
||||
1 file changed, 17 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8bf6f74da4..95707499e5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -97,6 +97,7 @@ option(UPNP "Enable UPnP support" OFF)
|
||||
option(ANTIBOT "Enable support for a dynamic anticheat library" OFF)
|
||||
option(CLIENT "Compile client" ON)
|
||||
option(DOWNLOAD_GTEST "Download and compile GTest" ${AUTO_DEPENDENCIES_DEFAULT})
|
||||
+option(STEAM "Build the Steam release version" OFF)
|
||||
option(PREFER_BUNDLED_LIBS "Prefer bundled libraries over system libraries" ${AUTO_DEPENDENCIES_DEFAULT})
|
||||
option(DEV "Don't generate stuff necessary for packaging" OFF)
|
||||
|
||||
@@ -269,7 +270,7 @@ function(set_own_rpath TARGET)
|
||||
endfunction()
|
||||
|
||||
if(NOT TARGET_OS STREQUAL "windows" AND NOT TARGET_OS STREQUAL "mac" AND CMAKE_VERSION VERSION_LESS 3.8)
|
||||
- if(CLIENT OR ANTIBOT)
|
||||
+ if((CLIENT AND STEAM) OR ANTIBOT)
|
||||
message(STATUS "Can't set BUILD_RPATH in CMake before 3.8, pass -Wl,-rpath,'$ORIGIN' manually if you wish to emulate this. Or just install a newer version of CMake...")
|
||||
endif()
|
||||
endif()
|
||||
@@ -1596,8 +1597,13 @@ if(CLIENT)
|
||||
steam_api_stub.cpp
|
||||
)
|
||||
|
||||
+ if(STEAM OR TARGET_OS STREQUAL "windows" OR TARGET_OS STREQUAL "mac")
|
||||
+ set(STEAMAPI_KIND SHARED)
|
||||
+ else()
|
||||
+ set(STEAMAPI_KIND STATIC)
|
||||
+ endif()
|
||||
set(TARGET_STEAMAPI steam_api)
|
||||
- add_library(${TARGET_STEAMAPI} SHARED ${STEAMAPI_SRC})
|
||||
+ add_library(${TARGET_STEAMAPI} ${STEAMAPI_KIND} ${STEAMAPI_SRC})
|
||||
list(APPEND TARGETS_OWN ${TARGET_STEAMAPI})
|
||||
|
||||
set_src(ENGINE_CLIENT GLOB src/engine/client
|
||||
@@ -1815,7 +1821,9 @@ if(CLIENT)
|
||||
${PLATFORM_CLIENT_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
- set_own_rpath(${TARGET_CLIENT})
|
||||
+ if(STEAMAPI_KIND STREQUAL DYNAMIC)
|
||||
+ set_own_rpath(${TARGET_CLIENT})
|
||||
+ endif()
|
||||
|
||||
set(PARAMS "${WAVPACK_INCLUDE_DIRS};${WAVPACK_INCLUDE_DIRS}")
|
||||
if(NOT(WAVPACK_OPEN_FILE_INPUT_EX_PARAMS STREQUAL PARAMS))
|
||||
@@ -2263,7 +2271,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME ${PROJECT_NAME})
|
||||
set(CPACK_TARGETS
|
||||
${TARGET_CLIENT}
|
||||
${TARGET_SERVER}
|
||||
- ${TARGET_STEAMAPI}
|
||||
config_retrieve
|
||||
config_store
|
||||
dilate
|
||||
@@ -2271,6 +2278,9 @@ set(CPACK_TARGETS
|
||||
map_diff
|
||||
map_extract
|
||||
)
|
||||
+if(STEAMAPI_KIND STREQUAL DYNAMIC)
|
||||
+ list(APPEND CPACK_TARGETS ${TARGET_STEAMAPI})
|
||||
+endif()
|
||||
set(CPACK_DIRS data)
|
||||
set(CPACK_FILES
|
||||
license.txt
|
||||
@@ -2286,7 +2296,9 @@ if(NOT DEV)
|
||||
include(GNUInstallDirs)
|
||||
install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ddnet COMPONENT data)
|
||||
install(TARGETS ${TARGET_CLIENT} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
|
||||
- install(TARGETS ${TARGET_STEAMAPI} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT client)
|
||||
+ if(STEAMAPI_KIND STREQUAL DYNAMIC)
|
||||
+ install(TARGETS ${TARGET_STEAMAPI} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT client)
|
||||
+ endif()
|
||||
install(TARGETS ${TARGET_SERVER} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT server)
|
||||
if(ANTIBOT)
|
||||
install(TARGETS ${TARGET_ANTIBOT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ddnet COMPONENT server)
|
||||
Loading…
Reference in New Issue
Block a user