summaryrefslogtreecommitdiff
path: root/games-strategy/warzone2100/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-19 14:35:33 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-19 14:35:33 +0000
commitb6ea5af1e29ca1c7885a1066ef27ae958cab9fa3 (patch)
treebb025d8ede7f6ae9580ea6d30a9d5d14cfb32c28 /games-strategy/warzone2100/files
parent43e5c605b9628aa112d3779b944c69199f25d0cd (diff)
Revert "games-strategy/warzone2100 : attempt to fix vulkan build"
This reverts commit 43e5c605b9628aa112d3779b944c69199f25d0cd.
Diffstat (limited to 'games-strategy/warzone2100/files')
-rw-r--r--games-strategy/warzone2100/files/warzone-vulkan.patch40
-rw-r--r--games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch60
2 files changed, 0 insertions, 100 deletions
diff --git a/games-strategy/warzone2100/files/warzone-vulkan.patch b/games-strategy/warzone2100/files/warzone-vulkan.patch
deleted file mode 100644
index 08b3ef7e..00000000
--- a/games-strategy/warzone2100/files/warzone-vulkan.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp
-index 594d127f70..419b8a7644 100644
---- a/lib/ivis_opengl/gfx_api_vk.cpp
-+++ b/lib/ivis_opengl/gfx_api_vk.cpp
-@@ -477,7 +477,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t minimumSize)
- if (result != vk::Result::eSuccess)
- {
- // Failed to allocate memory!
-- throwResultException( result, "vmaCreateBuffer" );
-+ vk::throwResultException( result, "vmaCreateBuffer" );
- }
-
- if (autoMap)
-@@ -1304,7 +1304,7 @@ VkPSO::VkPSO(vk::Device _dev,
- object = std::move(result.value);
- break;
- default:
-- throwResultException(result.result, "createGraphicsPipeline");
-+ vk::throwResultException(result.result, "createGraphicsPipeline");
- }
- }
-
-@@ -1368,7 +1368,7 @@ void VkBuf::allocateBufferObject(const std::size_t& size)
- if (result != vk::Result::eSuccess)
- {
- // Failed to allocate memory!
-- throwResultException( result, "vmaCreateBuffer" );
-+ vk::throwResultException( result, "vmaCreateBuffer" );
- }
-
- buffer_size = size;
-@@ -1486,7 +1486,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::size_t& mipmap_count, const
- if (result != vk::Result::eSuccess)
- {
- // Failed to allocate memory!
-- throwResultException( result, "vmaCreateImage" );
-+ vk::throwResultException( result, "vmaCreateImage" );
- }
-
- const auto imageViewCreateInfo = vk::ImageViewCreateInfo()
diff --git a/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch b/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch
deleted file mode 100644
index b90ad05b..00000000
--- a/games-strategy/warzone2100/files/warzone2100-4.1.3-no-compress-manpages.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/808120
-
-From e65b71cec99b2c3a4d0ed6aa448e7a2dc28fabac Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 17 Aug 2021 22:22:40 +0100
-Subject: [PATCH] Don't compress manpages
-
----
- doc/CMakeLists.txt | 34 ++++++----------------------------
- 1 file changed, 6 insertions(+), 28 deletions(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 3d27a1a..f3c702b 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -236,35 +236,13 @@ install(FILES ${wz2100_doc_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}${WZ_OUTPU
- if(UNIX)
- # Man-page gzip and installation
-
-- find_program(GZIP_BIN NAMES gzip PATHS /bin /usr/bin /usr/local/bin)
-- if (GZIP_BIN)
-- set(_warzone2100_6_uncompressed_orig "${CMAKE_CURRENT_BINARY_DIR}/warzone2100.6")
-- set(_warzone2100_6_uncompressed "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6")
-- set(_warzone2100_6_compressed "${_warzone2100_6_uncompressed}.gz")
--
-- add_custom_target(wz2100_manpages ALL)
-- set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc")
-- add_dependencies(wz2100_manpages wz2100_doc)
--
-- if (NOT "${_warzone2100_6_uncompressed_orig}" STREQUAL "${_warzone2100_6_uncompressed}")
-- add_custom_command(
-- TARGET wz2100_manpages
-- COMMAND ${CMAKE_COMMAND} -E copy "${_warzone2100_6_uncompressed_orig}" "${_warzone2100_6_uncompressed}"
-- COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
-- VERBATIM
-- )
-- else()
-- add_custom_command(
-- TARGET wz2100_manpages
-- COMMAND ${GZIP_BIN} -n -c ${_warzone2100_6_uncompressed} > ${_warzone2100_6_compressed}
-- VERBATIM
-- )
-- endif()
-+ set(_warzone2100_6 "${CMAKE_CURRENT_BINARY_DIR}/warzone2100${WZ_OUTPUT_NAME_SUFFIX}.6")
-
-- install(FILES "${_warzone2100_6_compressed}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
-- else()
-- message( WARNING "Unable to find gzip tool; skipping Unix man page generation" )
-- endif()
-+ add_custom_target(wz2100_manpages ALL)
-+ set_property(TARGET wz2100_manpages PROPERTY FOLDER "doc")
-+ add_dependencies(wz2100_manpages wz2100_doc)
-+
-+ install(FILES "${_warzone2100_6}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT Manpages)
- endif()
-
- set(wz2100_doc_IMAGES_FILES ${wz2100_doc_IMAGES_FILES} PARENT_SCOPE)
---
-2.33.0
-