* [gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/, games-fps/redeclipse/files/
@ 2015-07-12 8:31 Azamat H. Hackimov
0 siblings, 0 replies; 3+ messages in thread
From: Azamat H. Hackimov @ 2015-07-12 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 458c01dd93da7572afa2d9dcf9c686658640a7a3
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Jul 12 08:30:53 2015 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sun Jul 12 08:30:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=458c01dd
[games-fps/redeclipse] Bump to 1.5.2
Package-Manager: portage-2.2.20
Manifest-Sign-Key: A018DE8C
.../files/redeclipse-1.4_gamesdatadir.patch | 20 ------
.../files/redeclipse-1.5.2_unbundle-enet.patch | 76 ++++++++++++++++++++++
...declipse-1.4.ebuild => redeclipse-1.5.2.ebuild} | 48 +++++---------
3 files changed, 93 insertions(+), 51 deletions(-)
diff --git a/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch b/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch
deleted file mode 100644
index fbca38b..0000000
--- a/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nuar redeclipse-1.4.orig/src/engine/server.cpp redeclipse-1.4/src/engine/server.cpp
---- redeclipse-1.4.orig/src/engine/server.cpp 2013-04-18 23:14:32.899377004 +0600
-+++ redeclipse-1.4/src/engine/server.cpp 2013-04-18 23:18:12.528384587 +0600
-@@ -1407,13 +1407,13 @@
- chdir(dir);
- }
- #endif
-- loopi(3) if(!fileexists(findfile("data/config/keymap.cfg", "r"), "r"))
-+ loopi(3) if(!fileexists(findfile("/usr/share/games/redeclipse/data/config/keymap.cfg", "r"), "r"))
- {
- if(i != 2) chdir("..");
- else fatal("could not find data directory");
- }
-- addpackagedir("data");
-- defformatstring(gamedata)("game/%s", server::gameid());
-+ addpackagedir("/usr/share/games/redeclipse/data");
-+ defformatstring(gamedata)("/usr/share/games/redeclipse/game/%s", server::gameid());
- addpackagedir(gamedata);
- execfile("version.cfg", false, EXEC_VERSION);
- if(wanthome)
diff --git a/games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch b/games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch
new file mode 100644
index 0000000..5b8d9b1
--- /dev/null
+++ b/games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch
@@ -0,0 +1,76 @@
+--- redeclipse-1.5.2.orig/src/Makefile 2015-07-11 14:20:26.607791059 +0500
++++ redeclipse-1.5.2/src/Makefile 2015-07-11 14:37:20.846741852 +0500
+@@ -37,7 +37,7 @@
+ CXX_TEMP:=$(CXX)
+ override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
+
+-INCLUDES= -I. -Ishared -Iengine -Igame -Ienet/include
++INCLUDES= -I. -Ishared -Iengine -Igame
+
+
+ STRIP=
+@@ -81,7 +81,7 @@
+ endif
+ endif
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
+-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+ endif
+ ifneq (,$(findstring linux,$(PLATFORM)))
+ CLIENT_LIBS+= -lrt
+@@ -156,7 +156,7 @@
+ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINDLL) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
+ else
+ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
+-SERVER_LIBS= -Lenet -lenet -lz
++SERVER_LIBS= -lenet -lz
+ endif
+ SERVER_OBJS= \
+ shared/crypto-standalone.o \
+@@ -170,17 +170,12 @@
+ engine/server-standalone.o \
+ game/server-standalone.o
+
+-LIBENET= enet/libenet.a
+-
+ GENKEY_OBJS= engine/genkey.o shared/crypto-standalone.o
+
+ all:
+
+ default: all
+
+-clean-enet:
+- $(MAKE) -C enet clean
+-
+ clean-client:
+ @rm -fv $(CLIENT_PCH) $(CLIENT_OBJS) $(APPCLIENT)$(BIN_SUFFIX)
+
+@@ -190,7 +185,7 @@
+ clean-genkey:
+ @rm -fv $(GENKEY_OBJS) genkey$(BIN_SUFFIX)
+
+-clean: clean-enet clean-client clean-server clean-genkey
++clean: clean-client clean-server clean-genkey
+
+ %.h.gch: %.h
+ $(CXX) $(CXXFLAGS) -x c++-header -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
+@@ -256,9 +251,6 @@
+
+ install: install-client install-server
+
+-$(LIBENET):
+- $(MAKE) -C enet
+-
+ depend:
+ makedepend -Y -I. -Ishared -Iengine -Igame $(subst .o,.cpp,$(CLIENT_OBJS))
+ makedepend -a -o-standalone.o -Y -I. -Ishared -Iengine -Igame -DSTANDALONE $(subst -standalone.o,.cpp,$(SERVER_OBJS))
+--- redeclipse-1.5.2.orig/src/engine/engine.h 2015-07-11 14:20:25.554791110 +0500
++++ redeclipse-1.5.2/src/engine/engine.h 2015-07-11 15:01:02.790672864 +0500
+@@ -3,6 +3,7 @@
+
+ #include "version.h"
+ #include "cube.h"
++#include <enet/enet.h>
+
+ #define LAN_PORT 28799
+ #define MASTER_PORT 28800
diff --git a/games-fps/redeclipse/redeclipse-1.4.ebuild b/games-fps/redeclipse/redeclipse-1.5.2.ebuild
similarity index 68%
rename from games-fps/redeclipse/redeclipse-1.4.ebuild
rename to games-fps/redeclipse/redeclipse-1.5.2.ebuild
index e049e27..23f6a53 100644
--- a/games-fps/redeclipse/redeclipse-1.4.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -10,7 +10,7 @@ MAJOR_VERSION=$(get_version_component_range 1-2)
DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
HOMEPAGE="http://www.redeclipse.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MAJOR_VERSION}/${PN}_${PV}_nix.tar.bz2"
+SRC_URI="http://www.indiedb.com/downloads/mirror/86141/100/0789359bfb023138a8c5520fcb632b7d -> ${PN}_${PV}_nix.tar.bz2"
# According to doc/license.txt file
LICENSE="HPND ZLIB CC-BY-SA-3.0"
@@ -30,32 +30,14 @@ DEPEND="!dedicated? (
sys-libs/zlib"
RDEPEND="${DEPEND}"
-#S=${WORKDIR}/${PN}
-
src_prepare() {
- # Respect GAMES_DATADIR
- epatch "${FILESDIR}"/${P}_gamesdatadir.patch
-# sed -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
-# -e "s:::"
-#
-# -i src/engine/server.cpp
-
# Unbundle enet
- sed -e "s:\(client\)\: libenet:\1\::" \
- -e "s:\(server\)\: libenet:\1\::" \
- -e "s:-Lenet/.libs ::" \
- -e "s:-Ienet/include ::" \
- -i src/core.mk
- sed -e ":src/enet \\:d" -i src/dist.mk
+ epatch "${FILESDIR}/${P}_unbundle-enet.patch"
rm -r src/enet
- #respect LDFLAGS
-# sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \
-# -e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \
-# -i src/core.mk
-
# Menu and mans
sed -e "s:@APPNAME@:${PN}:" \
+ -e "/^Keywords=/s/$/;/" \
src/install/nix/redeclipse.desktop.am \
> src/install/nix/redeclipse.desktop
@@ -72,11 +54,9 @@ src_prepare() {
-e "s:@REDECLIPSE@:${PN}:g" \
doc/man/redeclipse-server.6.am \
> doc/man/redeclipse-server.6
-
}
src_compile() {
-# cd src
if ! use dedicated ; then
emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src client server
else
@@ -85,18 +65,24 @@ src_compile() {
}
src_install() {
- dogamesbin src/${PN}_server
- doman doc/man/redeclipse-server.6
- dodoc readme.txt doc/examples/servinit.cfg
- if ! use dedicated ; then
- dogamesbin src/redeclipse
+ local dir="${GAMES_PREFIX_OPT}/${PN}"
+ insinto "${dir}"
+ doins -r config data
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r data game
+ exeinto "${dir}"
+ doexe src/redeclipse_server_linux
+ if ! use dedicated ; then
+ doexe src/redeclipse_linux
newicon src/install/nix/${PN}_x128.png ${PN}.png
domenu src/install/nix/redeclipse.desktop
doman doc/man/redeclipse.6
fi
+ games_make_wrapper "${PN}" "${dir}/redeclipse_linux" "${dir}"
+ games_make_wrapper "${PN}_server" "${dir}/redeclipse_server_linux" "${dir}"
+
+ doman doc/man/redeclipse-server.6
+ dodoc readme.txt doc/examples/servinit.cfg
+
prepgamesdirs
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/, games-fps/redeclipse/files/
@ 2016-03-21 6:54 Azamat H. Hackimov
0 siblings, 0 replies; 3+ messages in thread
From: Azamat H. Hackimov @ 2016-03-21 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 113a19269f1af704112e05744daf56a955441775
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Mar 21 06:54:25 2016 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Mar 21 06:54:25 2016 +0000
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=113a1926
[games-fps/redeclipse] Bump to 1.5.3
...5.2_unbundle-enet.patch => redeclipse-1.5.3_unbundle-enet.patch} | 0
games-fps/redeclipse/metadata.xml | 1 -
.../redeclipse/{redeclipse-1.5.2.ebuild => redeclipse-1.5.3.ebuild} | 6 +++---
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch b/games-fps/redeclipse/files/redeclipse-1.5.3_unbundle-enet.patch
similarity index 100%
rename from games-fps/redeclipse/files/redeclipse-1.5.2_unbundle-enet.patch
rename to games-fps/redeclipse/files/redeclipse-1.5.3_unbundle-enet.patch
diff --git a/games-fps/redeclipse/metadata.xml b/games-fps/redeclipse/metadata.xml
index d5c68c3..e659e98 100644
--- a/games-fps/redeclipse/metadata.xml
+++ b/games-fps/redeclipse/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd></herd>
<maintainer>
<email>azamat.hackimov@gmail.com</email>
<name>Azamat H. Hackimov</name>
diff --git a/games-fps/redeclipse/redeclipse-1.5.2.ebuild b/games-fps/redeclipse/redeclipse-1.5.3.ebuild
similarity index 92%
rename from games-fps/redeclipse/redeclipse-1.5.2.ebuild
rename to games-fps/redeclipse/redeclipse-1.5.3.ebuild
index 23f6a53..325466e 100644
--- a/games-fps/redeclipse/redeclipse-1.5.2.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
EAPI=5
@@ -10,7 +10,7 @@ MAJOR_VERSION=$(get_version_component_range 1-2)
DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
HOMEPAGE="http://www.redeclipse.net/"
-SRC_URI="http://www.indiedb.com/downloads/mirror/86141/100/0789359bfb023138a8c5520fcb632b7d -> ${PN}_${PV}_nix.tar.bz2"
+SRC_URI="http://www.indiedb.com/downloads/mirror/87522/100/342c6b2c3783dcee476cdf0457a0d5e7 -> ${PN}_${PV}_nix.tar.bz2"
# According to doc/license.txt file
LICENSE="HPND ZLIB CC-BY-SA-3.0"
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/, games-fps/redeclipse/files/
@ 2013-04-18 18:34 Azamat H. Hackimov
0 siblings, 0 replies; 3+ messages in thread
From: Azamat H. Hackimov @ 2013-04-18 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 805ea5cea7b69bef11f67d4ccba8b069d2420446
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Apr 18 18:12:12 2013 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Thu Apr 18 18:12:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=805ea5ce
[games-fps/redeclipse] Version bump to 1.4.
Package-Manager: portage-2.1.11.55
Manifest-Sign-Key: A018DE8C
---
games-fps/redeclipse/ChangeLog | 10 +++-
.../files/redeclipse-1.4_gamesdatadir.patch | 20 ++++++++
...declipse-1.3.1.ebuild => redeclipse-1.4.ebuild} | 50 +++++++++++---------
3 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/games-fps/redeclipse/ChangeLog b/games-fps/redeclipse/ChangeLog
index 8ce0106..d52db7f 100644
--- a/games-fps/redeclipse/ChangeLog
+++ b/games-fps/redeclipse/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for games-fps/redeclipse
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*redeclipse-1.4 (18 Apr 2013)
+
+ 18 Apr 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com>
+ +files/redeclipse-1.4_gamesdatadir.patch, +redeclipse-1.4.ebuild,
+ -redeclipse-1.3.1.ebuild:
+ [games-fps/redeclipse] Version bump to 1.4.
+
*redeclipse-1.3.1 (30 Sep 2012)
30 Sep 2012; Azamat H. Hackimov <azamat.hackimov@gmail.com>
@@ -34,4 +41,3 @@
28 Mar 2011; Azamat H. Hackimov <azamat.hackimov@gmail.com> +metadata.xml,
+redeclipse-1.0.ebuild:
Initial ebuild 1.0 from source code.
-
diff --git a/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch b/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch
new file mode 100644
index 0000000..fbca38b
--- /dev/null
+++ b/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch
@@ -0,0 +1,20 @@
+diff -Nuar redeclipse-1.4.orig/src/engine/server.cpp redeclipse-1.4/src/engine/server.cpp
+--- redeclipse-1.4.orig/src/engine/server.cpp 2013-04-18 23:14:32.899377004 +0600
++++ redeclipse-1.4/src/engine/server.cpp 2013-04-18 23:18:12.528384587 +0600
+@@ -1407,13 +1407,13 @@
+ chdir(dir);
+ }
+ #endif
+- loopi(3) if(!fileexists(findfile("data/config/keymap.cfg", "r"), "r"))
++ loopi(3) if(!fileexists(findfile("/usr/share/games/redeclipse/data/config/keymap.cfg", "r"), "r"))
+ {
+ if(i != 2) chdir("..");
+ else fatal("could not find data directory");
+ }
+- addpackagedir("data");
+- defformatstring(gamedata)("game/%s", server::gameid());
++ addpackagedir("/usr/share/games/redeclipse/data");
++ defformatstring(gamedata)("/usr/share/games/redeclipse/game/%s", server::gameid());
+ addpackagedir(gamedata);
+ execfile("version.cfg", false, EXEC_VERSION);
+ if(wanthome)
diff --git a/games-fps/redeclipse/redeclipse-1.3.1.ebuild b/games-fps/redeclipse/redeclipse-1.4.ebuild
similarity index 64%
rename from games-fps/redeclipse/redeclipse-1.3.1.ebuild
rename to games-fps/redeclipse/redeclipse-1.4.ebuild
index 23e4dbb..e049e27 100644
--- a/games-fps/redeclipse/redeclipse-1.3.1.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit games versionator
@@ -10,19 +10,19 @@ MAJOR_VERSION=$(get_version_component_range 1-2)
DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
HOMEPAGE="http://www.redeclipse.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MAJOR_VERSION}/${PN}_${PV}_nix_bsd.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MAJOR_VERSION}/${PN}_${PV}_nix.tar.bz2"
-# According to license.txt file
-LICENSE="as-is ZLIB CCPL-Attribution-ShareAlike-3.0"
+# According to doc/license.txt file
+LICENSE="HPND ZLIB CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="dedicated"
DEPEND="!dedicated? (
media-libs/freetype:2
- media-libs/libsdl[opengl]
- media-libs/sdl-image[jpeg,png]
- media-libs/sdl-mixer[mp3,vorbis]
+ media-libs/libsdl:0[opengl]
+ media-libs/sdl-image:0[jpeg,png]
+ media-libs/sdl-mixer:0[mp3,vorbis]
virtual/opengl
x11-libs/libX11
)
@@ -30,23 +30,29 @@ DEPEND="!dedicated? (
sys-libs/zlib"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}
+#S=${WORKDIR}/${PN}
src_prepare() {
# Respect GAMES_DATADIR
- sed -i -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
- src/engine/server.cpp
+ epatch "${FILESDIR}"/${P}_gamesdatadir.patch
+# sed -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
+# -e "s:::"
+#
+# -i src/engine/server.cpp
# Unbundle enet
sed -e "s:\(client\)\: libenet:\1\::" \
-e "s:\(server\)\: libenet:\1\::" \
- -i src/Makefile
+ -e "s:-Lenet/.libs ::" \
+ -e "s:-Ienet/include ::" \
+ -i src/core.mk
+ sed -e ":src/enet \\:d" -i src/dist.mk
rm -r src/enet
#respect LDFLAGS
- sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \
- -e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \
- -i src/Makefile
+# sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \
+# -e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \
+# -i src/core.mk
# Menu and mans
sed -e "s:@APPNAME@:${PN}:" \
@@ -70,23 +76,23 @@ src_prepare() {
}
src_compile() {
- cd src
+# cd src
if ! use dedicated ; then
- emake CXXFLAGS="${CXXFLAGS}" STRIP= client server
+ emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src client server
else
- emake CXXFLAGS="${CXXFLAGS}" STRIP= server
+ emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src server
fi
}
src_install() {
- newgamesbin src/reserver ${PN}-server
+ dogamesbin src/${PN}_server
doman doc/man/redeclipse-server.6
- dodoc readme.txt doc/examples/serv{exec,init}.cfg
+ dodoc readme.txt doc/examples/servinit.cfg
if ! use dedicated ; then
- newgamesbin src/reclient ${PN}
+ dogamesbin src/redeclipse
insinto "${GAMES_DATADIR}"/${PN}
- doins -r data
+ doins -r data game
newicon src/install/nix/${PN}_x128.png ${PN}.png
domenu src/install/nix/redeclipse.desktop
doman doc/man/redeclipse.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-21 6:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-12 8:31 [gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/, games-fps/redeclipse/files/ Azamat H. Hackimov
-- strict thread matches above, loose matches on Subject: below --
2016-03-21 6:54 Azamat H. Hackimov
2013-04-18 18:34 Azamat H. Hackimov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox