gentoo auto-resync : 02:12:2024 - 02:07:07

3 files changed, 45 insertions, 3 deletions

diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 264bfb7ea225..6a0a850f93a7 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -1,8 +1,9 @@
 AUX sauerbraten-2020.12.27-respect-FLAGS-don-t-strip-symbols.patch 5648 BLAKE2B 0515107fdeb0a441cc772c747f98068f4819b8ac4999ffd67a68bef96a59b754c3d6e9602a378dfb51984283867b82f1a855c5fdb8d9dacc392d67b57ba9dfdc SHA512 658325bc184792b776eb1a698eb28efdd451aed2f37c1e2182e7ca4703e5ea38eb0e5a5b4742738c94281f829f14eb394972449c43818805b7fb21f259b2c473
 AUX sauerbraten-2020.12.27-unbundle-enet.patch 3893 BLAKE2B ee866466fc13977c62750ee63c669f4815c4a5c42c14ab34b19fb4b6b356201042eddbab48c768ef173e26bfc883b47fc7f92d82f4b7660ec25efede0ea82679 SHA512 65206ebfed702fc165eef57a922fd85d2bf0251a8e3f6a7b7fa3b7b3ceee207466c8ac846b1303a1de4e9857b5bff61a01688700e6d3a0286c60c567071f2633
 AUX sauerbraten-2020.12.27-use-pkg-config-for-freetype2.patch 1028 BLAKE2B b628050655e112e7002f2aa2680d55b7d56dc2034bcf445802c594ac7386aa1ebb8301493df4a981b5595b8e6bdc29bd6851be53733a77ebde1058c0eb48d590 SHA512 85d26c201ac55b746a77755a82e9a055ac3ff8cb374a398e98cf50f373388e9b5183f1b316d5b73af91bba5c9815bfa391f43d1621febd9bd7b8afb3c25ba209
+AUX sauerbraten-2020.12.29-includefix.patch 890 BLAKE2B 69a7c7ca3b28920664c41de0648f4d749cc17d4ffed198518d53c783de4c613b4cfed3fe6215f1b9017d878d94b16d87217bb77cb8d3c06803b9ad69f6c9bbf9 SHA512 0ca468365b539038e18ae5660b55c55b35508c73437c1df9aa8d33335c3cc22d8d215618411be7a3ac2096e30ff52d3051361502594c198f331bf8b1c49238d3
 AUX sauerbraten.conf 614 BLAKE2B 7fcd75fbc0be5ab445ddc5c5f5256529ab52d8f036687f2835b6e2996f0d832d42ecad75b857a4dc5b88db7ea2ff5bd0be30c60bd0462a20b8995b793adef348 SHA512 6731950c3f5309f7155ca71804f01d88562dcc82a7089499c076941b0283f42b0a7a4293859079d20a40b41e57f22f80c8e25f7670b17a64313055e9d1051000
 AUX sauerbraten.init 1903 BLAKE2B a7917ba65edf17c2ed3b0a3026a7f305978e34a15ea28dcf78f9de3ff55b3391a8fb3550f615ea4890c186d2348957ce0cda6354fdaf5b02e811383243efe04f SHA512 d4d95e1917d8324589b682112957f95de4033711e67a0303753978de57cb030ad28d59f350373014c791755f4225f5ec2b914a2fe73ca68e5f94fdb3d6998ae9
-DIST sauerbraten_2020_12_27_linux.tar.bz2 985815649 BLAKE2B 4ec9caf705766aed76153a8631b1990c6432db8c816d579e891263b36adf0e7ed4831d2fee010b7692f6457989c0acea552f72c95e0924e97182d2a03dc947f2 SHA512 60487e0493478b9dd8940a9239834d8f3f6b6ca529f3c5b718f91caf5116073942ca6908d7fff26ab37b7ec590114ab07f24cdcea5c355288d3c2706d626ea28
-EBUILD sauerbraten-2020.12.27.ebuild 3292 BLAKE2B e7c3e340822357f5556fb38f7cc753733e0f7c43d431505fe2e137d5e3eb1404f164ca0d095b414704f8ac79e1c84098f74eac57d3a34c9db85b9b7606ddfc81 SHA512 9b8c80e184d9c2201d8cb7fd925b67a565a1f906773f5f66d0cea3030078ebe458841268e48be2bbefbf6f8bb7fc51712b07236077923a45f2cacd4d32cd1b8b
+DIST sauerbraten_2020_12_29_linux.tar.bz2 985823440 BLAKE2B 8d3cb9a26b65fecd6596211af58504cf8a2f5f95486785e15fb2faa8398046d80f7548727dff96683a1d6dcd713ec175bbd9ca47852a8c88d872d954d02ab2c0 SHA512 fd2106e4ed3d48352b5cc2f9d4037933a486e6200ef89bf9e3f31952f4a27ef565f7740d45c32bb9b22da0e17e6542257169134f216bc51a6a465ff311f9bae9
+EBUILD sauerbraten-2020.12.29.ebuild 3430 BLAKE2B 5e8fa3dced9ab04bfdde5621031a4a3baf8449c5f55dc1a7f50ad326d3806050ffabdac2b0f5e3baafced749d71b1ce0477a567fc75e4b53115bd76874f13727 SHA512 ad9b744cf9723e2651188761bfc9e8942c1b7502bc2e478dec7b19cfb73285551b8623c673392e77a63f597e1d8dd63c5039ab3c3a72ff97356800664c131348
 MISC metadata.xml 402 BLAKE2B cf98604dae54752acae657864f2a168e284e484ddd903fbbb22dc2a3a25241a323233b49abcab62711398cf200e3617fae17d48a948a8dcf702c8435b83216b1 SHA512 60b18a5cd29a8a2ca8e32109ea6e1ed5721e95bdecc138d76767a10e143dc2532fafadded6e2f4b6ecb4769f4ab0a87927ade4db5e16a67ed8398b410f0577ee
diff --git a/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch b/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch
new file mode 100644
index 000000000000..422d6b1b3963
--- /dev/null
+++ b/games-fps/sauerbraten/files/sauerbraten-2020.12.29-includefix.patch
@@ -0,0 +1,39 @@
+diff --git a/movie.cpp b/movie.cpp
+index 25cb491..7f7536c 100644
+--- a/src/engine/movie.cpp
++++ b/src/engine/movie.cpp
+@@ -8,7 +8,7 @@
+ //   kino - ok
+ 
+ #include "engine.h"
+-#include "SDL_mixer.h"
++#include <SDL2/SDL_mixer.h>
+ 
+ VAR(dbgmovie, 0, 0, 1);
+ 
+diff --git a/sound.cpp b/sound.cpp
+index 38ff025..a0ed5db 100644
+--- a/src/engine/sound.cpp
++++ b/src/engine/sound.cpp
+@@ -1,7 +1,7 @@
+ // sound.cpp: basic positional sound using sdl_mixer
+ 
+ #include "engine.h"
+-#include "SDL_mixer.h"
++#include <SDL2/SDL_mixer.h>
+ 
+ bool nosound = true;
+ 
+diff --git a/texture.cpp b/texture.cpp
+index 964d39d..f76b9b1 100644
+--- a/src/engine/texture.cpp
++++ b/src/engine/texture.cpp
+@@ -1,7 +1,7 @@
+ // texture.cpp: texture slot management
+ 
+ #include "engine.h"
+-#include "SDL_image.h"
++#include <SDL2/SDL_image.h>
+ 
+ #ifndef SDL_IMAGE_VERSION_ATLEAST
+ #define SDL_IMAGE_VERSION_ATLEAST(X, Y, Z) \
diff --git a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild b/games-fps/sauerbraten/sauerbraten-2020.12.29.ebuild
index 586071487332..ca0be0265bc5 100644
--- a/games-fps/sauerbraten/sauerbraten-2020.12.27.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2020.12.29.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs wrapper xdg
 
@@ -43,6 +43,8 @@ PATCHES=(
 
 	# Don't use freetype-config, it's obsolete
 	"${FILESDIR}"/${PN}-2020.12.27-use-pkg-config-for-freetype2.patch
+	# More sensible ways of including SDL_mixer and SDL_image. Game doesn't build w/o this.
+	"${FILESDIR}"/${PN}-2020.12.29-includefix.patch
 )
 
 src_prepare() {