* [gentoo-commits] repo/gentoo:master commit in: games-fps/alienarena/, games-fps/alienarena/files/
@ 2018-04-29 17:13 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-04-29 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 6b8369377971c2503071bc38d68413ae11243b50
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 16:37:15 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 17:13:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b836937
games-fps/alienarena: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-fps/alienarena/alienarena-20130827-r1.ebuild | 73 ++++++++++++++++++++++
.../files/alienarena-20130827-format.patch | 4 +-
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
new file mode 100644
index 00000000000..fabaaecffeb
--- /dev/null
+++ b/games-fps/alienarena/alienarena-20130827-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2-utils
+
+MY_PN="alienarena-7.66"
+
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
+ http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +dga +vidmode +zlib"
+
+UIRDEPEND="
+ virtual/jpeg:0
+ media-libs/openal
+ media-libs/libvorbis
+ media-libs/freetype:2
+ virtual/glu
+ virtual/opengl
+ dga? ( x11-libs/libXxf86dga )
+ vidmode? ( x11-libs/libXxf86vm )
+ zlib? ( sys-libs/zlib )
+ net-misc/curl
+"
+UIDEPEND="
+ dga? ( x11-proto/xf86dgaproto )
+ vidmode? ( x11-proto/xf86vidmodeproto )
+"
+RDEPEND="!dedicated? ( ${UIRDEPEND} )"
+DEPEND="${RDEPEND}
+ !dedicated? ( ${UIDEPEND} )
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN/_/.}"
+
+PATCHES=( "${FILESDIR}"/${P}-format.patch )
+
+src_configure() {
+ econf \
+ --with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
+ --without-system-libode \
+ --disable-documents \
+ $(use_enable !dedicated client) \
+ $(use_with zlib) \
+ $(use_with vidmode xf86vm) \
+ $(use_with dga xf86dga)
+}
+
+src_install() {
+ DOCS="docs/README.txt README" default
+ if ! use dedicated ; then
+ make_desktop_entry ${PN} "Alien Arena"
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch b/games-fps/alienarena/files/alienarena-20130827-format.patch
index 4a88eab840f..3162a558afa 100644
--- a/games-fps/alienarena/files/alienarena-20130827-format.patch
+++ b/games-fps/alienarena/files/alienarena-20130827-format.patch
@@ -1,5 +1,5 @@
---- source/game/p_client.c.old 2016-01-18 20:13:25.147714704 +0100
-+++ source/game/p_client.c 2016-01-18 20:13:38.776476727 +0100
+--- 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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-fps/alienarena/, games-fps/alienarena/files/
@ 2020-11-15 20:03 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-11-15 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 1f6ad5398eafae0e922547b21224ce670ff2650c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 20:02:47 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 20:02:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6ad539
games-fps/alienarena: drop misversioned 20130827-r1
Closes: https://github.com/gentoo/gentoo/pull/17883
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-fps/alienarena/alienarena-20130827-r1.ebuild | 73 ----------------------
.../files/alienarena-20130827-format.patch | 11 ----
2 files changed, 84 deletions(-)
diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
deleted file mode 100644
index 8f32fffbdf5..00000000000
--- a/games-fps/alienarena/alienarena-20130827-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-MY_PN="alienarena-7.66"
-
-DESCRIPTION="Fast-paced multiplayer deathmatch game"
-HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
- http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +dga +vidmode +zlib"
-
-UIRDEPEND="
- virtual/jpeg:0
- media-libs/openal
- media-libs/libvorbis
- media-libs/freetype:2
- virtual/glu
- virtual/opengl
- dga? ( x11-libs/libXxf86dga )
- vidmode? ( x11-libs/libXxf86vm )
- zlib? ( sys-libs/zlib )
- net-misc/curl
-"
-UIDEPEND="
- dga? ( x11-base/xorg-proto )
- vidmode? ( x11-base/xorg-proto )
-"
-RDEPEND="!dedicated? ( ${UIRDEPEND} )"
-DEPEND="${RDEPEND}
- !dedicated? ( ${UIDEPEND} )
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN/_/.}"
-
-PATCHES=( "${FILESDIR}"/${P}-format.patch )
-
-src_configure() {
- econf \
- --with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
- --without-system-libode \
- --disable-documents \
- $(use_enable !dedicated client) \
- $(use_with zlib) \
- $(use_with vidmode xf86vm) \
- $(use_with dga xf86dga)
-}
-
-src_install() {
- DOCS="docs/README.txt README" default
- if ! use dedicated ; then
- make_desktop_entry ${PN} "Alien Arena"
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch b/games-fps/alienarena/files/alienarena-20130827-format.patch
deleted file mode 100644
index 3162a558afa..00000000000
--- a/games-fps/alienarena/files/alienarena-20130827-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
- {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-fps/alienarena/, games-fps/alienarena/files/
@ 2020-11-15 20:03 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-11-15 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 4a1f2b8d00cdd00ccc4740e2ab19777265078819
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Nov 15 20:02:44 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 20:02:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1f2b8d
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 <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-fps/alienarena/alienarena-7.66.ebuild | 71 ++++++++++++++++++++++
.../files/alienarena-7.66-C99-inline.patch | 25 ++++++++
.../alienarena/files/alienarena-7.66-ar.patch | 13 ++++
.../alienarena/files/alienarena-7.66-format.patch | 11 ++++
4 files changed, 120 insertions(+)
diff --git a/games-fps/alienarena/alienarena-7.66.ebuild b/games-fps/alienarena/alienarena-7.66.ebuild
new file mode 100644
index 00000000000..1630e7efd26
--- /dev/null
+++ b/games-fps/alienarena/alienarena-7.66.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic xdg
+
+MY_P="${P}-linux20130827"
+
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="
+ http://icculus.org/alienarena/Files/${MY_P}.tar.gz
+ http://red.planetarena.org/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +dga +vidmode +zlib"
+
+RDEPEND="
+ !dedicated? (
+ media-libs/freetype:2
+ media-libs/libvorbis
+ media-libs/openal
+ net-misc/curl
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ dga? ( x11-libs/libXxf86dga )
+ vidmode? ( x11-libs/libXxf86vm )
+ zlib? ( sys-libs/zlib )
+ )"
+DEPEND="${RDEPEND}
+ !dedicated? (
+ dga? ( x11-base/xorg-proto )
+ vidmode? ( x11-base/xorg-proto )
+ )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-format.patch
+ "${FILESDIR}"/${P}-ar.patch
+ "${FILESDIR}"/${P}-C99-inline.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # too many variables defined in .h to patch, https://bugs.gentoo.org/707814
+ append-cflags -fcommon
+
+ econf \
+ --with-icondir="${EPREFIX}/usr/share/icons/hicolor/48x48/apps/" \
+ --without-system-libode \
+ --disable-documents \
+ $(use_enable !dedicated client) \
+ $(use_with zlib) \
+ $(use_with vidmode xf86vm) \
+ $(use_with dga xf86dga)
+}
+
+src_install() {
+ DOCS=( docs/README.txt README )
+ default
+
+ use !dedicated && make_desktop_entry ${PN} "Alien Arena"
+}
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 00000000000..0b9166a2631
--- /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 00000000000..7674e00e561
--- /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 00000000000..3162a558afa
--- /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)
+ {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-15 20:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-29 17:13 [gentoo-commits] repo/gentoo:master commit in: games-fps/alienarena/, games-fps/alienarena/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-11-15 20:03 David Seifert
2020-11-15 20:03 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox