From baa0a700fa015587aaaa92fe980d7d35744dff6b Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 23 Nov 2020 18:52:01 -0600 Subject: [PATCH] bitfighter: upgrade to 021 --- srcpkgs/bitfighter/patches/cmake.patch | 158 ++++++++----------------- srcpkgs/bitfighter/template | 10 +- 2 files changed, 56 insertions(+), 112 deletions(-) diff --git a/srcpkgs/bitfighter/patches/cmake.patch b/srcpkgs/bitfighter/patches/cmake.patch index 217ba740763a3c..03f775f2f3aedc 100644 --- a/srcpkgs/bitfighter/patches/cmake.patch +++ b/srcpkgs/bitfighter/patches/cmake.patch @@ -1,38 +1,39 @@ ---- cmake/Platform/Linux.cmake.orig 2018-12-20 21:54:40.020718363 -0700 -+++ cmake/Platform/Linux.cmake 2018-12-20 21:54:49.064912089 -0700 -@@ -99,7 +99,7 @@ function(BF_PLATFORM_INSTALL targetName) +From 391c12b65643c7db6075547cce9addea5dcfb082 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Mon, 23 Nov 2020 18:38:08 -0600 +Subject: [PATCH] cmake + +--- + master/CMakeLists.txt | 6 +++++- + zap/bitfighter_client.cmake | 18 ++++++++++++++---- + zap/bitfighterd.cmake | 5 +++-- + 3 files changed, 22 insertions(+), 7 deletions(-) + +diff --git master/CMakeLists.txt master/CMakeLists.txt +index 28303fa..7dd2988 100644 +--- master/CMakeLists.txt ++++ master/CMakeLists.txt +@@ -41,7 +41,11 @@ else() + endif() - if(INSTALL_NOTIFIER) - # Modify python script to have the shebang -- install(CODE "execute_process(COMMAND sed -i -e \"1s@^@#!/usr/bin/env python\\\\n\\\\n@\" ${CMAKE_SOURCE_DIR}/notifier/bitfighter_notifier.py)") -+ install(CODE "execute_process(COMMAND sed -i -e \"1s@^@#!/usr/bin/python\\\\n\\\\n@\" ${CMAKE_SOURCE_DIR}/notifier/bitfighter_notifier.py)") - # Modify python script to use proper path to the system-installed icon - install(CODE "execute_process(COMMAND sed -i -e \"s@redship48.png@bitfighter.png@\" -e \"s@^ICON_BASE =.*@ICON_BASE = \\\"${CMAKE_DESKTOP_DATA_PATH}/pixmaps/\\\"@\" ${CMAKE_SOURCE_DIR}/notifier/bitfighter_notifier.py)") - install(PROGRAMS ${CMAKE_SOURCE_DIR}/notifier/bitfighter_notifier.py DESTINATION ${CMAKE_BIN_PATH} RENAME bitfighter_notifier) ---- zap/bitfighterd.cmake.orig 2018-12-20 21:19:40.666559517 -0700 -+++ zap/bitfighterd.cmake 2018-12-20 21:19:44.866653338 -0700 -@@ -11,13 +11,13 @@ add_executable(bitfighterd - add_dependencies(bitfighterd - tnl - ${LUA_LIB} -- tomcrypt - clipper - poly2tri - ) - target_link_libraries(bitfighterd - ${SHARED_LIBS} -+ ${TOMCRYPT__LIBRARIES} - ) +-set(MASTER_DEPS tnl tomcrypt) ++set(MASTER_DEPS tnl) ++# Add tomcypt if not already found on system ++if(NOT TOMCRYPT_FOUND) ++ list(APPEND MASTER_DEPS tomcrypt) ++endif() - set_target_properties(bitfighterd ---- ./zap/bitfighter_client.cmake.orig 2018-12-16 09:12:56.168753252 -0700 -+++ ./zap/bitfighter_client.cmake 2018-12-20 21:02:50.936433248 -0700 + set(MASTER_LIBS + tnl +diff --git zap/bitfighter_client.cmake zap/bitfighter_client.cmake +index 5dcbd3c..444a365 100644 +--- zap/bitfighter_client.cmake ++++ zap/bitfighter_client.cmake @@ -11,13 +11,23 @@ add_library(bitfighter_client OBJECT ${OTHER_HEADERS} ) -+ +# If certain system libs were not found, add the in-tree variants as dependencies +set(CLIENT_EXTRA_DEPS "") +if(NOT ALURE_FOUND) @@ -42,101 +43,50 @@ + list(APPEND CLIENT_EXTRA_DEPS tomcrypt) +endif() + ++if(NOT CLIPPER_FOUND) ++ list(APPEND CLIENT_EXTRA_DEPS clipper) ++endif() + add_dependencies(bitfighter_client - alure - ${LUA_LIB} +- ${LUA_LIB} tnl - tomcrypt - clipper +- clipper poly2tri + ${CLIENT_EXTRA_DEPS} ) if(USE_GLES) ---- ./master/CMakeLists.txt.orig 2018-12-20 21:10:17.222088600 -0700 -+++ ./master/CMakeLists.txt 2018-12-20 21:13:57.550931398 -0700 -@@ -41,7 +41,11 @@ else() - endif() - - --set(MASTER_DEPS tnl tomcrypt) -+set(MASTER_DEPS tnl) -+# Add tomcypt if not already found on system -+if(NOT TOMCRYPT_FOUND) -+ list(APPEND MASTER_DEPS tomcrypt) -+endif() - - set(MASTER_LIBS - tnl ---- ./CMakeLists.txt.orig 2018-12-12 15:40:38.904058738 -0700 -+++ ./CMakeLists.txt 2018-12-20 21:09:57.017647629 -0700 -@@ -1,17 +1,6 @@ - project (bitfighter) - cmake_minimum_required (VERSION 3.1.0) - --# CMake 3.0 policy that says you need to do something like this (NEW): --# set_target_properties(master_lib master PROPERTIES COMPILE_DEFINITIONS_DEBUG "TNL_DEBUG") --# --# instead of this (OLD): --# set_target_properties(master_lib master PROPERTIES COMPILE_DEFINITIONS $<$:TNL_DEBUG>) --# --# Set to OLD behavior until minimum cmake version >= 2.8.10 --if(POLICY CMP0043) -- cmake_policy(SET CMP0043 OLD) --endif() -- - - # - # CMake options - ---- zap/bitfighter_client.cmake 2019-01-07 02:43:43.453459870 +0100 -+++ - 2019-01-07 02:54:56.118124604 +0100 -@@ -20,12 +20,13 @@ - if(NOT TOMCRYPT_FOUND) - list(APPEND CLIENT_EXTRA_DEPS tomcrypt) - endif() -- -+if(NOT CLIPPER_FOUND) -+ list(APPEND CLIENT_EXTRA_DEPS clipper) -+endif() - - add_dependencies(bitfighter_client - ${LUA_LIB} - tnl -- clipper - poly2tri - ${CLIENT_EXTRA_DEPS} - ) ---- zap/bitfighterd.cmake 2019-01-07 02:57:05.348462052 +0100 -+++ - 2019-01-07 02:59:39.300598740 +0100 -@@ -11,12 +11,12 @@ +diff --git zap/bitfighterd.cmake zap/bitfighterd.cmake +index 3363a7b..917fb8d 100644 +--- zap/bitfighterd.cmake ++++ zap/bitfighterd.cmake +@@ -11,13 +11,14 @@ add_executable(bitfighterd add_dependencies(bitfighterd tnl ${LUA_LIB} +- tomcrypt - clipper poly2tri ) target_link_libraries(bitfighterd ${SHARED_LIBS} ++ ${LUA_LIB} + ${CLIPPER_LIBRARIES} - ${TOMCRYPT__LIBRARIES} ++ ${TOMCRYPT_LIBRARIES} ) ---- zap/bitfighter_client.cmake 2019-01-07 03:03:15.449271742 +0100 -+++ - 2019-01-07 03:05:39.233731581 +0100 -@@ -25,7 +25,6 @@ - endif() - - add_dependencies(bitfighter_client -- ${LUA_LIB} - tnl - poly2tri - ${CLIENT_EXTRA_DEPS} ---- zap/bitfighterd.cmake 2019-01-07 03:03:15.456271777 +0100 -+++ - 2019-01-07 03:05:59.095945997 +0100 -@@ -10,12 +10,12 @@ + set_target_properties(bitfighterd +-- +2.29.2 + +diff --git zap/bitfighterd.cmake zap/bitfighterd.cmake +index 917fb8d..9b7f1b7 100644 +--- zap/bitfighterd.cmake ++++ zap/bitfighterd.cmake +@@ -10,7 +10,6 @@ add_executable(bitfighterd add_dependencies(bitfighterd tnl @@ -144,9 +94,3 @@ poly2tri ) - target_link_libraries(bitfighterd - ${SHARED_LIBS} -+ ${LUA_LIB} - ${CLIPPER_LIBRARIES} - ${TOMCRYPT__LIBRARIES} - ) diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template index c3b2cc22a26520..7e0368fb44cac0 100644 --- a/srcpkgs/bitfighter/template +++ b/srcpkgs/bitfighter/template @@ -1,7 +1,7 @@ # Template file for 'bitfighter' pkgname=bitfighter -version=019g -revision=2 +version=021 +revision=1 build_style=cmake configure_args="-DMASTER_MINIMAL=1 -DLUAJIT_BUILTIN=OFF" hostmakedepends="pkg-config unzip" @@ -14,9 +14,9 @@ short_desc="Fast-paced team-based outer-space multi-player arcade game" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://bitfighter.org/" -distfiles="http://bitfighter.org/files/${pkgname}-${version}.tar.gz - http://bitfighter.org/files/classic_level_pack.zip" -checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427 +distfiles="https://bitfighter.org/files/${pkgname}-${version}.tar.gz + https://bitfighter.org/files/classic_level_pack.zip" +checksum="10eec70dc0d26357964df435606afcc58a36beeb0d7f3382f963ffd063a66aaf d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b" python_version=2 replaces="bitfighter-data>=0"