[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2021-10-29 22:40 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2021-10-29 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     3ee8ba23ed1b7768f1501a946bc9a18b9bbd7dc3
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 22:40:32 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 22:40:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee8ba23

games-action/supertuxkart: Drop old 1.1

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-action/supertuxkart/Manifest                 |  1 -
 .../supertuxkart-0.9.3-irrlicht-system-libs.patch  | 56 -------------
 games-action/supertuxkart/supertuxkart-1.1.ebuild  | 91 ----------------------
 3 files changed, 148 deletions(-)

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index cf24edce24e..c6449222002 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,4 +1,3 @@
 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-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-0.9.3-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
deleted file mode 100644
index ce7ce63fa66..00000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
+++ /dev/null
@@ -1,56 +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 <debian@christoph-egger.org
-
---- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -21,7 +21,7 @@
- 	#endif
- 	#include <GL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--		#include "glext.h"
-+		#include <GL/glext.h>
- 	#endif
- 	#include "wglext.h"
- 
-@@ -36,7 +36,7 @@
- 	#endif
- 	#include <OpenGL/gl.h>
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--		#include "glext.h"
-+		#include <GL/glext.h>
- 	#endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -50,7 +50,7 @@
- 	#include <SDL/SDL_video.h>
- 	#include <SDL/SDL_opengl.h>
-         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
--	#include "glext.h"
-+	#include <GL/glext.h>
- #else
- 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 		#define GL_GLEXT_LEGACY 1
---- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-+++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
-@@ -12,7 +12,7 @@
- 	#define WIN32_LEAN_AND_MEAN
- 	#include <windows.h>
- 	#include <GL/gl.h>
--	#include "glext.h"
-+	#include <GL/glext.h>
- #else
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- 	#define GL_GLEXT_LEGACY 1
-@@ -25,7 +25,7 @@
- 	#include <GL/gl.h>
- #endif
- #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
--	#include "glext.h"
-+	#include <GL/glext.h>
- #endif
- #endif
- 

diff --git a/games-action/supertuxkart/supertuxkart-1.1.ebuild b/games-action/supertuxkart/supertuxkart-1.1.ebuild
deleted file mode 100644
index 1b75dbc88d8..00000000000
--- a/games-action/supertuxkart/supertuxkart-1.1.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
-
-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 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/harfbuzz:=
-	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? (
-		>=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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2025-03-09 23:23 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2025-03-09 23:23 UTC (permalink / raw
  To: gentoo-commits

commit:     c0957cd77e3c514156f1c54a9b8d0cd8d3b37e7b
Author:     Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com>
AuthorDate: Sun Mar  9 22:58:48 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar  9 23:22:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0957cd7

games-action/supertuxkart: add patch for gcc 15

Backport commit that adds an include that's been removed from the
default ones in libstdc++.

Closes: https://bugs.gentoo.org/937731
Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40986
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/supertuxkart-1.4-gcc-15.patch            | 24 ++++++++++++++++++++++
 .../supertuxkart/supertuxkart-1.4-r1.ebuild        |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/files/supertuxkart-1.4-gcc-15.patch b/games-action/supertuxkart/files/supertuxkart-1.4-gcc-15.patch
new file mode 100644
index 000000000000..ef16a455117a
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.4-gcc-15.patch
@@ -0,0 +1,24 @@
+https://github.com/supertuxkart/stk-code/issues/5301
+https://bugs.gentoo.org/937731
+
+From 83e029cc123176a77a239edf90ee461e46f9f8a2 Mon Sep 17 00:00:00 2001
+From: Gwyn Ciesla <gwync@protonmail.com>
+Date: Wed, 19 Feb 2025 09:34:58 -0600
+Subject: [PATCH] Add include to work with gcc15. (#5310)
+
+---
+ src/network/remote_kart_info.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/network/remote_kart_info.hpp b/src/network/remote_kart_info.hpp
+index 80a6339187c..9865dcda8c3 100644
+--- a/src/network/remote_kart_info.hpp
++++ b/src/network/remote_kart_info.hpp
+@@ -29,6 +29,7 @@
+ #include <string>
+ #include <vector>
+ #include <irrString.h>
++#include <cstdint>
+ 
+ enum KartTeam : int8_t
+ {

diff --git a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
index 85252331bd59..7ed6c6e34cec 100644
--- a/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-irrlicht-arch-support.patch
 	"${FILESDIR}"/${PN}-1.3-irrlicht-system-libs.patch
 	"${FILESDIR}"/${P}-gcc-13.patch
+	"${FILESDIR}"/${P}-gcc-15.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2021-10-29 22:40 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2021-10-29 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     c23d173d94ad765832b91ee91c554ef2f57555f1
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 22:39:58 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 22:39:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23d173d

games-action/supertuxkart: Version bump to 1.3

Closes: https://bugs.gentoo.org/820683
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-action/supertuxkart/Manifest                 |  1 +
 .../supertuxkart-1.3-irrlicht-system-libs.patch    | 54 +++++++++++++
 games-action/supertuxkart/supertuxkart-1.3.ebuild  | 90 ++++++++++++++++++++++
 3 files changed, 145 insertions(+)

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index cb598d30c27..cf24edce24e 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,3 +1,4 @@
 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-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.3-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-1.3-irrlicht-system-libs.patch
new file mode 100644
index 00000000000..7ff75743260
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.3-irrlicht-system-libs.patch
@@ -0,0 +1,54 @@
+diff -ur a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp	2021-09-28 11:02:26.000000000 +0100
++++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp	2021-10-29 23:30:44.714768031 +0100
+@@ -35,7 +35,7 @@
+ #include <GL/gl.h>
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include <GL/glxext.h>
+ #endif
+ #endif
+ 
+diff -ur a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h	2021-09-28 11:02:26.000000000 +0100
++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h	2021-10-29 23:30:44.715768059 +0100
+@@ -30,7 +30,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
+@@ -45,7 +45,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ #endif
+ 
+diff -ur a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h	2021-09-28 11:02:26.000000000 +0100
++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h	2021-10-29 23:30:44.715768059 +0100
+@@ -20,7 +20,7 @@
+ 	#define WIN32_LEAN_AND_MEAN
+ 	#include <windows.h>
+ 	#include <GL/gl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
+@@ -34,7 +34,7 @@
+ 	#include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #endif
+ #endif
+ 

diff --git a/games-action/supertuxkart/supertuxkart-1.3.ebuild b/games-action/supertuxkart/supertuxkart-1.3.ebuild
new file mode 100644
index 00000000000..59bc12a5083
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-1.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+	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.3-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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2021-01-02 21:00 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2021-01-02 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     288360dc7ce2f968a2f12099edeace3f3ed1a705
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 20:59:21 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 20:59:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288360dc

games-action/supertuxkart: Fix build with latest SDL2

Closes: https://bugs.gentoo.org/761814
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../files/supertuxkart-1.2-new-sdl.patch           | 106 +++++++++++++++++++++
 games-action/supertuxkart/supertuxkart-1.2.ebuild  |   3 +-
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
new file mode 100644
index 00000000000..973c75d010f
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch
@@ -0,0 +1,106 @@
+From 61833c9c26da5520f2eaa02f2458971ba07f2aad Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+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 <array>
+ 
+-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<core::stringw, SDL_CONTROLLER_AXIS_WITH_DIRECTION_AND_BUTTON_MAX> readable =
++    std::map<unsigned, core::stringw> 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
index 5e9aa59fdef..fc674824ebb 100644
--- a/games-action/supertuxkart/supertuxkart-1.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,6 +57,7 @@ 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() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2020-09-01 23:25 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2020-09-01 23:25 UTC (permalink / raw
  To: gentoo-commits

commit:     05e8951e0fa0ad2c41db7ad94e242aef6bcad871
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 23:24:34 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <debian@christoph-egger.org
+
+--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
++++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+@@ -35,7 +35,7 @@
+ #include <GL/gl.h>
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include <GL/glxext.h>
+ #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 <SDL_video.h>
+ 	#include <SDL_opengl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #elif defined(_IRR_WINDOWS_API_)
+ 	// include windows headers for HWND
+ 	#define WIN32_LEAN_AND_MEAN
+@@ -34,7 +34,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
+@@ -49,7 +49,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#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 <windows.h>
+ 	#include <GL/gl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
+@@ -26,7 +26,7 @@
+ 	#include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #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 @@
 		<flag name="fribidi">Support for right-to-left languages</flag>
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
 		<flag name="recorder">Enable recording with <pkg>media-libs/libopenglrecorder</pkg></flag>
+		<flag name="sqlite">Record IP bans, statistics in server mode with <pkg>dev-db/sqlite</pkg></flag>
 		<flag name="wiimote">Support for wiimote input devices</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">supertuxkart/stk-code</remote-id>
 		<remote-id type="sourceforge">supertuxkart</remote-id>
 	</upstream>
 </pkgmetadata>

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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2019-05-13 22:06 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2019-05-13 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     fa2997a88ebb4ae65f728f35a0fb1a847d552969
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 22:05:28 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon May 13 22:05:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa2997a8

games-action/supertuxkart: Fix automagic dependency on libsquish

Closes: https://bugs.gentoo.org/685808
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../files/supertuxkart-1.0-system-squish.patch     | 43 ++++++++++++++++++++++
 games-action/supertuxkart/supertuxkart-1.0.ebuild  |  2 +
 2 files changed, 45 insertions(+)

diff --git a/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
new file mode 100644
index 00000000000..8158c4bb9e5
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-1.0-system-squish.patch
@@ -0,0 +1,43 @@
+From e1601b1ae07e3c1ac05cffe05b82e0c60998bc72 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+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/supertuxkart-1.0.ebuild b/games-action/supertuxkart/supertuxkart-1.0.ebuild
index 0069c7d8553..96746c833f7 100644
--- a/games-action/supertuxkart/supertuxkart-1.0.ebuild
+++ b/games-action/supertuxkart/supertuxkart-1.0.ebuild
@@ -52,6 +52,7 @@ 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() {
@@ -66,6 +67,7 @@ src_configure() {
 		-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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2017-12-26 12:02 James Le Cuirot
  0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2017-12-26 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e6532de05dd104f6427e27a6445b58e4ba062da5
Author:     François-Xavier Carton <fx.carton91 <AT> gmail <DOT> com>
AuthorDate: Tue Dec 26 04:01:24 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 12:01:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6532de0

games-action/supertuxkart: add version 0.9.3

Closes: https://bugs.gentoo.org/show_bug.cgi?id=640574

 games-action/supertuxkart/Manifest                 |   1 +
 .../files/supertuxkart-0.9.3-fix-buildsystem.patch | 103 +++++++++++++++++++++
 .../supertuxkart-0.9.3-irrlicht-arch-support.patch |  47 ++++++++++
 .../supertuxkart-0.9.3-irrlicht-bundled-libs.patch |  33 +++++++
 .../supertuxkart-0.9.3-irrlicht-system-libs.patch  |  56 +++++++++++
 .../files/supertuxkart-0.9.3-unbundle-enet.patch   |  57 ++++++++++++
 .../files/supertuxkart-0.9.3-unbundle-libs.patch   |  19 ++++
 .../supertuxkart/supertuxkart-0.9.3.ebuild         |  90 ++++++++++++++++++
 8 files changed, 406 insertions(+)

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 784666bf9dd..dcfa47b571f 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
 DIST supertuxkart-0.9.2-src.tar.xz 501606188 BLAKE2B cc77900ef49b31bfa26cd7be244279a64422757fce6bd020b262bfb8159d486d454a0bcfe49b6c958b8951b60accdbf7a41061cd69b1e2c74e9dfd7ac736919e SHA512 57f11d518736f88044d1cb73e1dfcc92f5667f3b1147ab7e54435f6bc560fe856c3650410410da5fa048bf23d0b64fc8a9887c830001e1435b0359c9163e71b0
+DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb SHA512 29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
 DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
new file mode 100644
index 00000000000..def5c80340b
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
@@ -0,0 +1,103 @@
+* Unbundle remaining libraries: GLEW, zlib, png, jpeg
+* Add -DAS_DEPRECATED for Angelscript
+* Remove definition of debug macros
+* Build bundled Irrlicht with user flags
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,43 +110,11 @@
+ include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
+ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
++    find_package(GLEW REQUIRED)
++    include_directories(${GLEW_INCLUDE_DIRS})
+     add_definitions(-DGLEW_NO_GLU)
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+ endif()
+
+-if(MSVC OR APPLE)
+-    if (NOT APPLE)
+-    # Build zlib library
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
+-
+-    set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/")
+-    set(ZLIB_LIBRARY zlibstatic)
+-    endif()
+-
+-    # Build png library
+-    set(SKIP_INSTALL_ALL TRUE)
+-    set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
+-    set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
+-    set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
+-
+-    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+-    set(PNG_LIBRARY png_static)
+-endif()
+-
+-# Add jpeg library
+-if (APPLE)
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+-    set(JPEG_LIBRARY jpeglib)
+-else()
+-    find_package(JPEG REQUIRED)
+-    include_directories(${JPEG_INCLUDE_DIR})
+-endif()
+ 
+ if (BUILD_RECORDER)
+@@ -206,6 +174,7 @@
+     find_package(Angelscript)
+     if(ANGELSCRIPT_FOUND)
+         include_directories(${Angelscript_INCLUDE_DIRS})
++        add_definitions(-DAS_DEPRECATED)
+     else()
+         message(FATAL_ERROR "Angelscript not found. "
+             "Either install angelscript or use built-in version using "
+@@ -307,14 +276,6 @@
+     # VS will automatically add NDEBUG for release mode, but only _DEBUG in debug mode.
+     # Since STK uses DEBUG, this is added for debug compilation only:
+     set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG)
+-else()
+-    # All non VS generators used create only a single compile mode, so
+-    # compile flags can be simplye be added
+-    if(CMAKE_BUILD_TYPE MATCHES Debug)
+-        add_definitions(-DDEBUG)
+-    else()
+-        add_definitions(-DNDEBUG)
+-    endif()
+ endif()
+ 
+ # TODO: remove this switch
+@@ -426,7 +395,7 @@
+ if(NOT SERVER_ONLY)
+     if(NOT USE_GLES2)
+-        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} glew graphics_utils)
++        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES} graphics_utils)
+     else()
+         target_link_libraries(supertuxkart GLESv2)
+     endif()
+ endif()
+--- a/lib/irrlicht/CMakeLists.txt
++++ b/lib/irrlicht/CMakeLists.txt
+@@ -68,15 +68,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  -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-0.9.3-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
new file mode 100644
index 00000000000..66191861a96
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
@@ -0,0 +1,47 @@
+From: Christoph Egger <debian@christoph-egger.org>
+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 <debian@christoph-egger.org>
+
+---
+ 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 <endian.h>
++ #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-0.9.3-irrlicht-bundled-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch
new file mode 100644
index 00000000000..194f278b958
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch
@@ -0,0 +1,33 @@
+Description: Remove embedded libraries in Irrlicht source (flagged by lintian)
+ Since removing the subdirectories containing libjpeg/libpng/zlib/bzip2/lzma
+ would make this patch way too large, this patch should be applied on top of
+	rm -rf lib/jpeglib/
+	rm -rf lib/zlib/
+	rm -rf lib/libpng/
+ in debian/rules (e.g. in the clean target).
+Forwarded: no
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-07
+
+--- a/lib/irrlicht/CMakeLists.txt
++++ b/lib/irrlicht/CMakeLists.txt
+@@ -2,9 +2,6 @@
+ find_package(PNG REQUIRED)
+ find_package(JPEG REQUIRED)
+ 
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
+-                    "${JPEG_INCLUDE_DIR}"
+-                    "${PNG_INCLUDE_DIRS}"
+-                    "${ZLIB_INCLUDE_DIR}")
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
+ 
+ if(MSVC OR APPLE)
+@@ -576,7 +573,7 @@
+ endif()
+ 
+ add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
+
+-target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
++target_link_libraries(stkirrlicht png jpeg z)
+ 
+ if(NOT SERVER_ONLY)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
new file mode 100644
index 00000000000..ce7ce63fa66
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
@@ -0,0 +1,56 @@
+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 <debian@christoph-egger.org
+
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,7 +21,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
+@@ -36,7 +36,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -50,7 +50,7 @@
+ 	#include <SDL/SDL_video.h>
+ 	#include <SDL/SDL_opengl.h>
+         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 		#define GL_GLEXT_LEGACY 1
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+@@ -12,7 +12,7 @@
+ 	#define WIN32_LEAN_AND_MEAN
+ 	#include <windows.h>
+ 	#include <GL/gl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
+@@ -25,7 +25,7 @@
+ 	#include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #endif
+ #endif
+ 

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch
new file mode 100644
index 00000000000..8c00fce7e18
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch
@@ -0,0 +1,57 @@
+Description: Build supertuxkart against system enet instead of embedded copy
+Forwarded: not-yet
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-17
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,9 +105,9 @@
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
+ 
+-# Build the ENet UDP network library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
++# ENet
++find_package(ENet REQUIRED)
++include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
+ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
+@@ -406,10 +406,10 @@
+     bulletdynamics
+     bulletcollision
+     bulletmath
+-    enet
+     stkirrlicht
+     ${Angelscript_LIBRARIES}
+     ${CURL_LIBRARIES}
++    ${ENET_LIBRARIES}
+     ${OGGVORBIS_LIBRARIES}
+     ${OPENAL_LIBRARY}
+     ${FREETYPE_LIBRARIES}
+--- /dev/null
++++ b/cmake/FindENet.cmake
+@@ -0,0 +1,22 @@
++# - Find ENet
++# Find the ENet includes and libraries
++#
++# Following variables are provided:
++# ENET_FOUND
++#     True if ENet has been found
++# ENET_INCLUDE_DIR
++#     The include directories of ENet
++# ENET_LIBRARIES
++#     ENet library list
++
++
++find_path(ENET_INCLUDE_DIR enet/enet.h /usr/include)
++find_library(ENET_LIBRARY NAMES enet PATHS /usr/lib)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(ENet DEFAULT_MSG ENET_INCLUDE_DIR ENET_LIBRARY)
++
++# Publish variables
++set(ENET_INCLUDE_DIRS ${ENET_INCLUDE_DIR})
++set(ENET_LIBRARIES ${ENET_LIBRARY})
++mark_as_advanced(ENET_INCLUDE_DIR ENET_LIBRARY)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch
new file mode 100644
index 00000000000..798a6cdea7a
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch
@@ -0,0 +1,19 @@
+Description: Link against system copies of zlib/libpng/libjpeg/bzip2
+Forwarded: not-yet
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-17
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -416,6 +416,11 @@
+     ${JPEG_LIBRARIES}
+     ${TURBOJPEG_LIBRARY}
+     #${VPX_LIBRARIES}
++    X11
++    z
++    png
++    jpeg
++    bz2
+     )
+ 
+ if(NOT SERVER_ONLY)

diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
new file mode 100644
index 00000000000..48522586a24
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-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-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fribidi wiimote openglrecorder"
+
+# 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="
+	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 )
+	wiimote? ( net-wireless/bluez )
+	openglrecorder? ( media-libs/libopenglrecorder )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.3-unbundle-enet.patch
+	"${FILESDIR}"/${PN}-0.9.3-unbundle-libs.patch
+	"${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch
+	"${FILESDIR}"/${PN}-0.9.3-irrlicht-bundled-libs.patch
+	"${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch
+	"${FILESDIR}"/${PN}-0.9.3-fix-buildsystem.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bundled libraries, just to be sure
+	rm -r lib/{enet,glew,jpeglib,libpng,zlib} || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# system dev-libs/angelscript leads
+		# to failed assert segfaults
+		-DUSE_SYSTEM_ANGELSCRIPT=OFF
+		-DUSE_FRIBIDI=$(usex fribidi)
+		-DUSE_WIIUSE=$(usex wiimote)
+		-DBUILD_RECORDER=$(usex openglrecorder)
+		-DSTK_INSTALL_BINARY_DIR=bin
+		-DSTK_INSTALL_DATA_DIR=share/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc CHANGELOG.md
+
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/
@ 2016-12-30 14:37 David Seifert
  0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2016-12-30 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1209a07b7421a4e01fdab912bffea3b5ea29f486
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 10:00:20 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 14:37:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1209a07b

games-action/supertuxkart: Version bump to 0.9.2

Gentoo-bug: 594396, 598491, 598493
* EAPI=6
* Remove games.eclass
* Add Debian patches for unbundling
* Add GPL-2 license

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-action/supertuxkart/Manifest                 |   1 +
 .../files/supertuxkart-0.9.2-fix-angelscript.patch |  27 ++++++
 .../files/supertuxkart-0.9.2-fix-buildsystem.patch |  97 +++++++++++++++++++
 .../supertuxkart-0.9.2-irrlicht-arch-support.patch |  49 ++++++++++
 .../supertuxkart-0.9.2-irrlicht-as-needed.patch    |  24 +++++
 .../supertuxkart-0.9.2-irrlicht-bundled-libs.patch |  35 +++++++
 .../supertuxkart-0.9.2-irrlicht-system-libs.patch  | 105 +++++++++++++++++++++
 .../files/supertuxkart-0.9.2-unbundle-enet.patch   |  58 ++++++++++++
 .../files/supertuxkart-0.9.2-unbundle-libs.patch   |  19 ++++
 .../supertuxkart/supertuxkart-0.9.2.ebuild         |  91 ++++++++++++++++++
 10 files changed, 506 insertions(+)

diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 99cc093..93f2de1 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,2 +1,3 @@
 DIST supertuxkart-0.9.1-src.tar.xz 425822808 SHA256 c50f00a71df165fb613d20e86bea2d9d5e51ed3e27e1d436fbac3b07cf2ea149 SHA512 11ea064210ea6bc36258f08e57c6aac46739133017ad3ba97ca0edd84c818c2f72dae60bbe7cd79135be9785fb0e15c9904b151c894e1c21b881598113344cf4 WHIRLPOOL 8acd59e878b44f8e504d57687ea1bbece05d5f14b29e0c62a22183729129fb115fccb9a1a89d5e0a86881ac6487c36ea520aab835ba5efaaa3c71471fda9b15f
+DIST supertuxkart-0.9.2-src.tar.xz 501606188 SHA256 0b080bb098a26adb552d6fd48905bcb6b1e873ef1567457d7268d7d3aaa48282 SHA512 57f11d518736f88044d1cb73e1dfcc92f5667f3b1147ab7e54435f6bc560fe856c3650410410da5fa048bf23d0b64fc8a9887c830001e1435b0359c9163e71b0 WHIRLPOOL c534854127981821412437632fdf9ff239988199d60f8d582b59bd624dff87f5e37a5cb54020b679e9fb6d440187a5bd0e0c2eb00311e2ae8de6ba58fb1d1d82
 DIST supertuxkart.png 4435 SHA256 99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda WHIRLPOOL eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
new file mode 100644
index 00000000..a2f4fb1
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-angelscript.patch
@@ -0,0 +1,27 @@
+Description: Fix FTBFS on arm64, mips/mips64/mipsel, ppc64el, s390x
+Origin: upstream, https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341
+Bug: https://github.com/supertuxkart/stk-code/issues/2569
+Bug-Debian: https://bugs.debian.org/830748
+Last-Update: 2016-12-03
+
+--- a/lib/angelscript/projects/cmake/CMakeLists.txt
++++ b/lib/angelscript/projects/cmake/CMakeLists.txt
+@@ -68,6 +68,7 @@ set(ANGELSCRIPT_SOURCE
+     ../../source/as_bytecode.cpp
+     ../../source/as_callfunc.cpp
+     ../../source/as_callfunc_x86.cpp
++    ../../source/as_callfunc_mips.cpp
+     ../../source/as_callfunc_x64_gcc.cpp
+     ../../source/as_callfunc_x64_msvc.cpp
+     ../../source/as_callfunc_x64_mingw.cpp
+--- a/lib/angelscript/source/as_config.h
++++ b/lib/angelscript/source/as_config.h
+@@ -844,7 +844,7 @@
+ 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+ 			#define AS_X86
+ 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+-		#elif defined(__LP64__) && !defined(__arm64__)
++		#elif defined(__x86_64__)
+ 			#define AS_X64_GCC
+ 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+ 			#define HAS_128_BIT_PRIMITIVES

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
new file mode 100644
index 00000000..6f1c39b
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-fix-buildsystem.patch
@@ -0,0 +1,97 @@
+* Unbundle remaining libraries: GLEW, zlib, png, jpeg
+* Add -DAS_DEPRECATED for Angelscript
+* Remove definition of debug macros
+* Build bundled Irrlicht with user flags
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,37 +68,10 @@
+ include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
++find_package(GLEW REQUIRED)
++include_directories(${GLEW_INCLUDE_DIRS})
+ add_definitions(-DGLEW_NO_GLU)
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+ 
+-if((WIN32 AND NOT MINGW) OR APPLE)
+-    if (NOT APPLE)
+-    # Build zlib library
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
+-
+-    set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/")
+-    set(ZLIB_LIBRARY zlibstatic)
+-    endif()
+-
+-    # Build png library
+-    set (SKIP_INSTALL_ALL TRUE)
+-    set (PNG_STATIC TRUE)
+-    set (PNG_TESTS FALSE)
+-    set (PNG_SHARED FALSE)
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
+-
+-    #build jpeg library
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-
+-    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+-    set(PNG_LIBRARY png15_static)
+-    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+-    set(JPEG_LIBRARY jpeglib)
+-endif()
+ # Build the irrlicht library
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
+@@ -130,6 +103,7 @@
+     find_package(Angelscript)
+     if(ANGELSCRIPT_FOUND)
+         include_directories(${Angelscript_INCLUDE_DIRS})
++        add_definitions(-DAS_DEPRECATED)
+     else()
+         message(FATAL_ERROR "Angelscript not found. "
+             "Either install angelscript or use built-in version using "
+@@ -245,14 +219,6 @@
+     # VS will automatically add NDEBUG for release mode, but only _DEBUG in debug mode.
+     # Since STK uses DEBUG, this is added for debug compilation only:
+     set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG)
+-else()
+-    # All non VS generators used create only a single compile mode, so
+-    # compile flags can be simplye be added
+-    if(CMAKE_BUILD_TYPE MATCHES Debug)
+-        add_definitions(-DDEBUG)
+-    else()
+-        add_definitions(-DNDEBUG)
+-    endif()
+ endif()
+ 
+ # TODO: remove this switch
+@@ -342,7 +308,7 @@
+     bulletdynamics
+     bulletcollision
+     bulletmath
+-    glew
++    ${GLEW_LIBRARIES}
+     stkirrlicht
+     ${Angelscript_LIBRARIES}
+     ${CURL_LIBRARIES}
+--- a/lib/irrlicht/CMakeLists.txt
++++ b/lib/irrlicht/CMakeLists.txt
+@@ -20,15 +20,6 @@
+ elseif(MINGW)
+   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 -I/usr/X11R6/include")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
+-  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()
+ 
+ # Xrandr

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-arch-support.patch
new file mode 100644
index 00000000..ec56838
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-arch-support.patch
@@ -0,0 +1,49 @@
+From: Christoph Egger <debian@christoph-egger.org>
+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 <debian@christoph-egger.org>
+
+---
+ 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
+@@ -101,6 +101,10 @@
+ #ifndef _IRR_SOLARIS_PLATFORM_
+ #if !defined(__linux__) && !defined(__FreeBSD__)
+ #define _IRR_LINUX_PLATFORM_
++#include <endian.h>
++ #if __BYTE_ORDER == __BIG_ENDIAN
++  #define __BIG_ENDIAN__
++ #endif
+ #endif
+ #endif
+ #define _IRR_POSIX_API_
+@@ -406,11 +410,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-0.9.2-irrlicht-as-needed.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-as-needed.patch
new file mode 100644
index 00000000..b6cb0fe
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-as-needed.patch
@@ -0,0 +1,24 @@
+From: Christoph Egger <Christoph.Egger@gmx.de>
+Subject: [PATCH] debian/link-against-needed-libs
+
+There are quite some libraries irrlicht needs but does not link
+against. This patch makes irrlicht link correctly against all the
+needed libraries.
+
+Signed-off-by: Christoph Egger <Christoph.Egger@gmx.de>
+
+---
+ lib/irrlicht/source/Irrlicht/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/lib/irrlicht/source/Irrlicht/Makefile
++++ b/lib/irrlicht/source/Irrlicht/Makefile
+@@ -88,7 +88,7 @@
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+ sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
++staticlib sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+ 
+ #OSX specific options

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-bundled-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-bundled-libs.patch
new file mode 100644
index 00000000..1a1013e
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-bundled-libs.patch
@@ -0,0 +1,35 @@
+Description: Remove embedded libraries in Irrlicht source (flagged by lintian)
+ Since removing the subdirectories containing libjpeg/libpng/zlib/bzip2/lzma
+ would make this patch way too large, this patch should be applied on top of
+	rm -rf lib/jpeglib/
+	rm -rf lib/zlib/
+	rm -rf lib/libpng/
+ in debian/rules (e.g. in the clean target).
+Forwarded: no
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-07
+
+--- a/lib/irrlicht/CMakeLists.txt
++++ b/lib/irrlicht/CMakeLists.txt
+@@ -2,11 +2,7 @@
+ find_package(PNG REQUIRED)
+ find_package(JPEG REQUIRED)
+ 
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
+-                    "${JPEG_INCLUDE_DIR}"
+-                    "${PNG_INCLUDE_DIRS}"
+-                    "${ZLIB_INCLUDE_DIR}"
+-                    "${CMAKE_CURRENT_BINARY_DIR}/../zlib/") # For zconf.h on WIN32
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
+ 
+ find_package(OpenGL REQUIRED)
+ include_directories(${OPENGL_INCLUDE_DIR})
+@@ -508,7 +504,7 @@
+ endif()
+ 
+ add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
+-target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
++target_link_libraries(stkirrlicht png jpeg z)
+ 
+ if(WIN32)
+     target_link_libraries(stkirrlicht imm32)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-system-libs.patch
new file mode 100644
index 00000000..f82dc50
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-irrlicht-system-libs.patch
@@ -0,0 +1,105 @@
+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 <debian@christoph-egger.org
+
+--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
++++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.h
+@@ -23,7 +23,7 @@
+ #include <GL/glx.h>
+ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
+ #define GLX_GLXEXT_PROTOTYPES
+-#include "glxext.h"
++#include <GL/glxext.h>
+ #endif
+ #endif
+ 
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,7 +21,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
+@@ -36,7 +36,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -50,7 +50,7 @@
+ 	#include <SDL/SDL_video.h>
+ 	#include <SDL/SDL_opengl.h>
+         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 		#define GL_GLEXT_LEGACY 1
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+@@ -12,7 +12,7 @@
+ 	#define WIN32_LEAN_AND_MEAN
+ 	#include <windows.h>
+ 	#include <GL/gl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
+@@ -25,7 +25,7 @@
+ 	#include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #endif
+ #endif
+ 
+--- a/lib/irrlicht/source/Irrlicht/Makefile
++++ b/lib/irrlicht/source/Irrlicht/Makefile
+@@ -43,7 +43,7 @@
+ 	CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
+ IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)
+ IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o
+-IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
++IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o
+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
+ ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
+@@ -56,14 +56,14 @@
+ EXTRAOBJ =
+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
+-	$(BZIP2OBJ) $(EXTRAOBJ)
++	$(IRRGUIOBJ) $(LIBAESGM) \
++	$(EXTRAOBJ)
+ 
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
++CXXINCS = -I../../include # -Izlib -Ijpeglib -Ilibpng
+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
++CXXFLAGS += -Wall -pipe -fno-exceptions -fstrict-aliasing
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+ else
+@@ -154,6 +154,7 @@
+ 	mkdir -p $(INSTALL_DIR)/../include/irrlicht
+ 	cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/
+ 	cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)
++	cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR)
+ 	cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)
+ 	cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)
+ #	ldconfig -n $(INSTALL_DIR)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-enet.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-enet.patch
new file mode 100644
index 00000000..259627a
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-enet.patch
@@ -0,0 +1,58 @@
+Description: Build supertuxkart against system enet instead of embedded copy
+Forwarded: not-yet
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-17
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,9 +63,9 @@
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
+ 
+-# Build the ENet UDP network library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
++# ENet
++find_package(ENet REQUIRED)
++include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
+ add_definitions(-DGLEW_NO_GLU)
+@@ -342,11 +342,11 @@
+     bulletdynamics
+     bulletcollision
+     bulletmath
+-    enet
+     glew
+     stkirrlicht
+     ${Angelscript_LIBRARIES}
+     ${CURL_LIBRARIES}
++    ${ENET_LIBRARIES}
+     ${OGGVORBIS_LIBRARIES}
+     ${OPENAL_LIBRARY}
+     ${OPENGL_LIBRARIES}
+--- /dev/null
++++ b/cmake/FindENet.cmake
+@@ -0,0 +1,22 @@
++# - Find ENet
++# Find the ENet includes and libraries
++#
++# Following variables are provided:
++# ENET_FOUND
++#     True if ENet has been found
++# ENET_INCLUDE_DIR
++#     The include directories of ENet
++# ENET_LIBRARIES
++#     ENet library list
++
++
++find_path(ENET_INCLUDE_DIR enet/enet.h /usr/include)
++find_library(ENET_LIBRARY NAMES enet PATHS /usr/lib)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(ENet DEFAULT_MSG ENET_INCLUDE_DIR ENET_LIBRARY)
++
++# Publish variables
++set(ENET_INCLUDE_DIRS ${ENET_INCLUDE_DIR})
++set(ENET_LIBRARIES ${ENET_LIBRARY})
++mark_as_advanced(ENET_INCLUDE_DIR ENET_LIBRARY)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-libs.patch
new file mode 100644
index 00000000..1ea29e1
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.2-unbundle-libs.patch
@@ -0,0 +1,19 @@
+Description: Link against system copies of zlib/libpng/libjpeg/bzip2
+Forwarded: not-yet
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-17
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -351,6 +351,11 @@
+     ${OPENAL_LIBRARY}
+     ${OPENGL_LIBRARIES}
+     ${FREETYPE_LIBRARIES}
++    X11
++    z
++    png
++    jpeg
++    bz2
+     )
+ 
+ if(UNIX AND NOT APPLE)

diff --git a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
new file mode 100644
index 00000000..12910df
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="http://supertuxkart.sourceforge.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-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fribidi wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# https://sourceforge.net/tracker/?func=detail&aid=3454889&group_id=74339&atid=540679
+
+RDEPEND="
+	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 )
+	wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.2-unbundle-enet.patch
+	"${FILESDIR}"/${PN}-0.9.2-unbundle-libs.patch
+	"${FILESDIR}"/${PN}-0.9.2-fix-angelscript.patch
+	"${FILESDIR}"/${PN}-0.9.2-irrlicht-arch-support.patch
+	"${FILESDIR}"/${PN}-0.9.2-irrlicht-as-needed.patch
+	"${FILESDIR}"/${PN}-0.9.2-irrlicht-bundled-libs.patch
+	"${FILESDIR}"/${PN}-0.9.2-irrlicht-system-libs.patch
+	"${FILESDIR}"/${PN}-0.9.2-fix-buildsystem.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bundled libraries, just to be sure
+	rm -r lib/{enet,glew,jpeglib,libpng,zlib} || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# system dev-libs/angelscript leads
+		# to failed assert segfaults
+		-DUSE_SYSTEM_ANGELSCRIPT=OFF
+		-DUSE_FRIBIDI=$(usex fribidi)
+		-DUSE_WIIUSE=$(usex wiimote)
+		-DSTK_INSTALL_BINARY_DIR=bin
+		-DSTK_INSTALL_DATA_DIR=share/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc CHANGELOG.md TODO.md
+
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-03-09 23:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-29 22:40 [gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/, games-action/supertuxkart/files/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2025-03-09 23:23 Sam James
2021-10-29 22:40 James Le Cuirot
2021-01-02 21:00 James Le Cuirot
2020-09-01 23:25 Sam James
2019-05-13 22:06 James Le Cuirot
2017-12-26 12:02 James Le Cuirot
2016-12-30 14:37 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox