From 5fe1a2d91a8d390f81bc7a9be62dc2b6acd4c1b1 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Tue, 24 Jul 2012 11:55:37 +0200 Subject: Abandoned P-UAE. Use FS-UAE from gamerlay overlay instead! --- app-emulation/puae/ChangeLog | 29 --- app-emulation/puae/Manifest | 5 - .../puae/files/001_fix_wrong_unzip_h.patch | 49 ----- .../files/002_wait_for_build68k_to_be_ready.patch | 22 -- app-emulation/puae/metadata.xml | 52 ----- app-emulation/puae/puae-2.3.3_pre9999.ebuild | 244 --------------------- 6 files changed, 401 deletions(-) delete mode 100644 app-emulation/puae/ChangeLog delete mode 100644 app-emulation/puae/Manifest delete mode 100644 app-emulation/puae/files/001_fix_wrong_unzip_h.patch delete mode 100644 app-emulation/puae/files/002_wait_for_build68k_to_be_ready.patch delete mode 100644 app-emulation/puae/metadata.xml delete mode 100644 app-emulation/puae/puae-2.3.3_pre9999.ebuild (limited to 'app-emulation') diff --git a/app-emulation/puae/ChangeLog b/app-emulation/puae/ChangeLog deleted file mode 100644 index 48122ed..0000000 --- a/app-emulation/puae/ChangeLog +++ /dev/null @@ -1,29 +0,0 @@ -# ChangeLog for app-emulation/puae -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*puae-2.3.2_pre9999 (20 Nov 2011) -*files/001_fix_wrong_unzip_h.patch (20 Nov 2011) - - 20 Nov 2011; Sven Eden +puae-2.3.3_pre9999.ebuild, - +files/001_fix_wrong_unzip.h.patch : Upstream has changed the version number. - But as it is still a live version, the pre9999 suffix will stay. Further - the bsdsock USE flag is removed, adding bsdsock emulation is no longer - optional. A wrong unzip.h version is fixed by the additional patch. - - 20 Mar 2011; Sven Eden -puae-2.3.2_pre9999.ebuild : Remove - old ebuild, git pull is unversioned. - -*puae-2.3.2_pre9999 (28 Mar 2011) - - 28 Mar 2011; Sven Eden +puae-2.3.2_pre9999.ebuild : Upstream - has changed the version number. But as it is still a live version, the - pre9999 suffix will stay - - 28 Mar 2011; Sven Eden -puae-2.3.1_pre9999.ebuild : Remove - old ebuild, git pull is unversioned. - -*puae-2.3.1_pre9999 (27 Mar 2011) - - 27 Mar 2011; Sven Eden +puae-2.3.1_pre9999.ebuild : Initial - release via seden overlay. diff --git a/app-emulation/puae/Manifest b/app-emulation/puae/Manifest deleted file mode 100644 index a7ad2a5..0000000 --- a/app-emulation/puae/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX 001_fix_wrong_unzip_h.patch 1618 RMD160 f775bd88d3e7624f397ca567f4bb869b52ed47e6 SHA1 07e739757cb1ffa7e663376efd3097b4909ab484 SHA256 cd0b9794bab9fee2fc78c151ca5919f46870f5dd07da86b03b8f6ca3ee1cb7a9 -AUX 002_wait_for_build68k_to_be_ready.patch 690 RMD160 93db425ac3a62abd062bc1a41372217706faeac8 SHA1 fb7ac45cbb06876f138c9ddbb9d8bfd2edd8b25a SHA256 91981ca71f4e9aaae09d171f53f6d513098b635d68e61835aa65bc54d3dfccd9 -EBUILD puae-2.3.3_pre9999.ebuild 7507 RMD160 09a36392a90b25fe03c6b9ce312c4f33ca5a124f SHA1 d9b6616889c682aaf97ac5ea9400449e3dadd797 SHA256 2eb28d75d4a10cb271987ea636280cfbee6c39d4729cba0d1a4be86a6c05b711 -MISC ChangeLog 1159 RMD160 729e84ced286bb5236dcb33b1384dd22ba63ee7f SHA1 7e4ccba260d60b6c17d5ed11880ea9c7f67803e8 SHA256 7cec7cec79f39eeec923ff1933c8fa7cc143819c94d04833dc25f77fecd8a680 -MISC metadata.xml 2643 RMD160 1ca246d22ebf49473428fabd6c1a90afb2d79f78 SHA1 add1c4f16b996324195781410d87387f028fc195 SHA256 8ec7853257496220eed3d5c8d3d7ec11c5199a3f5c1ca55c5432b9d4e5475e26 diff --git a/app-emulation/puae/files/001_fix_wrong_unzip_h.patch b/app-emulation/puae/files/001_fix_wrong_unzip_h.patch deleted file mode 100644 index 9a69a43..0000000 --- a/app-emulation/puae/files/001_fix_wrong_unzip_h.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- src/archivers/zip/unzip.h 2011-11-20 20:30:15.555322552 +0100 -+++ src/archivers/zip/unzip.h 2011-11-20 20:30:15.555322552 +0100 -@@ -45,19 +45,19 @@ - extern "C" { - #endif - -+/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */ -+#ifndef OF -+#ifdef __STDC__ -+#define OF(x) x -+#else -+#define OF(x) () -+#endif -+#endif -+ - #ifndef _ZLIB_H - #include "zlib.h" - #endif - --typedef int (ZEXPORT *INFLATEINIT2)(z_streamp strm, int windowBits, const char *version, int stream_size); --typedef int (ZEXPORT *INFLATEINIT)(z_streamp strm, const char *version, int stream_size); --typedef int (ZEXPORT *INFLATEEND)(z_streamp strm); --typedef int (ZEXPORT *INFLATE)(z_streamp strm, int flush); --typedef int (ZEXPORT *DEFLATEINIT)(z_streamp strm, int level, const char *version, int stream_size); --typedef int (ZEXPORT *DEFLATEEND)(z_streamp strm); --typedef int (ZEXPORT *DEFLATE)(z_streamp strm, int flush); --typedef uLong (ZEXPORT *CRC32)(uLong crc, const Bytef *buf, uInt len); -- - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted - from (void*) without cast */ -@@ -68,8 +68,6 @@ - #endif - - --#define ZIP_BZIP2 12 -- - #define UNZ_OK (0) - #define UNZ_END_OF_LIST_OF_FILE (-100) - #define UNZ_ERRNO (Z_ERRNO) -@@ -135,7 +133,7 @@ - */ - - --//extern unzFile ZEXPORT unzOpen OF((struct zfile *path)); -+extern unzFile ZEXPORT unzOpen OF((struct zfile *path)); - /* - Open a Zip file. path contain the full pathname (by example, - on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer diff --git a/app-emulation/puae/files/002_wait_for_build68k_to_be_ready.patch b/app-emulation/puae/files/002_wait_for_build68k_to_be_ready.patch deleted file mode 100644 index 631b9f9..0000000 --- a/app-emulation/puae/files/002_wait_for_build68k_to_be_ready.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/Makefile.am 2011-11-20 22:19:34.000000000 +0100 -+++ src/Makefile.am 2011-11-20 22:20:08.000000000 +0100 -@@ -297,7 +297,8 @@ - $(MAKE) -C tools genlinetoscr - - cpudefs.c: tools/build68k @top_srcdir@/src/table68k -- ./tools/build68k <@top_srcdir@/src/table68k >cpudefs.c -+ sleep 1s -+ ./tools/build68k <@top_srcdir@/src/table68k >cpudefs.c - - machdep/libmachdep.a: - $(MAKE) -C @MACHDEP@ libmachdep.a ---- src/tools/Makefile.in 2011-11-20 22:19:45.000000000 +0100 -+++ src/tools/Makefile.in 2011-11-20 22:20:26.000000000 +0100 -@@ -54,6 +54,7 @@ - drawing.o: linetoscr.c - - cpudefs.c: build68k @top_srcdir@/../table68k -+ sleep 1s - ./build68k <@top_srcdir@/../table68k >cpudefs.c - - .c.o: diff --git a/app-emulation/puae/metadata.xml b/app-emulation/puae/metadata.xml deleted file mode 100644 index b805b0c..0000000 --- a/app-emulation/puae/metadata.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - -no-herd - - sven.eden@gmx.de - The creator of this ebuild, but not the official maintainer - -PUAE tries to continue where E-UAE left off.. -PUAE versioning is based on the merged WinUAE version.. - -All is done by: - Mustafa 'GnoStiC' TUFAN (mustafa.tufan@gmail.com) - -with fixes from: - Steven 'xaind' Saunders (MacOSX) - 'wuffe' (FreeBSD) - - Build a profiling (SLOW!) version - - Enable A2091 SCSI emulation - Enable audio output (needs either alsa or sdl-sound USE flag) - Enable AMAX support - Enable bsdsocket.library emulation - Enable CDTV emulation - Enable CD32 emulation - Enable internal debugger/monitor - X11 version: Use the DGA extension - Enable Floppy Drive Sound Emulation - Enable ersatz Enforcer support - Enable GAYLE IDE emulation - Enable FPU emulation - Enable JIT compiler (x86 only) - Enable JIT direct memory support (x86 only) - Enable noflags support in JIT (x86 only) - Enable NCR SCSI emulation - Enable emulation of SCSI devices - Enable support for saving state snapshots - Enable thread support - Use a user interface if possible - X11 version: Use the XF86VidMode extension - Enable keymaps for X-Arcade joysticks - Use SDL library for low-level functions - Use SDL library for sound - Use SDL library for graphics - Allow GL for 2D acceleration with SDL graphics - Use QT library for graphics/ui instead of gtk/sdl (incomplete!) - Use ncurses library for graphics - Use ALSA library for sound - Use the X Window System - - diff --git a/app-emulation/puae/puae-2.3.3_pre9999.ebuild b/app-emulation/puae/puae-2.3.3_pre9999.ebuild deleted file mode 100644 index 0b87a7e..0000000 --- a/app-emulation/puae/puae-2.3.3_pre9999.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit autotools flag-o-matic git-2 - -DESCRIPTION="PUAE tries to continue where E-UAE left off." -HOMEPAGE="https://github.com/GnoStiC/PUAE" -EGIT_REPO_URI="https://github.com/GnoStiC/PUAE.git" -SRC_URI="" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="a2065 a2091 +alsa amax +audio cdtv cd32 +debugger dga \ - drvsnd enforcer +fpu gayle +gtk jit ncr +natmem noflags ncurses \ - profiling qt +save-state scsi-device +sdl +sdl-gfx sdl-gl \ - sdl-sound threads +ui vidmode +xarcade X" - -RDEPEND=" - alsa? ( !sdl-sound? ( media-libs/alsa-lib ) ) - gtk? ( >=x11-libs/gtk+-2 ) - ncurses? ( !qt? ( !sdl-gfx? ( sys-libs/ncurses ) ) ) - qt? ( !gtk? ( x11-libs/qt-gui ) ) - sdl? ( media-libs/libsdl ) - sdl-gfx? ( !qt? ( media-libs/sdl-gfx ) ) - sdl-sound? ( media-libs/sdl-sound ) - sdl-gl? ( !qt? ( virtual/opengl ) ) - X? ( x11-libs/libX11 - dga? ( x11-libs/libXxf86dga ) - ) -" -DEPEND="${DEPEND} ${RDEPEND} - X? ( dga? ( x11-proto/xf86dgaproto ) - vidmode? ( x11-proto/xf86vidmodeproto ) - ) -" - -src_prepare() { - # One of the unzip.h files (why use two anyway?) is wrong (right now), fix it: - epatch "${FILESDIR}"/001_fix_wrong_unzip_h.patch - - # Thanks to parallel build, tools/build68k might be called before it is ready. - # Little but nasty solution: Add a small delay - epatch "${FILESDIR}"/002_wait_for_build68k_to_be_ready.patch - - eautoreconf -} - -src_configure() { - local myconf="" - local hasUI=0 - local needSDL=0 - - # the following warnings are issued very often, and the user can't help it - append-cflags -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast -Wno-sign-compare - append-cflags -Wno-missing-prototypes -Wno-implicit -fno-strict-aliasing - append-cflags -std=gnu99 - - # gtk is the default ui. If it is enabled, qt must not be enabled, - # or it replaces the gtk ui. - if use ui ; then - myconf="${myconf} --enable-ui" - if use gtk ; then - myconf="${myconf} --enable-gtktest --without-qt" - hasUI=1 - fi - if use qt ; then - if ! use gtk ; then - myconf="${myconf} --disable-gtktest --with-qt" - hasUI=1 - else - # Notify user if both have been set - elog "Both gtk and qt USE flag are enabled." - elog "As gtk is preferred over qt, qt is ignored." - fi - fi - if [ ${hasUI} -eq 0 ] ; then - ewarn "ui USE flag set, but neither gtk nor qt chosen." - elog "--> gtk is selected automatically." - myconf="${myconf} --enable-gtktest --without-qt" - hasUI=1 - fi - fi - - # Both gtk and qt ui need threads: - if [ ${hasUI} -eq 1 ] ; then - if ! use threads ; then - ewarn "Both gtk and qt ui need threads. Therefore" - ewarn "threads are enabled despite USE flag setting" - fi - myconf="${myconf} --enable-threads" - else - myconf="${myconf} $(use_enable threads)" - fi - - # Graphics are done via sdl-gfx (plus sdl-gl), X, qt - # or ncurses (in this order) - if use sdl-gfx ; then - myconf="${myconf} --with-sdl-gfx --without-curses" - needSDL=$((needSDL+1)) - elog "sdl-gfx chosen for graphic output." - if use sdl-gl ; then - myconf="${myconf} --with-sdl-gl" - fi - # Notify user if qt and/or ncurses are set, too: - use qt && elog "-> qt USE flag ignored" - use ncurses && elog "-> ncurses USE flag ignored" - elif use X ; then - myconf="${myconf} --with-x \ - $(use_enable dga) \ - $(use_enable vidmode)" - elog "X chosen for graphic output" - elif use qt ; then - # qt can only be enabled if we do not use gtk - if ! use gtk ; then - myconf="${myconf} --without-sdl-gfx --without-sdl-gl" - myconf="${myconf} --without-curses" - if [ ${hasUI} -eq 0 ] ; then - myconf="${myconf} --with-qt --disable-gtktest" - fi - elog "qt chosen for graphic output." - use ncurses && elog "-> ncurses USE flag ignored" - elif [ ${hasUI} -eq 0 ] ; then - myconf="${myconf} --without-sdl-gfx --without-sdl-gl" - myconf="${myconf} --without-curses" - myconf="${myconf} --with-qt --disable-gtktest" - elog "qt chosen for graphic output." - use gtk && elog "-> gtk USE flag ignored, as no ui is used" - use ncurses && elog "-> ncurses USE flag ignored" - else - # tell the user that qt is disabled if gtk is in use - # without-qt and enable-gtktest are already set - elog "You can not use qt for graphics when gtk is" - elog "chosen for the ui. Therefore gtk/sdl is chosen." - use ncurses && elog "-> ncurses USE flag ignored" - myconf="${myconf} --with-sdl-gfx --without-curses" - needSDL=$((needSDL+1)) - if use sdl-gl ; then - myconf="${myconf} --with-sdl-gl" - fi - fi - elif use ncurses ; then - # who wants to use that? - myconf="${myconf} --without-sdl-gfx --without-sdl-gl" - myconf="${myconf} --without-qt --with-curses" - else - # As no graphics system is chosen, we default to sdl - ewarn "No graphics system is chosen." - elog "sdl-gfx has been enabled as the default system" - myconf="${myconf} --with-sdl-gfx --without-curses" - needSDL=$((needSDL+1)) - if use sdl-gl ; then - myconf="${myconf} --with-sdl-gl" - fi - fi - - # JIT can only be used with x86 - if use x86 ; then - myconf="${myconf} \ - $(use_enable jit) \ - $(use_enable natmem) \ - $(use_enable noflags)" - else - myconf="${myconf} --disable-jit --disable-natmem --disable-noflags" - use jit && elog "JIT is only available on x86 platforms and has been deactivated." - fi - - # If we use audio, alsa comes first, then sdl (like in configure.in) - if use audio ; then - if use alsa ; then - myconf="${myconf} --enable-audio --without-sdl-sound" - myconf="${myconf} --with-alsa" - elog "alsa is chosen for audio output" - use sdl-sound && elog "--> sdl-sound USE flag ignored" - elif use sdl-sound ; then - needSDL=$((needSDL+1)) - myconf="${myconf} --enable-audio --with-sdl-sound" - myconf="${myconf} --without-alsa" - elog "sdl-sound is chosen for audio output" - else - ewarn "audio is enabled, but neither alsa nor sdl-sound" - ewarn "selected. Defaulting to alsa." - myconf="${myconf} --enable-audio --without-sdl-sound" - myconf="${myconf} --with-alsa" - fi - else - myconf="${myconf} --disable-audio --without-sdl-sound" - myconf="${myconf} --without-alsa" - fi - - # We need to determine whether SDL is used for the low level - # functionality to determine, whether sdl has to be tested: - if use sdl ; then - needSDL=$((needSDL+1)) - myconf="${myconf} --with-sdl" - fi - - # Need sdl test programs? - if [ ${needSDL} -gt 0 ] ; then - myconf="${myconf} --enable-sdltest" - else - myconf="${myconf} --disable-sdltest" - fi - - # And now go for it: - econf \ - $(use_enable profiling) \ - $(use_enable a2065) \ - $(use_enable a2091) \ - $(use_enable amax) \ - $(use_enable cdtv) \ - $(use_enable cd32) \ - $(use_enable debugger) \ - $(use_enable drvsnd) \ - $(use_enable enforcer) \ - $(use_enable gayle) \ - $(use_enable fpu) \ - $(use_enable ncr) \ - $(use_enable scsi-device) \ - $(use_enable save-state) \ - $(use_enable xarcade) \ - --enable-bsdsock \ - ${myconf} || die "econf failed" -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" - - dodoc CHANGES COPYING README docs/* - - # Finally tell the user that he has to set up kick rom path and - # file first, or the gui will close on itself. - elog "Before the UI can be used, a configuration file" - elog "~/.uaerc has to be created with at least two" - elog "settings:" - elog "unix.rom_path=" - elog "kickstart_rom_file=\$(FILE_PATH)/" -} -- cgit v1.2.3-65-gdbad