From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-emulation/uae/Manifest | 10 +++ app-emulation/uae/files/sdlgfx.h | 38 ++++++++++ .../uae-0.8.25-allow_spaces_in_zip_filenames.diff | 18 +++++ .../uae-0.8.25-struct_uae_wrong_fields_name.diff | 18 +++++ .../uae/files/uae-0.8.26-uae_reset_args.diff | 86 ++++++++++++++++++++++ .../uae/files/uae-0.8.26-underlinking.patch | 19 +++++ app-emulation/uae/metadata.xml | 16 ++++ app-emulation/uae/uae-0.8.29-r2.ebuild | 70 ++++++++++++++++++ 8 files changed, 275 insertions(+) create mode 100644 app-emulation/uae/Manifest create mode 100644 app-emulation/uae/files/sdlgfx.h create mode 100644 app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff create mode 100644 app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff create mode 100644 app-emulation/uae/files/uae-0.8.26-uae_reset_args.diff create mode 100644 app-emulation/uae/files/uae-0.8.26-underlinking.patch create mode 100644 app-emulation/uae/metadata.xml create mode 100644 app-emulation/uae/uae-0.8.29-r2.ebuild (limited to 'app-emulation/uae') diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest new file mode 100644 index 000000000000..8b3ca938adb8 --- /dev/null +++ b/app-emulation/uae/Manifest @@ -0,0 +1,10 @@ +AUX sdlgfx.h 974 SHA256 dcbbcc57ffa9ee951963be49aa454ff6078b6e18d5bbe7b773b4bf8d37f5deea SHA512 56614df4b2640f01a32e714fe3578d0607472b2cd49131124eee998d9ea43d223817d44c25be942c47e47a5599249672a61b03d3c87d94a8c48c6b3304e2bc8e WHIRLPOOL 34672c30b62ba15dc164219973e6f774efb518ae6419874b980939228990256c730cfea652e3ae38d5e012d7af070becbfdd510b48ae0f56bf9e5d5891bfe4eb +AUX uae-0.8.25-allow_spaces_in_zip_filenames.diff 651 SHA256 13f4377de98fba7758bff128830f4f16a97db83fd4d2e5c1161a71d8423bd80e SHA512 f69200029c1c3e2a38ebbf09fda254e98e8ed457b447801953519969be6d78e73a8054a66f44c8c495a1205aa54033914da43159f84985f9421844c7a00740a0 WHIRLPOOL 4ebc3e528feb3b63fc3af745afaf6bd02720cf2a4c125e0c2197f7abfd30f8c776843fed93fa67151aab8097e71a90383594095b440ef7ca15e6bc4be6f32781 +AUX uae-0.8.25-struct_uae_wrong_fields_name.diff 613 SHA256 ac020eacef32f92b82740022c0383fb5746c6a6d205a96c2564805063ad9035a SHA512 553150271c42ca76f414fd19e482230dedc7ea9c466d5bffb31ef5e729a92d558c020f91aae3a91570b1ef5cef5af5f6872bdaf009db17517651b5e106323270 WHIRLPOOL 62158ba7d9af4fa7952723a601eeb0937bddd1368422a6505e88ca45e6beeab0ec75b2d7a69396134f2ba93ba878db9bc4ff7bf13f35922f14b8468e3234781a +AUX uae-0.8.26-uae_reset_args.diff 3216 SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 SHA512 04d404efa4d63fa89eb537e9c0f6b964e5dad031305abdf6ba08339d1aa5d211b51c37599202e52210b5805ebb5c1109b5b04092e2484001b7f630b268e59a21 WHIRLPOOL ffd0d154fd750a332ab1d059167119758847d3e8121eed97cf9ff59491d48e43b29de8cfbd1287a8acd91ea106bd1ba067063b9ac504c8b64bf70d37a8bd9ca2 +AUX uae-0.8.26-underlinking.patch 499 SHA256 05c8a4d29d5cbc0c1fe4a2150697f37aa716374baa3edbb255c84188f2ce0405 SHA512 8a297f34d3550a66b4145ef913cd2ef4399ebcd43adff88b9d0b93a6eabb1ace8dedef53f515b6f413faef7b6e6491fd81f3b60a0e6efa67212b082d2671b74a WHIRLPOOL c43caacc7a4baf28ffd242368c9201979c77135ff89d60fa35d83a9d1c32fe246b618f4e4f86f4294fe956e9b47dab9f961749fe1e20ccf7cefbe12d4ceb0e60 +DIST uae-0.8.29.tar.bz2 925508 SHA256 2463524b19b36ab44de158c5f24871878eda05230ea391343849959643634317 SHA512 2b8f362f9ba7171cf9ce71938b0a4f22c5d90d518524d50023792f4dc9f75a1b1e17e55966926e1138801b4d9ffbc2f1ae4c4b5dfa42e98a8e6ec688adb84064 WHIRLPOOL 0fcf540415b4434f59f8df97de6c49db03f088d219267eb19647afad483ffc99c48cba7cbf704e86e3d2f25ab184f19119d5a1c578df6dcbe53f7e6c25d1648c +EBUILD uae-0.8.29-r2.ebuild 1788 SHA256 29ddd3be6a3b2bb87e5b367d8eb3b30f6fbf992a06646ffac5759d48a40add3a SHA512 c1d1cd60d58aefcca7583d56d1f6bd115a4f3f5d483740110a0309081bb488d8974f69739e2d6e8fe9902d993b831954c7e3934a3b6ed51f83519ccd89e650fa WHIRLPOOL 7989718731c47643578d66ebe8b91b0b3f6e9a0abd7456fb182ab18b371a648d38750c02c5d440389cddc9479fc87abd2e89f479caa28e6103be96ba22a5bbbc +MISC ChangeLog 3123 SHA256 807953ba859ee11ca3fa5560aa557ef73a4c510c385527722cbc094b5353da6d SHA512 ba4193ea6c8c84dc69f3b80ab1bdd0d5ff0943417c6dc827971541d68ba61da2368ad53d5f2836ba7692127b2f98e375447726d5e12ed916c8b154da4e19444a WHIRLPOOL d831e8d082d08de41e88fdb2aa139709946c5be523927a3d83b5f5de8f2112b210e46b97992df63026ad134c5b31deb3cad4206d24a5d2cfc418f3f98e5b3842 +MISC ChangeLog-2015 7748 SHA256 1c5748052c350286d4ab26a64cfbad8ddca31eb98904fbb6693cdce54af0072e SHA512 939f96f49751dc10ea6df9a8983a700845c95afb0c317f96c9fb46d748f54309d0cc95ca05610121ca4650e3fc6ee40a4591ed3b5869ad18cc6283962cea16b0 WHIRLPOOL 995695c4dd9b1b0db15de104e61360b1a1dc3aeaab17f355538da91b6b4cf715b2149e83b21d3c3f3a51381fa75e0912658efce2d8101b445d342177072ef214 +MISC metadata.xml 673 SHA256 58f3242df62428f2a0a8f083aca74a63478cc9394ad29dc9d7ea6bef8e804d16 SHA512 032f19c7d06b328cf02f8ef99094999a59bdc1072141e96313cfd2c8d1b3bd6ef4644e8d0f4a066e0d21cff73334b186e05d5ae9935d366c4a2920992cce6868 WHIRLPOOL b7215664919fc2956e729a9be3f2ad4bf3e310700a6bc6a5a21f4e14330c5caccd4c604a1d7b3e14e7b4bc7c2969674a6f8bac5718512bf7c391fd1107b58d92 diff --git a/app-emulation/uae/files/sdlgfx.h b/app-emulation/uae/files/sdlgfx.h new file mode 100644 index 000000000000..30bee2ee4024 --- /dev/null +++ b/app-emulation/uae/files/sdlgfx.h @@ -0,0 +1,38 @@ +/* + * UAE - The Un*x Amiga Emulator + * + * SDL graphics support + * + * Copyright 2004 Richard Drummond + */ + +/* + * What graphics platform are we running on . . .? + * + * Yes, SDL is supposed to abstract away from the underlying + * platform, but we need to know this to be able to map raw keys + * and to work around any platform-specific quirks . . . + */ +enum { + SDLGFX_DRIVER_UNKNOWN, + SDLGFX_DRIVER_X11, + SDLGFX_DRIVER_DGA, + SDLGFX_DRIVER_SVGALIB, + SDLGFX_DRIVER_FBCON, + SDLGFX_DRIVER_DIRECTFB, + SDLGFX_DRIVER_QUARTZ, + SDLGFX_DRIVER_BWINDOW, + SDLGFX_DRIVER_CYBERGFX, + SDLGFX_DRIVER_AMIGAOS4 +}; + +extern int get_sdlgfx_type (void); + +/* keyboard support */ +struct uae_input_device_kbr_default *get_default_raw_keymap (int type); +extern int keysym2amiga (int keycode); +int modifier_hack (int *scancode, int *pressed); + +/* hotkey support */ +struct uae_hotkeyseq *get_default_cooked_hotkeys (void); +struct uae_hotkeyseq *get_default_raw_hotkeys (void); diff --git a/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff b/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff new file mode 100644 index 000000000000..629ae702c520 --- /dev/null +++ b/app-emulation/uae/files/uae-0.8.25-allow_spaces_in_zip_filenames.diff @@ -0,0 +1,18 @@ +## 03_allow_spaces_in_zip_filenames.dpatch by Florian Ernst +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Allow spaces in filenames for zipped files, bug#238678 + +@DPATCH@ +diff -urNad uae-0.8.25~/src/zfile.c uae-0.8.25/src/zfile.c +--- uae-0.8.25~/src/zfile.c 2005-07-01 17:53:26.000000000 +0200 ++++ uae-0.8.25/src/zfile.c 2005-11-08 01:17:59.000000000 +0100 +@@ -126,7 +126,7 @@ + if (!dst) + return 1; + #if defined AMIGA || defined __unix +- sprintf (cmd, "unzip -p %s '*.adf' >%s", src, dst); ++ sprintf (cmd, "unzip -p \"%s\" '*.adf' >%s", src, dst); + return !system (cmd); + #endif + } diff --git a/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff b/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff new file mode 100644 index 000000000000..cd8d7e00cd8a --- /dev/null +++ b/app-emulation/uae/files/uae-0.8.25-struct_uae_wrong_fields_name.diff @@ -0,0 +1,18 @@ +Somewhere wrong (old) names are used in accessing the preferences structure. + +This is just a remainder for the upstream!! + +Antonio Ospite + +diff -pruN uae-0.8.25/src/tui.c uae-0.8.25_patched/src/tui.c +--- uae-0.8.25/src/tui.c 2006-06-07 17:45:55.000000000 +0200 ++++ uae-0.8.25_patched/src/tui.c 2006-06-07 17:55:39.000000000 +0200 +@@ -606,7 +606,7 @@ static void SoundOptions (void) + currprefs.sound_freq = atoi (tmp); + break; + case 5: +- currprefs.stereo = (currprefs.stereo + 1) % 3; ++ currprefs.sound_stereo = (currprefs.sound_stereo + 1) % 3; + break; + } + } 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/files/uae-0.8.26-underlinking.patch b/app-emulation/uae/files/uae-0.8.26-underlinking.patch new file mode 100644 index 000000000000..16bf5744826e --- /dev/null +++ b/app-emulation/uae/files/uae-0.8.26-underlinking.patch @@ -0,0 +1,19 @@ +--- configure.in ++++ configure.in +@@ -81,6 +81,16 @@ + AC_CHECK_LIB(audio, alOpenPort, HAVE_SGIAUDIO_LIB=yes, HAVE_SGIAUDIO_LIB=no) + AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA=yes, HAVE_ALSA=no) + ++dnl Check for libm for cos() ++AC_SEARCH_LIBS([cos], [m], [], [ ++ AC_MSG_ERROR([unable to find the cos() function]) ++]) ++ ++dnl Check for libm for floor() ++AC_SEARCH_LIBS([floor], [m], [], [ ++ AC_MSG_ERROR([unable to find the floor() function]) ++]) ++ + AC_PATH_XTRA + AC_CONFIG_HEADER(src/sysconfig.h) + diff --git a/app-emulation/uae/metadata.xml b/app-emulation/uae/metadata.xml new file mode 100644 index 000000000000..86f65e797020 --- /dev/null +++ b/app-emulation/uae/metadata.xml @@ -0,0 +1,16 @@ + + + + + + UAE is a mostly complete software emulation of the hardware of the + Commodore Amiga 500/1000/2000. A Commodore Amiga is a 16/32 bit computer + system based on the Motorola 680x0 CPU and a few specially designed + custom chips that provide very good graphics and sound capabilities. It's + first incarnation, the A1000, appeared in 1985, followed by the highly + successful A500 and A2000 models. + + + Enable the uaescsi.device + + diff --git a/app-emulation/uae/uae-0.8.29-r2.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild new file mode 100644 index 000000000000..98485c01745e --- /dev/null +++ b/app-emulation/uae/uae-0.8.29-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils autotools + +DESCRIPTION="The Umiquious Amiga Emulator" +HOMEPAGE="http://www.amigaemulator.org/" +SRC_URI="ftp://ftp.amigaemulator.org/pub/uae/sources/develop/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="sdl alsa scsi" + +DEPEND="sdl? ( media-libs/libsdl + media-libs/sdl-gfx + x11-libs/gtk+:2 + alsa? ( media-libs/alsa-lib ) + ) + !sdl? ( x11-libs/libXext + x11-libs/gtk+:2 + ) + alsa? ( media-libs/alsa-lib ) + scsi? ( app-cdr/cdrtools )" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.8.25-allow_spaces_in_zip_filenames.diff + epatch "${FILESDIR}"/${PN}-0.8.25-struct_uae_wrong_fields_name.diff + epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff + epatch "${FILESDIR}"/${PN}-0.8.26-underlinking.patch + + cp "${FILESDIR}"/sdlgfx.h "${S}"/src || die + + eautoreconf +} + +src_configure() { + # disabling lots of options, cause many code-paths are broken, these should compile, + # if you want/need other options, please test if they work with other combinations + # before opening a bug + econf --enable-ui --with-x --without-svgalib \ + --without-asciiart --without-sdl-sound --enable-threads \ + $(use_with sdl) $(use_with sdl sdl-gfx) \ + $(use_with alsa) \ + $(use_enable scsi scsi-device) +} + +src_compile() { + emake -j1 +} + +src_install() { + dobin uae readdisk + cp docs/unix/README docs/README.unix || die + rm -r docs/{AmigaOS,BeOS,pOS,translated,unix} || die + dodoc docs/* + + insinto /usr/share/uae/amiga-tools + doins amiga/{*hack,trans*,uae*} +} + +pkg_postinst() { + elog + elog "Upstream recommends using SDL graphics (with an environment variable)" + elog "SDL_VIDEO_X11_XRANDR=1 for fullscreen support." + echo +} -- cgit v1.2.3