| 1 |
commit: 7d97869582c5d3310410c146f3cc5f793987438a |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 2 05:03:23 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 2 05:03:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d978695 |
| 7 |
|
| 8 |
dev-games/mygui: drop 3.2.2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/823994 |
| 11 |
Closes: https://bugs.gentoo.org/665804 |
| 12 |
Closes: https://bugs.gentoo.org/625362 |
| 13 |
Closes: https://bugs.gentoo.org/828736 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-games/mygui/Manifest | 1 - |
| 17 |
dev-games/mygui/files/mygui-3.2.2-FHS.patch | 44 ------- |
| 18 |
dev-games/mygui/files/mygui-3.2.2-build.patch | 61 --------- |
| 19 |
dev-games/mygui/files/mygui-3.2.2-c++17.patch | 27 ---- |
| 20 |
.../mygui/files/mygui-3.2.2-underlinking.patch | 20 --- |
| 21 |
dev-games/mygui/mygui-3.2.2.ebuild | 144 --------------------- |
| 22 |
6 files changed, 297 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest |
| 25 |
index 907e4d1b27ed..eaf910c62584 100644 |
| 26 |
--- a/dev-games/mygui/Manifest |
| 27 |
+++ b/dev-games/mygui/Manifest |
| 28 |
@@ -1,2 +1 @@ |
| 29 |
-DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4 |
| 30 |
DIST mygui-3.4.1.tar.gz 22433198 BLAKE2B 400f88a63df1bff5554236a0aeb58218fdb6100aa84f9eb1ac111adabfa45ae7eb1c3124bb04f3ef57587566e716d3242daa9cb5866d7ccc43a56c9605952411 SHA512 9d36272345b1a755db88848c8a0919feb6f8ae09d048efa3b8ed833bb5ddb9c65e1e7e0d26ad39eecd2a4de53fb654f4099c555e9ebd21ce9541a1a74580ef05 |
| 31 |
|
| 32 |
diff --git a/dev-games/mygui/files/mygui-3.2.2-FHS.patch b/dev-games/mygui/files/mygui-3.2.2-FHS.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index 14d21626ff7b..000000000000 |
| 35 |
--- a/dev-games/mygui/files/mygui-3.2.2-FHS.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,44 +0,0 @@ |
| 38 |
-From: Julian Ospald <hasufell@g.o> |
| 39 |
-Date: Sat Oct 27 22:39:31 UTC 2012 |
| 40 |
-Subject: FHS |
| 41 |
- |
| 42 |
-paths hardcoded until upstream fixed the logic |
| 43 |
- |
| 44 |
---- mygui-MyGUI3.2.2.orig/CMake/InstallResources.cmake |
| 45 |
-+++ mygui-MyGUI3.2.2/CMake/InstallResources.cmake |
| 46 |
-@@ -24,7 +24,7 @@ |
| 47 |
- else () |
| 48 |
- install(FILES |
| 49 |
- ${MYGUI_BINARY_DIR}/bin/${FILENAME} |
| 50 |
-- DESTINATION "bin" |
| 51 |
-+ DESTINATION "/etc/MYGUI" |
| 52 |
- ) |
| 53 |
- endif () |
| 54 |
- endfunction(install_file) |
| 55 |
-@@ -53,7 +53,7 @@ |
| 56 |
- if (WIN32) |
| 57 |
- set(MYGUI_MEDIA_DIR "../../Media") |
| 58 |
- elseif (UNIX) |
| 59 |
-- set(MYGUI_MEDIA_DIR "../share/MYGUI/Media") |
| 60 |
-+ set(MYGUI_MEDIA_DIR "${CMAKE_INSTALL_PREFIX}/share/MYGUI/Media") |
| 61 |
- else () |
| 62 |
- set(MYGUI_MEDIA_DIR "../../Media") |
| 63 |
- endif () |
| 64 |
---- mygui-MyGUI3.2.2.orig/Common/Base/Ogre/BaseManager.cpp |
| 65 |
-+++ mygui-MyGUI3.2.2/Common/Base/Ogre/BaseManager.cpp |
| 66 |
-@@ -49,13 +49,13 @@ |
| 67 |
- mWindow(nullptr), |
| 68 |
- mExit(false), |
| 69 |
- mPluginCfgName("plugins.cfg"), |
| 70 |
-- mResourceXMLName("resources.xml"), |
| 71 |
-+ mResourceXMLName("/etc/MYGUI/resources.xml"), |
| 72 |
- mResourceFileName("MyGUI_Core.xml") |
| 73 |
- { |
| 74 |
- #if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE |
| 75 |
- mResourcePath = macBundlePath() + "/Contents/Resources/"; |
| 76 |
- #else |
| 77 |
-- mResourcePath = ""; |
| 78 |
-+ mResourcePath = "/etc/MYGUI/"; |
| 79 |
- #endif |
| 80 |
- } |
| 81 |
- |
| 82 |
|
| 83 |
diff --git a/dev-games/mygui/files/mygui-3.2.2-build.patch b/dev-games/mygui/files/mygui-3.2.2-build.patch |
| 84 |
deleted file mode 100644 |
| 85 |
index a16b27c285b7..000000000000 |
| 86 |
--- a/dev-games/mygui/files/mygui-3.2.2-build.patch |
| 87 |
+++ /dev/null |
| 88 |
@@ -1,61 +0,0 @@ |
| 89 |
-diff -ru mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake |
| 90 |
---- mygui-MyGUI3.2.2.orig/CMake/ConfigureBuild.cmake 2015-01-26 10:32:35.000000000 -0500 |
| 91 |
-+++ mygui-MyGUI3.2.2/CMake/ConfigureBuild.cmake 2015-03-14 01:09:40.743621643 -0400 |
| 92 |
-@@ -4,6 +4,8 @@ |
| 93 |
- # also prepare package files for pkg-config and CMake. |
| 94 |
- ####################################################################### |
| 95 |
- |
| 96 |
-+include(GNUInstallDirs) |
| 97 |
-+ |
| 98 |
- # should we build static libs? |
| 99 |
- if (MYGUI_STATIC) |
| 100 |
- set(MYGUI_LIB_TYPE STATIC) |
| 101 |
-@@ -47,7 +49,7 @@ |
| 102 |
- else () |
| 103 |
- configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY) |
| 104 |
- endif () |
| 105 |
-- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig) |
| 106 |
-+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
| 107 |
- |
| 108 |
- # configure additional packages |
| 109 |
- |
| 110 |
-diff -ru mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake |
| 111 |
---- mygui-MyGUI3.2.2.orig/CMake/Utils/MyGUIConfigTargets.cmake 2015-01-26 10:32:35.000000000 -0500 |
| 112 |
-+++ mygui-MyGUI3.2.2/CMake/Utils/MyGUIConfigTargets.cmake 2015-03-14 01:08:44.905791784 -0400 |
| 113 |
-@@ -1,6 +1,8 @@ |
| 114 |
- # Configure settings and install targets |
| 115 |
- # FIXME: Copypasted from Ogre and need lots of changes |
| 116 |
- |
| 117 |
-+include(GNUInstallDirs) |
| 118 |
-+ |
| 119 |
- if (WIN32) |
| 120 |
- set(MYGUI_RELEASE_PATH "/Release") |
| 121 |
- set(MYGUI_RELWDBG_PATH "/RelWithDebInfo") |
| 122 |
-@@ -60,6 +62,12 @@ |
| 123 |
- # install targets according to current build type |
| 124 |
- function(mygui_install_target TARGETNAME SUFFIX) |
| 125 |
- install(TARGETS ${TARGETNAME} |
| 126 |
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo "" |
| 127 |
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo "" |
| 128 |
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo "" |
| 129 |
-+ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Gentoo "" |
| 130 |
-+ ) |
| 131 |
-+ install(TARGETS ${TARGETNAME} |
| 132 |
- RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" |
| 133 |
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" |
| 134 |
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" |
| 135 |
-@@ -171,7 +179,13 @@ |
| 136 |
- endif () |
| 137 |
- add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) |
| 138 |
- endif () |
| 139 |
-- set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) |
| 140 |
-+ |
| 141 |
-+ # rename demo target^M |
| 142 |
-+ if (${SOLUTIONFOLDER} STREQUAL "Demos") |
| 143 |
-+ set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER} OUTPUT_NAME MYGUI-${PROJECTNAME}) |
| 144 |
-+ else() |
| 145 |
-+ set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) |
| 146 |
-+ endif() |
| 147 |
- |
| 148 |
- add_dependencies(${PROJECTNAME} MyGUIEngine Common) |
| 149 |
- |
| 150 |
|
| 151 |
diff --git a/dev-games/mygui/files/mygui-3.2.2-c++17.patch b/dev-games/mygui/files/mygui-3.2.2-c++17.patch |
| 152 |
deleted file mode 100644 |
| 153 |
index 1cdf7babeb12..000000000000 |
| 154 |
--- a/dev-games/mygui/files/mygui-3.2.2-c++17.patch |
| 155 |
+++ /dev/null |
| 156 |
@@ -1,27 +0,0 @@ |
| 157 |
-https://github.com/MyGUI/mygui/commit/ced30dac10082ff9593a2c971d26b3aebce6b2be.patch |
| 158 |
-https://bugs.gentoo.org/732778 |
| 159 |
- |
| 160 |
-Part of: |
| 161 |
- |
| 162 |
-From ced30dac10082ff9593a2c971d26b3aebce6b2be Mon Sep 17 00:00:00 2001 |
| 163 |
-From: George Evmenov <george.evmenov@×××××.com> |
| 164 |
-Date: Fri, 26 Jun 2015 12:25:26 +0300 |
| 165 |
-Subject: [PATCH] do not use nullptr define |
| 166 |
- |
| 167 |
---- a/MyGUIEngine/include/MyGUI_Prerequest.h |
| 168 |
-+++ b/MyGUIEngine/include/MyGUI_Prerequest.h |
| 169 |
-@@ -19,13 +19,7 @@ |
| 170 |
- #define MYGUI_DEFINE_VERSION(major, minor, patch) ((major << 16) | (minor << 8) | patch) |
| 171 |
- |
| 172 |
- #ifndef MYGUI_DONT_REPLACE_NULLPTR |
| 173 |
--# if MYGUI_COMPILER == MYGUI_COMPILER_MSVC |
| 174 |
--# ifndef _MANAGED |
| 175 |
--# ifndef _NATIVE_NULLPTR_SUPPORTED |
| 176 |
--# define nullptr 0 |
| 177 |
--# endif |
| 178 |
--# endif |
| 179 |
--# else |
| 180 |
-+# if __cplusplus < 201103L && !defined(_NATIVE_NULLPTR_SUPPORTED) |
| 181 |
- # define nullptr 0 |
| 182 |
- # endif |
| 183 |
- #endif |
| 184 |
|
| 185 |
diff --git a/dev-games/mygui/files/mygui-3.2.2-underlinking.patch b/dev-games/mygui/files/mygui-3.2.2-underlinking.patch |
| 186 |
deleted file mode 100644 |
| 187 |
index 2d1026856f03..000000000000 |
| 188 |
--- a/dev-games/mygui/files/mygui-3.2.2-underlinking.patch |
| 189 |
+++ /dev/null |
| 190 |
@@ -1,20 +0,0 @@ |
| 191 |
-From: Julian Ospald <hasufell@g.o> |
| 192 |
-Date: Fri Jun 15 10:42:42 UTC 2012 |
| 193 |
-Subject: build system |
| 194 |
- |
| 195 |
-fix underlinking |
| 196 |
- |
| 197 |
---- MyGUIEngine/CMakeLists.txt |
| 198 |
-+++ MyGUIEngine/CMakeLists.txt |
| 199 |
-@@ -48,7 +48,10 @@ |
| 200 |
- if (MYGUI_USE_FREETYPE) |
| 201 |
- target_link_libraries(${PROJECTNAME} |
| 202 |
- ${FREETYPE_LIBRARIES} |
| 203 |
-- ) |
| 204 |
-+ dl) |
| 205 |
-+else() |
| 206 |
-+ target_link_libraries(${PROJECTNAME} |
| 207 |
-+ dl) |
| 208 |
- endif() |
| 209 |
- |
| 210 |
- # platform specific dependencies |
| 211 |
|
| 212 |
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild |
| 213 |
deleted file mode 100644 |
| 214 |
index 827a5384a718..000000000000 |
| 215 |
--- a/dev-games/mygui/mygui-3.2.2.ebuild |
| 216 |
+++ /dev/null |
| 217 |
@@ -1,144 +0,0 @@ |
| 218 |
-# Copyright 1999-2022 Gentoo Authors |
| 219 |
-# Distributed under the terms of the GNU General Public License v2 |
| 220 |
- |
| 221 |
-EAPI=5 |
| 222 |
-CMAKE_REMOVE_MODULES="yes" |
| 223 |
-CMAKE_REMOVE_MODULES_LIST="FindFreetype" |
| 224 |
-inherit eutils cmake-utils flag-o-matic multilib |
| 225 |
- |
| 226 |
-MY_PN=MyGUI |
| 227 |
-MY_P=${MY_PN}${PV} |
| 228 |
- |
| 229 |
-DESCRIPTION="A library for creating GUIs for games" |
| 230 |
-HOMEPAGE="http://mygui.info/" |
| 231 |
-SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz" |
| 232 |
- |
| 233 |
-LICENSE="MIT" |
| 234 |
-SLOT="0" |
| 235 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
| 236 |
-IUSE="debug doc +ogre opengl plugins samples static-libs test tools l10n_ru" |
| 237 |
-RESTRICT="!test? ( test )" |
| 238 |
-REQUIRED_USE="ogre? ( !opengl ) |
| 239 |
- opengl? ( !ogre )" |
| 240 |
- |
| 241 |
-RDEPEND=" |
| 242 |
- media-libs/freetype:2 |
| 243 |
- ogre? ( |
| 244 |
- dev-games/ogre:=[freeimage,opengl] |
| 245 |
- samples? ( dev-games/ois ) |
| 246 |
- ) |
| 247 |
- opengl? ( virtual/opengl |
| 248 |
- media-libs/glew ) |
| 249 |
- tools? ( dev-games/ois )" |
| 250 |
-DEPEND="${RDEPEND} |
| 251 |
- virtual/pkgconfig |
| 252 |
- doc? ( app-doc/doxygen )" |
| 253 |
- |
| 254 |
-S=${WORKDIR}/mygui-${MY_P} |
| 255 |
-STATIC_BUILD=${WORKDIR}/${P}_build_static |
| 256 |
- |
| 257 |
-PATCHES=( |
| 258 |
- "${FILESDIR}"/${P}-underlinking.patch |
| 259 |
- "${FILESDIR}"/${P}-build.patch |
| 260 |
- "${FILESDIR}"/${P}-FHS.patch |
| 261 |
- "${FILESDIR}"/${P}-c++17.patch |
| 262 |
-) |
| 263 |
- |
| 264 |
-pkg_setup() { |
| 265 |
- if use samples && use !ogre ; then |
| 266 |
- ewarn "Samples disabled, because they only work with ogre!" |
| 267 |
- ewarn "Enable ogre USE flag if you want to use samples." |
| 268 |
- fi |
| 269 |
-} |
| 270 |
- |
| 271 |
-src_configure() { |
| 272 |
- use debug && append-cppflags -DDEBUG |
| 273 |
- |
| 274 |
- local mycmakeargs=() |
| 275 |
- |
| 276 |
- # static configuration |
| 277 |
- if use static-libs ; then |
| 278 |
- mycmakeargs=( -DMYGUI_STATIC=ON |
| 279 |
- -DMYGUI_BUILD_DOCS=OFF |
| 280 |
- -DMYGUI_INSTALL_DOCS=OFF |
| 281 |
- -DMYGUI_USE_FREETYPE=ON |
| 282 |
- $(cmake-utils_use plugins MYGUI_BUILD_PLUGINS) |
| 283 |
- -DMYGUI_BUILD_DEMOS=OFF |
| 284 |
- -DMYGUI_INSTALL_SAMPLES=OFF |
| 285 |
- -DMYGUI_BUILD_TOOLS=OFF |
| 286 |
- -DMYGUI_INSTALL_TOOLS=OFF |
| 287 |
- -DMYGUI_BUILD_WRAPPER=OFF |
| 288 |
- -DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") ) |
| 289 |
- |
| 290 |
- CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_configure |
| 291 |
- unset mycmakeargs |
| 292 |
- fi |
| 293 |
- |
| 294 |
- # main configuration |
| 295 |
- mycmakeargs=( -DMYGUI_STATIC=OFF |
| 296 |
- $(cmake-utils_use doc MYGUI_BUILD_DOCS) |
| 297 |
- $(cmake-utils_use doc MYGUI_INSTALL_DOCS) |
| 298 |
- -DMYGUI_USE_FREETYPE=ON |
| 299 |
- $(cmake-utils_use plugins MYGUI_BUILD_PLUGINS) |
| 300 |
- $(usex ogre "$(cmake-utils_use samples MYGUI_BUILD_DEMOS)" "-DMYGUI_BUILD_DEMOS=OFF") |
| 301 |
- $(usex ogre "$(cmake-utils_use samples MYGUI_INSTALL_SAMPLES)" "-DMYGUI_INSTALL_SAMPLES=OFF") |
| 302 |
- $(cmake-utils_use tools MYGUI_BUILD_TOOLS) |
| 303 |
- $(cmake-utils_use tools MYGUI_INSTALL_TOOLS) |
| 304 |
- $(cmake-utils_use opengl MYGUI_USE_SYSTEM_GLEW) |
| 305 |
- -DMYGUI_BUILD_WRAPPER=OFF |
| 306 |
- -DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") ) |
| 307 |
- |
| 308 |
- if use tools || (use samples && use ogre) ; then |
| 309 |
- mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=ON ) |
| 310 |
- else |
| 311 |
- mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=OFF ) |
| 312 |
- fi |
| 313 |
- |
| 314 |
- cmake-utils_src_configure |
| 315 |
-} |
| 316 |
- |
| 317 |
-src_compile() { |
| 318 |
- # build system does not support building static and shared at once, |
| 319 |
- # run a double build |
| 320 |
- if use static-libs ; then |
| 321 |
- CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_compile |
| 322 |
- fi |
| 323 |
- |
| 324 |
- cmake-utils_src_compile |
| 325 |
- |
| 326 |
- use doc && emake -C "${CMAKE_BUILD_DIR}"/Docs api-docs |
| 327 |
-} |
| 328 |
- |
| 329 |
-src_install() { |
| 330 |
- cmake-utils_src_install |
| 331 |
- |
| 332 |
- if use static-libs ; then |
| 333 |
- find "${STATIC_BUILD}" -name "*.a" \! -name "libCommon.a" -exec dolib.a '{}' \; |
| 334 |
- insinto /usr/$(get_libdir)/pkgconfig |
| 335 |
- doins "${STATIC_BUILD}"/pkgconfig/MYGUIStatic.pc |
| 336 |
- fi |
| 337 |
- |
| 338 |
- if use doc ; then |
| 339 |
- dohtml -r "${CMAKE_BUILD_DIR}"/Docs/html/* |
| 340 |
- |
| 341 |
- if use l10n_ru ; then |
| 342 |
- docompress -x /usr/share/doc/${PF}/Papers |
| 343 |
- dodoc -r Docs/Papers |
| 344 |
- fi |
| 345 |
- fi |
| 346 |
- |
| 347 |
- keepdir /etc/MYGUI |
| 348 |
- fperms o+w /etc/MYGUI |
| 349 |
- |
| 350 |
- # test media not needed at runtime |
| 351 |
- rm -rf "${ED%/}"/usr/share/MYGUI/Media/UnitTests || die |
| 352 |
- # wrapper not available for linux, remove related media |
| 353 |
- rm -rf "${ED%/}"/usr/share/MYGUI/Media/Wrapper || die |
| 354 |
-} |
| 355 |
- |
| 356 |
-pkg_postinst() { |
| 357 |
- elog |
| 358 |
- elog "ogre.cfg and Ogre.log are created as" |
| 359 |
- elog "${EROOT%/}/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log" |
| 360 |
- elog |
| 361 |
-} |
Archives