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

Package-Manager: portage-2.1.3.4

3 files changed, 127 insertions, 0 deletions

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;
+ 	    }
+ 	}