[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/files/, games-fps/rtcw/

2018-11-15 Thread Azamat H. Hackimov
commit: 56fdf1540bf95aa6f908d8d1f4bebe048a9d414c
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Thu Nov 15 20:58:27 2018 +
Commit: Azamat H. Hackimov  gentoo  ru>
CommitDate: Thu Nov 15 20:58:27 2018 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=56fdf154

[games-fps/rtcw] remove live

Need to migrate to iortcw. Still broken as uses games eclass.

Signed-off-by: Azamat H. Hackimov  gmail.com>

 games-fps/rtcw/files/Makefile.local  |  39 
 games-fps/rtcw/files/rtcw-zlib.patch |  16 ---
 games-fps/rtcw/files/wolf-ded.rc |  25 -
 games-fps/rtcw/metadata.xml  |   8 --
 games-fps/rtcw/rtcw-.ebuild  | 185 ---
 5 files changed, 273 deletions(-)

diff --git a/games-fps/rtcw/files/Makefile.local 
b/games-fps/rtcw/files/Makefile.local
deleted file mode 100644
index 451bde9..000
--- a/games-fps/rtcw/files/Makefile.local
+++ /dev/null
@@ -1,39 +0,0 @@
-#CFLAGS# use this for custom CFLAGS
-#V # set to show cc command line when building
-#DEFAULT_BASEDIR   # extra path to search for main and such
-#BUILD_SERVER  # build the 'iowolfmpded' server binary
-#BUILD_CLIENT  # build the 'iowolfmp' or 'iowolfsp' client binary
-#BUILD_BASEGAME# build the 'main' binaries
-#BUILD_GAME_SO # build the game shared libraries
-#BUILD_GAME_QVM# build the game qvms
-#BUILD_STANDALONE  # build binaries suited for stand-alone games
-#SERVERBIN # rename 'iowolfmpded' server binary
-#CLIENTBIN # rename 'iowolfmp' or 'iowolfsp' client binary
-#BASEGAME  # rename 'main'
-#BASEGAME_CFLAGS   # custom CFLAGS for basegame
-#USE_OPENAL# use OpenAL where available
-#USE_OPENAL_DLOPEN # link with OpenAL at runtime
-#USE_CURL  # use libcurl for http/ftp download support
-#USE_CURL_DLOPEN   # link with libcurl at runtime
-#USE_CODEC_VORBIS  # enable Ogg Vorbis support
-#USE_CODEC_OPUS# enable Ogg Opus support
-#USE_MUMBLE# enable Mumble support
-#USE_VOIP  # # enable built-in VoIP support
-#USE_INTERNAL_SPEEX# build internal speex library instead of dynamically 
linking against system libspeex
-#USE_FREETYPE  # enable FreeType support for rendering fonts
-#USE_INTERNAL_ZLIB # build and link against internal zlib
-#USE_INTERNAL_JPEG # build and link against internal JPEG library
-#USE_INTERNAL_OGG  # build and link against internal ogg library
-#USE_INTERNAL_OPUS # build and link against internal opus/opusfile 
libraries
-#USE_LOCAL_HEADERS # use headers local to ioq3 instead of system ones
-#DEBUG_CFLAGS  # C compiler flags to use for building debug version
-#COPYDIR   # the target installation directory
-#TEMPDIR   # specify userdefined directory for temp files
-CFLAGS=-march=native -mtune=native -O3 -pipe
-V=1
-USE_INTERNAL_LIBS=0
-USE_LOCAL_HEADERS=0
-USE_MUMBLE=0
-USE_VOIP=0
-USE_CODEC_OPUS=0
-NO_STRIP=1

diff --git a/games-fps/rtcw/files/rtcw-zlib.patch 
b/games-fps/rtcw/files/rtcw-zlib.patch
deleted file mode 100644
index aae0450..000
--- a/games-fps/rtcw/files/rtcw-zlib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: code/qcommon/ioapi.h
-===
-diff --git a/trunk/SP/code/qcommon/ioapi.h b/trunk/SP/code/qcommon/ioapi.h
 a/trunk/SP/code/qcommon/ioapi.h(revision 762)
-+++ b/trunk/SP/code/qcommon/ioapi.h(working copy)
-@@ -31,6 +31,10 @@
- #endif
- #endif
- 
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif

diff --git a/games-fps/rtcw/files/wolf-ded.rc b/games-fps/rtcw/files/wolf-ded.rc
deleted file mode 100644
index 41c84ae..000
--- a/games-fps/rtcw/files/wolf-ded.rc
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/files/wolf-ded.rc,v 1.4 
2004/07/14 22:16:39 agriffis Exp $
-
-depend() {
-   need net
-}
-
-start() {
-   ebegin "Starting RTCW dedicated server..."
-   screen -A -m -d -S rtcw su - dedicated -c GENTOO_DIR/startwolfded
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping RTCW dedicated server..."
-   kill `screen -list | grep rtcw | awk -F . '{ print $1 }' | sed -e s/.//`
-   eend $?
-
-}
-
-status() {
-   screen -list | grep rtcwded
-}

diff --git a/games-fps/rtcw/metadata.xml b/games-fps/rtcw/metadata.xml
deleted file mode 100644
index 6a07ecd..000
--- a/games-fps/rtcw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-games
-
-Return to Castle Wolfenstein is a first-person 3-D shooter based loosely on 
the original Wolfenstein series by id software.  The game takes place in Europe 
during World 

[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/

2017-09-07 Thread Vadim A. Misbakh-Soloviov
commit: 3d2ababc25d2128212c0438f29490cb1403ad621
Author: Vadim A. Misbakh-Soloviov  mva  name>
AuthorDate: Thu Sep  7 15:31:14 2017 +
Commit: Vadim A. Misbakh-Soloviov  mva  name>
CommitDate: Thu Sep  7 15:31:14 2017 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=3d2ababc

rtcw: fixed calling ext command in global scope (fixes bgo#630174)

 games-fps/rtcw/rtcw-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-fps/rtcw/rtcw-.ebuild b/games-fps/rtcw/rtcw-.ebuild
index 961a07a..8d0b8fb 100644
--- a/games-fps/rtcw/rtcw-.ebuild
+++ b/games-fps/rtcw/rtcw-.ebuild
@@ -55,7 +55,6 @@ RDEPEND="client? ( media-libs/libsdl2
#voip? ( media-libs/speex )"
 
 dir=${GAMES_PREFIX_OPT}/${PN}
-ARCHITECTURE=$(uname -m)
 
 use_switch() {
local flag="${1}" cfg_option="${2}" cfg_val=0
@@ -127,6 +126,8 @@ src_prepare(){
 
use curl && echo "USE_CURL_DLOPEN=0" >> ${makefile}
use openal && echo "USE_OPENAL_DLOPEN=0" >> ${makefile}
+
+   export ARCHITECTURE=$(uname -m)
 }
 
 src_compile() {



[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/

2015-08-27 Thread Christian Schmitt
commit: 23e47f7d7c32f8ac4a27b309c67f81891dd8d2ba
Author: Christian Schmitt  ilovelinux  de>
AuthorDate: Thu Aug 27 16:16:11 2015 +
Commit: Christian Schmitt  ilovelinux  de>
CommitDate: Thu Aug 27 16:16:11 2015 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=23e47f7d

[games-fps/rtcw-] Download most of the pk3 files from the last point 
release and install them as well (thanks again, polynomial-c)

 games-fps/rtcw/rtcw-.ebuild | 34 +++---
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/games-fps/rtcw/rtcw-.ebuild b/games-fps/rtcw/rtcw-.ebuild
index e50f689..961a07a 100644
--- a/games-fps/rtcw/rtcw-.ebuild
+++ b/games-fps/rtcw/rtcw-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 SCM=""
 [[ "${PV}" =  ]] && SCM="git-r3"
-inherit eutils games ${SCM}
+inherit eutils games unpacker ${SCM}
 unset SCM
 
 DESCRIPTION="Return to Castle Wolfenstein - IORTCW Project"
@@ -20,7 +20,11 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2"
+WOLF_POINTRELEASE="wolf-linux-1.41b.x86.run"
+SRC_URI+=" mirror://idsoftware/wolf/linux/${WOLF_POINTRELEASE}"
+# iortcw is GPL-2 but the point release files still have the original 
copyrights
+# from ID-software
+LICENSE="GPL-2 RTCW"
 SLOT="0"
 IUSE="+client curl mumble openal opus server truetype voip vorbis"
 
@@ -69,6 +73,16 @@ use_switch() {
fi
 }
 
+src_unpack() {
+   if [[ "${PV}" =  ]] ; then
+   git-r3_src_unpack
+   else
+   default
+   fi
+
+   unpack_makeself "${DISTDIR}/${WOLF_POINTRELEASE}"
+}
+
 src_prepare(){
epatch "${FILESDIR}/${PN}-zlib.patch"
cp "${FILESDIR}/Makefile.local" "${S}/SP/"
@@ -97,7 +111,9 @@ src_prepare(){
done
done
 
-   sed "/^CFLAGS=/s@=.*\$@=${CFLAGS}@" -i SP/Makefile.local || die
+   local makefile="SP/Makefile.local"
+
+   sed "/^CFLAGS=/s@=.*\$@=${CFLAGS}@" -i ${makefile} || die
 
use_switch client BUILD_CLIENT
use_switch curl USE_CURL
@@ -109,8 +125,8 @@ src_prepare(){
use_switch vorbis USE_CODEC_VORBIS
use_switch voip USE_VOIP
 
-   use curl && echo "USE_CURL_DLOPEN=0" >> SP/Makefile.local
-   use openal && echo "USE_OPENAL_DLOPEN=0" >> SP/Makefile.local
+   use curl && echo "USE_CURL_DLOPEN=0" >> ${makefile}
+   use openal && echo "USE_OPENAL_DLOPEN=0" >> ${makefile}
 }
 
 src_compile() {
@@ -136,6 +152,10 @@ src_install() {
#   || die
#fi
 
+   # install pk3 files from the point release
+   insinto ${dir}/main
+   doins ${WORKDIR}/main/*.pk3
+
doicon -s scalable misc/iortcw.svg
make_desktop_entry rtcwsp "Return to Castle Wolfenstein (SP)" iortcw
prepgamesdirs
@@ -143,8 +163,8 @@ src_install() {
 
 pkg_postinst() {
games_pkg_postinst
-   elog "You need to copy pak0.pk3, mp_pak0.pk3, mp_pak1.pk3, mp_pak2.pk3,"
-   elog "sp_pak1.pk3 and sp_pak2.pk3 sp_pak3.pk3 sp_pak4.pk3 from a Window 
installation into ${dir}/main/"
+   elog "You need to copy pak0.pk3, mp_pak0.pk3 and sp_pak1.pk3 from a"
+   elog "Window installation or your install media into ${dir}/main/"
elog
elog "To play the game run:"
elog " rtcwsp (single-player)"



[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/, games-fps/rtcw/files/

2015-08-25 Thread Christian Schmitt
commit: ad47a7041dd5606568c1ce7cc7ae175209e37cff
Author: Christian Schmitt  ilovelinux  de>
AuthorDate: Tue Aug 25 18:30:06 2015 +
Commit: Christian Schmitt  ilovelinux  de>
CommitDate: Tue Aug 25 18:30:06 2015 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ad47a704

[games-fps/rtcw-] Some nice improvements from Lars Wendler (polynomial-c), 
a Gentoo dev. Thanks a lot!

 games-fps/rtcw/files/Makefile.local |   3 +-
 games-fps/rtcw/rtcw-.ebuild | 101 
 2 files changed, 91 insertions(+), 13 deletions(-)

diff --git a/games-fps/rtcw/files/Makefile.local 
b/games-fps/rtcw/files/Makefile.local
index 462f31d..451bde9 100644
--- a/games-fps/rtcw/files/Makefile.local
+++ b/games-fps/rtcw/files/Makefile.local
@@ -30,11 +30,10 @@
 #COPYDIR   # the target installation directory
 #TEMPDIR   # specify userdefined directory for temp files
 CFLAGS=-march=native -mtune=native -O3 -pipe
+V=1
 USE_INTERNAL_LIBS=0
 USE_LOCAL_HEADERS=0
 USE_MUMBLE=0
 USE_VOIP=0
 USE_CODEC_OPUS=0
 NO_STRIP=1
-
-#CLIENT_CFLAGS+=-I/usr/include/opus

diff --git a/games-fps/rtcw/rtcw-.ebuild b/games-fps/rtcw/rtcw-.ebuild
index 6fdbcec..e50f689 100644
--- a/games-fps/rtcw/rtcw-.ebuild
+++ b/games-fps/rtcw/rtcw-.ebuild
@@ -3,19 +3,31 @@
 # $Id$
 
 EAPI=5
-inherit eutils games git-2
+
+SCM=""
+[[ "${PV}" =  ]] && SCM="git-r3"
+inherit eutils games ${SCM}
+unset SCM
 
 DESCRIPTION="Return to Castle Wolfenstein - IORTCW Project"
 HOMEPAGE="http://games.activision.com/games/wolfenstein/";
-EGIT_REPO_URI="https://github.com/iortcw/iortcw.git";
+if [[ "${PV}" =  ]] ; then
+   EGIT_REPO_URI="https://github.com/iortcw/iortcw.git";
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/iortcw/iortcw/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}/iortcw-${PV}"
+   KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
+IUSE="+client curl mumble openal opus server truetype voip vorbis"
+
+REQUIRED_USE="|| ( client server )
+   voip? ( opus )"
 
-UIDEPEND="
-   (
+DEPEND="client?(
media-libs/libsdl2
x11-libs/libX11
x11-libs/libXau
@@ -23,15 +35,82 @@ UIDEPEND="
x11-libs/libXext
virtual/opengl
)"
-RDEPEND="sys-libs/glibc
-   opengl? ( ${UIDEPEND} )"
+
+RDEPEND="client? ( media-libs/libsdl2
+   virtual/opengl
+   virtual/jpeg:0
+   curl? ( net-misc/curl )
+   mumble? ( media-sound/mumble )
+   openal? ( media-libs/openal )
+   opus? ( media-libs/libogg
+   media-libs/opus
+   media-libs/opusfile )
+   truetype? ( media-libs/freetype )
+   vorbis? ( media-libs/libogg
+   media-libs/libvorbis ) )"
+   #voip? ( media-libs/speex )"
 
 dir=${GAMES_PREFIX_OPT}/${PN}
 ARCHITECTURE=$(uname -m)
 
+use_switch() {
+   local flag="${1}" cfg_option="${2}" cfg_val=0
+   local makefile="${S}/SP/Makefile.local"
+   [[ -z "${flag}" ]] && die
+   [[ -z "${cfg_option}" ]] && die
+
+   use ${flag} && cfg_val=1
+
+   if grep -q "^${cfg_option}=" ${makefile} ; then
+   sed "/${cfg_option}=/s@[[:digit:]]@${cfg_val}@" -i ${makefile} \
+   || die
+   else
+   echo "${cfg_option}=${cfg_val}" >> ${makefile}
+   fi
+}
+
 src_prepare(){
epatch "${FILESDIR}/${PN}-zlib.patch"
cp "${FILESDIR}/Makefile.local" "${S}/SP/"
+
+   # remove bundled libs
+   local bundled_libs bundle bdir tdir
+
+   bundled_libs=(
+   AL # openal
+   SDL2
+   freetype-2.5.5
+   jpeg-8c
+   libcurl-7.35.0
+   libogg-1.3.2
+   libvorbis-1.3.4
+   opus-1.1
+   opusfile-0.6
+   zlib
+   )
+   for bundle in ${bundled_libs[@]} ; do
+   for tdir in MP SP ; do
+   bdir="${tdir}/code/${bundle}"
+   if [[ -d "${bdir}" ]] ; then
+   rm -r ${bdir} || die
+   fi
+   done
+   done
+
+   sed "/^CFLAGS=/s@=.*\$@=${CFLAGS}@" -i SP/Makefile.local || die
+
+   use_switch client BUILD_CLIENT
+   use_switch curl USE_CURL
+   use_switch mumble USE_MUMBLE
+   use_switch openal USE_OPENAL
+   use_switch opus USE_CODEC_OPUS
+   use_switch server BUILD_SERVER
+   use_switch truetype USE_FREETYPE
+   use_switch vorbis USE_CODEC_VORBIS
+   use_switch voip USE_VOIP
+
+   use curl && echo "USE_CURL_DLOPEN=0" >> SP/Makefile.local
+   use openal && echo "USE_OPENAL_DLOPEN=0" >> SP/Makefile.local
 }
 
 src_compile() {
@@ -48,7 +127,7 @@ src_install() {
#games_make_wrapper rtcwmp ./w

[gentoo-commits] proj/gamerlay:master commit in: games-fps/rtcw/files/, games-fps/rtcw/

2015-08-12 Thread Christian Schmitt
commit: 584791822fbe3eb62132742a84af15039f1e1411
Author: Christian Schmitt  ilovelinux  de>
AuthorDate: Wed Aug 12 08:30:32 2015 +
Commit: Christian Schmitt  ilovelinux  de>
CommitDate: Wed Aug 12 09:19:28 2015 +
URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=58479182

games-fps/rtcw: new live ebuild that installs the opensource iortcw version.
This ebuild contains the singleplayer only for now. Dedicated server and MP to 
be done

 games-fps/rtcw/files/Makefile.local  | 40 +
 games-fps/rtcw/files/rtcw-zlib.patch | 16 +++
 games-fps/rtcw/files/wolf-ded.rc | 25 +++
 games-fps/rtcw/metadata.xml  |  8 
 games-fps/rtcw/rtcw-.ebuild  | 85 
 5 files changed, 174 insertions(+)

diff --git a/games-fps/rtcw/files/Makefile.local 
b/games-fps/rtcw/files/Makefile.local
new file mode 100644
index 000..462f31d
--- /dev/null
+++ b/games-fps/rtcw/files/Makefile.local
@@ -0,0 +1,40 @@
+#CFLAGS# use this for custom CFLAGS
+#V # set to show cc command line when building
+#DEFAULT_BASEDIR   # extra path to search for main and such
+#BUILD_SERVER  # build the 'iowolfmpded' server binary
+#BUILD_CLIENT  # build the 'iowolfmp' or 'iowolfsp' client binary
+#BUILD_BASEGAME# build the 'main' binaries
+#BUILD_GAME_SO # build the game shared libraries
+#BUILD_GAME_QVM# build the game qvms
+#BUILD_STANDALONE  # build binaries suited for stand-alone games
+#SERVERBIN # rename 'iowolfmpded' server binary
+#CLIENTBIN # rename 'iowolfmp' or 'iowolfsp' client binary
+#BASEGAME  # rename 'main'
+#BASEGAME_CFLAGS   # custom CFLAGS for basegame
+#USE_OPENAL# use OpenAL where available
+#USE_OPENAL_DLOPEN # link with OpenAL at runtime
+#USE_CURL  # use libcurl for http/ftp download support
+#USE_CURL_DLOPEN   # link with libcurl at runtime
+#USE_CODEC_VORBIS  # enable Ogg Vorbis support
+#USE_CODEC_OPUS# enable Ogg Opus support
+#USE_MUMBLE# enable Mumble support
+#USE_VOIP  # # enable built-in VoIP support
+#USE_INTERNAL_SPEEX# build internal speex library instead of dynamically 
linking against system libspeex
+#USE_FREETYPE  # enable FreeType support for rendering fonts
+#USE_INTERNAL_ZLIB # build and link against internal zlib
+#USE_INTERNAL_JPEG # build and link against internal JPEG library
+#USE_INTERNAL_OGG  # build and link against internal ogg library
+#USE_INTERNAL_OPUS # build and link against internal opus/opusfile 
libraries
+#USE_LOCAL_HEADERS # use headers local to ioq3 instead of system ones
+#DEBUG_CFLAGS  # C compiler flags to use for building debug version
+#COPYDIR   # the target installation directory
+#TEMPDIR   # specify userdefined directory for temp files
+CFLAGS=-march=native -mtune=native -O3 -pipe
+USE_INTERNAL_LIBS=0
+USE_LOCAL_HEADERS=0
+USE_MUMBLE=0
+USE_VOIP=0
+USE_CODEC_OPUS=0
+NO_STRIP=1
+
+#CLIENT_CFLAGS+=-I/usr/include/opus

diff --git a/games-fps/rtcw/files/rtcw-zlib.patch 
b/games-fps/rtcw/files/rtcw-zlib.patch
new file mode 100644
index 000..aae0450
--- /dev/null
+++ b/games-fps/rtcw/files/rtcw-zlib.patch
@@ -0,0 +1,16 @@
+Index: code/qcommon/ioapi.h
+===
+diff --git a/trunk/SP/code/qcommon/ioapi.h b/trunk/SP/code/qcommon/ioapi.h
+--- a/trunk/SP/code/qcommon/ioapi.h(revision 762)
 b/trunk/SP/code/qcommon/ioapi.h(working copy)
+@@ -31,6 +31,10 @@
+ #endif
+ #endif
+ 
++#ifndef OF
++#define OF(x) x
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif

diff --git a/games-fps/rtcw/files/wolf-ded.rc b/games-fps/rtcw/files/wolf-ded.rc
new file mode 100644
index 000..41c84ae
--- /dev/null
+++ b/games-fps/rtcw/files/wolf-ded.rc
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/files/wolf-ded.rc,v 1.4 
2004/07/14 22:16:39 agriffis Exp $
+
+depend() {
+   need net
+}
+
+start() {
+   ebegin "Starting RTCW dedicated server..."
+   screen -A -m -d -S rtcw su - dedicated -c GENTOO_DIR/startwolfded
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping RTCW dedicated server..."
+   kill `screen -list | grep rtcw | awk -F . '{ print $1 }' | sed -e s/.//`
+   eend $?
+
+}
+
+status() {
+   screen -list | grep rtcwded
+}

diff --git a/games-fps/rtcw/metadata.xml b/games-fps/rtcw/metadata.xml
new file mode 100644
index 000..6a07ecd
--- /dev/null
+++ b/games-fps/rtcw/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+games
+
+Return to Castle Wolfenstein is a first-person 3-D shooter based loosely on 
the original Wolfenstein s