diff options
author | Peter Volkov <pva@gentoo.org> | 2007-08-12 15:15:33 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2007-08-12 15:15:33 +0000 |
commit | 207ab9a2d5c324ec5bbcd04c58be83029cdf9975 (patch) | |
tree | c395cd1161a4c8c4a5409a934a86e741226a87a5 /app-emulation/uae | |
parent | Revision bump XML-Parser to avoid problems with expat upgrade. No changes mad... (diff) | |
download | historical-207ab9a2d5c324ec5bbcd04c58be83029cdf9975.tar.gz historical-207ab9a2d5c324ec5bbcd04c58be83029cdf9975.tar.bz2 historical-207ab9a2d5c324ec5bbcd04c58be83029cdf9975.zip |
Version bump. New version, ebuild cleaner, but it still fails to compile with sdl.
Package-Manager: portage-2.1.3.4
Diffstat (limited to 'app-emulation/uae')
-rw-r--r-- | app-emulation/uae/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/uae/Manifest | 24 | ||||
-rw-r--r-- | app-emulation/uae/files/digest-uae-0.8.26 | 3 | ||||
-rw-r--r-- | app-emulation/uae/files/uae-0.8.26-gtk-ui-cleanup.patch | 38 | ||||
-rw-r--r-- | app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff | 86 | ||||
-rw-r--r-- | app-emulation/uae/uae-0.8.26.ebuild | 154 |
6 files changed, 309 insertions, 5 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/Manifest b/app-emulation/uae/Manifest index dd0fcf7a7cb4..6a486a663efa 100644 --- a/app-emulation/uae/Manifest +++ b/app-emulation/uae/Manifest @@ -42,7 +42,16 @@ AUX uae-0.8.25-uae_reset_args.diff 4013 RMD160 39926c387602817abfc373011cd672cff MD5 e7fff375c47c05fac0b5d0e77258180a files/uae-0.8.25-uae_reset_args.diff 4013 RMD160 39926c387602817abfc373011cd672cffb442b6e files/uae-0.8.25-uae_reset_args.diff 4013 SHA256 1946a51c6af63f8e007aa707f7038170e295e604a91cbab2a54d65e645c171e7 files/uae-0.8.25-uae_reset_args.diff 4013 +AUX uae-0.8.26-gtk-ui-cleanup.patch 1472 RMD160 bd73022a5161c0ebe0164ac9b8d8fc78063117c3 SHA1 0b9e125cdfec3d6fb4362546fdd62371498b0ef7 SHA256 c87f354a4afe35aeec1eb02509e8f0716818fb534e9ed829f8d6613405e942a5 +MD5 2b19f07716a6829b293d9ad810a551d3 files/uae-0.8.26-gtk-ui-cleanup.patch 1472 +RMD160 bd73022a5161c0ebe0164ac9b8d8fc78063117c3 files/uae-0.8.26-gtk-ui-cleanup.patch 1472 +SHA256 c87f354a4afe35aeec1eb02509e8f0716818fb534e9ed829f8d6613405e942a5 files/uae-0.8.26-gtk-ui-cleanup.patch 1472 +AUX uae-0.8.26-uae_reset_args.diff 3216 RMD160 a4c87ae59a5c0e12683600d4eaf4b14ffdaae35f SHA1 092f4cc261783b81da0ca6a48c291403b3a7eaa2 SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 +MD5 f94f4f2bc52f8b00e2b1e7aecce6b09b files/uae-0.8.26-uae_reset_args.diff 3216 +RMD160 a4c87ae59a5c0e12683600d4eaf4b14ffdaae35f files/uae-0.8.26-uae_reset_args.diff 3216 +SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 files/uae-0.8.26-uae_reset_args.diff 3216 DIST uae-0.8.25.tar.gz 970727 RMD160 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1 SHA1 41b7a70cf672d3cc516bd3856a051459a95a6517 SHA256 611a7e04dd77080d87c7e9680aed997ed2be45116eec91613eb36a85235a686a +DIST uae-0.8.26.tar.gz 1013196 RMD160 8394b85b4ea2c74a758984e89b2793157c585da1 SHA1 3e705798f3a9089578902a853b41c991b9d4b2f7 SHA256 9da8f71f9fe1bfaf18f6ea227f31baadb89d12ba78cb7ac9ce6132f35055f868 EBUILD uae-0.8.25-r1.ebuild 2348 RMD160 82d07f606029da78add45208c74513967c36b798 SHA1 29e5ada0810054f7429e221ea77d6c95ea553e76 SHA256 73322efcd3a0d084a48c9133729ccb075f9d7125001099dde76a21b2076a8cd7 MD5 9c6e906e942f527f5376c98df1cfe771 uae-0.8.25-r1.ebuild 2348 RMD160 82d07f606029da78add45208c74513967c36b798 uae-0.8.25-r1.ebuild 2348 @@ -51,10 +60,14 @@ EBUILD uae-0.8.25.ebuild 2400 RMD160 9d22869ccbecbdf4a9c1466f20d099d7da68e1ba SH MD5 764859e252ef9dbeb2ddf1e33617339d uae-0.8.25.ebuild 2400 RMD160 9d22869ccbecbdf4a9c1466f20d099d7da68e1ba uae-0.8.25.ebuild 2400 SHA256 20521f8013530a7538b1b01c48cccb99eaecada6e86064cd79796510058b3c48 uae-0.8.25.ebuild 2400 -MISC ChangeLog 5126 RMD160 e90025213071b281b19421da1586d03671e6546f SHA1 43a53f75cc8a46e23383f067cb00a1ffc9a9feb4 SHA256 86ce6f7ff5c2a9b957573750eb61b71aeb8a1d82fa67b36db2762d942707c61d -MD5 c94a9614f97b0322634d3747917f7bf1 ChangeLog 5126 -RMD160 e90025213071b281b19421da1586d03671e6546f ChangeLog 5126 -SHA256 86ce6f7ff5c2a9b957573750eb61b71aeb8a1d82fa67b36db2762d942707c61d ChangeLog 5126 +EBUILD uae-0.8.26.ebuild 4901 RMD160 3a2b22846a282bf62d4b3f0b6906b0d8d1c22f82 SHA1 09cc9bde5c01779b38f632f18fe74fb8e9be34a6 SHA256 5f921e228dcecdb483289b8ad9df89732d1840a68fdfb97f887a2e33a18d2130 +MD5 82856a78594af44b82f5bccf9c0f6514 uae-0.8.26.ebuild 4901 +RMD160 3a2b22846a282bf62d4b3f0b6906b0d8d1c22f82 uae-0.8.26.ebuild 4901 +SHA256 5f921e228dcecdb483289b8ad9df89732d1840a68fdfb97f887a2e33a18d2130 uae-0.8.26.ebuild 4901 +MISC ChangeLog 5374 RMD160 dc709f8e9c253a85a8a8237f5fd6aa08820e6e54 SHA1 3fba23a399abf67c0e294540e34604174957cc66 SHA256 ec13d8ae31bea790f26a5a065487758635a0c9e29cc1608b39b4fdd42e4ed943 +MD5 738c4b42ff91348dcecf55266429e03a ChangeLog 5374 +RMD160 dc709f8e9c253a85a8a8237f5fd6aa08820e6e54 ChangeLog 5374 +SHA256 ec13d8ae31bea790f26a5a065487758635a0c9e29cc1608b39b4fdd42e4ed943 ChangeLog 5374 MISC metadata.xml 668 RMD160 b7ba19a061d3ca237bfeca2709346e8cf3fe86f3 SHA1 910d7f0379c233559cb51ebca71a2fe8009689fa SHA256 afa4747772ac1eaa54ff9a14804f1b466500192c932d6849ce1a27ff2af29bcc MD5 800d59bca6b74f54268ca8c63af928ee metadata.xml 668 RMD160 b7ba19a061d3ca237bfeca2709346e8cf3fe86f3 metadata.xml 668 @@ -65,3 +78,6 @@ SHA256 f63c9f0dbc9851c5809d8f55e5c62f14376dc0ab0a4873da6b41be8eb50cbb14 files/di MD5 a8bc45a7e84ed5c37b6181d628edbfe4 files/digest-uae-0.8.25-r1 232 RMD160 e19483b6ed38d300d83062a22cdd2eb8d9b432ba files/digest-uae-0.8.25-r1 232 SHA256 f63c9f0dbc9851c5809d8f55e5c62f14376dc0ab0a4873da6b41be8eb50cbb14 files/digest-uae-0.8.25-r1 232 +MD5 8fc08da35100e708f469e9c3147aa563 files/digest-uae-0.8.26 235 +RMD160 9a733a6e86ce3ee5ceb4c8b34fe057d400035ec3 files/digest-uae-0.8.26 235 +SHA256 3cefc5d1aa8e4128bf01a0730614cebe08304f468fd43950ddaf530bb4e2c84d files/digest-uae-0.8.26 235 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*} +} |