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 A5E5D158094 for ; Thu, 11 Aug 2022 07:37:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41BEAE0C2F; Thu, 11 Aug 2022 07:37:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1F8CEE0C2F for ; Thu, 11 Aug 2022 07:37:52 +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 2BEEC34134D for ; Thu, 11 Aug 2022 07:37:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6662570 for ; Thu, 11 Aug 2022 07:37:49 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1660203427.b70f4edfd59c00ca8f5fec6eea004bee0657ae4c.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/ 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/files/supertuxkart-1.2-new-sdl.patch games-action/supertuxkart/supertuxkart-1.2.ebuild X-VCS-Directories: games-action/supertuxkart/files/ games-action/supertuxkart/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b70f4edfd59c00ca8f5fec6eea004bee0657ae4c X-VCS-Branch: master Date: Thu, 11 Aug 2022 07:37:49 +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: 3dc69bbd-6396-442a-8601-16e5fc104224 X-Archives-Hash: c7fba89b8ab68529a6b345bc55c9caaa commit: b70f4edfd59c00ca8f5fec6eea004bee0657ae4c Author: Ionen Wolkens gentoo org> AuthorDate: Thu Aug 11 05:49:50 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Aug 11 07:37:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70f4edf games-action/supertuxkart: drop 1.2 Signed-off-by: Ionen Wolkens gentoo.org> games-action/supertuxkart/Manifest | 1 - .../supertuxkart-1.2-irrlicht-system-libs.patch | 67 ------------- .../files/supertuxkart-1.2-new-sdl.patch | 106 --------------------- games-action/supertuxkart/supertuxkart-1.2.ebuild | 91 ------------------ 4 files changed, 265 deletions(-) diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest index c6449222002c..df717f644ffd 100644 --- a/games-action/supertuxkart/Manifest +++ b/games-action/supertuxkart/Manifest @@ -1,3 +1,2 @@ -DIST SuperTuxKart-1.2-src.tar.xz 614569164 BLAKE2B 5bdaa8dcac12ab6c399e6f0fc3121906070f4cd5c58dba6ccf04229d92b9b21d87a43662f39fc29ac1528ce429aebea87934fa8a180a0933385704f5a43cd6f7 SHA512 bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835 DIST SuperTuxKart-1.3-src.tar.xz 627753500 BLAKE2B 3ffc86edf80adb27cd17a6ba796fb14d0660a1c14ff21c7908e5f965609c6f6a6b40270a21690cd1318d1003e07d90b4180c292252b1731d4cd6292fe12e6086 SHA512 42664390c844ebca0be9b2f2aeb3c9197c0c79a7c604707b32e81ef41aec10fa36f5950f06e1540ea6f75f6c7f8a8f7f80aeda48de3d101d991420f5b20530ed 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 deleted file mode 100644 index f9681733cfb1..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-1.2-irrlicht-system-libs.patch +++ /dev/null @@ -1,67 +0,0 @@ -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/files/supertuxkart-1.2-new-sdl.patch b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch deleted file mode 100644 index 973c75d010fb..000000000000 --- a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001 -From: Benau -Date: Sun, 29 Nov 2020 12:42:11 +0800 -Subject: [PATCH] Fix compilation with latest SDL - ---- - src/input/gamepad_config.cpp | 55 ++++++++++++++++++------------------ - 1 file changed, 27 insertions(+), 28 deletions(-) - -diff --git a/src/input/gamepad_config.cpp b/src/input/gamepad_config.cpp -index 7c6f632099..c060e7a5a7 100644 ---- a/src/input/gamepad_config.cpp -+++ b/src/input/gamepad_config.cpp -@@ -32,8 +32,7 @@ - #include "input/sdl_controller.hpp" - #include - --static_assert(SDL_CONTROLLER_BUTTON_MAX - 1 == SDL_CONTROLLER_BUTTON_DPAD_RIGHT, "non continous name"); --enum AxisWithDirection -+enum AxisWithDirection : unsigned - { - SDL_CONTROLLER_AXIS_LEFTX_RIGHT = SDL_CONTROLLER_BUTTON_MAX, - SDL_CONTROLLER_AXIS_LEFTX_LEFT, -@@ -140,56 +139,56 @@ void GamepadConfig::setDefaultBinds () - core::stringw GamepadConfig::getBindingAsString(const PlayerAction action) const - { - #ifndef SERVER_ONLY -- std::array readable = -+ std::map readable = - {{ -- "A", // SDL_CONTROLLER_BUTTON_A -- "B", // SDL_CONTROLLER_BUTTON_B -- "X", // SDL_CONTROLLER_BUTTON_X -- "Y", // SDL_CONTROLLER_BUTTON_Y -+ { SDL_CONTROLLER_BUTTON_A, "A" }, -+ { SDL_CONTROLLER_BUTTON_B, "B" }, -+ { SDL_CONTROLLER_BUTTON_X, "X" }, -+ { SDL_CONTROLLER_BUTTON_Y, "Y" }, - // I18N: name of buttons on gamepads -- _("Back"), // SDL_CONTROLLER_BUTTON_BACK -+ { SDL_CONTROLLER_BUTTON_BACK, _("Back") }, - // I18N: name of buttons on gamepads -- _("Guide"), // SDL_CONTROLLER_BUTTON_GUIDE -+ { SDL_CONTROLLER_BUTTON_GUIDE, _("Guide") }, - // I18N: name of buttons on gamepads -- _("Start"), // SDL_CONTROLLER_BUTTON_START -+ { SDL_CONTROLLER_BUTTON_START, _("Start") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick press"), // SDL_CONTROLLER_BUTTON_LEFTSTICK -+ { SDL_CONTROLLER_BUTTON_LEFTSTICK, _("Left thumbstick press") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick press"), // SDL_CONTROLLER_BUTTON_RIGHTSTICK -+ { SDL_CONTROLLER_BUTTON_RIGHTSTICK, _("Right thumbstick press") }, - // I18N: name of buttons on gamepads -- _("Left shoulder"), // SDL_CONTROLLER_BUTTON_LEFTSHOULDER -+ { SDL_CONTROLLER_BUTTON_LEFTSHOULDER, _("Left shoulder") }, - // I18N: name of buttons on gamepads -- _("Right shoulder"), // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER -+ { SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, _("Right shoulder") }, - // I18N: name of buttons on gamepads -- _("DPad up"), // SDL_CONTROLLER_BUTTON_DPAD_UP -+ { SDL_CONTROLLER_BUTTON_DPAD_UP, _("DPad up") }, - // I18N: name of buttons on gamepads -- _("DPad down"), // SDL_CONTROLLER_BUTTON_DPAD_DOWN -+ { SDL_CONTROLLER_BUTTON_DPAD_DOWN, _("DPad down") }, - // I18N: name of buttons on gamepads -- _("DPad left"), // SDL_CONTROLLER_BUTTON_DPAD_LEFT -+ { SDL_CONTROLLER_BUTTON_DPAD_LEFT, _("DPad left") }, - // I18N: name of buttons on gamepads -- _("DPad right"), // SDL_CONTROLLER_BUTTON_DPAD_RIGHT -+ { SDL_CONTROLLER_BUTTON_DPAD_RIGHT, _("DPad right") }, - - // Below are extensions after SDL2 header SDL_CONTROLLER_BUTTON_MAX - // I18N: name of buttons on gamepads -- _("Left thumbstick right"), // SDL_CONTROLLER_AXIS_LEFTX_RIGHT -+ { SDL_CONTROLLER_AXIS_LEFTX_RIGHT, _("Left thumbstick right") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick left"), // SDL_CONTROLLER_AXIS_LEFTX_LEFT -+ { SDL_CONTROLLER_AXIS_LEFTX_LEFT, _("Left thumbstick left") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick down"), // SDL_CONTROLLER_AXIS_LEFTY_DOWN -+ { SDL_CONTROLLER_AXIS_LEFTY_DOWN, _("Left thumbstick down") }, - // I18N: name of buttons on gamepads -- _("Left thumbstick up"), // SDL_CONTROLLER_AXIS_LEFTY_UP -+ { SDL_CONTROLLER_AXIS_LEFTY_UP, _("Left thumbstick up") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick right"), // SDL_CONTROLLER_AXIS_RIGHTX_RIGHT -+ { SDL_CONTROLLER_AXIS_RIGHTX_RIGHT, _("Right thumbstick right") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick left"), // SDL_CONTROLLER_AXIS_RIGHTX_LEFT -+ { SDL_CONTROLLER_AXIS_RIGHTX_LEFT, _("Right thumbstick left") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick down"), // SDL_CONTROLLER_AXIS_RIGHTY_DOWN -+ { SDL_CONTROLLER_AXIS_RIGHTY_DOWN, _("Right thumbstick down") }, - // I18N: name of buttons on gamepads -- _("Right thumbstick up"), // SDL_CONTROLLER_AXIS_RIGHTY_UP -+ { SDL_CONTROLLER_AXIS_RIGHTY_UP, _("Right thumbstick up") }, - // I18N: name of buttons on gamepads -- _("Left trigger"), // SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP -+ { SDL_CONTROLLER_AXIS_TRIGGERLEFT_UP, _("Left trigger") }, - // I18N: name of buttons on gamepads -- _("Right trigger") // SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP -+ { SDL_CONTROLLER_AXIS_TRIGGERRIGHT_UP, _("Right trigger") } - }}; - - const Binding &b = getBinding(action); diff --git a/games-action/supertuxkart/supertuxkart-1.2.ebuild b/games-action/supertuxkart/supertuxkart-1.2.ebuild deleted file mode 100644 index ef10342df4ea..000000000000 --- a/games-action/supertuxkart/supertuxkart-1.2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 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 ~riscv ~x86" -IUSE="debug 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:= - media-libs/freetype:2 - media-libs/glew:0= - media-libs/harfbuzz:= - media-libs/libpng:0= - media-libs/libsdl2[opengl,video] - 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? ( - >=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 - "${FILESDIR}"/${P}-new-sdl.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 -}