diff options
author | Nikoli <nikoli@lavabit.com> | 2013-08-03 20:23:42 +0400 |
---|---|---|
committer | Nikoli <nikoli@lavabit.com> | 2013-08-03 20:23:42 +0400 |
commit | b51b15fe9eec7c98f66ea11cdaa482d37f0cb940 (patch) | |
tree | ecde93a375821edc834eae0fb88f2c6be871f572 /games-fps | |
parent | [games-strategy/curseofwar] New ebuild. (diff) | |
download | gamerlay-b51b15fe9eec7c98f66ea11cdaa482d37f0cb940.tar.gz gamerlay-b51b15fe9eec7c98f66ea11cdaa482d37f0cb940.tar.bz2 gamerlay-b51b15fe9eec7c98f66ea11cdaa482d37f0cb940.zip |
xonotic: build system was updated upstream
Package-Manager: portage-2.1.12.2
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/xonotic/metadata.xml | 3 | ||||
-rw-r--r-- | games-fps/xonotic/xonotic-9999.ebuild | 45 |
2 files changed, 27 insertions, 21 deletions
diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml index 568bba7..b99e5e4 100644 --- a/games-fps/xonotic/metadata.xml +++ b/games-fps/xonotic/metadata.xml @@ -10,6 +10,7 @@ <flag name='maps'>Download and install maps</flag> <flag name='ode'>Enable ODE physics engine support</flag> <flag name='s3tc'>Install <pkg>media-libs/libtxc_dxtn</pkg> for S3TC texture (de)compression, works with mesa drivers only</flag> - <flag name="server">Enable compilation of server</flag> + <flag name='server'>Enable compilation of server</flag> + <flag name='videocapture'>Enable video capture feature</flag> </use> </pkgmetadata> diff --git a/games-fps/xonotic/xonotic-9999.ebuild b/games-fps/xonotic/xonotic-9999.ebuild index e8c4a2f..b94426a 100644 --- a/games-fps/xonotic/xonotic-9999.ebuild +++ b/games-fps/xonotic/xonotic-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils games toolchain-funcs flag-o-matic git-2 +inherit eutils toolchain-funcs git-2 games DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine" HOMEPAGE="http://www.xonotic.org/" @@ -14,16 +14,16 @@ EGIT_REPO_URI="${BASE_URI}${PN}.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="alsa experimental +maps ode opengl +s3tc +sdl +server" +IUSE="cdda dedicated experimental +maps +ode opengl +s3tc +sdl +server videocapture" REQUIRED_USE=" || ( opengl sdl server ) + dedicated? ( server !opengl !sdl ) " UIRDEPEND=" media-libs/libogg - media-libs/libtheora[encode] + videocapture? ( media-libs/libtheora[encode] ) media-libs/libvorbis - media-libs/libmodplug x11-libs/libX11 virtual/opengl media-libs/freetype:2 @@ -44,11 +44,11 @@ RDEPEND=" x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86vm - alsa? ( media-libs/alsa-lib ) + media-libs/alsa-lib ) sdl? ( ${UIRDEPEND} - media-libs/libsdl[X,audio,joystick,opengl,video,alsa?] + media-libs/libsdl[X,audio,joystick,opengl,video] ) " DEPEND="${RDEPEND} @@ -56,13 +56,17 @@ DEPEND="${RDEPEND} x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xproto + cdda? ( virtual/os-headers ) ) " src_unpack() { git-2_src_unpack - use experimental || EGIT_BRANCH="div0-stable" + if use !experimental; then + EGIT_BRANCH="div0-stable" + EGIT_COMMIT=${EGIT_BRANCH} + fi EGIT_REPO_URI="${BASE_URI}darkplaces.git" \ EGIT_SOURCEDIR="${S}/darkplaces" \ git-2_src_unpack @@ -70,23 +74,17 @@ src_unpack() { src_prepare() { tc-export CC - # Required for DP_PRELOAD_DEPENDENCIES=1 - append-ldflags $(no-as-needed) - - epatch_user sed -e 's,Version=2.5,Version=1.0,' -i misc/logos/xonotic-*.desktop || die + cd darkplaces || die + epatch_user + sed -i \ -e "/^EXE_/s:darkplaces:${PN}:" \ -e "/^OPTIM_RELEASE=/s:$: ${CFLAGS}:" \ - -e "/^LDFLAGS_RELEASE=/s:$: ${LDFLAGS}:" \ - darkplaces/makefile.inc || die - - if use !alsa; then - sed -e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \ - -i darkplaces/makefile || die - fi + -e "/^LDFLAGS_RELEASE=/s:$: -DNO_BUILD_TIMESTAMPS ${LDFLAGS}:" \ + makefile.inc || die } src_compile() { @@ -99,9 +97,16 @@ src_compile() { cd darkplaces || die for i in ${targets}; do - emake STRIP=true \ + emake \ + STRIP=true \ DP_FS_BASEDIR="${GAMES_DATADIR}/${PN}" \ - DP_PRELOAD_DEPENDENCIES=1 \ + DP_SOUND_API="ALSA" \ + DP_LINK_ODE="shared" \ + DP_LINK_CRYPTO="shared" \ + $(usex cdda "" "DP_CDDA=") \ + $(usex ode "" "LIB_ODE=") \ + $(usex ode "" "CFLAGS_ODE=") \ + $(usex videocapture "" "DP_VIDEO_CAPTURE=") \ ${i} done } |