* [gentoo-commits] gentoo-x86 commit in games-fps/darkplaces: darkplaces-20121222.ebuild ChangeLog
@ 2013-01-14 18:40 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2013-01-14 18:40 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/01/14 18:40:42
Modified: ChangeLog
Added: darkplaces-20121222.ebuild
Log:
version bump (bug #452004)
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.16 games-fps/darkplaces/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 21 Jun 2012 19:34:31 -0000 1.15
+++ ChangeLog 14 Jan 2013 18:40:42 -0000 1.16
@@ -1,6 +1,12 @@
# ChangeLog for games-fps/darkplaces
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.15 2012/06/21 19:34:31 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.16 2013/01/14 18:40:42 mr_bones_ Exp $
+
+*darkplaces-20121222 (14 Jan 2013)
+
+ 14 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+ +darkplaces-20121222.ebuild:
+ version bump (bug #452004)
21 Jun 2012; Agostino Sarubbo <ago@gentoo.org> darkplaces-20110628.ebuild:
Stable for amd64, wrt bug #422129
@@ -71,4 +77,3 @@
+darkplaces-20060616_beta1.ebuild:
Initial import. Ebuild by Paul Bredbury <brebs@sent.com>. Closing bug
#106344.
-
1.1 games-fps/darkplaces/darkplaces-20121222.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild?rev=1.1&content-type=text/plain
Index: darkplaces-20121222.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild,v 1.1 2013/01/14 18:40:42 mr_bones_ Exp $
EAPI=2
inherit eutils flag-o-matic games
# Latest versions are in http://icculus.org/twilight/darkplaces/files/
MY_PV=${PV/_beta/beta}
MY_ENGINE="${PN}engine${MY_PV}.zip"
# Different Quake 1 engines expect the lights in different directories
# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
MY_LIGHTS="fuhquake-lits.rar"
DESCRIPTION="Enhanced engine for iD Software's Quake 1"
HOMEPAGE="http://icculus.org/twilight/darkplaces/"
SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
lights? (
http://www.fuhquake.net/files/extras/${MY_LIGHTS}
http://www.kgbsyndicate.com/romi/id1.pk3 )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
UIRDEPEND="virtual/jpeg
media-libs/libogg
media-libs/libvorbis
virtual/opengl
alsa? ( media-libs/alsa-lib )
sdl? ( media-libs/libsdl )
x11-libs/libX11
x11-libs/libXpm
x11-libs/libXxf86dga
x11-libs/libXxf86vm"
UIDEPEND="x11-proto/xextproto
x11-proto/xf86dgaproto
x11-proto/xf86vidmodeproto
x11-proto/xproto"
RDEPEND="net-misc/curl
cdinstall? ( games-fps/quake1-data )
demo? ( games-fps/quake1-demodata )
textures? ( >=games-fps/quake1-textures-20050820 )
opengl? ( ${UIRDEPEND} )
!opengl? ( sdl? ( ${UIRDEPEND} ) )
!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )"
DEPEND="lights? ( || (
app-arch/unrar
app-arch/rar ) )
opengl? (
${UIRDEPEND}
${UIDEPEND} )
!opengl? ( sdl? (
${UIRDEPEND}
${UIDEPEND} ) )
!opengl? ( !sdl? ( !dedicated? (
${UIRDEPEND}
${UIDEPEND} ) ) )
virtual/pkgconfig
app-arch/unzip"
S=${WORKDIR}/${PN}
dir=${GAMES_DATADIR}/quake1
opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
src_unpack() {
if use lights ; then
unpack "${MY_LIGHTS}"
unzip -qo "${DISTDIR}"/id1.pk3 || die "unzip id1.pk3 failed"
mv *.lit maps/ || die
mv ReadMe.txt rtlights.txt
fi
unpack "${MY_ENGINE}"
unpack ./${PN}*.zip
}
src_prepare() {
rm "${WORKDIR}"/README-SDL.txt
cd "${S}"
rm mingw_note.txt
strip-flags
# Only additional CFLAGS optimization is the -march flag
local march=$(get-flag -march)
sed -i \
-e "s:-lasound:$(pkg-config --libs alsa):" \
-e "/^CPUOPTIMIZATIONS/d" \
-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
-e "s:strip:true:" \
makefile.inc || die "sed makefile.inc failed"
if ! use cdsound ; then
# Turn the CD accesses off
sed -i \
-e "s:/dev/cdrom:/dev/null:" \
cd_linux.c || die "sed cd_linux.c failed"
sed -i \
-e 's:COM_CheckParm("-nocdaudio"):1:' \
cd_shared.c || die "sed cd_shared.c failed"
fi
}
src_compile() {
local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
# Preferred sound is alsa
local sound_api="NULL"
use oss && sound_api="OSS"
use alsa && sound_api="ALSA"
opts="${opts} DP_SOUND_API=${sound_api}"
local type="release"
use debug && type="debug"
# Only compile a maximum of 1 client
if use sdl ; then
emake ${opts} "sdl-${type}" || die "emake sdl-${type} failed"
elif opengl_client ; then
emake ${opts} "cl-${type}" || die "emake cl-${type} failed"
fi
if use dedicated ; then
emake ${opts} "sv-${type}" || die "emake sv-${type} failed"
fi
}
src_install() {
if opengl_client || use sdl ; then
local type=glx
use sdl && type=sdl
# darkplaces executable is needed, even just for demo
newgamesbin "${PN}-${type}" ${PN} || die "newgamesbin client failed"
newicon darkplaces72x72.png ${PN}.png || die "newicon failed"
if use demo ; then
# Install command-line for demo, even if not desktop entry
games_make_wrapper ${PN}-demo "${PN} -game demo"
fi
if use demo && ! use cdinstall ; then
make_desktop_entry ${PN}-demo "Dark Places (Demo)"
else
# Full version takes precedence over demo
make_desktop_entry ${PN} "Dark Places"
fi
fi
if use dedicated ; then
newgamesbin ${PN}-dedicated ${PN}-ded || die "newgamesbin ded failed"
fi
dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
if use lights ; then
insinto "${dir}"/id1
doins -r "${WORKDIR}"/{cubemaps,maps} || die "doins cubemaps maps failed"
if use demo ; then
# Set up symlinks, for the demo levels to include the lights
local d
for d in cubemaps maps ; do
dosym "${dir}/id1/${d}" "${dir}/demo/${d}"
done
fi
fi
prepgamesdirs
}
pkg_postinst() {
games_pkg_postinst
if ! use cdinstall && ! use demo ; then
elog "Place pak0.pak and pak1.pak in ${dir}/id1"
fi
if use sdl ; then
ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-fps/darkplaces: darkplaces-20121222.ebuild ChangeLog
@ 2013-01-22 18:39 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2013-01-22 18:39 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 13/01/22 18:39:39
Modified: darkplaces-20121222.ebuild ChangeLog
Log:
declutter
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 games-fps/darkplaces/darkplaces-20121222.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild?r1=1.1&r2=1.2
Index: darkplaces-20121222.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- darkplaces-20121222.ebuild 14 Jan 2013 18:40:42 -0000 1.1
+++ darkplaces-20121222.ebuild 22 Jan 2013 18:39:39 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild,v 1.1 2013/01/14 18:40:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20121222.ebuild,v 1.2 2013/01/22 18:39:39 mr_bones_ Exp $
EAPI=2
inherit eutils flag-o-matic games
@@ -69,7 +69,7 @@
src_unpack() {
if use lights ; then
unpack "${MY_LIGHTS}"
- unzip -qo "${DISTDIR}"/id1.pk3 || die "unzip id1.pk3 failed"
+ unzip -qo "${DISTDIR}"/id1.pk3 || die
mv *.lit maps/ || die
mv ReadMe.txt rtlights.txt
fi
@@ -95,16 +95,16 @@
-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
-e "s:strip:true:" \
- makefile.inc || die "sed makefile.inc failed"
+ makefile.inc || die
if ! use cdsound ; then
# Turn the CD accesses off
sed -i \
-e "s:/dev/cdrom:/dev/null:" \
- cd_linux.c || die "sed cd_linux.c failed"
+ cd_linux.c || die
sed -i \
-e 's:COM_CheckParm("-nocdaudio"):1:' \
- cd_shared.c || die "sed cd_shared.c failed"
+ cd_shared.c || die
fi
}
@@ -122,13 +122,13 @@
# Only compile a maximum of 1 client
if use sdl ; then
- emake ${opts} "sdl-${type}" || die "emake sdl-${type} failed"
+ emake ${opts} "sdl-${type}" || die
elif opengl_client ; then
- emake ${opts} "cl-${type}" || die "emake cl-${type} failed"
+ emake ${opts} "cl-${type}" || die
fi
if use dedicated ; then
- emake ${opts} "sv-${type}" || die "emake sv-${type} failed"
+ emake ${opts} "sv-${type}" || die
fi
}
@@ -139,8 +139,8 @@
use sdl && type=sdl
# darkplaces executable is needed, even just for demo
- newgamesbin "${PN}-${type}" ${PN} || die "newgamesbin client failed"
- newicon darkplaces72x72.png ${PN}.png || die "newicon failed"
+ newgamesbin "${PN}-${type}" ${PN} || die
+ newicon darkplaces72x72.png ${PN}.png || die
if use demo ; then
# Install command-line for demo, even if not desktop entry
@@ -156,14 +156,14 @@
fi
if use dedicated ; then
- newgamesbin ${PN}-dedicated ${PN}-ded || die "newgamesbin ded failed"
+ newgamesbin ${PN}-dedicated ${PN}-ded || die
fi
dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
if use lights ; then
insinto "${dir}"/id1
- doins -r "${WORKDIR}"/{cubemaps,maps} || die "doins cubemaps maps failed"
+ doins -r "${WORKDIR}"/{cubemaps,maps} || die
if use demo ; then
# Set up symlinks, for the demo levels to include the lights
local d
1.18 games-fps/darkplaces/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/darkplaces/ChangeLog?r1=1.17&r2=1.18
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 22 Jan 2013 18:33:25 -0000 1.17
+++ ChangeLog 22 Jan 2013 18:39:39 -0000 1.18
@@ -1,6 +1,10 @@
# ChangeLog for games-fps/darkplaces
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.17 2013/01/22 18:33:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.18 2013/01/22 18:39:39 mr_bones_ Exp $
+
+ 22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+ darkplaces-20121222.ebuild:
+ declutter
22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
-darkplaces-20100408.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-22 18:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-14 18:40 [gentoo-commits] gentoo-x86 commit in games-fps/darkplaces: darkplaces-20121222.ebuild ChangeLog Michael Sterrett (mr_bones_)
-- strict thread matches above, loose matches on Subject: below --
2013-01-22 18:39 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox