Added patch submitted to bug #98810 and closing bug #98810.

Package-Manager: portage-2.0.52-r1

diff --git a/games-action/d2x/ChangeLog b/games-action/d2x/ChangeLog
index 2bb640c76609f9a3a00e8a4ae5a3cacf1949f000..2d2793c7053e705949a5938c199dbbc8247ebf79 100644 (file)
--- a/games-action/d2x/ChangeLog
+++ b/games-action/d2x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/d2x
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.10 2005/07/07 13:39:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.11 2005/09/29 19:59:30 wolf31o2 Exp $
+
+*d2x-0.2.5-r2 (29 Sep 2005)
+
+  29 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/d2x-0.2.5-dofpcalcs-macro.patch, +d2x-0.2.5-r2.ebuild:
+  Added patch submitted to bug #98810 and closing bug #98810.
 
   07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> d2x-0.2.5-r1.ebuild:
   Changed nocd to cdinstall, since it is optional and breaks interactivity.

diff --git a/games-action/d2x/Manifest b/games-action/d2x/Manifest
index 699e0389cf3de675d1d389f5a107bd48d6538462..38edcaaf4a7ccd4d131f9b442a265983134ac189 100644 (file)
--- a/games-action/d2x/Manifest
+++ b/games-action/d2x/Manifest
@@ -1,7 +1,10 @@
-MD5 b12ce707e74812859c7ae92c1d007aca ChangeLog 1342
+MD5 a2ec04277f0b7a88a95de3e851944d54 ChangeLog 1552
 MD5 abfafce3ebdf03bbcfa5c289391e0986 d2x-0.2.5-r1.ebuild 2649
 MD5 e560b26a3a230cfe16b0871e80234121 d2x-0.2.5.ebuild 1978
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 59771d56979cfd368c761da689c03ef5 d2x-0.2.5-r2.ebuild 2698
 MD5 499b24f4949333a0c04d1177aa3213e5 files/0.2.5-shellscripts.patch 747
 MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5 123
 MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5-r1 123
+MD5 db543dff86446ad7eec4b3d2f633106b files/d2x-0.2.5-dofpcalcs-macro.patch 584
+MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5-r2 123

diff --git a/games-action/d2x/d2x-0.2.5-r2.ebuild b/games-action/d2x/d2x-0.2.5-r2.ebuild
new file mode 100644 (file)
index 0000000..da6126b
--- /dev/null
+++ b/games-action/d2x/d2x-0.2.5-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5-r2.ebuild,v 1.1 2005/09/29 19:59:30 wolf31o2 Exp $
+
+inherit flag-o-matic eutils games
+
+DATAFILE="d2shar10"
+DESCRIPTION="Descent 2"
+HOMEPAGE="http://icculus.org/d2x/"
+SRC_URI="http://icculus.org/d2x/src/${P}.tar.gz
+       !cdinstall? ( http://icculus.org/d2x/data/${DATAFILE}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="cdinstall debug opengl ggi svga"
+
+RDEPEND="media-libs/libsdl
+       media-libs/sdl-image
+       cdinstall? ( app-arch/unarj )
+       opengl? ( virtual/opengl )
+       ggi? ( media-libs/libggi )
+       svga? ( media-libs/svgalib )"
+DEPEND="${RDEPEND}
+       x86? ( dev-lang/nasm )"
+
+pkg_setup() {
+       games_pkg_setup
+
+       if use cdinstall ; then
+               if [[ ! -e ${DISTDIR}/descent2.sow ]] ; then
+                       cdrom_get_cds d2data
+                       if [ -e ${CDROM_ROOT}/d2data/descent2.sow ] ; then
+                               export CDROM_ROOT=${CDROM_ROOT}/d2data
+                               einfo "Found the original Descent2 CD"
+                               einfo "Copying descent2.sow to ${DISTDIR}"
+                               cp ${CDROM_ROOT}/descent2.sow ${DISTDIR}/descent2.sow
+                       else
+                               die "You need the original Descent2 CD"
+                       fi
+               fi
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       if use cdinstall ; then
+               cd ${WORKDIR}
+               mkdir SOW
+               cd SOW
+               unarj e ${DISTDIR}/descent2.sow
+       fi
+       rm *.{exe,bat}
+       cd ${S}
+       epatch ${FILESDIR}/${PV}-shellscripts.patch
+       epatch ${FILESDIR}/${P}-dofpcalcs-macro.patch
+}
+
+src_compile() {
+       # --disable-network --enable-console
+       local myconf="$(use_enable x86 assembler)"
+       use debug \
+               && myconf="${myconf} --enable-debug --disable-release" \
+               || myconf="${myconf} --disable-debug --enable-release"
+       # we do this because each of the optional guys define the same functions
+       # in gr, thus when they go to link they cause redefine errors ...
+       # we build each by it self, save the binary file, clean up, and start over
+       mkdir my-bins
+       for ren in sdl $(useq opengl && echo opengl) \
+                       $(useq svga && echo svga) $(useq ggi && echo ggi)
+       do
+               [ "${ren}" == "sdl" ] \
+                       && renconf="" \
+                       || renconf="--with-${ren}"
+               [ "${ren}" == "svga" ] \
+                       && defflags="-DSVGALIB_INPUT" \
+                       || defflags=""
+               make distclean
+               egamesconf \
+                       ${myconf} \
+                       ${renconf} \
+                       --datadir=${GAMES_DATADIR_BASE} \
+                       || die "conf ${ren}"
+               emake CXXFLAGS="${CXXFLAGS} ${defflags}" || die "build ${ren}"
+               mv d2x* my-bins/
+       done
+}
+
+src_install() {
+       make install DESTDIR=${D} || die
+       dogamesbin my-bins/*
+       dodir ${GAMES_DATADIR}/${PN}
+       if use cdinstall ; then
+               cp -r ${WORKDIR}/SOW/* ${D}/${GAMES_DATADIR}/${PN}/
+       else
+               cp -r ${WORKDIR}/${DATAFILE}/* ${D}/${GAMES_DATADIR}/${PN}/
+       fi
+       dodoc AUTHORS ChangeLog NEWS README* TODO readme.txt
+       prepgamesdirs
+}

diff --git a/games-action/d2x/files/d2x-0.2.5-dofpcalcs-macro.patch b/games-action/d2x/files/d2x-0.2.5-dofpcalcs-macro.patch
new file mode 100644 (file)
index 0000000..9178fb1
--- /dev/null
+++ b/games-action/d2x/files/d2x-0.2.5-dofpcalcs-macro.patch
@@ -0,0 +1,12 @@
+diff -ur d2x-0.2.5.org/texmap/tmapppro.S d2x-0.2.5/texmap/tmapppro.S
+--- d2x-0.2.5.org/texmap/tmapppro.S    2005-07-12 15:29:34.526000439 -0500
++++ d2x-0.2.5/texmap/tmapppro.S        2005-07-12 15:29:57.245237920 -0500
+@@ -122,7 +122,7 @@
+ // dzdx to z, and finally puts 64 back onto the stack. At the end of
+ // the macro, the stack contains: 64, z, u, v.
+ 
+-.macro DoFPCalcs 0            // The FP stack after each instruction:
++.macro DoFPCalcs              // The FP stack after each instruction:
+                               //               64/z  z    u    v
+       fst     %st(4)          //               64/z  z    u    v  64/z
+       fxch    %st(2)          //                 u   z  64/z   v  64/z

diff --git a/games-action/d2x/files/digest-d2x-0.2.5-r2 b/games-action/d2x/files/digest-d2x-0.2.5-r2
new file mode 100644 (file)
index 0000000..3bae26d
--- /dev/null
+++ b/games-action/d2x/files/digest-d2x-0.2.5-r2
@@ -0,0 +1,2 @@
+MD5 79474db1ff4f0ae1fb76d691701cc560 d2x-0.2.5.tar.gz 2015249
+MD5 1b952cc4a4419e24d230589027d73490 d2shar10.tar.gz 4311406