diff options
| author |   Alexey Sokolov <sokolov@google.com> | 2020-11-15 21:02:44 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2020-11-15 21:02:44 +0100 |
| commit | 4a1f2b8d00cdd00ccc4740e2ab19777265078819 (patch) | |
| tree | 72dd9b0a1dc7fcf6a399ce4e7a760316581cd3af /games-fps/alienarena/files | |
| parent | games-puzzle/rezerwar: drop 0.4.2-r1 (diff) | |
| download | gentoo-4a1f2b8d00cdd00ccc4740e2ab19777265078819.tar.gz gentoo-4a1f2b8d00cdd00ccc4740e2ab19777265078819.tar.bz2 gentoo-4a1f2b8d00cdd00ccc4740e2ab19777265078819.zip | |
games-fps/alienarena: fix version to be 7.66
Fix build:
* on prefix
* without native-symlinks
* with gcc 10
Closes: https://bugs.gentoo.org/650294
Closes: https://bugs.gentoo.org/707814
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'games-fps/alienarena/files')
3 files changed, 49 insertions, 0 deletions
diff --git a/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch new file mode 100644 index 000000000000..0b9166a2631f --- /dev/null +++ b/games-fps/alienarena/files/alienarena-7.66-C99-inline.patch @@ -0,0 +1,25 @@ +From: Markus Koschany <apo@debian.org> +Date: Fri, 18 Aug 2017 23:24:22 +0200 +Subject: gcc7 + +Fix FTBFS with GCC 7. + +Bug-Debian: https://bugs.debian.org/871218 +Forwarded: no +--- + source/ref_gl/r_iqm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/ref_gl/r_iqm.c b/source/ref_gl/r_iqm.c +index ba5d178..cb3d2da 100644 +--- a/source/ref_gl/r_iqm.c ++++ b/source/ref_gl/r_iqm.c +@@ -1263,7 +1263,7 @@ void IQM_Vlight (vec3_t baselight, mnormal_t *normal, vec3_t angles, vec3_t ligh + void R_Mesh_SetupShell (int shell_skinnum, qboolean ragdoll, qboolean using_varray, vec3_t lightcolor);
+ void R_Mesh_SetupGLSL (int skinnum, rscript_t *rs, vec3_t lightcolor);
+
+-inline void IQM_DrawVBO (qboolean tangents)
++void IQM_DrawVBO (qboolean tangents)
+ {
+ qglEnableClientState( GL_VERTEX_ARRAY );
+ GL_BindVBO(vbo_xyz);
diff --git a/games-fps/alienarena/files/alienarena-7.66-ar.patch b/games-fps/alienarena/files/alienarena-7.66-ar.patch new file mode 100644 index 000000000000..7674e00e561d --- /dev/null +++ b/games-fps/alienarena/files/alienarena-7.66-ar.patch @@ -0,0 +1,13 @@ +Fix for -native-symlinks + +diff -r 262952236ff5 configure.ac +--- a/configure.ac Sun Oct 11 11:33:09 2020 +0000 ++++ b/configure.ac Sun Oct 11 11:33:37 2020 +0000 +@@ -65,6 +65,7 @@ + AC_PROG_RANLIB + AC_PROG_MKDIR_P + AM_PROG_CC_C_O ++AM_PROG_AR + PKG_PROG_PKG_CONFIG + + diff --git a/games-fps/alienarena/files/alienarena-7.66-format.patch b/games-fps/alienarena/files/alienarena-7.66-format.patch new file mode 100644 index 000000000000..3162a558afad --- /dev/null +++ b/games-fps/alienarena/files/alienarena-7.66-format.patch @@ -0,0 +1,11 @@ +--- a/source/game/p_client.c.old 2016-01-18 20:13:25.147714704 +0100 ++++ b/source/game/p_client.c 2016-01-18 20:13:38.776476727 +0100 +@@ -2123,7 +2123,7 @@ + #else
+ ent->ctype = 0; //alien is default
+ sprintf(modelpath, "players/%s/human", playermodel);
+- sprintf(ent->charModel, playermodel);
++ sprintf(ent->charModel, "%s", playermodel);
+ Q2_FindFile (modelpath, &file);
+ if(file)
+ {
|