1 |
commit: 9d448e9f319856efa39c33057917ec2b89075e24 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 28 15:06:03 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 28 17:00:07 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d448e9f |
7 |
|
8 |
games-fps/gzdoom: drop 4.7.0 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
games-fps/gzdoom/Manifest | 2 - |
13 |
...-4.5.0-Introduce-the-BUILD_NONFREE-option.patch | 36 --------- |
14 |
games-fps/gzdoom/gzdoom-4.7.0.ebuild | 86 ---------------------- |
15 |
3 files changed, 124 deletions(-) |
16 |
|
17 |
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest |
18 |
index 759883275350..9712094c2ea3 100644 |
19 |
--- a/games-fps/gzdoom/Manifest |
20 |
+++ b/games-fps/gzdoom/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f |
23 |
DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0 |
24 |
-DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543 |
25 |
|
26 |
diff --git a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch |
27 |
deleted file mode 100644 |
28 |
index 64a230dcd984..000000000000 |
29 |
--- a/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch |
30 |
+++ /dev/null |
31 |
@@ -1,36 +0,0 @@ |
32 |
-From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 Mon Sep 17 00:00:00 2001 |
33 |
-From: William Breathitt Gray <vilhelm.gray@×××××.com> |
34 |
-Date: Sat, 31 Aug 2019 21:23:23 +0900 |
35 |
-Subject: [PATCH] Introduce the BUILD_NONFREE option |
36 |
- |
37 |
-This allow users to disable building nonfree components (brightmaps.pk3, |
38 |
-game_support.pk3, and game_widescreen_gfx.pk3) if they so desire. |
39 |
---- |
40 |
- CMakeLists.txt | 9 ++++++--- |
41 |
- 1 file changed, 6 insertions(+), 3 deletions(-) |
42 |
- |
43 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
44 |
-index a3763ec1f..d0c4720bd 100644 |
45 |
---- a/CMakeLists.txt |
46 |
-+++ b/CMakeLists.txt |
47 |
-@@ -400,11 +400,14 @@ add_subdirectory( libraries/lzma ) |
48 |
- add_subdirectory( tools ) |
49 |
- add_subdirectory( libraries/gdtoa ) |
50 |
- add_subdirectory( wadsrc ) |
51 |
--add_subdirectory( wadsrc_bm ) |
52 |
- add_subdirectory( wadsrc_lights ) |
53 |
--add_subdirectory( wadsrc_extra ) |
54 |
--add_subdirectory( wadsrc_widescreen ) |
55 |
- add_subdirectory( src ) |
56 |
-+option (BUILD_NONFREE "Build nonfree components" ON) |
57 |
-+if( BUILD_NONFREE ) |
58 |
-+ add_subdirectory( wadsrc_bm ) |
59 |
-+ add_subdirectory( wadsrc_extra ) |
60 |
-+ add_subdirectory( wadsrc_widescreen ) |
61 |
-+endif() |
62 |
- |
63 |
- if( NOT CMAKE_CROSSCOMPILING ) |
64 |
- export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" ) |
65 |
--- |
66 |
-2.28.0 |
67 |
- |
68 |
|
69 |
diff --git a/games-fps/gzdoom/gzdoom-4.7.0.ebuild b/games-fps/gzdoom/gzdoom-4.7.0.ebuild |
70 |
deleted file mode 100644 |
71 |
index 52da570e32f4..000000000000 |
72 |
--- a/games-fps/gzdoom/gzdoom-4.7.0.ebuild |
73 |
+++ /dev/null |
74 |
@@ -1,86 +0,0 @@ |
75 |
-# Copyright 1999-2021 Gentoo Authors |
76 |
-# Distributed under the terms of the GNU General Public License v2 |
77 |
- |
78 |
-EAPI=7 |
79 |
- |
80 |
-inherit cmake desktop xdg flag-o-matic |
81 |
- |
82 |
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad" |
83 |
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" |
84 |
-HOMEPAGE="https://zdoom.org" |
85 |
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz |
86 |
- non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )" |
87 |
- |
88 |
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT |
89 |
- non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="~amd64 ~arm ~x86" |
92 |
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan" |
93 |
- |
94 |
-DEPEND=" |
95 |
- app-arch/bzip2 |
96 |
- media-libs/libsdl2[gles2?,opengl,vulkan?] |
97 |
- media-libs/openal |
98 |
- media-libs/zmusic |
99 |
- sys-libs/zlib |
100 |
- virtual/jpeg:0 |
101 |
- gtk? ( x11-libs/gtk+:3 )" |
102 |
-RDEPEND="${DEPEND}" |
103 |
- |
104 |
-S="${WORKDIR}/${PN}-g${PV}" |
105 |
- |
106 |
-PATCHES=( |
107 |
- "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch" |
108 |
-) |
109 |
- |
110 |
-src_prepare() { |
111 |
- rm -rf docs/licenses || die |
112 |
- rm -rf libraries/{bzip2,jpeg,zlib} || die |
113 |
- if ! use non-free ; then |
114 |
- rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die |
115 |
- else |
116 |
- mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || die |
117 |
- fi |
118 |
- |
119 |
- cmake_src_prepare |
120 |
-} |
121 |
- |
122 |
-src_configure() { |
123 |
- local mycmakeargs=( |
124 |
- -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}" |
125 |
- -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom" |
126 |
- -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom" |
127 |
- -DDYN_OPENAL=OFF |
128 |
- -DNO_GTK="$(usex !gtk)" |
129 |
- -DNO_OPENAL=OFF |
130 |
- -DHAVE_VULKAN="$(usex vulkan)" |
131 |
- -DHAVE_GLES2="$(usex gles2)" |
132 |
- -DNO_OPENMP="$(usex !openmp)" |
133 |
- -DBUILD_NONFREE="$(usex non-free)" |
134 |
- ) |
135 |
- |
136 |
- use debug || append-cppflags -DNDEBUG |
137 |
- use telemetry || append-cppflags -DNO_SEND_STATS |
138 |
- |
139 |
- cmake_src_configure |
140 |
-} |
141 |
- |
142 |
-src_install() { |
143 |
- newicon src/posix/zdoom.xpm "${PN}.xpm" |
144 |
- make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" |
145 |
- cmake_src_install |
146 |
-} |
147 |
- |
148 |
-pkg_postinst() { |
149 |
- xdg_pkg_postinst |
150 |
- |
151 |
- if ! use non-free ; then |
152 |
- ewarn |
153 |
- ewarn "GZDoom installed without non-free components." |
154 |
- ewarn "Note: The non-free game_support.pk3 file is needed to play" |
155 |
- ewarn " games natively supported by GZDoom." |
156 |
- ewarn "A list of games natively supported by GZDoom is available" |
157 |
- ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD" |
158 |
- ewarn |
159 |
- fi |
160 |
-} |