From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q3vnH-000843-B9 for garchives@archives.gentoo.org; Sun, 27 Mar 2011 19:38:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0ED1AE0654; Sun, 27 Mar 2011 19:38:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C261DE064F for ; Sun, 27 Mar 2011 19:38:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 346F81B416F for ; Sun, 27 Mar 2011 19:38:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5DB2D8006A for ; Sun, 27 Mar 2011 19:38:26 +0000 (UTC) From: "Nikoli" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nikoli" Message-ID: Subject: [gentoo-commits] proj/gamerlay:master commit in: games-fps/xonotic-data/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-fps/xonotic-data/ChangeLog games-fps/xonotic-data/metadata.xml games-fps/xonotic-data/xonotic-data-9999.ebuild X-VCS-Directories: games-fps/xonotic-data/ X-VCS-Committer: nikoli X-VCS-Committer-Name: Nikoli X-VCS-Revision: a57cec6cba3099290e178516decc28b6d2f92310 Date: Sun, 27 Mar 2011 19:38:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b33e2ce5147b33720cf574f0bae867a3 commit: a57cec6cba3099290e178516decc28b6d2f92310 Author: Nikoli lavabit com> AuthorDate: Sun Mar 27 19:36:21 2011 +0000 Commit: Nikoli lavabit com> CommitDate: Sun Mar 27 19:36:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3Da57cec6c xonotic-data: use cached-converter.sh, do not run 7za as root (Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit) --- games-fps/xonotic-data/ChangeLog | 4 ++ games-fps/xonotic-data/metadata.xml | 2 + games-fps/xonotic-data/xonotic-data-9999.ebuild | 61 +++++++++++++++++= +++--- 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/games-fps/xonotic-data/ChangeLog b/games-fps/xonotic-data/Ch= angeLog index 3702ccb..8dd9774 100644 --- a/games-fps/xonotic-data/ChangeLog +++ b/games-fps/xonotic-data/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 27 Mar 2011; Nikoli xonotic-data-9999.ebuild, + metadata.xml: + use cached-converter.sh, do not run 7za as root + 02 Feb 2011; Nikoli xonotic-data-9999.ebuild: move maps to xonotic-maps package =20 diff --git a/games-fps/xonotic-data/metadata.xml b/games-fps/xonotic-data= /metadata.xml index 9533e9d..1663973 100644 --- a/games-fps/xonotic-data/metadata.xml +++ b/games-fps/xonotic-data/metadata.xml @@ -8,6 +8,8 @@ Install files for client. Disabling is experimen= tal. + Use cached-converter.sh for converting tga to j= peg + Use low preset of cached-converter.sh: compress wav= to ogg, lower jpeg quality. Download and install maps. Compress resources dirs in zip archives. diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/= xonotic-data/xonotic-data-9999.ebuild index 3120f81..d79b77d 100644 --- a/games-fps/xonotic-data/xonotic-data-9999.ebuild +++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild @@ -16,11 +16,15 @@ EGIT_PROJECT=3D"${MY_PN}" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"" -IUSE=3D"+client +maps +zip" +IUSE=3D"+client +convert low +maps +zip" =20 RDEPEND=3D"" DEPEND=3D" ~games-util/fteqcc-xonotic-9999 + convert? ( + media-gfx/imagemagick[jpeg,png] + low? ( media-sound/vorbis-tools ) + ) zip? ( app-arch/p7zip ) " PDEPEND=3D"maps? ( ~games-fps/xonotic-maps-9999 )" @@ -28,6 +32,11 @@ PDEPEND=3D"maps? ( ~games-fps/xonotic-maps-9999 )" pkg_setup() { games_pkg_setup =20 + if use convert; then + ewarn "cached-converter.sh will use \"xonotic-cached-converter\" subdi= rectory of your DISTDIR" + echo + fi + if use !client; then ewarn "You have disabled client USE flag, only files for server will b= e installed." ewarn "This feature is experimental, if anything goes wrong, contact t= he maintainer." @@ -110,17 +119,14 @@ src_prepare() { =20 src_compile() { # Data - pushd data/xonotic-data.pk3dir + cd data + pushd xonotic-data.pk3dir emake \ FTEQCC=3D"/usr/bin/fteqcc-xonotic" \ FTEQCCFLAGS_WATERMARK=3D'' \ || die "emake data.pk3 failed" popd -} =20 -src_install() { - # Data - cd data rm -rf \ $(find -name '.git*') \ $(find -type d -name '.svn') \ @@ -130,6 +136,42 @@ src_install() { $(find -type f -name 'Makefile') \ || die "rm failed" =20 + if use convert; then + # Used git.eclass,v 1.50 as example + : ${CACHE_STORE_DIR:=3D"${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/xonotic-c= ached-converter"} + # initial download, we have to create master maps storage directory an= d play + # nicely with sandbox + if [[ ! -d ${CACHE_STORE_DIR} ]] ; then + addwrite "${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}" # git.eclass was used= , DISTDIR sure exists + mkdir -p "${CACHE_STORE_DIR}" \ + || die "can't mkdir ${CACHE_STORE_DIR}." + export SANDBOX_WRITE=3D"${SANDBOX_WRITE%%:/}" + fi + # allow writing into CACHE_STORE_DIR + addwrite "${CACHE_STORE_DIR}" + + if use low; then + export jpeg_qual_rgb=3D80 + export jpeg_qual_a=3D97 + export do_ogg=3Dtrue + export ogg_qual=3D1 + else + export jpeg_qual_rgb=3D97 + export jpeg_qual_a=3D99 + export do_ogg=3Dfalse + fi + + for i in data music maps nexcompat; do + find xonotic-${i}.pk3dir -type f -print0 | + git_src_repo=3D"${S}"/data/xonotic-${i}.pk3dir \ + CACHEDIR=3D"${CACHE_STORE_DIR}" \ + do_jpeg=3Dtrue \ + do_dds=3Dfalse \ + del_src=3Dtrue \ + xargs -0 "${S}"/misc/tools/cached-converter.sh + done + fi + if use zip; then for d in *.pk3dir; do pushd "${d}" @@ -138,9 +180,12 @@ src_install() { rm -rf "${d}" || die "rm failed" done fi +} =20 - insinto "${GAMES_DATADIR}/${MY_PN}/data" - doins -r . || die "doins data failed" +src_install() { + # Data + insinto "${GAMES_DATADIR}/${MY_PN}" + doins -r data || die "doins data failed" =20 prepgamesdirs }