bitfighter: update to 022.

srcpkgs/bitfighter/patches/cmake.patch

@@ -1,152 +0,0 @@
---- a/cmake/Platform/Linux.cmake	2018-12-20 21:54:40.020718363 -0700
-+++ b/cmake/Platform/Linux.cmake	2018-12-20 21:54:49.064912089 -0700
-@@ -99,7 +99,7 @@ function(BF_PLATFORM_INSTALL targetName)
- 
- 	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)
---- a/zap/bitfighterd.cmake	2018-12-20 21:19:40.666559517 -0700
-+++ b/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_target_properties(bitfighterd
---- a/zap/bitfighter_client.cmake	2018-12-16 09:12:56.168753252 -0700
-+++ b/zap/bitfighter_client.cmake	2018-12-20 21:02:50.936433248 -0700
-@@ -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)
-+	list(APPEND CLIENT_EXTRA_DEPS alure)
-+endif()
-+if(NOT TOMCRYPT_FOUND)
-+	list(APPEND CLIENT_EXTRA_DEPS tomcrypt)
-+endif()
-+
-+
- add_dependencies(bitfighter_client
--	alure
- 	${LUA_LIB}
- 	tnl
--	tomcrypt
- 	clipper
- 	poly2tri
-+	${CLIENT_EXTRA_DEPS}
- )
- 
- if(USE_GLES)
---- a/master/CMakeLists.txt	2018-12-20 21:10:17.222088600 -0700
-+++ b/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
---- a/CMakeLists.txt	2018-12-12 15:40:38.904058738 -0700
-+++ b/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 $<$<CONFIG:Debug>:TNL_DEBUG>)
--#
--# Set to OLD behavior until minimum cmake version >= 2.8.10
--if(POLICY CMP0043)
--	cmake_policy(SET CMP0043 OLD)
--endif()
--
- 
- #
- # CMake options
-
---- a/zap/bitfighter_client.cmake	2019-01-07 02:43:43.453459870 +0100
-+++ b/zap/bitfighter_client.cmake	2019-01-07 02:43:43.453459870 +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}
- )
---- a/zap/bitfighterd.cmake	2019-01-07 02:57:05.348462052 +0100
-+++ b/zap/bitfighterd.cmake	2019-01-07 02:57:05.348462052 +0100
-@@ -11,12 +11,12 @@
- add_dependencies(bitfighterd
- 	tnl
- 	${LUA_LIB}
--	clipper
- 	poly2tri
- )
- 
- target_link_libraries(bitfighterd
- 	${SHARED_LIBS}
-+	${CLIPPER_LIBRARIES}
- 	${TOMCRYPT__LIBRARIES}
- )
- 
---- a/zap/bitfighter_client.cmake	2019-01-07 03:03:15.449271742 +0100
-+++ b/zap/bitfighter_client.cmake	2019-01-07 03:03:15.449271742 +0100
-@@ -25,7 +25,6 @@
- endif()
- 
- add_dependencies(bitfighter_client
--	${LUA_LIB}
- 	tnl
- 	poly2tri
- 	${CLIENT_EXTRA_DEPS}
---- a/zap/bitfighterd.cmake	2019-01-07 03:03:15.456271777 +0100
-+++ b/zap/bitfighterd.cmake	2019-01-07 03:03:15.456271777 +0100
-@@ -10,12 +10,12 @@
- 
- add_dependencies(bitfighterd
- 	tnl
--	${LUA_LIB}
- 	poly2tri
- )
- 
- target_link_libraries(bitfighterd
- 	${SHARED_LIBS}
-+	${LUA_LIB}
- 	${CLIPPER_LIBRARIES}
- 	${TOMCRYPT__LIBRARIES}
- )

srcpkgs/bitfighter/template

@@ -1,7 +1,7 @@
 # Template file for 'bitfighter'
 pkgname=bitfighter
-version=019g
+version=022
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DMASTER_MINIMAL=1 -DLUAJIT_BUILTIN=OFF"
 hostmakedepends="pkg-config unzip"
@@ -9,16 +9,16 @@ makedepends="boost-devel MesaLib-devel SDL2-devel LuaJIT-devel
  libopenal-devel libmariadbclient-devel libmodplug-devel
  libpng-devel libtomcrypt-devel speex-devel
  clipper-devel alure-devel"
-depends="desktop-file-utils libmpg123"
+depends="libmpg123"
 short_desc="Fast-paced team-based outer-space multi-player arcade game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 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
+checksum="b853c9c4f15e88f13dea601f6bf224a40b96a3309a73064955233d03c5ca835f
  d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b"
-python_version=2
+python_version=3
 replaces="bitfighter-data>=0"
 
 CXXFLAGS="-Wno-narrowing"