From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 981CB159557 for ; Fri, 5 Jul 2024 17:49:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E12242BC10D; Fri, 5 Jul 2024 17:49:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C003B2BC10D for ; Fri, 5 Jul 2024 17:49:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C63A434309D for ; Fri, 5 Jul 2024 17:49:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 60FB81D9F for ; Fri, 5 Jul 2024 17:49:30 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1720201733.d919c9d9c6cb23b2aec783a9e098daef20d88c5a.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/megaglest/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/megaglest/megaglest-3.13.0-r1.ebuild games-strategy/megaglest/megaglest-3.13.0.ebuild X-VCS-Directories: games-strategy/megaglest/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: d919c9d9c6cb23b2aec783a9e098daef20d88c5a X-VCS-Branch: master Date: Fri, 5 Jul 2024 17:49:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38cbf6c2-5e0e-472a-a07d-e1f9876054dd X-Archives-Hash: 0790eaf9dfcd86c0fde6d095c4f8353e commit: d919c9d9c6cb23b2aec783a9e098daef20d88c5a Author: Pacho Ramos gentoo org> AuthorDate: Fri Jul 5 17:24:31 2024 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Fri Jul 5 17:48:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d919c9d9 games-strategy/megaglest: drop 3.13.0, 3.13.0-r1 Signed-off-by: Pacho Ramos gentoo.org> .../megaglest/megaglest-3.13.0-r1.ebuild | 173 --------------------- games-strategy/megaglest/megaglest-3.13.0.ebuild | 144 ----------------- 2 files changed, 317 deletions(-) diff --git a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild b/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild deleted file mode 100644 index 26f172483f1e..000000000000 --- a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 2010-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Todo: google-breakpad? - -EAPI=8 - -# src_install() currently requires this -CMAKE_MAKEFILE_GENERATOR="emake" - -LUA_COMPAT=( lua5-{1..4} ) - -# Only needed by certain features -VIRTUALX_REQUIRED="manual" - -WX_GTK_VER="3.0-gtk3" -inherit cmake desktop flag-o-matic lua-single readme.gentoo-r1 virtualx wxwidgets xdg-utils - -DESCRIPTION="Cross-platform 3D realtime strategy game" -HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source" -SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz - https://github.com/MegaGlest/megaglest-source/commit/789e1cdf.patch -> ${P}-789e1cdf.patch - https://github.com/MegaGlest/megaglest-source/commit/5801b1fa.patch -> ${P}-5801b1fa.patch - https://github.com/MegaGlest/megaglest-source/commit/412b37d0.patch -> ${P}-412b37d0.patch - https://github.com/MegaGlest/megaglest-source/commit/e09ba53c.patch -> ${P}-e09ba53c.patch - https://github.com/MegaGlest/megaglest-source/commit/fbd0cfb1.patch -> ${P}-fbd0cfb1.patch -" - -LICENSE="GPL-3 BitstreamVera" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -COMMON_DEPEND=" - ${LUA_DEPS} - dev-libs/libxml2 - dev-libs/xerces-c[icu] - media-libs/fontconfig - media-libs/freetype - media-libs/ftgl - media-libs/glew:= - net-libs/libircclient - media-libs/libpng:0 - media-libs/libsdl2[X,sound,joystick,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/gnutls:= - net-libs/miniupnpc:= - net-misc/curl - sys-libs/zlib - virtual/opengl - virtual/glu - virtual/jpeg:0= - x11-libs/libX11 - x11-libs/libXext - editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) - fribidi? ( dev-libs/fribidi ) - model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - videos? ( media-video/vlc ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} - ~games-strategy/${PN}-data-${PV} -" - -BDEPEND="sys-apps/help2man - virtual/pkgconfig - editor? ( ${VIRTUALX_DEPEND} ) - model-viewer? ( ${VIRTUALX_DEPEND} )" - -PATCHES=( - "${FILESDIR}/${PN}-3.11.1-cmake-lua.patch" - - # From Fedora and Arch - "${FILESDIR}/${P}-underlink.patch" - "${FILESDIR}/${P}-fix-lua-version-ordering.patch" - "${FILESDIR}/${P}-multiple-definitions.patch" - "${FILESDIR}/${P}-GLEW_ERROR_NO_GLX_DISPLAY.patch" - "${FILESDIR}/${P}-help2man.patch" - - # Fix build with wxWidgets 3.2 - "${DISTDIR}/${P}-789e1cdf.patch" - "${DISTDIR}/${P}-5801b1fa.patch" - "${DISTDIR}/${P}-412b37d0.patch" - "${DISTDIR}/${P}-e09ba53c.patch" - "${FILESDIR}/${P}-fbd0cfb1.patch" -) - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini -and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride -values in these files. - -If you have an older graphics card which only supports OpenGL 1.2, and the -game crashes when you try to play, try starting with 'megaglest --disable-vbo' -Some graphics cards may require setting Max Lights to 1. -" - -src_prepare() { - cmake_src_prepare - - if use editor || use model-viewer ; then - setup-wxwidgets - fi -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/926143 - # https://github.com/MegaGlest/megaglest-source/issues/275 - filter-lto - - if use cpu_flags_x86_sse3; then - SSE=3 - elif use cpu_flags_x86_sse2; then - SSE=2 - elif use cpu_flags_x86_sse; then - SSE=1 - else - SSE=0 - fi - - local mycmakeargs=( - -DWANT_GIT_STAMP=OFF - -DWANT_USE_FriBiDi="$(usex fribidi)" - -DBUILD_MEGAGLEST_MAP_EDITOR="$(usex editor)" - -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS="$(usex tools)" - -DBUILD_MEGAGLEST_MODEL_VIEWER="$(usex model-viewer)" - -DWANT_USE_VLC="$(usex videos)" - -DFORCE_LUA_VERSION="$(lua_get_version)" - -DFORCE_MAX_SSE_LEVEL="${SSE}" - -DWANT_USE_FTGL=ON - -DWANT_STATIC_LIBS=OFF - -DWANT_USE_STREFLOP="$(usex streflop)" - -DwxWidgets_USE_STATIC=OFF - -DwxWidgets_USE_UNICODE="$(usex unicode)" - -DwxWidgets_USE_UNIVERSAL="$(usex wxuniversal)" - - $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_install() { - # rebuilds some targets randomly without fast option - emake -C "${BUILD_DIR}" DESTDIR="${D}" "$@" install/fast - - dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt - - use editor && - make_desktop_entry ${PN}_editor "MegaGlest Map Editor" - use model-viewer && - make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" - - readme.gentoo_create_doc - einstalldocs -} - -pkg_postinst() { - xdg_icon_cache_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild b/games-strategy/megaglest/megaglest-3.13.0.ebuild deleted file mode 100644 index 1a07d154d993..000000000000 --- a/games-strategy/megaglest/megaglest-3.13.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 2010-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Todo: google-breakpad? - -EAPI=7 - -# src_install() currently requires this -CMAKE_MAKEFILE_GENERATOR="emake" - -LUA_COMPAT=( lua5-{1..2} ) - -# Only needed by certain features -VIRTUALX_REQUIRED="manual" - -WX_GTK_VER="3.0-gtk3" -inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils - -DESCRIPTION="Cross-platform 3D realtime strategy game" -HOMEPAGE="https://megaglest.org/ https://github.com/MegaGlest/megaglest-source" -SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz" - -LICENSE="GPL-3 BitstreamVera" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 +streflop +tools +unicode wxuniversal +model-viewer videos" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} - ~games-strategy/${PN}-data-${PV} - dev-libs/libxml2 - dev-libs/xerces-c[icu] - media-libs/fontconfig - media-libs/freetype - media-libs/ftgl - media-libs/glew:= - net-libs/libircclient - media-libs/libpng:0 - media-libs/libsdl2[X,sound,joystick,opengl,video] - media-libs/libvorbis - media-libs/openal - net-libs/gnutls:= - net-libs/miniupnpc:= - net-misc/curl - sys-libs/zlib - virtual/opengl - virtual/glu - virtual/jpeg:0= - x11-libs/libX11 - x11-libs/libXext - editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) - fribidi? ( dev-libs/fribidi ) - model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - videos? ( media-video/vlc ) -" -DEPEND="${RDEPEND}" - -BDEPEND="sys-apps/help2man - virtual/pkgconfig - editor? ( ${VIRTUALX_DEPEND} ) - model-viewer? ( ${VIRTUALX_DEPEND} )" - -PATCHES=( - "${FILESDIR}/${PN}-3.11.1-cmake-lua.patch" -) - -src_prepare() { - cmake_src_prepare - - if use editor || use model-viewer ; then - setup-wxwidgets - fi -} - -src_configure() { - # See https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common - append-cflags -fcommon - - if use cpu_flags_x86_sse3; then - SSE=3 - elif use cpu_flags_x86_sse2; then - SSE=2 - elif use cpu_flags_x86_sse; then - SSE=1 - else - SSE=0 - fi - - local mycmakeargs=( - -DWANT_USE_FriBiDi="$(usex fribidi)" - -DBUILD_MEGAGLEST_MAP_EDITOR="$(usex editor)" - -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS="$(usex tools)" - -DBUILD_MEGAGLEST_MODEL_VIEWER="$(usex model-viewer)" - -DWANT_USE_VLC="$(usex videos)" - -DFORCE_LUA_VERSION="$(lua_get_version)" - -DFORCE_MAX_SSE_LEVEL="${SSE}" - -DWANT_USE_FTGL=ON - -DWANT_STATIC_LIBS=OFF - -DWANT_USE_STREFLOP="$(usex streflop)" - -DwxWidgets_USE_STATIC=OFF - -DwxWidgets_USE_UNICODE="$(usex unicode)" - -DwxWidgets_USE_UNIVERSAL="$(usex wxuniversal)" - - $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_install() { - # rebuilds some targets randomly without fast option - emake -C "${BUILD_DIR}" DESTDIR="${D}" "$@" install/fast - - dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt - - use editor && - make_desktop_entry ${PN}_editor "MegaGlest Map Editor" - use model-viewer && - make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" -} - -pkg_postinst() { - einfo - elog 'Note about Configuration:' - elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini' - elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride' - elog 'values in these files.' - elog - elog 'If you have an older graphics card which only supports OpenGL 1.2, and the' - elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"' - elog 'Some graphics cards may require setting Max Lights to 1.' - einfo - - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -}