From 267b3b848468a603048b181330ee73cf0bd99c44 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Mar 2024 07:00:36 +0000 Subject: gentoo auto-resync : 22:03:2024 - 07:00:36 --- games-strategy/Manifest.gz | Bin 8090 -> 8089 bytes games-strategy/megaglest/Manifest | 2 +- games-strategy/megaglest/megaglest-3.13.0-r1.ebuild | 18 +++++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'games-strategy') diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index 00fe2cd19b42..535905ab82fc 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index 2ff3b7e8e580..201c1c0f6a59 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -11,6 +11,6 @@ DIST megaglest-3.13.0-789e1cdf.patch 1543 BLAKE2B f75ce901683b6a9f9578ec6987101f DIST megaglest-3.13.0-e09ba53c.patch 3485 BLAKE2B fa0c94b88726f239957b3fb950c6be2be18e564bbf2cfbc809a069961edae0023d69d629cdaab73ca31bb731fbf0dbbd2103a8b84c3f857f423d08addacde706 SHA512 4785ff6c1967aaacd8e674cdd6f3a2ecd038cd1951a2337899f5d9654376c7549360f65ed36bc9f0e108f6fff809486f38a6f641afc694b248c6a47b1b1f1ebb DIST megaglest-3.13.0-fbd0cfb1.patch 1820 BLAKE2B b3a1bf7ca1b51d948b354e4b9cd2d675dadac7b9f072e11032f117479c5199d1f7cfd87146da46a40387bfeaef8433144e37410aa8c92865048744ae31ffd730 SHA512 960fe1be66eb1737e9292c5956c09902e6761ed8de56d864950268e3e8a5184f59b7cf3521629aeb460842f4423699526d5dd71fa0494c7ac2899cab117e7f45 DIST megaglest-source-3.13.0.tar.xz 1979440 BLAKE2B 9df70502e0dddc754897c989222d0bddbebbb781a16f49ffa2dd30ee1dbd3e88249ccd600fbde8dab712a1286e29651bebfc9add0d255b675e9eb0ca5ba60153 SHA512 5ae74efce55d7ec9f38d7701da9c865458e15223b5a3c5ac829e09dc81e63fbea2a235cae99450ea7333044c5166af82a762a29c5793c75711d1200688518b5c -EBUILD megaglest-3.13.0-r1.ebuild 4537 BLAKE2B faacacad0b6a04d95e806e0689f4e10437a55941d574dc92cc91ec4d3095e8d8e910adb7666b76bfbb5a79482c4ffbc1829f9e5c473c667b2e091703e0447640 SHA512 59e26cba7f046e000558afada8c880a2855d38799e22e217c8983bf7e6926a28d70d20320673554d4be27f87dc1d05016201c822e29ccbd7c4ddc26b7cc64cfb +EBUILD megaglest-3.13.0-r1.ebuild 4714 BLAKE2B 9b0138ae3875091cd0c1b2fbb70eb659c81de2febacb4016c7256f8d58f994d60d53f80bfbece0f8a825a3a69faffa7fbcce1e18981f84666bef4c5c23834ac6 SHA512 ae2aadbb0902837f8189c0e5d1df6b1b6e948bb0885fcf18ad33b30da99e0d47bd6865718a79d3bb4dd88eb40ee58c5bc153190a3e9ed3d09aa862cce39f2465 EBUILD megaglest-3.13.0.ebuild 3681 BLAKE2B 637c56194556b157e5eabf97051e27a3c988a92d52ba028299490ce5038fb9ff46186e2d59fc689931c4582789d5ef5738f79588c901b14c5ad2a211dc6d613d SHA512 36f9bd1b500ee3c5d05b0df26a862a11db2b7602ff87608a6af8b7191fe3b93def37c697879862fbf038900d1327510f8da64d6cb897a0abb2a5e5fcfc3935a6 MISC metadata.xml 1622 BLAKE2B f4d7dddd0d654cefb22fe3acc00d366501a5fa93243bef3336965fffe2f8500f94eed915e5adf7655a8e1f7a28fcbc2fc49d99a2cdf2899173ffe819cdfdfa80 SHA512 5b65d3bf4ccf9619350293d3669e7a001fcb0f4addcb0c50f56c6ccba2239b87507a796a34d5fc5c3b2d144e740057496220aff2d0699a41db5f37ae8eaad2bc diff --git a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild b/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild index abc3ccab6973..26f172483f1e 100644 --- a/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild +++ b/games-strategy/megaglest/megaglest-3.13.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2023 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Todo: google-breakpad? @@ -14,7 +14,7 @@ LUA_COMPAT=( lua5-{1..4} ) VIRTUALX_REQUIRED="manual" WX_GTK_VER="3.0-gtk3" -inherit cmake desktop lua-single readme.gentoo-r1 virtualx wxwidgets xdg-utils +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" @@ -33,9 +33,8 @@ IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_s REQUIRED_USE="${LUA_REQUIRED_USE}" -RDEPEND=" +COMMON_DEPEND=" ${LUA_DEPS} - ~games-strategy/${PN}-data-${PV} dev-libs/libxml2 dev-libs/xerces-c[icu] media-libs/fontconfig @@ -61,7 +60,11 @@ RDEPEND=" model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) videos? ( media-video/vlc ) " -DEPEND="${RDEPEND}" +DEPEND="${COMMON_DEPEND}" +RDEPEND=" + ${COMMON_DEPEND} + ~games-strategy/${PN}-data-${PV} +" BDEPEND="sys-apps/help2man virtual/pkgconfig @@ -105,6 +108,11 @@ src_prepare() { } 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 -- cgit v1.2.3