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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB3AE138359 for ; Tue, 1 Sep 2020 23:25:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9BF1E0844; Tue, 1 Sep 2020 23:25:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FE5BE0844 for ; Tue, 1 Sep 2020 23:25:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98071340C6C for ; Tue, 1 Sep 2020 23:25:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 170DA2EE for ; Tue, 1 Sep 2020 23:25:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1599002686.05e8951e0fa0ad2c41db7ad94e242aef6bcad871.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-action/supertuxkart/Manifest games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch games-action/supertuxkart/metadata.xml games-action/supertuxkart/supertuxkart-1.2.ebuild X-VCS-Directories: games-action/supertuxkart/files/ games-action/supertuxkart/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 05e8951e0fa0ad2c41db7ad94e242aef6bcad871 X-VCS-Branch: master Date: Tue, 1 Sep 2020 23:25:01 +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: 59cef67e-8a8d-44af-a588-4e42d4ee53c5 X-Archives-Hash: a14ac848f02397e60fdd2495fbcd9bbc commit: 05e8951e0fa0ad2c41db7ad94e242aef6bcad871 Author: Sam James gentoo org> AuthorDate: Tue Sep 1 23:24:34 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 1 23:24:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e8951e games-action/supertuxkart: bump to 1.2 Closes: https://bugs.gentoo.org/739480 Closes: https://bugs.gentoo.org/737250 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> games-action/supertuxkart/Manifest | 1 + .../supertuxkart-1.2-irrlicht-system-libs.patch | 69 ++++++++++++++++ games-action/supertuxkart/metadata.xml | 2 + games-action/supertuxkart/supertuxkart-1.2.ebuild | 92 ++++++++++++++++++++++ 4 files changed, 164 insertions(+) diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest index 4fd966710bc..cb598d30c27 100644 --- a/games-action/supertuxkart/Manifest +++ b/games-action/supertuxkart/Manifest @@ -1,2 +1,3 @@ +DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835 DIST supertuxkart-1.1-src.tar.xz 616739152 BLAKE2B a4dd9ec0a8ee158306dc902d3de363b68e7a317800df1b36339843521019df91c0713b74bdef8dc06b40bee57285237408a17b539c7bd7298cd3ef3deaf99fda SHA512 81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch new file mode 100644 index 00000000000..2a23e51323d --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch @@ -0,0 +1,69 @@ +https://salsa.debian.org/games-team/supertuxkart/-/raw/master/debian/patches/irrlicht/use-system-libs.diff +---- +Subject: [PATCH] debian/use-system-libs + +Path to build irrlicht using the system libraries for png,zlib and +jpeg as well as the glext family of header files. + +Signed-off-by: Christoph Egger + #ifdef _IRR_OPENGL_USE_EXTPOINTER_ + #define GLX_GLXEXT_PROTOTYPES +-#include "glxext.h" ++#include + #endif + #endif + +--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h ++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h +@@ -24,7 +24,7 @@ + #define NO_SDL_GLEXT + #include + #include +- #include "glext.h" ++ #include + #elif defined(_IRR_WINDOWS_API_) + // include windows headers for HWND + #define WIN32_LEAN_AND_MEAN +@@ -34,7 +34,7 @@ + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include + #endif + #include "wglext.h" + +@@ -49,7 +49,7 @@ + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include + #endif + #endif + +--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h ++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h +@@ -12,7 +12,7 @@ + #define WIN32_LEAN_AND_MEAN + #include + #include +- #include "glext.h" ++ #include + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + #define GL_GLEXT_LEGACY 1 +@@ -26,7 +26,7 @@ + #include + #endif + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include + #endif + #endif + diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml index ced8e3e6ee9..22a9fc08bd8 100644 --- a/games-action/supertuxkart/metadata.xml +++ b/games-action/supertuxkart/metadata.xml @@ -9,9 +9,11 @@ Support for right-to-left languages Use dev-libs/nettle crypto backend Enable recording with media-libs/libopenglrecorder + Record IP bans, statistics in server mode with dev-db/sqlite Support for wiimote input devices + supertuxkart/stk-code supertuxkart diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild b/games-action/supertuxkart/supertuxkart-1.2.ebuild new file mode 100644 index 00000000000..d78f9737b39 --- /dev/null +++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg + +MY_P="SuperTuxKart-${PV}-src" +DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)" +HOMEPAGE="https://supertuxkart.net/" +SRC_URI="https://github.com/${PN}/stk-code/releases/download/${PV}/${MY_P}.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 sqlite 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-cpp/libmcpp + sqlite? ( dev-db/sqlite:3 ) + dev-libs/angelscript:= + dev-libs/fribidi + media-libs/freetype:2 + media-libs/glew:0= + media-libs/harfbuzz:= + media-libs/libpng:0= + media-libs/libsdl2 + 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}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch + "${FILESDIR}"/${PN}-1.2-irrlicht-system-libs.patch +) + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_SQLITE3=$(usex sqlite) + -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) + -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 +}