diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2015-01-02 06:02:50 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-01-02 06:02:50 +0000 |
commit | cb9ae37de1b53f034434b74cb55d1132d88bfca7 (patch) | |
tree | befeaf079c45d0f628592acaf82072d15f40474c /games-fps | |
parent | tidy (diff) | |
download | gentoo-2-cb9ae37de1b53f034434b74cb55d1132d88bfca7.tar.gz gentoo-2-cb9ae37de1b53f034434b74cb55d1132d88bfca7.tar.bz2 gentoo-2-cb9ae37de1b53f034434b74cb55d1132d88bfca7.zip |
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/doomsday/ChangeLog | 9 | ||||
-rw-r--r-- | games-fps/doomsday/doomsday-1.10.2-r1.ebuild | 188 | ||||
-rw-r--r-- | games-fps/doomsday/doomsday-1.9.0_beta69.ebuild | 87 | ||||
-rw-r--r-- | games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch | 158 | ||||
-rw-r--r-- | games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch | 86 | ||||
-rw-r--r-- | games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch | 11 |
6 files changed, 8 insertions, 531 deletions
diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog index 0b19f0555634..b9e5db577f23 100644 --- a/games-fps/doomsday/ChangeLog +++ b/games-fps/doomsday/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-fps/doomsday # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.64 2015/01/02 06:01:37 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.65 2015/01/02 06:02:50 mr_bones_ Exp $ + + 02 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> + -doomsday-1.10.2-r1.ebuild, -doomsday-1.9.0_beta69.ebuild, + -files/doomsday-1.10.2-openal-link.patch, + -files/doomsday-1.9.0_beta69-png15.patch, + -files/doomsday-1.9.0_beta69-underlink.patch: + old 02 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> doomsday-1.14.5.ebuild: tidy diff --git a/games-fps/doomsday/doomsday-1.10.2-r1.ebuild b/games-fps/doomsday/doomsday-1.10.2-r1.ebuild deleted file mode 100644 index f79ab6e36b2e..000000000000 --- a/games-fps/doomsday/doomsday-1.10.2-r1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.10.2-r1.ebuild,v 1.1 2014/09/01 07:58:26 mgorny Exp $ - -# TODO: fmod support broken (deng_fmod) - -EAPI=5 - -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit python-r1 confutils eutils qt4-r2 games - -DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" -HOMEPAGE="http://www.dengine.net/" -SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools" -# we need python at build time, so -# snowberry? ( ${PYTHON_REQUIRED_USE} ) -# could break the build -REQUIRED_USE="${PYTHON_REQUIRED_USE} - demo? ( doom ) freedoom? ( doom ) resources? ( doom )" - -DEPEND=" - dev-qt/qtcore:4 - dev-qt/qtopengl:4 - dev-qt/qtgui:4 - net-misc/curl - sys-libs/zlib - !dedicated? ( - media-libs/libsdl[joystick,sound] - media-libs/sdl-mixer - media-libs/libpng:0 - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXxf86vm - ) - fluidsynth? ( media-sound/fluidsynth ) - openal? ( media-libs/openal ) - tools? ( sys-libs/ncurses )" -RDEPEND="${DEPEND} - !dedicated? ( - snowberry? ( - ${PYTHON_DEPS} - dev-lang/python-exec:2[${PYTHON_USEDEP}] - dev-python/wxpython[${PYTHON_USEDEP}] - ) - )" -DEPEND="${DEPEND} - ${PYTHON_DEPS}" -PDEPEND=" - !dedicated? ( - demo? ( games-fps/doom-data ) - freedoom? ( games-fps/freedoom ) - resources? ( games-fps/doomsday-resources ) - )" - -S=${S}/${PN} - -pkg_setup() { - games_pkg_setup - python_export_best -} - -src_prepare() { - sed -i \ - -e '/readme.path/s#$$PREFIX#/usr#' \ - client/client.pro || die "fixing docdir failed!" - - sed -i \ - -e "/^DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \ - config_unix.pri || die - - echo "CONFIG += nostrip" > config_user.pri - echo "PREFIX=/usr/games" >> config_user.pri - - if use dedicated ; then - echo "CONFIG += deng_noclient" >> config_user.pri - echo "CONFIG += deng_nosnowberry" >> config_user.pri - else - use snowberry && - echo "CONFIG += deng_snowberry" >> config_user.pri || \ - echo "CONFIG += deng_nosnowberry" >> config_user.pri - fi - - use fluidsynth && - echo "CONFIG += deng_fluidsynth" >> config_user.pri - - use tools || - echo "CONFIG += deng_notools" >> config_user.pri - - if use openal; then - echo "CONFIG += deng_openal" >> config_user.pri - sed -i \ - -e 's:\# Generic Unix.:LIBS += -lopenal:' \ - dep_openal.pri || die - epatch "${FILESDIR}"/${P}-openal-link.patch - fi - - qt4-r2_src_prepare -} - -#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args] -doom_make_wrapper() { - local name=$1 game=$2 icon=$3 de_title=$4 - shift 4 - games_make_wrapper $name \ - "doomsday -game ${game} $@" - make_desktop_entry $name "${de_title}" ${icon} -} - -src_configure() { - qt4-r2_src_configure -} - -src_install() { - qt4-r2_src_install - - dodoc "${WORKDIR}"/${P}/README.md - - mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die - dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom - - if use !dedicated ; then - if use snowberry ; then - python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday - - installmodules() { - # relocate snowberry module directory recursively into site-packages - python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry - # hack around improper path handling - sed -i \ - -e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \ - "${D%/}$(python_get_scriptdir)"/launch-doomsday || die - } - python_foreach_impl installmodules - # remove old module dir - rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die - - make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry - doicon ../snowberry/graphics/snowberry.png - fi - - if use doom; then - local res_arg - if use resources; then - res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded" - fi - - doicon ../snowberry/graphics/orb-doom.png - doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}" - elog "Created jdoom launcher. To play Doom place your doom.wad to" - elog "\"${GAMES_DATADIR}\"/doom-data" - elog - - if use demo; then - doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \ - "-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}" - fi - if use freedoom; then - doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \ - "-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad" - fi - fi - if use hexen; then - doicon ../snowberry/graphics/orb-hexen.png - doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen" - - elog "Created jhexen launcher. To play Hexen place your hexen.wad to" - elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen" - elog - fi - if use heretic; then - doicon ../snowberry/graphics/orb-heretic.png - doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic" - - elog "Created jheretic launcher. To play Heretic place your heretic.wad to" - elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic" - elog - fi - fi - - prepgamesdirs -} diff --git a/games-fps/doomsday/doomsday-1.9.0_beta69.ebuild b/games-fps/doomsday/doomsday-1.9.0_beta69.ebuild deleted file mode 100644 index 2858a3e0cf02..000000000000 --- a/games-fps/doomsday/doomsday-1.9.0_beta69.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.0_beta69.ebuild,v 1.7 2011/10/15 14:08:01 xarthisius Exp $ - -EAPI=2 -inherit cmake-utils games - -MY_P=deng-1.9.0-beta6.9 # FIXME, this is stupid -DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" -HOMEPAGE="http://www.dengine.net/" -SRC_URI="mirror://sourceforge/deng/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-amd64 ppc x86" -IUSE="openal" - -RDEPEND="virtual/opengl - virtual/glu - media-libs/libsdl[video] - media-libs/sdl-mixer - media-libs/sdl-net - media-libs/libpng - net-misc/curl - openal? ( media-libs/openal )" -DEPEND="${RDEPEND} - app-arch/zip" - -S=${WORKDIR}/${MY_P}/${PN} - -PATCHES=( "${FILESDIR}"/${P}-underlink.patch - "${FILESDIR}"/${P}-png15.patch -) - -src_configure() { - mycmakeargs=( - -Dbindir="${GAMES_BINDIR}" - -Ddatadir="${GAMES_DATADIR}"/${PN} - -Dlibdir="$(games_get_libdir)"/${PN} - $(cmake-utils_use openal BUILDOPENAL) ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die - dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom || die - - local game - for game in jdoom jheretic jhexen ; do - newgamesbin "${FILESDIR}"/wrapper ${game} - sed -i "s:GAME:${game}:" \ - "${D}/${GAMES_BINDIR}"/${game} \ - || die "sed ${GAMES_BINDIR}/${game} failed" - done - - # Make wrappers for the common wads - local n - for n in doom doom2 ; do - games_make_wrapper ${PN}-${n} \ - "jdoom -file \"${GAMES_DATADIR}\"/doom-data/${n}.wad" - done - - doman engine/doc/${PN}.6 - dodoc engine/doc/*.txt build/README - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "To play the original Doom levels, place doom.wad and/or doom2.wad" - elog "into ${GAMES_DATADIR}/doom-data" - elog "Then run doomsday-doom or doomsday-doom2 accordingly." - elog - elog "doom1.wad is the shareware demo wad consisting of 1 episode," - elog "and doom.wad is the full Doom 1 set of 3 episodes" - elog "(or 4 in the Final Doom wad)." - elog - elog "You can even emerge doom-data and/or freedoom, with the doomsday use" - elog "flag enabled, to play for free" -} diff --git a/games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch b/games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch deleted file mode 100644 index c59c48ac7aef..000000000000 --- a/games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch +++ /dev/null @@ -1,158 +0,0 @@ ---- doomsday/plugins/openal/src/driver_openal.cpp 2012-05-15 06:01:38.000000000 +0200 -+++ doomsday/plugins/openal/src/driver_openal.cpp 2012-05-29 07:37:21.170639342 +0200 -@@ -66,6 +66,7 @@ ALenum(*EAXGet) (const struct _GUID* pro - ALenum(*EAXSet) (const struct _GUID* propertySetID, ALuint prop, ALuint source, ALvoid* value, ALuint size); - #endif - -+extern "C" { - int DS_Init(void); - void DS_Shutdown(void); - void DS_Event(int type); -@@ -83,6 +84,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p - void DS_SFX_Listener(int prop, float value); - void DS_SFX_Listenerv(int prop, float* values); - int DS_SFX_Getv(int prop, void* values); -+} - - #ifdef WIN32 - // EAX 2.0 GUIDs -@@ -134,14 +136,14 @@ static void loadExtensions(void) - #endif - } - --int DS_Init(void) -+extern "C" int DS_Init(void) - { - // Already initialized? - if(initOk) return true; - - // Open a playback device. - /// @todo Shouldn't we use the system default device? -- device = alcOpenDevice((ALCchar*) "DirectSound3D"); -+ device = alcOpenDevice((ALCchar*) NULL); - if(!device) - { - Con_Message("OpenAL init failed (device: DirectSound3D).\n"); -@@ -167,7 +169,7 @@ int DS_Init(void) - return true; - } - --void DS_Shutdown(void) -+extern "C" void DS_Shutdown(void) - { - if(!initOk) return; - -@@ -185,12 +187,12 @@ void DS_Event(int /*type*/) - // Not supported. - } - --int DS_SFX_Init(void) -+extern "C" int DS_SFX_Init(void) - { - return true; - } - --sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate) -+extern "C" sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate) - { - sfxbuffer_t* buf; - ALuint bufName, srcName; -@@ -236,7 +238,7 @@ sfxbuffer_t* DS_SFX_CreateBuffer(int fla - return buf; - } - --void DS_SFX_DestroyBuffer(sfxbuffer_t* buf) -+extern "C" void DS_SFX_DestroyBuffer(sfxbuffer_t* buf) - { - ALuint srcName, bufName; - -@@ -251,7 +253,7 @@ void DS_SFX_DestroyBuffer(sfxbuffer_t* b - Z_Free(buf); - } - --void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample) -+extern "C" void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample) - { - if(!buf || !sample) return; - -@@ -277,7 +279,7 @@ void DS_SFX_Load(sfxbuffer_t* buf, struc - /** - * Stops the buffer and makes it forget about its sample. - */ --void DS_SFX_Reset(sfxbuffer_t* buf) -+extern "C" void DS_SFX_Reset(sfxbuffer_t* buf) - { - if(!buf) return; - -@@ -285,7 +287,7 @@ void DS_SFX_Reset(sfxbuffer_t* buf) - buf->sample = NULL; - } - --void DS_SFX_Play(sfxbuffer_t* buf) -+extern "C" void DS_SFX_Play(sfxbuffer_t* buf) - { - ALuint source; - -@@ -310,7 +312,7 @@ void DS_SFX_Play(sfxbuffer_t* buf) - buf->flags |= SFXBF_PLAYING; - } - --void DS_SFX_Stop(sfxbuffer_t* buf) -+extern "C" void DS_SFX_Stop(sfxbuffer_t* buf) - { - if(!buf || !buf->sample) return; - -@@ -318,7 +320,7 @@ void DS_SFX_Stop(sfxbuffer_t* buf) - buf->flags &= ~SFXBF_PLAYING; - } - --void DS_SFX_Refresh(sfxbuffer_t* buf) -+extern "C" void DS_SFX_Refresh(sfxbuffer_t* buf) - { - ALint state; - -@@ -368,7 +370,7 @@ static void setPan(ALuint source, float - alSourcefv(source, AL_POSITION, pos); - } - --void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value) -+extern "C" void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value) - { - ALuint source; - -@@ -411,7 +413,7 @@ void DS_SFX_Set(sfxbuffer_t* buf, int pr - } - } - --void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values) -+extern "C" void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values) - { - ALuint source; - -@@ -435,7 +437,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p - } - } - --void DS_SFX_Listener(int prop, float value) -+extern "C" void DS_SFX_Listener(int prop, float value) - { - switch(prop) - { -@@ -451,7 +453,7 @@ void DS_SFX_Listener(int prop, float val - } - } - --void DS_SFX_Listenerv(int prop, float* values) -+extern "C" void DS_SFX_Listenerv(int prop, float* values) - { - float ori[6]; - -@@ -489,7 +491,7 @@ void DS_SFX_Listenerv(int prop, float* v - } - } - --int DS_SFX_Getv(int /*prop*/, void* /*values*/) -+extern "C" int DS_SFX_Getv(int /*prop*/, void* /*values*/) - { - // Stub. - return 0; diff --git a/games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch b/games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch deleted file mode 100644 index ace2adf6c086..000000000000 --- a/games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- engine/portable/src/gl_png.c.old 2011-09-16 13:42:35.684991097 +0200 -+++ engine/portable/src/gl_png.c 2011-09-16 13:55:18.835900517 +0200 -@@ -119,18 +119,18 @@ - - // Check if it can be used. - canLoad = true; -- if(png_info->bit_depth != 8) -+ if(png_get_bit_depth(png_ptr, png_info) != 8) - { - Con_Message("PNG_Load: \"%s\": Bit depth must be 8.\n", fileName); - canLoad = false; - } -- else if(!png_info->width || !png_info->height) -+ else if(!png_get_image_width(png_ptr, png_info) || !png_get_image_height(png_ptr, png_info)) - { - Con_Message("PNG_Load: \"%s\": Bad file? Size is zero.\n", fileName); - canLoad = false; - } -- else if(png_info->channels <= 2 && -- png_info->color_type == PNG_COLOR_TYPE_PALETTE && -+ else if(png_get_channels(png_ptr, png_info) <= 2 && -+ png_get_color_type(png_ptr, png_info) == PNG_COLOR_TYPE_PALETTE && - !png_get_valid(png_ptr, png_info, PNG_INFO_PLTE)) - { - Con_Message("PNG_Load: \"%s\": Palette is invalid.\n", fileName); -@@ -140,9 +140,9 @@ - if(canLoad) - { - // Information about the image. -- *width = png_info->width; -- *height = png_info->height; -- *pixelSize = png_info->channels; -+ *width = png_get_image_width(png_ptr, png_info); -+ *height = png_get_image_height(png_ptr, png_info); -+ *pixelSize = png_get_channels(png_ptr, png_info); - - // Paletted images have three color components - // per pixel. -@@ -154,33 +154,36 @@ - // OK, let's copy it into Doomsday's buffer. - // \fixme Why not load directly into it? - retbuf = -- M_Malloc(4 * png_info->width * png_info->height); -+ M_Malloc(4 * (*width) * (*height)); - rows = png_get_rows(png_ptr, png_info); - for(i = 0; i < *height; ++i) - { -- if(png_info->channels >= 3) -+ if(png_get_channels(png_ptr, png_info) >= 3) - { -- memcpy(retbuf + i * (*pixelSize) * png_info->width, -- rows[i], (*pixelSize) * png_info->width); -+ memcpy(retbuf + i * (*pixelSize) * (*width), -+ rows[i], (*pixelSize) * (*width)); - } - else // Paletted image. - { - for(k = 0; k < *width; ++k) - { -- pixel = retbuf + ((*pixelSize) * (i * png_info->width + k)); -- off = k * png_info->channels; -- if(png_info->color_type == PNG_COLOR_TYPE_PALETTE) -+ pixel = retbuf + ((*pixelSize) * (i * (*width) + k)); -+ off = k * png_get_channels(png_ptr, png_info); -+ if(png_get_color_type(png_ptr, png_info) == PNG_COLOR_TYPE_PALETTE) - { -- pixel[0] = png_info->palette[rows[i][off]].red; -- pixel[1] = png_info->palette[rows[i][off]].green; -- pixel[2] = png_info->palette[rows[i][off]].blue; -+ png_colorp palette; -+ int num_palette; -+ png_get_PLTE(png_ptr, png_info, &palette, &num_palette); -+ pixel[0] = palette[rows[i][off]].red; -+ pixel[1] = palette[rows[i][off]].green; -+ pixel[2] = palette[rows[i][off]].blue; - } - else - { - // Grayscale. - pixel[0] = pixel[1] = pixel[2] = rows[i][off]; - } -- if(png_info->channels == 2) // Alpha data. -+ if(png_get_channels(png_ptr, png_info) == 2) // Alpha data. - { - pixel[3] = rows[i][off + 1]; - } diff --git a/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch b/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch deleted file mode 100644 index 782ebafaec45..000000000000 --- a/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.old 2011-05-16 16:00:22.000000000 +0200 -+++ CMakeLists.txt 2011-05-16 16:14:50.000000000 +0200 -@@ -645,7 +645,7 @@ - - IF (UNIX) - IF (NOT WIN32) -- TARGET_LINK_LIBRARIES (doomsday dl) -+ TARGET_LINK_LIBRARIES (doomsday dl m) - IF (NOT APPLE) - TARGET_LINK_LIBRARIES (doomsday ${X11_LIBRARIES}) - ENDIF (NOT APPLE) |