From 580e5350bc8789a3bda9d281ab21b1681f84a95b Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Fri, 2 Jan 2015 06:02:55 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- games-fps/doomsday/ChangeLog | 9 +- games-fps/doomsday/Manifest | 9 +- games-fps/doomsday/doomsday-1.10.2-r1.ebuild | 188 ------------------ .../doomsday/doomsday-1.9.0_beta69.ebuild | 87 -------- .../files/doomsday-1.10.2-openal-link.patch | 158 --------------- .../files/doomsday-1.9.0_beta69-png15.patch | 86 -------- .../doomsday-1.9.0_beta69-underlink.patch | 11 - 7 files changed, 9 insertions(+), 539 deletions(-) delete mode 100644 games-fps/doomsday/doomsday-1.10.2-r1.ebuild delete mode 100644 games-fps/doomsday/doomsday-1.9.0_beta69.ebuild delete mode 100644 games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch delete mode 100644 games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch delete mode 100644 games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch 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 + -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 doomsday-1.14.5.ebuild: tidy diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest index 293dc534c919..d2268652921e 100644 --- a/games-fps/doomsday/Manifest +++ b/games-fps/doomsday/Manifest @@ -1,17 +1,10 @@ -AUX doomsday-1.10.2-openal-link.patch 4100 SHA256 61b75a8c3bc299dcbf23c887ea3f5799c12f80e94bdb0924d58e02e222563d5a SHA512 cf9f027bd28ce5870a0bf460730a11bec1a68962efc9158261649bbd486358d7057495b59920fe57b1590c40598ccd0937e5be57744ba694a95de136085cc7d2 WHIRLPOOL 80d0517349108e98452e5da1fd1dfe8e2b14f0ffb19aa21db8ef0806a7d5ea3941b02c8f97851092ff4f72a93785cc911f8f685c20265251325a50063675cfe7 -AUX doomsday-1.9.0_beta69-png15.patch 5042 SHA256 0a406daa9afafffca641be96a7f153635655b5611d7747daaf67ca2f2a943d07 SHA512 87bdcf3fbe0160b3866632b51f07475dcba719b1fdcb24523a65f73afa66d59e57b28e9b278ca7c90255d83db4b03fee8d394b95a2ec79b7d61a2a38e09c4970 WHIRLPOOL 9470584b53c18f98115e3176a09a89a9765dad933547f365c82bb7f419ac6bde5c539fca36a41dfd838cb41f2cdc1fc408113a883aca3a3e71ce139a7397d800 -AUX doomsday-1.9.0_beta69-underlink.patch 386 SHA256 b774ef4cdad497668728668ec49b46b17c90a399cce5949337e8c0756cdfe0b7 SHA512 78b24e69ace32a0c9575c7164333694585e88a39fae6b3e9e85900fa606d54b21e1c69a52c928426757acaf242dd401cc7ebf7fabf2048dd518f2bd2be1a66f7 WHIRLPOOL 83e7fcd55991f0bfe6f069afb1a9ae5f1d7e491c80efda45918edab100627362b6243767a13f09e7ccdce7f928833522425dd2ac7baf5da481b96b5cde1529a9 AUX doomsday-1.9.8-2to3.patch 12480 SHA256 e9439d7d1c2482e73c623ac45271d627928a08419002c13e5e45d37de6008149 SHA512 76254c73caffac1a840f14f3572215af4ae86f03867e08761b8dc9d301562841f7cdee8aab54512c211dc41ce98b233d37c4ee641f71b87e231ccfdd5fd3354a WHIRLPOOL a17ad494f3ee56b2e6afa23f4cf173a27c57c076bb9acdf769c147ede29b6f7baa5ec11b1159965a677f83742d6e160a4e9005da4926b0c2e5337d76e44a89aa AUX doomsday-1.9.8-openal-64bit-fix.patch 1189 SHA256 1ed4cf8085a8867cc3df1ca46c3bb25fdee00fbba0f3fb9d4ac47aa76832adc7 SHA512 d7515ba91fe94e035feb5352de084435a379b80543108525bb6f839a85dbeadf21df053f317d965ff54f7602ce8ac5c67dd3ab9b8c7a33cd9a8b602cf5ef8908 WHIRLPOOL fb980b1cb395f943122656c0582e2e9480ff8d62bb0a7fcdd87c8d96f6c1f055032c5e8343d0820a7cf67288be66d3393d26aa3c829b3a2a8d96d4a0701572ce AUX doomsday-1.9.8-openal-link.patch 4100 SHA256 61b75a8c3bc299dcbf23c887ea3f5799c12f80e94bdb0924d58e02e222563d5a SHA512 cf9f027bd28ce5870a0bf460730a11bec1a68962efc9158261649bbd486358d7057495b59920fe57b1590c40598ccd0937e5be57744ba694a95de136085cc7d2 WHIRLPOOL 80d0517349108e98452e5da1fd1dfe8e2b14f0ffb19aa21db8ef0806a7d5ea3941b02c8f97851092ff4f72a93785cc911f8f685c20265251325a50063675cfe7 AUX wrapper 136 SHA256 64b959cfeb77bd778f16768c0ee509cd128eb855fa4acd8e7c37046c5885dbc8 SHA512 ec3fe44a7c07a835167780924423256d202450666cfa82f97269561794f28194e9f331c4581dfe7f810581c4adcc31c5ee11fba83441f8771885e40420c53049 WHIRLPOOL b4a6fd7c4d531eef4defbdf215a9c4318d3eff7f5e85dd77c5a4aa83f6fe709bfc09e99cac7d8c2901e18475c090e96f56e9010e659214cb2ece70b743603cc0 -DIST deng-1.9.0-beta6.9.tar.gz 6085833 SHA256 3553f6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af SHA512 937dbff6b8acbc19a986cf7ac460d577a7f9feb9db717a8ad630a8b11cc33d8728782cd9a13b13d61e28de3b8a50a433845eedfed498b79bcb9aba87f43839d2 WHIRLPOOL e7833c48a78f4a241c89ac38ad4f0da5b0d1a4395758d312f13c1c43d54da33b1f561dff6f259328f5f67578f92fa402601bb5ebed2d0a8643b4d1541b9b4e41 -DIST doomsday-1.10.2.tar.gz 8501449 SHA256 f4e27c70823464595b77b64e392f5405152ee83f6e71e3be56bbb8e3b83fb839 SHA512 f7fe378a5309faffca2aa5f83126626182c76a65993c2addb28cf5e78e0892e25bb5ecb4893aff3b4b6d0f420a558600082ae54a93e50a11306e23d9de8177f6 WHIRLPOOL d433b273a2c9a6c89a31532771149e2e4c5800cf55e8a05f1a38394a58c5c3e7fe1718e5813c2641bb247155e39c7b166aea63bd0f21fd136321038eb2f93117 DIST doomsday-1.14.5.tar.gz 14081857 SHA256 019cd0cf89e69d80cd8f6fbbd3e3fd57b8ae4d0bcdf4285e8a71caad9f46417e SHA512 f8ecf7d213ab57081858226ab4078fcf8f250271be19a3ce5883c01e53c43b5c0e7afc16085703fe19c0cbccb795c7fd1b651e3efb8a8e854160131c6374cd9a WHIRLPOOL 2351129c6dba951ca4975e6f6e92d78c75ad3e8f9648e9129a9f5a3a22c295b25c4fdb87d5208b2d3fe9c0af94c4ff968730929fbc645da9171018a672cfc60e DIST doomsday-1.9.8.tar.gz 7048039 SHA256 5401e5d58d197c287f7bc1318ee8429f27a76792ae6f2471c12d10281a569474 SHA512 e264d75e939c501290ae33cd69f4c408c83f57b33bc3c17eba4f7b334b1846d830717395b140a986817ea61dbc2918992b66be9e564b2d04d5eb5046fc3f5a65 WHIRLPOOL 66150a95d1e242b6612f39501d0a699eb194d519223b176fd647a250edf6d28478e0d3d52929f659a6e60a8928b227e38339e12323f48e791001be4e6754f638 -EBUILD doomsday-1.10.2-r1.ebuild 5169 SHA256 a2f2d6bd54913d49a7dc74c82150af82a752321ff3c1f737052e26a2fc826933 SHA512 b224c8d5cc92edce8a1e2132807a79ad1fcfe05ace79d5e5faf5ca594e55aa6b443153374cc091b7f7054b18b6012a14703b1ebaf8e22ba1b512f809c132cdfc WHIRLPOOL aa80b9ae8f682ab19dc3397201bb078c1bbd2f5704c385d85cb5841f43e7f2118274772b88adbbfa6a7b77a0f1ce6cadfa633d3b0c708b412bb3323de606462a EBUILD doomsday-1.14.5.ebuild 5098 SHA256 0da17790ab176c36cf7ceea73f3562c18c45967a2ef525f54ad308eb71803e35 SHA512 d900f743d93ab0514e2274c6b56edbc22e54ac52fc65f5f3779a8b6e73dab8ebaa35696234690df06d49434ee7c53bb8369964876d1795c8ab141cd30fecbc3f WHIRLPOOL 2f58827b2fa27f4d6c20fabadceb51ac9b5108f92d66323a3353d88e1bc3eee93adae1f647260e05b7fe4cb874dadf1fab4528c02fb56a61d302ff6758a242f9 -EBUILD doomsday-1.9.0_beta69.ebuild 2264 SHA256 5ba265d19c0868cebf7a53b32585babbc0fa99bbe29b3686da5c7fda5f227469 SHA512 7cb47d13d70cbfdda7e784f5d1bb3c8fd62b8e32d9298985eee744855356193a76034f7d83e72400ef0d362a4b3851dc7b35bf1c49bb60a19d27cbbcfd0d0e41 WHIRLPOOL 2f7eaa8a2794c45a0279c8c43ffc11e68bb79aaec709d1c675299252d5c0f48e746a51efb12c84b538332da0e43b1168fa7868c444edb961c06d9985469a5152 EBUILD doomsday-1.9.8.ebuild 3693 SHA256 45c8a64674de7519e7e33f85e66bed782dba0805f29c85d9ac84b01d6f14c9be SHA512 fc58a67c34e53651247aa4f86b1da0dfdb976c643da4b19838bbf7df6bd3bcaa2050c55bda7acc993ed5a22e06517b40c5f65737b1d6982009bfcb558b6171df WHIRLPOOL c6a354d8be1580115ae3ee10e463ffc7567284537873ec5a47ce17f5bbca6cac0b2d4cc05026a1b6594e8450d12ae1be2fbed6f0a6f480d6ba31a587770efec5 -MISC ChangeLog 9676 SHA256 a77696c013ecd5132575cd91ed8911b70f83db35b3b78fa8d28b0062136166e1 SHA512 31393ba702229f7f07f013167ba000de65839b1b00bf68b1f962ca6a7c15834ad19615eee220f0d58a60f28ebae9595953bd575d2c7bc2584c0d912b5040f57a WHIRLPOOL bc5bcad1f7241e111fea5850868cfea2e46ac1a36a80dccecab58b56308042f01fd2c4676892a6cc8a2e972586e9c18f3b0de37e66d3921f717eba500be10ba3 +MISC ChangeLog 9935 SHA256 0c0ad6d4e23c645e04730aa945e2ffce239af40afe927879afa23ed710af645c SHA512 4ce2d28e6838365ee71c654393548428ed7cec836471ab064612ec8c0071434fcf333bc36a73f1bda3a6e994772990563411b6092fb8a5847095cdebcfb3abe8 WHIRLPOOL e469cb4524b6a3f66423bb7319cec7a42ad46fde295be2c928f4eae8baa552fa91f923bd25845cdd1a77fff80b749e934c85efdd8326a928ad45fde5a08290b9 MISC metadata.xml 875 SHA256 cdf77347f052fb941dd7a789cd191c401d8ae0add020bed309baf4876e8c22b6 SHA512 039aa83733658ed1036f2c28798cbf28432e9b69dfd669ab3fe87ab2dafbffc33bb6455d82fdaf9a895379f8ab66cf03483fe089a96f2cf33ad7ba89ee8ed43c WHIRLPOOL 5b91d3f1d971b6ec695b3a089bb7285a4b331d79b6f3dd3713aeb99e7a0bd73ca4c3b0ca4bbb6fa335da82f4038ad1941884ed9d62cedb4475b1eee843ab9620 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 [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) -- 2.26.2