[gentoo-commits] proj/gamerlay:master commit in: games-action/descent2-data/
commit: f2f6af2f5de7a14d922d461c5fc6f43b154f42e2 Author: Alexander Turenko gmail com> AuthorDate: Thu Jan 19 12:55:35 2017 + Commit: Alexander Turenko gmail com> CommitDate: Thu Jan 19 12:55:35 2017 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=f2f6af2f games-action/descent2-data: updated patch's URL Now it hosted on dxx-rebirth's server. Thanks to Christian Beckhaeuser for it :) games-action/descent2-data/descent2-data-1.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-action/descent2-data/descent2-data-1.0-r2.ebuild b/games-action/descent2-data/descent2-data-1.0-r2.ebuild index f0a9e9d..6c9e548 100644 --- a/games-action/descent2-data/descent2-data-1.0-r2.ebuild +++ b/games-action/descent2-data/descent2-data-1.0-r2.ebuild @@ -10,7 +10,7 @@ inherit cdrom eutils games # Not possible to apply official 1.2 patch under Linux, so provide our own # http://www.interplay.com/support/support.php?id=104 # Should only be needed for original DOS CD-ROM release -MY_PATCH="http://totktonada.ru/gentoo/distfiles/d2xptch12.tgz; +MY_PATCH="http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz; # For GOG install MY_EXE="setup_descent_1_2.exe"
[gentoo-commits] proj/gamerlay:master commit in: games-action/dxx-rebirth/
commit: 9076bffb57e47a58156aed2e9f1c79515d6449e1 Author: Alexander Turenko gmail com> AuthorDate: Fri Dec 30 16:20:58 2016 + Commit: Alexander Turenko gmail com> CommitDate: Fri Dec 30 16:20:58 2016 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=9076bffb games-action/dxx-rebirth: added DEPEND into RDEPEND Also removed trailing whitespace and made parenthesis in *DEPEND more consistent in its style. games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild index be99ee8..b0dcf95 100644 --- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild +++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild @@ -10,7 +10,7 @@ MY_P=${PN}_v${PV}-src DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine" HOMEPAGE="http://www.dxx-rebirth.com/; SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz - opl3-musicpack? ( + opl3-musicpack? ( descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) ) sc55-musicpack? ( @@ -37,15 +37,14 @@ REQUIRED_USE="|| ( descent1 descent2 ) DEPEND="dev-games/physfs[hog,mvl,zip] media-libs/libsdl:0[X,sound,joystick,opengl?,video] music? ( - media-libs/sdl-mixer:0[midi,timidity,vorbis] - ) + media-libs/sdl-mixer:0[midi,timidity,vorbis] ) opengl? ( virtual/opengl - virtual/glu - )" -RDEPEND="data? ( - descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) ) - descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) )" + virtual/glu )" +RDEPEND="${DEPEND} + data? ( + descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) ) + descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) )" S="${WORKDIR}/${MY_P}"
[gentoo-commits] proj/gamerlay:master commit in: games-action/descent1-data/
commit: b8fcc6973b4af6f150a468ade33ad6f58bf9a933 Author: Alexander Turenko gmail com> AuthorDate: Thu Dec 29 17:15:09 2016 + Commit: Alexander Turenko gmail com> CommitDate: Thu Dec 29 22:28:43 2016 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=b8fcc697 games-action/descent1-data: updated URL, fix GOG install GOG setup file doesn't need the patch, but -cdinstall assumes RESTRICT=fetch and it was required manual downloading for the patch. games-action/descent1-data/descent1-data-1.0-r1.ebuild | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/games-action/descent1-data/descent1-data-1.0-r1.ebuild b/games-action/descent1-data/descent1-data-1.0-r1.ebuild index 4509d1b..9b0cf82 100644 --- a/games-action/descent1-data/descent1-data-1.0-r1.ebuild +++ b/games-action/descent1-data/descent1-data-1.0-r1.ebuild @@ -12,7 +12,7 @@ MY_EXE="setup_descent_1_2.exe" DESCRIPTION="Data files for Descent 1" HOMEPAGE="http://www.interplay.com/games/support.php?id=263; -SRC_URI="http://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip +SRC_URI="cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/descent-game-content-10to14a-patch.zip ) !cdinstall? ( $MY_EXE )" # See readme.txt @@ -102,7 +102,10 @@ src_unpack() { mv missions/descent.pig . || die 'descent.pig not found' # Unpack data file patches - unpack d1datapt.zip + if use cdinstall; then + mkdir d1datapt && cd d1datapt + unpack ../descent-game-content-10to14a-patch.zip + fi mkdir doc || die "mkdir doc failed" mv missions/*.txt missions/*.pdf doc/ # ignore fail
[gentoo-commits] proj/gamerlay:master commit in: games-action/dxx-rebirth/, games-action/dxx-rebirth/files/
commit: f614d06cffc32da0b8e76570ad2a1e1035a80e60 Author: Alexander Turenko gmail com> AuthorDate: Thu Dec 29 23:19:16 2016 + Commit: Alexander Turenko gmail com> CommitDate: Thu Dec 29 23:28:37 2016 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=f614d06c games-action/dxx-rebirth: version bump: 0.59.100 This is the first release shipped d1x-rebirth and d2x-rebirth as the single package (but with two executables), so rather then update two ebuilds separately I merged it into this one. For more information see the release announcement: * http://www.dxx-rebirth.com/news/dxx-rebirth-v0-60-beta-1-released/ Changes --- Merged {d1x,d2x}-rebirth ebuilds into one named dxx-rebirth (this follows up upstream's code bases merging). Added "descent1" and "descent2" USE flags for controlling which game(s) install. Updated from EAPI 5 to 6. Dropped "games" eclass using. * https://bugs.gentoo.org/show_bug.cgi?id=574082 Migrate from LINGUAS to L10N: * https://github.com/gentoo/gentoo/commit/05275527fc624b00a9aa42cc2f6d4b480af463f4 Replaced games herd in metadata.xml with me as the maintainer: * https://github.com/gentoo/gentoo/commit/cfd93d768e79a349f1e762b92773190295c36980 * https://github.com/gentoo/gentoo/commit/8849b098c085c07e4ac1257e5b39df35d98c3c58 Updated `SConstruct` file patch to get rid of hardcoded CXXFLAGS="-g -O2". Added `SConstruct` file patch and prefix='/usr' scons argument to looking games' data in `/usr/share/games/{d1x,d2x}` instead of default `/usr/local/share/games/{d1x,d2x}-rebirth` (not sure how to achieve this on the recent version w/o patching). Moved documentation installing to the appropriate stage (from prepare to install). Changed dependency type for game data ebuilds from PDEPEND to RDEPEND as devmanual suggests. Added `doc` USE flag (disabled by default). Added the message about necessary of libsdl alsa/oss/pulseaudio USE flag. .../dxx-rebirth/dxx-rebirth-0.59.100.ebuild| 127 + .../files/dxx-rebirth-0.59.100-flags.patch | 10 ++ .../files/dxx-rebirth-0.59.100-sharepath.patch | 11 ++ games-action/dxx-rebirth/metadata.xml | 35 ++ 4 files changed, 183 insertions(+) diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild new file mode 100644 index 000..be99ee8 --- /dev/null +++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=6 + +inherit eutils scons-utils + +MY_P=${PN}_v${PV}-src +DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine" +HOMEPAGE="http://www.dxx-rebirth.com/; +SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz + opl3-musicpack? ( + descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) + descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) ) + sc55-musicpack? ( + descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa ) + descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) ) + l10n_de? ( + descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa ) + descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) ) + textures? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa )" + +RESTRICT=mirror + +LICENSE="D1X GPL-2 public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+data debug +descent1 +descent2 doc ipv6 l10n_de +music +opengl opl3-musicpack sc55-musicpack +textures" + +REQUIRED_USE="|| ( descent1 descent2 ) + ?? ( opl3-musicpack sc55-musicpack ) + opl3-musicpack? ( music ) + sc55-musicpack? ( music ) + textures ( descent1 )" + +DEPEND="dev-games/physfs[hog,mvl,zip] + media-libs/libsdl:0[X,sound,joystick,opengl?,video] + music? ( + media-libs/sdl-mixer:0[midi,timidity,vorbis] + ) + opengl? ( + virtual/opengl + virtual/glu + )" +RDEPEND="data? ( + descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) ) + descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${MY_P}.tar.gz +} + +src_prepare() { + # * flags patch -- remove hardcoded '-g -O2' + # * sharepath patch -- change location of games' data from + # /usr/share/games/{d1x,d2x}-rebirth to /usr/share/games/{d1x,d2x} + PATCHES=("${FILESDIR}"/${P}-{flags,sharepath}.patch) + default +
[gentoo-commits] proj/gamerlay:master commit in: games-action/d1x-rebirth/files/, games-action/d1x-rebirth/, ...
commit: 3b850aba481dccb2e6fe066e165c6f7c76734df1 Author: Alexander Turenko gmail com> AuthorDate: Tue Dec 27 20:44:29 2016 + Commit: Alexander Turenko gmail com> CommitDate: Tue Dec 27 20:44:29 2016 + URL:https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=3b850aba games-action/d[12]x-rebirth: clean up, fix indent .../files/d1x-rebirth-0.57.3-flags.patch| 21 - games-action/d1x-rebirth/metadata.xml | 4 ++-- games-action/d2x-rebirth/metadata.xml | 4 ++-- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.57.3-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.57.3-flags.patch deleted file mode 100644 index b8aaa72..000 --- a/games-action/d1x-rebirth/files/d1x-rebirth-0.57.3-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ d1x-rebirth_v0.57.3-src/SConstruct -+++ d1x-rebirth_v0.57.3-src/SConstruct -@@ -390,7 +390,6 @@ - env.Append(CPPFLAGS = ['-g']) - else: - env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE']) -- env.Append(CPPFLAGS = ['-O2']) - - # profiler? - if (profiler == 1): -@@ -419,8 +418,9 @@ - print '\n' - - env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(sharepath) + '\\"')]) -+env.Append(LINKFLAGS = [str(lflags)]) - # finally building program... --env.Program(target=str(target), source = common_sources, LIBS = libs, LINKFLAGS = str(lflags)) -+env.Program(target=str(target), source = common_sources, LIBS = libs) - if (sys.platform != 'darwin'): - env.Install(BIN_DIR, str(target)) - env.Alias('install', BIN_DIR) diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml index f41ce91..7a44d1e 100644 --- a/games-action/d1x-rebirth/metadata.xml +++ b/games-action/d1x-rebirth/metadata.xml @@ -17,7 +17,7 @@ music, recorded with the Roland Sound Canvas SC-55 MIDI module Include high resolution (640x480) backgrounds, briefing images and fonts - Adds music support - Install data files +Adds music support +Install data files diff --git a/games-action/d2x-rebirth/metadata.xml b/games-action/d2x-rebirth/metadata.xml index 0078f1c..d1e4c62 100644 --- a/games-action/d2x-rebirth/metadata.xml +++ b/games-action/d2x-rebirth/metadata.xml @@ -19,7 +19,7 @@ music, recorded with the Yamaha YMF262 OPL3 soundchip Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module - Adds music support - Install data files +Adds music support +Install data files