diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-20 14:45:01 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-20 14:45:01 +0100 |
| commit | 34dea8e38f88007799629d0a56b12dec480b1d21 (patch) | |
| tree | 6790873994b58030360328cf5897d934b3b03d16 /games-engines/odamex | |
| parent | 7932d472a02d4c016ff7dff4b7a5479ab9d1883d (diff) | |
gentoo resync : 20.06.2021
Diffstat (limited to 'games-engines/odamex')
| -rw-r--r-- | games-engines/odamex/Manifest | 5 | ||||
| -rw-r--r-- | games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch | 24 | ||||
| -rw-r--r-- | games-engines/odamex/odamex-0.9.3.ebuild (renamed from games-engines/odamex/odamex-0.9.0.ebuild) | 5 |
3 files changed, 4 insertions, 30 deletions
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index 09dfb31a4a42..c06f1fb7cf74 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -1,7 +1,6 @@ -AUX odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch 835 BLAKE2B c15d7fcf8e2992a01f8c329c494f118c4d7279b10fd1acce97a03a6bd08a4aeede40b44b7f3d99c6140e252ff154ff607861733e35fa5e0f898f6b56b592cd2c SHA512 86fe37efa3bbb03d89ef02ea7792809d38c6abfaa607af74cda4815722ffc4bd35502a83bccd4c902b697d9420bde078228d8e40b21e722a48cb608627366c71 AUX odamex-0.9.0-Unbundle-miniupnpc.patch 2765 BLAKE2B f1a7307c82d6ab9ee17524d0384ec7b54ee51a1ee611a89cad9cdd3e8a98b448327a85242f71f0432ec266cbb8b24b893a0ca86dd62b994bc1320ef4157dc9f6 SHA512 a310ede1fc3340e6ee28ea0925da828dae517d7f9f83d015b744e0b3185ed82fa737f0a1d6c73ab000edf87a4467910ab14aa3a6bb34dc7c157535bd8270173c -DIST odamex-0.9.0.tar.bz2 6644055 BLAKE2B 656a469665783e0a5aa1a39792454a7ec34843b7fa11539f5504463701b5485eed0b5fabcd4f9f39eef3bdad9062f657c0b1d6147bcd41defa4142b51b4096a4 SHA512 f86e61afd5fdd9be6db03554e07fa140fdcc61747ce9312706af2cada8ec88705647abdfff4f221d8cfbd4a53b991e08edf4cbf0025cf6e5a74d2213fc662855 DIST odamex-0.9.2.tar.bz2 6657974 BLAKE2B 60bf542806fe9d66711b45211f646607875621b014175fa3c4b9948c1c02d45af36d4a324349f22f4a7a4e11c13f48f2b96c731a9bb5f18c9d43111c56676f18 SHA512 69fb2ecc1d642c9c90da7503712aba628c753534ee56003945e4d267dc38bca0136d155a75695e483b0b4ec739aa331fca8c7493263b39a2521e8abcb378b5e4 -EBUILD odamex-0.9.0.ebuild 1837 BLAKE2B fef2b8796d963b50f1995a2dd216858c588df500d445e6f851a1ff12cd6260291aee07ab3d58965d4ceef083960d7603adc7432e4c849533a6077fc362df802c SHA512 3d7de60fdeb55593e31ab92d90782b5d2063de1966dddb9235e389523217023fe226572ceef76497c829bb9e4f07028dd7c2399113ef11bb62b50d1bbf3f6ef2 +DIST odamex-0.9.3.tar.bz2 6658459 BLAKE2B 1afe34400d2875ac196d5c189a35eb402fce0de90ded496aafcc98d2847ac7cdb10f07261c977a69e2442876897c0931813ddaf1954de2a871af6ca9d9317895 SHA512 114afe22f5651c87cedd7677055286ef9d222de790d9578669fdb5a20b471b273bd427c0dd103a64bcf7c285477776b6fa608b4086f78b4cd8271c33c87afcc3 EBUILD odamex-0.9.2.ebuild 1784 BLAKE2B b839525adfa4f0d0e2b29dd0b5d76f80568fb79d5c5ea2b9f6d2ba4a0a30d922db86b732ff92e345afe1f27f111aac92e0b8a6946440805901234b22bed8bf54 SHA512 5948ffd6eadc5ac78902a8e674c85727ac937b42309dff653fa9f4eea84a76fdf820e473983c4ca9af759add321acf71cb85e950684a82ebc0a8d6310d900ca6 +EBUILD odamex-0.9.3.ebuild 1779 BLAKE2B 51a20fbcb38a36737b4cb0ad84ab30240da396e597d3c7bc6339c86df6ccbf3e2cabbd9b1155d366b064a5745e29a232eace583d0c0c2b3264d28305b78e409f SHA512 0b366a7024835787d546caa4f3855466205b2e7c47f5d13aad5c1f518d7a09b7e9f7e55cb77f0dd9280e96d1a71f273078cef6e763cd795ec7630ae17a25cfee MISC metadata.xml 1560 BLAKE2B 9005fa7ad7cf0c111c7f1843320a325ab2859e125a7fe173585a41efa0c255b7cb547af627bb574e4276052ccc4797d0de214cacf8aa39b9e14576f326f8ba30 SHA512 da4fc9f0f98577b4e221649b6dca286cc00037cd2579d4adafc98bc00b0761ac5f553018394ea8509784754c4adf86963c1098db555aca0b01d62c1bc9efb843 diff --git a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch b/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch deleted file mode 100644 index 654085d1d252..000000000000 --- a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3707d8ebad7a4a0664ca4d5a5a5bef4a276af6a2 Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray <vilhelm.gray@gmail.com> -Date: Mon, 29 Mar 2021 20:30:10 +0900 -Subject: [PATCH] Set IMPORTED_LOCATION for jsoncpp - ---- - libraries/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt -index 2ffe95a5..a7dcb83b 100644 ---- a/libraries/CMakeLists.txt -+++ b/libraries/CMakeLists.txt -@@ -172,6 +172,7 @@ if(BUILD_SERVER) - INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/local/include" - IMPORTED_LOCATION_DEBUG ${JSONCPP_LIBRARY_DEBUG} - IMPORTED_LOCATION_RELEASE ${JSONCPP_LIBRARY_RELEASE} -+ IMPORTED_LOCATION ${JSONCPP_LIBRARY_RELEASE} - MAP_IMPORTED_CONFIG_MINSIZEREL Release - MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release) - endif() --- -2.31.0 - diff --git a/games-engines/odamex/odamex-0.9.0.ebuild b/games-engines/odamex/odamex-0.9.3.ebuild index dc97bd284d12..2a6cc608b6d8 100644 --- a/games-engines/odamex/odamex-0.9.0.ebuild +++ b/games-engines/odamex/odamex-0.9.3.ebuild @@ -21,12 +21,12 @@ RDEPEND=" media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer + net-misc/curl odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) server? ( - dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )" DEPEND="${RDEPEND}" @@ -35,8 +35,7 @@ BDEPEND="games-util/deutex" S="${WORKDIR}/${PN}-src-${PV}" PATCHES=( - "${FILESDIR}/${P}-Unbundle-miniupnpc.patch" - "${FILESDIR}/${P}-Set-IMPORTED_LOCATION-for-jsoncpp.patch" + "${FILESDIR}/${PN}-0.9.0-Unbundle-miniupnpc.patch" ) src_prepare() { |