Version bump. New version, ebuild cleaner, but it still fails to compile with sdl.

(Portage version: 2.1.3.4)

5 files changed, 289 insertions, 1 deletions

diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index 155efd45cfb2..6a48e9e77658 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/uae
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.28 2007/02/16 15:50:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.29 2007/08/12 15:15:32 pva Exp $
+
+*uae-0.8.26 (12 Aug 2007)
+
+  12 Aug 2007; <pva@gentoo.org> +files/uae-0.8.26-gtk-ui-cleanup.patch,
+  +files/uae-0.8.26-uae_reset_args.diff, +uae-0.8.26.ebuild:
+  Version bump. New version, ebuild cleaner, but it still fails to compile
+  with sdl.
 
 *uae-0.8.25-r1 (16 Feb 2007)
 
diff --git a/app-emulation/uae/files/digest-uae-0.8.26 b/app-emulation/uae/files/digest-uae-0.8.26
new file mode 100644
index 000000000000..fb066b85adbe
--- /dev/null
+++ b/app-emulation/uae/files/digest-uae-0.8.26
@@ -0,0 +1,3 @@
+MD5 d6e651295ccf24b8d5ab13110164970d uae-0.8.26.tar.gz 1013196
+RMD160 8394b85b4ea2c74a758984e89b2793157c585da1 uae-0.8.26.tar.gz 1013196
+SHA256 9da8f71f9fe1bfaf18f6ea227f31baadb89d12ba78cb7ac9ce6132f35055f868 uae-0.8.26.tar.gz 1013196
diff --git a/app-emulation/uae/files/uae-0.8.26-gtk-ui-cleanup.patch b/app-emulation/uae/files/uae-0.8.26-gtk-ui-cleanup.patch
new file mode 100644
index 000000000000..a06f350c93db
--- /dev/null
+++ b/app-emulation/uae/files/uae-0.8.26-gtk-ui-cleanup.patch
@@ -0,0 +1,38 @@
+--- ./src/gtkui.c.orig	2007-08-12 18:18:21.000000000 +0400
++++ ./src/gtkui.c	2007-08-12 18:22:19.000000000 +0400
+@@ -752,8 +752,8 @@
+ 	return;
+ 
+     write_comm_pipe_int (&from_gui_pipe, 0, 0);
+-    write_comm_pipe_int (&from_gui_pipe, (int)data, 1);
+-    gtk_label_set_text (GTK_LABEL (disk_text_widget[(int)data]), "");
++    write_comm_pipe_int (&from_gui_pipe, GPOINTER_TO_INT(data), 1);
++    gtk_label_set_text (GTK_LABEL (disk_text_widget[GPOINTER_TO_INT(data)]), "");
+ }
+ 
+ static void pause_uae (void)
+@@ -841,7 +841,7 @@
+ 
+ static void did_insert (GtkWidget *w, gpointer data)
+ {
+-    int n = (int)data;
++    int n = GPOINTER_TO_INT(data);
+     if (filesel_active != -1)
+ 	return;
+     filesel_active = n;
+@@ -1188,13 +1188,13 @@
+ 	gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
+ 	gtk_widget_show (thing);
+ 	disk_eject_widget[i] = thing;
+-	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_eject, (gpointer) i);
++	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_eject, GINT_TO_POINTER(i));
+ 
+ 	thing = gtk_button_new_with_label ("Insert");
+ 	gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
+ 	gtk_widget_show (thing);
+ 	disk_insert_widget[i] = thing;
+-	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_insert, (gpointer) i);
++	gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_insert, GINT_TO_POINTER(i));
+     }
+ 
+     add_empty_vbox (vbox);
diff --git a/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff b/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff
new file mode 100644
index 000000000000..3df99e4d2a4f
--- /dev/null
+++ b/app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff
@@ -0,0 +1,86 @@
+diff -Naur uae-0.8.26.orig/src/ncurses.c uae-0.8.26/src/ncurses.c
+--- uae-0.8.26.orig/src/ncurses.c	2007-08-05 20:01:58.000000000 +0400
++++ uae-0.8.26/src/ncurses.c	2007-08-12 18:36:33.000000000 +0400
+@@ -595,7 +595,7 @@
+ 	if (ch == 16) --lastmy; /* ^P */
+ 	if (ch == 11) {buttonstate[0] = keydelay;ch = 0;} /* ^K */
+ 	if (ch == 25) {buttonstate[2] = keydelay;ch = 0;} /* ^Y */
+-	if (ch == 15) uae_reset (); /* ^O */
++	if (ch == 15) uae_reset (0); /* ^O */
+ 	if (ch == 17) uae_quit (); /* ^Q */
+ 	if (ch == KEY_F(1)) {
+ 	  curses_insert_disk();
+diff -Naur uae-0.8.26.orig/src/NeXTwin.m uae-0.8.26/src/NeXTwin.m
+--- uae-0.8.26.orig/src/NeXTwin.m	1997-10-18 17:39:04.000000000 +0400
++++ uae-0.8.26/src/NeXTwin.m	2007-08-12 18:36:33.000000000 +0400
+@@ -86,7 +86,7 @@
+ @implementation AmigaView
+ -reset:sender
+ 	{
+-	uae_reset();
++	uae_reset(0);
+ 	//m68k_reset();
+ 	return self;
+ 	}
+diff -Naur uae-0.8.26.orig/src/od-beos/beos.cpp uae-0.8.26/src/od-beos/beos.cpp
+--- uae-0.8.26.orig/src/od-beos/beos.cpp	2001-02-19 23:59:11.000000000 +0300
++++ uae-0.8.26/src/od-beos/beos.cpp	2007-08-12 18:36:33.000000000 +0400
+@@ -719,7 +719,7 @@
+ 	uint32 mouse_buttons;
+ 
+ 	if (reset_thyself) {
+-		uae_reset();
++		uae_reset(0);
+ 		reset_thyself = false;
+ 	}
+ 
+diff -Naur uae-0.8.26.orig/src/od-win32/keyboard.c uae-0.8.26/src/od-win32/keyboard.c
+--- uae-0.8.26.orig/src/od-win32/keyboard.c	2007-08-06 00:23:08.000000000 +0400
++++ uae-0.8.26/src/od-win32/keyboard.c	2007-08-12 18:36:33.000000000 +0400
+@@ -488,8 +488,8 @@
+ 	record_key ((akey << 1) + 1);
+ 
+     /* "Affengriff" */
+-	if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset();
+-    //if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset();
++	if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset(0);
++    //if(  (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset(0);
+ 
+     return 0;
+ }
+diff -Naur uae-0.8.26.orig/src/od-win32/win32gui.c uae-0.8.26/src/od-win32/win32gui.c
+--- uae-0.8.26.orig/src/od-win32/win32gui.c	2007-08-06 00:23:08.000000000 +0400
++++ uae-0.8.26/src/od-win32/win32gui.c	2007-08-12 18:36:33.000000000 +0400
+@@ -2260,7 +2260,7 @@
+ 	    }
+ 	    break;
+ 	case IDC_RESETAMIGA:
+-	    uae_reset();
++	    uae_reset(0);
+ 	    break;
+ 	case IDC_QUITEMU:
+ 	    uae_quit();
+diff -Naur uae-0.8.26.orig/src/svga.c uae-0.8.26/src/svga.c
+--- uae-0.8.26.orig/src/svga.c	2007-08-05 20:01:58.000000000 +0400
++++ uae-0.8.26/src/svga.c	2007-08-12 18:36:33.000000000 +0400
+@@ -438,7 +438,7 @@
+ 
+     /* "Affengriff" */
+     if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
+-	uae_reset ();
++	uae_reset (0);
+ }
+ 
+ static void leave_graphics_mode (void)
+diff -Naur uae-0.8.26.orig/src/tui.c uae-0.8.26/src/tui.c
+--- uae-0.8.26.orig/src/tui.c	2007-08-12 18:35:41.000000000 +0400
++++ uae-0.8.26/src/tui.c	2007-08-12 18:36:33.000000000 +0400
+@@ -683,7 +683,7 @@
+ 	     case 0: DiskOptions (); break;
+ 	     case 1: OtherOptions (); break;
+ 	     case 2: save_settings (); break;
+-	     case 3: uae_reset (); break;
++	     case 3: uae_reset (0); break;
+ 	     case 4: uae_quit (); break;
+ 	    }
+ 	}
diff --git a/app-emulation/uae/uae-0.8.26.ebuild b/app-emulation/uae/uae-0.8.26.ebuild
new file mode 100644
index 000000000000..eeed53d9c6fc
--- /dev/null
+++ b/app-emulation/uae/uae-0.8.26.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.26.ebuild,v 1.1 2007/08/12 15:15:32 pva Exp $
+
+inherit eutils
+
+DESCRIPTION="The Umiquious Amiga Emulator"
+HOMEPAGE="http://www.freiburg.linux.de/~uae/"
+SRC_URI="ftp://ftp.coresystems.de/pub/uae/sources/develop/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="sdl X dga svga aalib alsa sdl-sound scsi ui"
+
+DEPEND="sdl? ( media-libs/libsdl
+			   media-libs/sdl-gfx
+			   ui? ( x11-libs/gtk+ )
+			   alsa? ( media-libs/alsa-lib )
+			 )
+	!sdl? ( X? ( x11-libs/libXext
+				 dga? ( x11-libs/libXxf86dga 
+					    x11-libs/libXxf86vm )
+				 ui? ( x11-libs/gtk+ )
+			   )
+			!X? ( svga? ( media-libs/svgalib
+				 		  ui? ( sys-libs/ncurses ) )
+				  !svga? ( aalib? ( media-libs/aalib 
+				 		            ui? ( sys-libs/ncurses ) ) )
+				  		   !aalib? ( media-libs/libsdl 
+			   						 ui? ( x11-libs/gtk+ ) ) ) 
+			alsa? ( media-libs/alsa-lib )
+		  )
+	scsi? ( app-cdr/cdrtools )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/uae-0.8.25-allow_spaces_in_zip_filenames.diff
+	epatch "${FILESDIR}"/uae-0.8.25-close_window_hack.diff
+	epatch "${FILESDIR}"/uae-0.8.25-fix_save_config.diff
+	epatch "${FILESDIR}"/${P}-gtk-ui-cleanup.patch
+	epatch "${FILESDIR}"/uae-0.8.25-makefile_more_cleaning.diff
+	epatch "${FILESDIR}"/uae-0.8.25-memory_leaks_in_gui.diff
+	epatch "${FILESDIR}"/uae-0.8.25-preserve_home_in_writing_optionsfile.diff
+	epatch "${FILESDIR}"/uae-0.8.25-struct_uae_wrong_fields_name.diff
+	epatch "${FILESDIR}"/${P}-uae_reset_args.diff
+}
+
+pkg_setup() {
+	# See configure.in for possible pathes of logic...
+	if use sdl ; then
+		elog "Enabling sdl for video output."
+		my_config="$(use_with sdl) $(use_with sdl sdl-gfx)"
+		# SELECT UI
+		if use ui ; then
+			elog "Using GTK+ for UI."
+			my_config="${my_config} $(use_enable ui)"
+		else
+			elog "You do not have ui in USE. Disabling UI"
+			my_config="${my_config} --disable-ui"
+		fi
+		if use sdl-sound ; then
+			elog "Enabling sdl-sound for sound output."
+			my_config="${my_config} $(use_with sdl-sound)"
+		elif use alsa ; then
+			elog "Enabling alsa for sound output."
+			my_config="${my_config} --without-sdl-sound $(use_with alsa)"
+		else
+			elog "You have not enabled alsa or sdl-sound in USE."
+			elog "Using sound output to file."
+			my_config="${my_config} --enable-file-sound"
+		fi
+	else
+		elog "Disabling sdl for all (video and sound)."
+		my_config="--without-sdl"
+		if use X ; then
+			elog "Enabling X11 for video output."
+			# Disabling all other GFX to be sure that we'll have what we want.
+			my_config="${my_config} --without-svgalib --without-asciiart $(use_with X x)"
+			use dga && my_config="${my_config} $(use_enable dga) $(use_enable X vidmode)"
+			# SELECT UI
+			if use ui ; then
+				elog "Using GTK+ for UI."
+				my_config="${my_config} $(use_enable ui)"
+			else
+				elog "You do not have ui in USE. Disabling UI"
+				my_config="${my_config} --disable-ui"
+			fi
+		else
+			my_config="${my_config} --without-x"
+			if use svga ; then
+				elog "Enabling svga for video output."
+				my_config="${my_config} $(use_with svga svgalib)"
+				if use ui ; then
+					elog "Using ncurses for UI."
+					my_config="${my_config} $(use_enable ui)"
+				else
+					elog "You do not have ui in USE. Disabling UI"
+					my_config="${my_config} --disable-ui"
+				fi
+			elif use aalib ; then
+				elog "Enabling ASCII art for video output."
+				my_config="${my_config} $(use_with aalib svgalib)"
+				if use ui ; then
+					einfo "Using ncurses for UI."
+					my_config="${my_config} $(use_enable ui)"
+				else
+					elog "You do not have ui in USE. Disabling UI"
+					my_config="${my_config} --disable-ui"
+				fi
+			else
+				elog "You have not enabled sdl or X or svga or ncruses in USE!"
+				elog "Video output is not selected. Falling back on sdl..."
+				my_config="$(use_with sdl) $(use_with sdl sdl-gfx) $(use with sdl-sound)"
+				# SELECT UI
+				if use ui ; then
+					elog "Using GTK+ for UI."
+					my_config="${my_config} $(use_enable ui)"
+				else
+					elog "You do not have ui in USE. Disabling UI"
+					my_config="${my_config} --disable-ui"
+				fi
+			fi
+		fi
+		if use alsa ; then
+			elog "Enabling alsa for sound output."
+			my_config="${my_config} $(use_with alsa)"
+		else
+			use sdl-sound && ewarn "You can not have sdl-sound without sdl."
+			elog "You have not enabled alsa in USE."
+			elog "Using sound output to file."
+			my_config="${my_config} --enable-file-sound"
+		fi
+	fi
+
+	my_config="${my_config} $(use_enable scsi scsi-device)"
+	my_config="${my_config} --enable-threads"
+}
+
+src_compile() {
+	econf ${my_config} || die "configure failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dobin uae readdisk || die
+	cp docs/unix/README docs/README.unix
+	dodoc docs/*
+
+	insinto /usr/share/uae/amiga-tools
+	doins amiga/{*hack,trans*,uae*}
+}