[gentoo-commits] repo/proj/guru:dev commit in: games-engines/instead/, games-engines/instead/files/

[gentoo-commits] repo/proj/guru:dev commit in: games-engines/instead/, games-engines/instead/files/

[Golubev Alexander]

commit:     12899f2577752ccebe2e804729c6232b3b55b87e
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sun Jun 20 20:28:27 2021 +0000
Commit:     Golubev Alexander <fatzer2 <AT> gmail <DOT> com>
CommitDate: Sun Jun 20 20:29:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=12899f25

games-engines/instead: fix build failur with USE=sdl2

Closes: https://bugs.gentoo.org/796962
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>

 ...3.4-resolve-conflict-with-SDL-function-91.patch | 34 ++++++++++++++++++++++
 games-engines/instead/instead-3.3.4.ebuild         |  3 ++
 2 files changed, 37 insertions(+)

diff --git a/games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch b/games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch
new file mode 100644
index 000000000..7c6c2f04d
--- /dev/null
+++ b/games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch
@@ -0,0 +1,34 @@
+From d263759d94c45bea6acbf6fb079350bba6c6e3c6 Mon Sep 17 00:00:00 2001
+From: Peter Kosyh <p.kosyh@gmail.com>
+Date: Sun, 20 Jun 2021 23:13:29 +0300
+Subject: [PATCH] resolve conflict with SDL function: #91
+
+---
+ src/SDL_gif.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/SDL_gif.c b/src/SDL_gif.c
+index 543280cc..0a74cf1e 100644
+--- a/src/SDL_gif.c
++++ b/src/SDL_gif.c
+@@ -741,7 +741,7 @@ ReadImage(SDL_RWops * src, int len, int height, int cmapSize,
+ }
+ 
+ /* Load a GIF type animation from an SDL datasource */
+-static Animation_t *IMG_LoadGIFAnimation_RW(SDL_RWops *src)
++static Animation_t *LoadGIFAnimation_RW(SDL_RWops *src)
+ {
+     GIF_Anim_t *internal = IMG_LoadGIF_RW_Internal(src, SDL_TRUE);
+     if (internal) {
+@@ -782,7 +782,7 @@ Animation_t *GIF_LoadAnim(const char* file)
+ 	SDL_RWops* src = RWFromIdf(instead_idf(), file);
+ 	if (!src)
+ 		return NULL;
+-	anim = IMG_LoadGIFAnimation_RW(src);
++	anim = LoadGIFAnimation_RW(src);
+ 	SDL_RWclose(src);
+ 	if (!anim)
+ 		return NULL;
+-- 
+2.31.1
+

diff --git a/games-engines/instead/instead-3.3.4.ebuild b/games-engines/instead/instead-3.3.4.ebuild
index f25d0ad53..0b3ebfac9 100644
--- a/games-engines/instead/instead-3.3.4.ebuild
+++ b/games-engines/instead/instead-3.3.4.ebuild
@@ -60,6 +60,9 @@ DEPEND="${COMMON_DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
+# https://bugs.gentoo.org/796962
+PATCHES=( "$FILESDIR/$P-resolve-conflict-with-SDL-function-91.patch" )
+
 src_prepare() {
 	l10n_find_plocales_changes "${S}/lang" "" ".ini"