From 5ccdc4cdefd69a61bdbd330058e81e695e225544 Mon Sep 17 00:00:00 2001
From: TheZeldakatze <60302169+TheZeldakatze@users.noreply.github.com>
Date: Wed, 22 Nov 2023 07:58:41 +0100
Subject: [PATCH] endless_sky: bump version (#9756)

---
 ....9.14.recipe => endless_sky-0.10.4.recipe} |  6 +-
 .../patches/endless_sky-0.10.4.patchset       | 85 +++++++++++++++++++
 .../patches/endless_sky-0.9.14.patchset       | 24 ------
 3 files changed, 90 insertions(+), 25 deletions(-)
 rename games-action/endless_sky/{endless_sky-0.9.14.recipe => endless_sky-0.10.4.recipe} (91%)
 create mode 100644 games-action/endless_sky/patches/endless_sky-0.10.4.patchset
 delete mode 100644 games-action/endless_sky/patches/endless_sky-0.9.14.patchset

diff --git a/games-action/endless_sky/endless_sky-0.9.14.recipe b/games-action/endless_sky/endless_sky-0.10.4.recipe
similarity index 91%
rename from games-action/endless_sky/endless_sky-0.9.14.recipe
rename to games-action/endless_sky/endless_sky-0.10.4.recipe
index d4a3906d6..a209ec42c 100644
--- a/games-action/endless_sky/endless_sky-0.9.14.recipe
+++ b/games-action/endless_sky/endless_sky-0.10.4.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="Michael Zahniser"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/endless-sky/endless-sky/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="6c22571b5398a18297aa7410890c319b5cb292a833889b4e7c0cd94d831f29af"
+CHECKSUM_SHA256="baeaa462315587788d81c58847d600f66f1ced063cdfb4cf108d6a26fe75e175"
 SOURCE_DIR="endless-sky-$portVersion"
 PATCHES="endless_sky-$portVersion.patchset"
 ADDITIONAL_FILES="endless-sky.rdef.in"
@@ -33,6 +33,8 @@ REQUIRES="
 	lib:libopenal$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libSDL2_2.0$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -43,6 +45,8 @@ BUILD_REQUIRES="
 	devel:libopenal$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libSDL2_2.0$secondaryArchSuffix
+	devel:libuuid$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
diff --git a/games-action/endless_sky/patches/endless_sky-0.10.4.patchset b/games-action/endless_sky/patches/endless_sky-0.10.4.patchset
new file mode 100644
index 000000000..2bd0b6990
--- /dev/null
+++ b/games-action/endless_sky/patches/endless_sky-0.10.4.patchset
@@ -0,0 +1,85 @@
+From 4cc532e4b1ef5967a3ca07e99c6decb7e6da7d9a Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 27 Sep 2021 14:16:14 +1000
+Subject: Remove LTO
+
+
+diff --git a/SConstruct b/SConstruct
+index 45815ab..7799a9b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -62,8 +62,8 @@ Help(opts.GenerateHelpText(env))
+ # or modify the `flags` variable:
+ flags = ["-std=c++11", "-Wall", "-pedantic-errors", "-Wold-style-cast", "-fno-rtti"]
+ if env["mode"] != "debug":
+-	flags += ["-Werror", "-O3", "-flto"]
+-	env.Append(LINKFLAGS = ["-O3", "-flto"])
++	flags += ["-O3"]
++	env.Append(LINKFLAGS = ["-O3"])
+ if env["mode"] == "debug":
+ 	flags += ["-g"]
+ elif env["mode"] == "profile":
+-- 
+2.42.0
+
+
+From 26c277380dbde2543bfd5991a113bc38ebf2145a Mon Sep 17 00:00:00 2001
+From: Maite Gamper <victor@wenzeslaus.de>
+Date: Tue, 14 Nov 2023 22:41:45 +0100
+Subject: use -lGL on haiku
+
+
+diff --git a/SConstruct b/SConstruct
+index 7799a9b..cd671c2 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -10,6 +10,7 @@ def pathjoin(*args):
+ # Load environment variables, including some that should be renamed.
+ # If we are compiling on Windows, then we need to change the toolset to MinGW.
+ is_windows_host = platform.system().startswith('Windows')
++is_haiku = platform.system().startswith('Haiku')
+ scons_toolset = ['mingw' if is_windows_host else 'default']
+ env = DefaultEnvironment(tools = scons_toolset, ENV = os.environ, COMPILATIONDB_USE_ABSPATH=True)
+ # If manually building within the Steam Runtime (scout), SCons will need to be invoked directly
+@@ -115,9 +116,14 @@ if env["opengl"] == "gles":
+ 	if is_windows_host:
+ 		print("OpenGL ES builds are not supported on Windows")
+ 		Exit(1)
+-	env.Append(LIBS = [
+-		"OpenGL",
+-	])
++	if is_haiku:
++		env.Append(LIBS = [
++			"GL",
++		])
++	else:
++		env.Append(LIBS = [
++			"OpenGL",
++		])
+ 	env.Append(CCFLAGS = ["-DES_GLES"])
+ elif is_windows_host:
+ 	env.Append(LIBS = [
+@@ -125,10 +131,16 @@ elif is_windows_host:
+ 		"opengl32",
+ 	])
+ else:
+-	env.Append(LIBS = [
+-		"GL" if 'steamrt_scout' in chroot_name else "OpenGL",
+-		"GLEW",
+-	])
++	if is_haiku:
++		env.Append(LIBS = [
++			"GL",
++			"GLEW",
++		])
++	else:
++		env.Append(LIBS = [
++			"GL" if 'steamrt_scout' in chroot_name else "OpenGL",
++			"GLEW",
++		])
+ 
+ # libmad is not in the Steam runtime, so link it statically:
+ if 'steamrt_scout_i386' in chroot_name:
+-- 
+2.42.0
+
diff --git a/games-action/endless_sky/patches/endless_sky-0.9.14.patchset b/games-action/endless_sky/patches/endless_sky-0.9.14.patchset
deleted file mode 100644
index 5e268ca54..000000000
--- a/games-action/endless_sky/patches/endless_sky-0.9.14.patchset
+++ /dev/null
@@ -1,24 +0,0 @@
-From 218cce1093b81875762b1490cf2e2d3cc2ac191c Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 27 Sep 2021 14:16:14 +1000
-Subject: Remove LTO
-
-
-diff --git a/SConstruct b/SConstruct
-index 3ae455a..ee9722b 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -48,8 +48,8 @@ Help(opts.GenerateHelpText(env))
- # or modify the `flags` variable:
- flags = ["-std=c++11", "-Wall", "-Werror", "-Wold-style-cast"]
- if env["mode"] != "debug":
--	flags += ["-O3", "-flto"]
--	env.Append(LINKFLAGS = ["-O3", "-flto"])
-+	flags += ["-O3"]
-+	env.Append(LINKFLAGS = ["-O3"])
- if env["mode"] == "debug":
- 	flags += ["-g"]
- elif env["mode"] == "profile":
--- 
-2.30.2
-