diff options
| author |   Alexander Golubev <fatzer2@gmail.com> | 2021-06-20 23:28:27 +0300 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2021-06-20 23:29:05 +0300 |
| commit | 12899f2577752ccebe2e804729c6232b3b55b87e (patch) | |
| tree | a71268ff2fc0baed4571f3fc0b23ab0cbdf42a17 /games-engines | |
| parent | profiles: mask dev-R/BH (diff) | |
| download | guru-12899f2577752ccebe2e804729c6232b3b55b87e.tar.gz guru-12899f2577752ccebe2e804729c6232b3b55b87e.tar.bz2 guru-12899f2577752ccebe2e804729c6232b3b55b87e.zip | |
games-engines/instead: fix build failur with USE=sdl2
Closes: https://bugs.gentoo.org/796962
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/instead/files/instead-3.3.4-resolve-conflict-with-SDL-function-91.patch | 34 | ||||
| -rw-r--r-- | games-engines/instead/instead-3.3.4.ebuild | 3 |
2 files changed, 37 insertions, 0 deletions
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" |