diff options
| author |   William Breathitt Gray <vilhelm.gray@gmail.com> | 2020-04-04 20:34:08 -0400 |
|---|---|---|
| committer |   James Le Cuirot <chewi@gentoo.org> | 2020-04-08 23:43:38 +0100 |
| commit | 5adac9c46b9fd6af6b2c816dd1dca43453f57855 (patch) | |
| tree | e02c6c565458e603c07bd1ea024520aae937d98d /games-engines/odamex/files | |
| parent | dev-python/pygtk: arm64 stable (bug #716294) (diff) | |
| download | gentoo-5adac9c46b9fd6af6b2c816dd1dca43453f57855.tar.gz gentoo-5adac9c46b9fd6af6b2c816dd1dca43453f57855.tar.bz2 gentoo-5adac9c46b9fd6af6b2c816dd1dca43453f57855.zip | |
games-engines/odamex: Version bump to 0.8.2
Closes: https://bugs.gentoo.org/716238
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15268
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-engines/odamex/files')
| -rw-r--r-- | games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch | 71 | ||||
| -rw-r--r-- | games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch | 26 |
2 files changed, 97 insertions, 0 deletions
diff --git a/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch b/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch new file mode 100644 index 000000000000..e90617c38ea7 --- /dev/null +++ b/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch @@ -0,0 +1,71 @@ +From 03581f45a3563d3d79075fe0e85e6fb52e864b76 Mon Sep 17 00:00:00 2001 +From: William Breathitt Gray <vilhelm.gray@gmail.com> +Date: Sat, 4 Apr 2020 22:38:26 -0400 +Subject: [PATCH] Fix odamex.wad build flow + +The odamex.wad file should be built in the proper build directory; +building in the source tree confuses CMake and causes it to attempt to +rebuild a second time. This patch also removes odawad dependency for the +Odamex client and server executables. +--- + wad/CMakeLists.txt | 40 ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) + +diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt +index c09b0d1a..349ce0df 100644 +--- a/wad/CMakeLists.txt ++++ b/wad/CMakeLists.txt +@@ -4,28 +4,32 @@ find_program(DEUTEX deutex) + if(DEUTEX) + message("Found DeuTex: ${DEUTEX}") + +- file(REMOVE odamex.wad) +- add_custom_command(OUTPUT odamex.wad +- COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt odamex.wad ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad ++ COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++ BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad + VERBATIM) + +- add_custom_target(odawad DEPENDS odamex.wad) ++ add_custom_target(odawad ALL ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad) + +- if(BUILD_CLIENT) +- add_dependencies(odamex odawad) ++ if(WIN32) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad ++ DESTINATION . ++ COMPONENT common) ++ else() ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex ++ COMPONENT common) + endif() +- if(BUILD_SERVER) +- add_dependencies(odasrv odawad) +- endif() +-endif() +- +-if(WIN32) +- install(FILES odamex.wad +- DESTINATION . +- COMPONENT common) + else() +- install(FILES odamex.wad +- DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex +- COMPONENT common) ++ if(WIN32) ++ install(FILES odamex.wad ++ DESTINATION . ++ COMPONENT common) ++ else() ++ install(FILES odamex.wad ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex ++ COMPONENT common) ++ endif() + endif() +-- +2.26.0 + diff --git a/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch b/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch new file mode 100644 index 000000000000..1b1bcf55d9e6 --- /dev/null +++ b/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch @@ -0,0 +1,26 @@ +From 2d80f79770f43d19e1af2c7b04a41078b860a46a Mon Sep 17 00:00:00 2001 +From: William Breathitt Gray <vilhelm.gray@gmail.com> +Date: Wed, 8 Apr 2020 11:47:45 -0400 +Subject: [PATCH] Remove duplicate build rule for odamex.wad + +The odamex.wad file shouldn't be listed in BYPRODUCTS because it's +already listed as the OUTPUT of the add_custom_command. +--- + wad/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt +index 349ce0df..7b948ea3 100644 +--- a/wad/CMakeLists.txt ++++ b/wad/CMakeLists.txt +@@ -7,7 +7,6 @@ if(DEUTEX) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad + COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad + VERBATIM) + + add_custom_target(odawad ALL +-- +2.26.0 + |