From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- games-action/Manifest.gz | Bin 13489 -> 13487 bytes games-action/minetest/Manifest | 4 +- games-action/minetest/minetest-5.1.1.ebuild | 139 --------------------- games-action/minetest/minetest-5.2.0.ebuild | 135 ++++++++++++++++++++ games-action/supertuxkart/Manifest | 9 +- .../supertuxkart-0.9.3-irrlicht-arch-support.patch | 47 ------- .../files/supertuxkart-1.0-fix-buildsystem.patch | 20 --- .../files/supertuxkart-1.0-system-squish.patch | 43 ------- .../files/supertuxkart-1.1-fix-buildsystem.patch | 20 +++ .../supertuxkart-1.1-irrlicht-arch-support.patch | 47 +++++++ games-action/supertuxkart/supertuxkart-1.0.ebuild | 97 -------------- games-action/supertuxkart/supertuxkart-1.1.ebuild | 91 ++++++++++++++ 12 files changed, 299 insertions(+), 353 deletions(-) delete mode 100644 games-action/minetest/minetest-5.1.1.ebuild create mode 100644 games-action/minetest/minetest-5.2.0.ebuild delete mode 100644 games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch delete mode 100644 games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch delete mode 100644 games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch create mode 100644 games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch create mode 100644 games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch delete mode 100644 games-action/supertuxkart/supertuxkart-1.0.ebuild create mode 100644 games-action/supertuxkart/supertuxkart-1.1.ebuild (limited to 'games-action') diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz index 5c5057e55f48..11a48c905a73 100644 Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest index 216c10688afc..dd55f5e3631a 100644 --- a/games-action/minetest/Manifest +++ b/games-action/minetest/Manifest @@ -1,5 +1,5 @@ AUX minetestserver.confd 313 BLAKE2B 51af7c8d6c23461028774e459d3ff24a867102ac56c239da056e31ba800ec0904d4ad2daa26a9fd5069ecffc2fded37a8409d966403456c239e78d2a7c369345 SHA512 75442376afb031ad65880fd2b9cad034c520c7bed489543d5e1cee65fc998d0ae082d5736528dcdfaca41681b01ee895d7e0471f8581e8f0cba1a8cbbe20b3bc AUX minetestserver.initd 555 BLAKE2B 307f310338ded815dc8a6f8ba29d51ae77ef94a1530125ad82ab3b7dc6d9a1b8a40a48b6dfb53d17230418bc8e5e05ffe5493c897150a853338fb01c8ef21b5b SHA512 b9103841e18586e9877b1a1b7fc9510545d02b947d5558cfee79de09a8c770767aeeb1b29b35bd47bf3670d739996a782f347f2274a94f3b3a9435d37ba566f1 -DIST minetest-5.1.1.tar.gz 9002025 BLAKE2B 8258850a0f45125a09e0a4cf5eda7a8860be4f0a5e564767952e27fc8509593bf0615c1457a0ee168f6eeedcf1065e288b787d74e1d0a2180870bc1bae818bfc SHA512 4a36a86a3e5f8f5246ff3410e9ab182631f38292bea077e7dbc25fdc1520e5a479ffbd5ec447000fb4999ab252a59bf976299e6fecda1f8cd47f40549885766b -EBUILD minetest-5.1.1.ebuild 3260 BLAKE2B ab0cc56e29f123224315d220f7dc1a4484cbb71fee250ece1d170abe3cc4bf6e49e8fa4374bb57108c17148e29d8c0c8fd8953c1cdc639d0ff40de562f7eb4af SHA512 dedd9e37aabdc91697c4193309da03822de866181d78f8b3511e358696fa0d154382841d6c116e12b6c4f3bfaa11e1d2aed3bcbf8dbb259334bc682411823fb5 +DIST minetest-5.2.0.tar.gz 10361815 BLAKE2B 244cacc92f08f571f45bedef9a8f2154a8105fc83c1396d626e78dcb0d4050c3ba9610ccf2ec2864a5d4b73d9d31aac0dc162fdcc277ef35cc1ead53158cc51f SHA512 47e3cdf488d50ea61659ac3b72960c9971270d1a793e0d79dcb649c89f7a6e65a16c21e1b903d08c916a2ebcbd3fd2164ec67173a3d4f2a2e9bb3a6351b48851 +EBUILD minetest-5.2.0.ebuild 3167 BLAKE2B bd19cb7d7294dcd39fc2646601b8596c1f73def726f36a6a39ed9bc557abf24ce483bce69c122ba074d8270609412d8fad2b5c5ea2e6a776470f3b582bf22805 SHA512 1c8786341dab656a3203fc8e06e18142de91353e918dec3cbdb70d10683c8f34e6ed7fd7f0884c6bd219601608ddda4dbaf5439361efeb81402815ce4fccfb47 MISC metadata.xml 2238 BLAKE2B 71d17709848d892d3eb5e99165bc21f41b3d3c4ff51f4b9923f078156eb48c743308cb74c5f84ecc147aa9284332e0968b6e47a34c0c412e32abde9685c1bb1f SHA512 33d80f695f354f623e7dd927881865e074c430b4b562f2ac2bcc716a6be0d9ef89bcd2eb773d9207d3887a00b8ff7b9017b8d613cd603499cb6b0226ed3ffce4 diff --git a/games-action/minetest/minetest-5.1.1.ebuild b/games-action/minetest/minetest-5.1.1.ebuild deleted file mode 100644 index 66f7329bb98e..000000000000 --- a/games-action/minetest/minetest-5.1.1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="A free open-source voxel game engine with easy modding and game creation" -HOMEPAGE="https://www.minetest.net" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial +truetype" -REQUIRED_USE="|| ( client server )" - -RDEPEND=" - dev-db/sqlite:3 - dev-lang/luajit:2 - dev-libs/gmp:0= - dev-libs/jsoncpp:= - sys-libs/zlib - client? ( - app-arch/bzip2 - dev-games/irrlicht - media-libs/libpng:0= - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - sound? ( - media-libs/libogg - media-libs/libvorbis - media-libs/openal - ) - truetype? ( media-libs/freetype:2 ) - ) - curl? ( net-misc/curl ) - leveldb? ( dev-libs/leveldb:= ) - ncurses? ( sys-libs/ncurses:0= ) - nls? ( virtual/libintl ) - postgres? ( >=dev-db/postgresql-9.5:= ) - redis? ( dev-libs/hiredis:= ) - server? ( - acct-group/minetest - acct-user/minetest - dev-games/irrlicht-headers - ) - spatial? ( sci-libs/libspatialindex:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext )" - -src_prepare() { - cmake_src_prepare - # set paths - sed \ - -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ - -e "s#@GROUP@#${PN}#g" \ - "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die - - # remove bundled libraries - rm -rf lib || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CLIENT=$(usex client) - -DBUILD_SERVER=$(usex server) - -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" - -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale" - -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" - -DENABLE_CURL=$(usex curl) - -DENABLE_CURSES=$(usex ncurses) - -DENABLE_FREETYPE=$(usex truetype) - -DENABLE_GETTEXT=$(usex nls) - -DENABLE_GLES=0 - -DENABLE_LEVELDB=$(usex leveldb) - -DENABLE_LUAJIT=1 - -DENABLE_POSTGRESQL=$(usex postgres) - -DENABLE_REDIS=$(usex redis) - -DENABLE_SPATIAL=$(usex spatial) - -DENABLE_SOUND=$(usex sound) - -DENABLE_SYSTEM_GMP=1 - -DENABLE_SYSTEM_JSONCPP=1 - -DRUN_IN_PLACE=0 - ) - - use server && mycmakeargs+=( - -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc ; then - cmake_src_compile doc - HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - fi -} - -src_install() { - cmake_src_install - - if use server ; then - keepdir /var/log/minetest - fowners minetest:minetest /var/log/minetest - - newconfd "${T}"/minetestserver.confd minetest-server - newinitd "${FILESDIR}"/minetestserver.initd minetest-server - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - if use server ; then - elog - elog "Configure your server via /etc/conf.d/minetest-server" - elog - fi - - elog - elog "The version 5.x series is not compatible to the version 0.4 series." - elog "This applies to clients and servers, other content such as mods," - elog "texture packs and worlds is unaffected and backwards-compatible" - elog "as usual." - elog -} diff --git a/games-action/minetest/minetest-5.2.0.ebuild b/games-action/minetest/minetest-5.2.0.ebuild new file mode 100644 index 000000000000..73950475263b --- /dev/null +++ b/games-action/minetest/minetest-5.2.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="A free open-source voxel game engine with easy modding and game creation" +HOMEPAGE="https://www.minetest.net" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+client +curl doc +leveldb ncurses nls postgres redis +server +sound spatial +truetype" +REQUIRED_USE="|| ( client server )" + +RDEPEND=" + dev-db/sqlite:3 + dev-lang/luajit:2 + dev-libs/gmp:0= + dev-libs/jsoncpp:= + sys-libs/zlib + client? ( + app-arch/bzip2 + dev-games/irrlicht + media-libs/libpng:0= + virtual/jpeg:0 + virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm + sound? ( + media-libs/libogg + media-libs/libvorbis + media-libs/openal + ) + truetype? ( media-libs/freetype:2 ) + ) + curl? ( net-misc/curl ) + leveldb? ( dev-libs/leveldb:= ) + ncurses? ( sys-libs/ncurses:0= ) + nls? ( virtual/libintl ) + postgres? ( >=dev-db/postgresql-9.5:= ) + redis? ( dev-libs/hiredis:= ) + server? ( + acct-group/minetest + acct-user/minetest + dev-games/irrlicht-headers + ) + spatial? ( sci-libs/libspatialindex:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) + nls? ( sys-devel/gettext )" + +src_prepare() { + cmake_src_prepare + # set paths + sed \ + -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ + -e "s#@GROUP@#${PN}#g" \ + "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die + + # remove bundled libraries + rm -rf lib || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_CLIENT=$(usex client) + -DBUILD_SERVER=$(usex server) + -DCUSTOM_BINDIR="${EPREFIX}/usr/bin" + -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale" + -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}" + -DENABLE_CURL=$(usex curl) + -DENABLE_CURSES=$(usex ncurses) + -DENABLE_FREETYPE=$(usex truetype) + -DENABLE_GETTEXT=$(usex nls) + -DENABLE_GLES=0 + -DENABLE_LEVELDB=$(usex leveldb) + -DENABLE_LUAJIT=1 + -DENABLE_POSTGRESQL=$(usex postgres) + -DENABLE_REDIS=$(usex redis) + -DENABLE_SPATIAL=$(usex spatial) + -DENABLE_SOUND=$(usex sound) + -DENABLE_SYSTEM_GMP=1 + -DENABLE_SYSTEM_JSONCPP=1 + -DRUN_IN_PLACE=0 + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc ; then + cmake_src_compile doc + HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + fi +} + +src_install() { + cmake_src_install + + if use server ; then + keepdir /var/log/minetest + fowners minetest:minetest /var/log/minetest + + newconfd "${T}"/minetestserver.confd minetest-server + newinitd "${FILESDIR}"/minetestserver.initd minetest-server + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + if use server ; then + elog + elog "Configure your server via /etc/conf.d/minetest-server" + elog + fi + + elog + elog "The version 5.x series is not compatible to the version 0.4 series." + elog "This applies to clients and servers, other content such as mods," + elog "texture packs and worlds is unaffected and backwards-compatible" + elog "as usual." + elog +} diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest index e7647f9000a2..27562c043259 100644 --- a/games-action/supertuxkart/Manifest +++ b/games-action/supertuxkart/Manifest @@ -1,8 +1,7 @@ -AUX supertuxkart-0.9.3-irrlicht-arch-support.patch 1514 BLAKE2B b7daa129e94ddb96a774ce8cbc47d88475ced879efb9ff38029bd36268083c5838d2c03051f8147e3e8068b588bf0325c7c204f1b3b91ec1d58936cdee6cb119 SHA512 e6560b05c37ca95f8c04ac20f109f55a0a2bf00dd10fbe1975daae5f41c0ed2e1612df12fcdf3c4b6d70ecdfbb67f3d5b4a11ec137051592f5fc67114721c03c AUX supertuxkart-0.9.3-irrlicht-system-libs.patch 1576 BLAKE2B b252cc0036f41e9bcf02e1bf049f82de7cd94aba981cc7e161aac52306890fc490d2d4b213fcec60f9098573b3cc059a26aa2efe524030034e4a29c15bf36b88 SHA512 55d353d492aafec3ddb801b28bbe4058bc0b348980f631057850915849013ec191658c55dbc41b48402219a13ec5db811d89401d5cfbb27e7bf5c68f2478d5b6 -AUX supertuxkart-1.0-fix-buildsystem.patch 806 BLAKE2B a7e81d17b75225f1db4cbaf51a9ca4634b1d39d0460ce3f481f6b63c8e88778f76993469ca40bca5051e85dba428580938eee6b47ea0505d1c6bcbb7768449fd SHA512 1951e3e83984e3da7be0f23eea4ccea7a57472c1f12e9d7552c94ccefb07b41ce0616040aacdc41ed2448ffb60445aad0e3918a18f9df639fc3c6960a8cd315e -AUX supertuxkart-1.0-system-squish.patch 1667 BLAKE2B 87d61b4118ab09cb7d455cdb7c9311e67049d3edbf9a0e067bf700baeac16a91aac8ea58a4e76e42f2c6c96df353ef4485292cd93fe00bcbe0624cabfb878d44 SHA512 6c43d3bed3400dfcc8ceeecc9cc2d2ed53f7a8e363bd17935e6ce38f8a7b98b75be26664c53ddfbbe0d680e0c9ea4f3f8a5a7047c18c7c83f4386f7f5383b6fc -DIST supertuxkart-1.0-src.tar.xz 597012504 BLAKE2B ed1b851bad8696b4593c54f215b115528afc29bde237f67627e2918c4a9fab09eddc204d0c879fa85c6b10b5544dba5fa5fc1b437cb83e6d884ac717e3369c28 SHA512 182754610abd09545630fa1f7fda858ba1731bbacb078bc71597e143f9cb2a1cfcedd3038720760d0471a89b79cc3bb1eb292d38fcd53be05aad7cb17c474ca9 +AUX supertuxkart-1.1-fix-buildsystem.patch 761 BLAKE2B 6a3ca6329851b3ad22b4b7617d7d6b7668ac50a7aebaf8a2cb41f5e8036af03f669dab6cd803de2e7315196aa2c6f8698bf3d65280fb90446e7b64d22d7eabd1 SHA512 b15729cc2aea6286ecc55927a26c5e667c1ac51e8ea505622373fe8b6c51ae3a9dc8d57334d3a9ab1bd968c6107bc5a315963731a3b3ad9d89a8839981abfc11 +AUX supertuxkart-1.1-irrlicht-arch-support.patch 1520 BLAKE2B 14c6fc7615e44c5007eb5828ac7e157f69a41343d6f5affb1c6b5af5afdca4c123bd1fe238c90495c097a5eafed976f557212f1e8d89c787069473cf63218fc0 SHA512 7cdb9582248937a9a48aeb1d66cee565fe1bb3255d58ec5dcfd735ee807fa51d7fc0ba661b74156ca12b036af3aefe7cabdf386e71fef98617d24268da2d0c0e +DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda -EBUILD supertuxkart-1.0.ebuild 2324 BLAKE2B de0737dcd264f3b02a74251cf708b2ab802100c7b7e54291ac3f08bbccea0ff7739b2d6ec8d80ebacc2f531fa2eeca3cad3353ff2ec9f66c3fc87cbbdbc1484e SHA512 e44ad7eaa6db13705042aec24f9f7cc31b9fffc8fcaef9e6b758ebfaa913d9e1fb3d3ab685627d6531ab394a94049243ef4553d58c522b2ebc572a25621cb606 +EBUILD supertuxkart-1.1.ebuild 2246 BLAKE2B 53b9b07a6a1e7d95a9315330cf740b7d34eba70cdea8c9c0e039662f2be6c9f7b63aeb36af318baffbdac088f5171faac1e523eca57b3dc85436351d7be6b4f4 SHA512 02163204a18f2172bac856922fef03fd4aac80625f2421dda527997a65e27c68327e8c6b8897fa100ed65e14c40bdacc3344ff749572da29c3b51c0c2e3168be MISC metadata.xml 648 BLAKE2B d59c4184d4dbc02f0b6d9edae30553187e4a91c81385ab360e93231ffaf4c49c647720f1839ebefd92a938bc1efbb5f8ee0fa1434cae56087ab73f0f7cca8697 SHA512 5191f653e432c5b01a6aef1f1fbae8d92daa66dd94eb391d7b132a510452b19532f2b620afe131e9b1b5bdbb4a2cb597bf9cd2c236deb5b4de74a3154f279df4 diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch deleted file mode 100644 index 66191861a963..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Christoph Egger -Subject: [PATCH] debian/arch-support - -Building on non-linux architectures currently fails with unpatched -irrlicht because irrlicht tries to create Joystick support using -linux-specific headers. However there's infrastructure to disable -Joystick support, we just need to activate that on non-linux -architectures. - -Additionally if built on a sparc machine irrlicht assumes wrongly it's -a solaris system. We fix this wrong assumption as our sparc builds are -all on linux. - -Finally irrlicht exceeds the size constraights for -fpic requiering to -build with -fPIC. As upstream doesn't do that we need to fix this for -sparc and s390 builds (powerPC?). - -Signed-off-by: Christoph Egger - ---- - lib/irrlicht/include/IrrCompileConfig.h | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - ---- a/lib/irrlicht/include/IrrCompileConfig.h -+++ b/lib/irrlicht/include/IrrCompileConfig.h -@@ -110,4 +110,8 @@ - #ifndef _IRR_SOLARIS_PLATFORM_ - #define _IRR_LINUX_PLATFORM_ -+#include -+ #if __BYTE_ORDER == __BIG_ENDIAN -+ #define __BIG_ENDIAN__ -+ #endif - #endif - #define _IRR_POSIX_API_ -@@ -460,11 +464,7 @@ - #undef _IRR_WCHAR_FILESYSTEM - #endif - --#if defined(__sparc__) || defined(__sun__) --#define __BIG_ENDIAN__ --#endif -- --#if defined(_IRR_SOLARIS_PLATFORM_) -+#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) - #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ - #endif - diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch deleted file mode 100644 index 23e8280a18f4..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-1.0-fix-buildsystem.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt -index 92a881c81..1371fdf11 100644 ---- a/lib/irrlicht/CMakeLists.txt -+++ b/lib/irrlicht/CMakeLists.txt -@@ -96,15 +96,6 @@ endif() - if(WIN32) - add_definitions(-D_IRR_STATIC_LIB_) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff --else() -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing") -- if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations") -- endif() -- if(CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexpensive-optimizations") -- endif() - endif() - - if(USE_GLES2) diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch deleted file mode 100644 index 8158c4bb9e5e..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e1601b1ae07e3c1ac05cffe05b82e0c60998bc72 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Mon, 13 May 2019 22:51:21 +0100 -Subject: [PATCH] CMake: Add option to use system Squish library - -The system version was preferred before but it wasn't possible to -explicitly disable it, making its use automagic, which is bad for -packaging. - -Closes: https://github.com/supertuxkart/stk-code/pull/3916 ---- - CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a7f03264..40e7790fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,6 +31,8 @@ CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON - "NOT SERVER_ONLY;NOT APPLE" OFF) - CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON - "NOT SERVER_ONLY" OFF) -+CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of the built-in version, when available." ON -+ "NOT SERVER_ONLY" OFF) - CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON - "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF) - -@@ -247,8 +249,10 @@ if(NOT SERVER_ONLY) - endif() - - if(NOT SERVER_ONLY) -- find_library(SQUISH_LIBRARY NAMES squish libsquish) -- find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS) -+ if(USE_SYSTEM_SQUISH) -+ find_library(SQUISH_LIBRARY NAMES squish libsquish) -+ find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS) -+ endif() - if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR) - add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish") - include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish") --- -2.20.1 - diff --git a/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch new file mode 100644 index 000000000000..394a1963199d --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-1.1-fix-buildsystem.patch @@ -0,0 +1,20 @@ +diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt +index 92a881c81..1371fdf11 100644 +--- a/lib/irrlicht/CMakeLists.txt ++++ b/lib/irrlicht/CMakeLists.txt +@@ -94,15 +94,6 @@ + if(WIN32) + add_definitions(-D_IRR_STATIC_LIB_) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff +-else() +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fstrict-aliasing") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3 -fstrict-aliasing") +- if(CMAKE_COMPILER_IS_GNUCC) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations") +- endif() +- if(CMAKE_COMPILER_IS_GNUCXX) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexpensive-optimizations") +- endif() + endif() + + if(USE_GLES2) diff --git a/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch new file mode 100644 index 000000000000..ad9638ff3dcf --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-1.1-irrlicht-arch-support.patch @@ -0,0 +1,47 @@ +From: Christoph Egger +Subject: [PATCH] debian/arch-support + +Building on non-linux architectures currently fails with unpatched +irrlicht because irrlicht tries to create Joystick support using +linux-specific headers. However there's infrastructure to disable +Joystick support, we just need to activate that on non-linux +architectures. + +Additionally if built on a sparc machine irrlicht assumes wrongly it's +a solaris system. We fix this wrong assumption as our sparc builds are +all on linux. + +Finally irrlicht exceeds the size constraights for -fpic requiering to +build with -fPIC. As upstream doesn't do that we need to fix this for +sparc and s390 builds (powerPC?). + +Signed-off-by: Christoph Egger + +--- + lib/irrlicht/include/IrrCompileConfig.h | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +--- a/lib/irrlicht/include/IrrCompileConfig.h ++++ b/lib/irrlicht/include/IrrCompileConfig.h +@@ -110,4 +110,8 @@ + #ifndef _IRR_SOLARIS_PLATFORM_ + #define _IRR_LINUX_PLATFORM_ ++#include ++ #if __BYTE_ORDER == __BIG_ENDIAN ++ #define __BIG_ENDIAN__ ++ #endif + #endif + #define _IRR_POSIX_API_ +@@ -465,11 +465,7 @@ + #undef _IRR_WCHAR_FILESYSTEM + #endif + +-#if defined(__sparc__) || defined(__sun__) +-#define __BIG_ENDIAN__ +-#endif +- +-#if defined(_IRR_SOLARIS_PLATFORM_) ++#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ + #endif + diff --git a/games-action/supertuxkart/supertuxkart-1.0.ebuild b/games-action/supertuxkart/supertuxkart-1.0.ebuild deleted file mode 100644 index 9d7ff7ec2272..000000000000 --- a/games-action/supertuxkart/supertuxkart-1.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg-utils - -DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)" -HOMEPAGE="https://supertuxkart.net/" -SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz - mirror://gentoo/${PN}.png" - -LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fribidi libressl nettle recorder wiimote" - -# don't unbundle irrlicht and bullet -# both are modified and system versions will break the game -# https://sourceforge.net/p/irrlicht/feature-requests/138/ - -RDEPEND=" - dev-libs/angelscript:= - media-libs/freetype:2 - media-libs/glew:0= - media-libs/libpng:0= - media-libs/libvorbis - media-libs/openal - net-libs/enet:1.3= - net-misc/curl - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/libintl - virtual/opengl - x11-libs/libX11 - x11-libs/libXxf86vm - fribidi? ( dev-libs/fribidi ) - nettle? ( dev-libs/nettle:= ) - !nettle? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-1.0.1d:0= ) - ) - recorder? ( media-libs/libopenglrecorder ) - wiimote? ( net-wireless/bluez )" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch - "${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch - "${FILESDIR}"/${PN}-1.0-fix-buildsystem.patch - "${FILESDIR}"/${PN}-1.0-system-squish.patch -) - -src_prepare() { - cmake_src_prepare - - # remove bundled libraries, just to be sure - rm -r lib/{angelscript,enet,glew,jpeglib,libpng,zlib} || die -} - -src_configure() { - local mycmakeargs=( - -DUSE_SYSTEM_ANGELSCRIPT=ON - -DUSE_SYSTEM_ENET=ON - -DUSE_SYSTEM_GLEW=ON - -DUSE_SYSTEM_SQUISH=OFF - -DUSE_SYSTEM_WIIUSE=OFF - -DUSE_CRYPTO_OPENSSL=$(usex nettle no yes) - -DENABLE_WAYLAND_DEVICE=OFF - -DUSE_FRIBIDI=$(usex fribidi) - -DBUILD_RECORDER=$(usex recorder) - -DUSE_WIIUSE=$(usex wiimote) - -DSTK_INSTALL_BINARY_DIR=bin - -DSTK_INSTALL_DATA_DIR=share/${PN} - -DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - dodoc CHANGELOG.md - - doicon -s 64 "${DISTDIR}"/${PN}.png -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild b/games-action/supertuxkart/supertuxkart-1.1.ebuild new file mode 100644 index 000000000000..5701c73bab72 --- /dev/null +++ b/games-action/supertuxkart/supertuxkart-1.1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg + +DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)" +HOMEPAGE="https://supertuxkart.net/" +SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz + mirror://gentoo/${PN}.png" + +LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug fribidi libressl nettle recorder wiimote" + +# don't unbundle irrlicht and bullet +# both are modified and system versions will break the game +# https://sourceforge.net/p/irrlicht/feature-requests/138/ + +RDEPEND=" + dev-libs/angelscript:= + dev-libs/fribidi + media-libs/freetype:2 + media-libs/glew:0= + media-libs/libpng:0= + media-libs/libvorbis + media-libs/openal + net-libs/enet:1.3= + net-misc/curl + sys-libs/zlib + virtual/glu + virtual/jpeg:0 + virtual/libintl + virtual/opengl + x11-libs/libX11 + x11-libs/libXxf86vm + nettle? ( dev-libs/nettle:= ) + !nettle? ( + libressl? ( dev-libs/libressl:= ) + !libressl? ( >=dev-libs/openssl-1.0.1d:0= ) + ) + recorder? ( media-libs/libopenglrecorder ) + wiimote? ( net-wireless/bluez )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +S="${WORKDIR}/${P}-src" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch + "${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch + "${FILESDIR}"/${PN}-1.1-fix-buildsystem.patch +) + +src_prepare() { + cmake_src_prepare + + # remove bundled libraries, just to be sure + rm -r lib/{angelscript,enet,glew,jpeglib,libpng,zlib} || die +} + +src_configure() { + local mycmakeargs=( + -DUSE_SYSTEM_ANGELSCRIPT=ON + -DUSE_SYSTEM_ENET=ON + -DUSE_SYSTEM_GLEW=ON + -DUSE_SYSTEM_SQUISH=OFF + -DUSE_SYSTEM_WIIUSE=OFF + -DUSE_IPV6=OFF # not supported by system enet + -DOpenGL_GL_PREFERENCE=GLVND + -DUSE_CRYPTO_OPENSSL=$(usex nettle no yes) + -DENABLE_WAYLAND_DEVICE=OFF + -DBUILD_RECORDER=$(usex recorder) + -DUSE_WIIUSE=$(usex wiimote) + -DSTK_INSTALL_BINARY_DIR=bin + -DSTK_INSTALL_DATA_DIR=share/${PN} + -DBUILD_SHARED_LIBS=OFF # build bundled libsquish as static library + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + dodoc CHANGELOG.md + + doicon -s 64 "${DISTDIR}"/${PN}.png +} -- cgit v1.2.3