Fix for crash that was reproducable on amd64 with newer versions of gcc. Thank Ben Hodgetts for report (bug 140460) and Richard Drummond for the fix.

Package-Manager: portage-2.1-r1

5 files changed, 166 insertions, 5 deletions

diff --git a/app-emulation/e-uae/ChangeLog b/app-emulation/e-uae/ChangeLog
index db40c4c99437..417a79cbc7bc 100644
--- a/app-emulation/e-uae/ChangeLog
+++ b/app-emulation/e-uae/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/e-uae
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.12 2006/07/11 17:52:12 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.13 2006/07/17 11:07:09 pva Exp $
+
+*e-uae-0.8.28-r2 (17 Jul 2006)
+
+  17 Jul 2006; Peter Volkov <pva@gentoo.org>
+  +files/e-uae-0.8.28-gtkui_64bit_fix.diff, +e-uae-0.8.28-r2.ebuild:
+  Fix for crash that was reproducable on amd64 with newer versions of gcc. Thank
+  Ben Hodgetts for report (bug 140460) and Richard Drummond for the fix.
 
   11 Jul 2006; Peter Volkov <pva@gentoo.org> e-uae-0.8.28-r1.ebuild:
   einfo replaced with elog. Additional elogs added to clearly state video output.
diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
index 04607a5387b0..d0e3526953ed 100644
--- a/app-emulation/e-uae/Manifest
+++ b/app-emulation/e-uae/Manifest
@@ -10,6 +10,10 @@ AUX e-uae-0.8.28-fix-joystick-conflicts.patch 907 RMD160 9d4a75b46c43b07ccc34b6a
 MD5 66a07fc56b355aa2bb8ce779b66e17d7 files/e-uae-0.8.28-fix-joystick-conflicts.patch 907
 RMD160 9d4a75b46c43b07ccc34b6ae3d01a8407fe29d29 files/e-uae-0.8.28-fix-joystick-conflicts.patch 907
 SHA256 9f8958d7777fc4ff62c00dcd287aa8cdceafa786d1afbd2dea68b5a56085a23c files/e-uae-0.8.28-fix-joystick-conflicts.patch 907
+AUX e-uae-0.8.28-gtkui_64bit_fix.diff 599 RMD160 87e1144e50b46210a67c8f0a8da21cd50084edb4 SHA1 629e541bd875ced3171f8ca6117c6bf57a7a83c2 SHA256 cc239b06724d3c694044da7d99e30d4ed6bbe216b3c64c9830cae9d91ece8f97
+MD5 6ef3f457410ab992aea3ffdbe9e2e6b6 files/e-uae-0.8.28-gtkui_64bit_fix.diff 599
+RMD160 87e1144e50b46210a67c8f0a8da21cd50084edb4 files/e-uae-0.8.28-gtkui_64bit_fix.diff 599
+SHA256 cc239b06724d3c694044da7d99e30d4ed6bbe216b3c64c9830cae9d91ece8f97 files/e-uae-0.8.28-gtkui_64bit_fix.diff 599
 AUX e-uae-0.8.28-shm-crash.patch 582 RMD160 a7a6c99ee6e9ea627bfc294fbe03d69a213f1810 SHA1 a00e04203994bfc9fa1b36e8d4c7f441f0626656 SHA256 58ea8ef7d95c65ccfea57a3eeb5c6695e2b2cbac687c6819ce9862eed0d8bda7
 MD5 774c0436b6e91dd8f18b0df23f10c75b files/e-uae-0.8.28-shm-crash.patch 582
 RMD160 a7a6c99ee6e9ea627bfc294fbe03d69a213f1810 files/e-uae-0.8.28-shm-crash.patch 582
@@ -24,10 +28,14 @@ EBUILD e-uae-0.8.28-r1.ebuild 3746 RMD160 f0db2c380b5320a6c28e9626e4e67c7c4d9677
 MD5 79ab626a28585196cca5857ab8221e79 e-uae-0.8.28-r1.ebuild 3746
 RMD160 f0db2c380b5320a6c28e9626e4e67c7c4d967722 e-uae-0.8.28-r1.ebuild 3746
 SHA256 615fd89c0edaa68571796cdcc9b472c5245d58536582059bb74e68629db46bc2 e-uae-0.8.28-r1.ebuild 3746
-MISC ChangeLog 2158 RMD160 31439523e6185a870cb0b83db2a6902c607c6f94 SHA1 7b98558622b30dfa0d5614e57b6b13067bcb6b5e SHA256 c90980cd71948c3a760bb879b83dc9f2a9ce7084d06ebd4bb279d412034133a3
-MD5 16026083e4ac523ce4ec06ba5d950a6b ChangeLog 2158
-RMD160 31439523e6185a870cb0b83db2a6902c607c6f94 ChangeLog 2158
-SHA256 c90980cd71948c3a760bb879b83dc9f2a9ce7084d06ebd4bb279d412034133a3 ChangeLog 2158
+EBUILD e-uae-0.8.28-r2.ebuild 3792 RMD160 dc43b471f16ad216dbb2431b1b6d94a7148a90e4 SHA1 d13fdb9f03ba21795ab65ca89f9ccc3e21435c21 SHA256 027ecfb6fcf828aaba6477f712049fa2d5f8e5190513a78f658e258991546c36
+MD5 4123478cfa0f44df7572d7ef32801365 e-uae-0.8.28-r2.ebuild 3792
+RMD160 dc43b471f16ad216dbb2431b1b6d94a7148a90e4 e-uae-0.8.28-r2.ebuild 3792
+SHA256 027ecfb6fcf828aaba6477f712049fa2d5f8e5190513a78f658e258991546c36 e-uae-0.8.28-r2.ebuild 3792
+MISC ChangeLog 2459 RMD160 690075bb79546b2f7bd5b3695826c591dd7a0a9d SHA1 e42f3b7b7ae3134286f3b49f5a3592113aae95d9 SHA256 62630bfb241f334df64199d07693f871fae07b6659b7ddccc02ccbd0bf7b6a4a
+MD5 56df866e8628f36629c92140bbf68814 ChangeLog 2459
+RMD160 690075bb79546b2f7bd5b3695826c591dd7a0a9d ChangeLog 2459
+SHA256 62630bfb241f334df64199d07693f871fae07b6659b7ddccc02ccbd0bf7b6a4a ChangeLog 2459
 MISC metadata.xml 468 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 SHA1 575564530c1b5d164d1eedcd003b4f43dc435abc SHA256 6bdc3ef9c0c895a8d4f227e52c2bb044d38fc00c17c04199ffd7a1aaa023ec0f
 MD5 107be5d8d010a6b3dac228473128bdf4 metadata.xml 468
 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 metadata.xml 468
@@ -38,3 +46,6 @@ SHA256 3064e15358b96838b92ee05876d4a74a218db4e4a275553fad4707c562430a5b files/di
 MD5 188bf5165e1f85783a9ba7fa185f9fd3 files/digest-e-uae-0.8.28-r1 244
 RMD160 754a2776d6ff1b461b1278828ea678dd002b4e3c files/digest-e-uae-0.8.28-r1 244
 SHA256 82cc02576ec30a11aaafa85d5e55d9118795f73e0db80ed544cded39f1df25ac files/digest-e-uae-0.8.28-r1 244
+MD5 188bf5165e1f85783a9ba7fa185f9fd3 files/digest-e-uae-0.8.28-r2 244
+RMD160 754a2776d6ff1b461b1278828ea678dd002b4e3c files/digest-e-uae-0.8.28-r2 244
+SHA256 82cc02576ec30a11aaafa85d5e55d9118795f73e0db80ed544cded39f1df25ac files/digest-e-uae-0.8.28-r2 244
diff --git a/app-emulation/e-uae/e-uae-0.8.28-r2.ebuild b/app-emulation/e-uae/e-uae-0.8.28-r2.ebuild
new file mode 100644
index 000000000000..02574b85f138
--- /dev/null
+++ b/app-emulation/e-uae/e-uae-0.8.28-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.28-r2.ebuild,v 1.1 2006/07/17 11:07:09 pva Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
+HOMEPAGE="http://www.rcdrummond.net/uae/"
+SRC_URI="http://www.rcdrummond.net/uae/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X dga ncurses sdl gtk alsa oss sdl-sound capslib"
+
+# Note: opposed to ./configure --help zlib support required! Check
+# src/Makefile.am that includes zfile.c unconditionaly.
+RDEPEND="X? ( || ( ( x11-libs/libXt
+					 x11-libs/libxkbfile
+					 x11-libs/libXext
+					 dga? ( x11-libs/libXxf86dga
+						    x11-libs/libXxf86vm )
+				   )
+				   virtual/x11
+				)
+			)
+		!X? ( sdl? ( media-libs/libsdl )
+			  !sdl? ( sys-libs/ncurses ) )
+		alsa? ( media-libs/alsa-lib )
+		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
+		gtk? ( >=x11-libs/gtk+-2.0 )
+		capslib? ( games-emulation/caps )
+		sys-libs/zlib
+		app-cdr/cdrtools"
+
+DEPEND="$RDEPEND
+		X? ( dga? ( x11-proto/xf86vidmodeproto
+					x11-proto/xf86dgaproto ) )"
+
+pkg_setup() {
+	# Sound setup.
+	if use alsa; then
+		elog "Choosing alsa as sound target to use."
+		myconf="--with-alsa --without-sdl-sound"
+	elif use sdl-sound ; then
+		if ! use sdl ; then
+			ewarn "sdl-sound is not enabled because sdl is switched off. Leaving"
+			ewarn "sound on oss autodetection."
+			myconf="--without-alsa --without-sdl-sound"
+			ebeep
+		else
+			elog "Choosing sdl-sound as sound target to use."
+			myconf="--without-alsa --with-sdl-sound"
+		fi
+	elif use oss ; then
+		elog "Choosing oss as sound target to use."
+		ewarn "oss will be autodetected. See output of configure."
+		myconf="--without-alsa --without-sdl-sound"
+	else
+		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
+		myconf="--disable-audio"
+	fi
+
+	# VIDEO setup. X is autodetected (there is no --with-X option).
+	if use X ; then
+		elog "Using X11 for video output."
+		myconf="$myconf --without-curses --without-sdl-gfx"
+		use dga && myconf="$myconf --enable-dga --enable-vidmode"
+	elif use sdl ; then
+		elog "Using sdl for video output."
+		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
+	elif use ncurses; then
+		elog "Using ncurses for video output."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+	else
+		ewarn "There is no X or sdl or ncurses in USE!"
+		ewarn "Following upstream falling back on ncurses."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+		ebeep
+	fi
+
+	use gtk && myconf="$myconf --enable-ui --enable-threads"
+	use gtk || myconf="$myconf --disable-ui"
+
+	use capslib && myconf="$myconf --with-caps"
+
+	myconf="$myconf --with-zlib"
+
+	# And explicitly state defaults:
+	myconf="$myconf --enable-aga"
+	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
+	myconf="$myconf --enable-bsdsock"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-shm-crash.patch
+	epatch ${FILESDIR}/${P}-fix-joystick-conflicts.patch
+	epatch ${FILESDIR}/${P}-fix-atoscroll-screen-support.patch
+	epatch ${FILESDIR}/${P}-fix-JIT-cache-on-NX-cpu.patch
+	epatch ${FILESDIR}/${P}-gtkui_64bit_fix.diff
+}
+
+src_compile() {
+	strip-flags
+
+	econf ${myconf} \
+		--with-libscg-includedir=/usr/include/scsilib \
+		|| die "./configure failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /usr/share/uae/amiga-tools
+	doins amiga/{*hack,trans*,uae*,*.library}
+
+	# Rename it to e-uae
+	mv ${D}/usr/bin/uae ${D}/usr/bin/e-uae
+	mv ${D}/usr/bin/readdisk ${D}/usr/bin/e-readdisk
+	mv ${D}/usr/share/uae ${D}/usr/share/${PN}
+
+	dodoc docs/* README ChangeLog CHANGES
+}
diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.28-r2 b/app-emulation/e-uae/files/digest-e-uae-0.8.28-r2
new file mode 100644
index 000000000000..f73743e1c92c
--- /dev/null
+++ b/app-emulation/e-uae/files/digest-e-uae-0.8.28-r2
@@ -0,0 +1,3 @@
+MD5 9fc186f9256d04f940304044e29175ef e-uae-0.8.28.tar.bz2 1148790
+RMD160 7e9fa21fa14b0ca3a32a28ccb236b9d7628a7f69 e-uae-0.8.28.tar.bz2 1148790
+SHA256 afc8b30fb9aa0819a4e53b3eb0db8e658e5a2b23d7dbf436f6b5a49b2269da86 e-uae-0.8.28.tar.bz2 1148790
diff --git a/app-emulation/e-uae/files/e-uae-0.8.28-gtkui_64bit_fix.diff b/app-emulation/e-uae/files/e-uae-0.8.28-gtkui_64bit_fix.diff
new file mode 100644
index 000000000000..1a7f53ad5bda
--- /dev/null
+++ b/app-emulation/e-uae/files/e-uae-0.8.28-gtkui_64bit_fix.diff
@@ -0,0 +1,12 @@
+diff -Naru e-uae-0.8.28.orig/src/gui-gtk/util.h e-uae-0.8.28/src/gui-gtk/util.h
+--- e-uae-0.8.28.orig/src/gui-gtk/util.h	2005-08-30 18:00:57.000000000 +0400
++++ e-uae-0.8.28/src/gui-gtk/util.h	2006-07-17 14:31:59.000000000 +0400
+@@ -34,7 +34,7 @@
+ extern void add_table_padding (GtkWidget *table, int x, int y);
+ extern void add_to_table(GtkWidget *table, GtkWidget *widget, int x, int y, int width, int xflags);
+ 
+-#define GTKUTIL_TABLE_END	0
++#define GTKUTIL_TABLE_END	((GtkWidget *)0)
+ #define GTKUTIL_ROW_END		((GtkWidget *)1)
+ 
+ extern GtkWidget *gtkutil_add_table (GtkWidget *container, ...);