puae 2.3.2

debian/README

@@ -0,0 +1,6 @@
+The Debian Package P-UAE
+------------------------
+
+Comments regarding the Package
+
+Mustafa Tufan <mustafa.tufan@gmail.com>, Mon, 30 May 2011 11:25:00 +0200

debian/README.Debian

@@ -0,0 +1,26 @@
+P-UAE for Debian
+----------------
+
+Currently this build of P-UAE does not support the SCSI emulation. This will
+be addressed eventually.
+
+Additionally, this package is missing support for IPF floppy images as the
+corresponding header files are distributed under a disputable license.
+However, the package build system is configured to use these headers if they
+are present, so all you need to do is download the package source via
+| $ apt-get source p-uae
+(works only if you have a working deb-src line in your /etc/apt/sources.list)
+install all packages needed for a rebuild via
+| $ apt-get build-dep p-uae; apt-get install build-essential fakeroot
+download the IPF Access API tarball from http://www.softpres.org/
+and copy the include/caps directory included therein into the src/include
+directory in your private p-uae build tree. From this tree, now execute
+| $ dpkg-buildpackage -rfakeroot -uc -B
+and you will get a shiny new package with support for IPF floppy images,
+just right for installation via "dpkg -i packagename.deb" (as root).
+
+This package will be built using Jeff Shepherd's new network emulation which
+doesn't require the companion bsdsocket.library on platforms that support it.
+Currently, these are i386, amd64 (aka x86_64) and powerpc.
+
+ -- Florian Ernst <florian@debian.org>  Wed, 23 Nov 2005 13:31:05 +0100

debian/changelog

@@ -0,0 +1,76 @@
+p-uae (0.0.0-0) UNRELEASED; urgency=low
+
+  * Changed package name to p-uae.
+  * http://rzr.online.fr/q/amiga
+
+ -- Philippe Coval <rzr@gna.org>  Mon, 23 May 2011 11:43:36 +0200
+
+e-uae (0.8.28-2) unstable; urgency=low
+
+  * Adjustments to Debian packaging, making this package suitable for
+    inclusion in the Debian archives (Closes: #301312)
+
+ -- Florian Ernst <florian@debian.org>  Wed, 23 Nov 2005 17:42:44 +0100
+
+e-uae (0.8.28-1) unstable; urgency=low
+
+  * Updated to version 0.8.28.
+
+ -- Richard Drummond <uae@rcdrummond.net>  Sat, 17 Sep 2005 15:54:09 -0400
+
+e-uae (0.8.27-1) unstable; urgency=low
+
+  * Changed package name to e-uae.
+  * Updated to version 0.8.27.
+
+ -- Richard Drummond <uae@rcdrummond.net>  Mon,  3 Jan 2005 14:57:37 -0500
+
+uae (0.8.23-1.20040125.1) unstable; urgency=low
+
+  * Updated.
+
+ -- Richard Drummond <uae@rcdrummond.net>  Sun, 25 Jan 2004 03:29:46 -0500
+
+uae (0.8.23-1.20040123.1) unstable; urgency=low
+
+  * Updated to 0.8.23
+  * Now build depends on either gtk1.2-dev or gtk2.0-dev 
+
+ -- Richard Drummond <uae@rcdrummond.net>  Fri, 23 Jan 2004 14:37:25 -0500
+
+uae (0.8.22-1.20040104.1) unstable; urgency=low
+
+  * Updated. See CHANGES-rich.txt for details.
+  * Added readdisk binary to package.
+  * Updated rules due to new automake-based build system used.
+
+ -- Richard Drummond <uae@rcdrummond.net>  Mon,  5 Jan 2004 14:38:37 -0500
+
+uae (0.8.22-1.20031215.1) unstable; urgency=low
+
+  * Updated. See CHANGES-rich.txt for details.
+
+ -- Richard Drummond <uae@rcdrummond.net>  Mon, 15 Dec 2003 03:40:21 -0500
+
+uae (0.8.22-1.20031214.1) unstable; urgency=low
+
+  * Updated. See CHANGES-rich.txt for details.
+
+ -- Richard Drummond <uae@rcdrummond.net>  Sun, 14 Dec 2003 21:42:43 -0500
+
+uae (0.8.22-1.20031202.1) unstable; urgency=low
+
+  * Update. See CHANGES-rich.txt for details.
+  * No longer requires GCC-2.95 to build. Will build with default gcc.
+
+ -- Richard Drummond <uae@rcdrummond.net>  Tue, 18 Nov 2003 15:48:00 -0500
+
+uae (0.8.22-1.20031118.1) unstable; urgency=low
+
+  * Initial debian packaging
+
+ -- Richard Drummond <uae@rcdrummond.net>  Tue, 18 Nov 2003 15:48:00 -0500
+
+Local variables:
+mode: debian-changelog
+End:

debian/compat

@@ -0,0 +1 @@
+5

debian/control

@@ -0,0 +1,28 @@
+Source: p-uae
+Section: contrib/otherosfs
+Priority: optional
+Maintainer: Mustafa Tufan <mustafa.tufan@gmail.com>
+Uploaders: Florian Ernst <florian@debian.org>
+Build-Depends: debhelper (>= 5),
+ libgtk2.0-dev, libsdl1.2-dev, zlib1g-dev, 
+ autotools-dev,
+ autoconf, 
+ automake
+Standards-Version: 3.6.2
+
+Package: p-uae
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: uae, uae-sdl
+Description: Unix Amiga Emulator
+ This is a fork of E-UAE, the Ubiquitous Amiga Emulator, with an emulation core
+ based on WinUAE. It attempts to bring many of the great features of WinUAE
+ to non-Windows platforms. P-UAE was meant to be a Pandora Amiga emulator,
+ thus P-UAE, but later become the 'Portable' UAE.
+ .
+ To make full use of P-UAE you will need access to an image of some version
+ of the Amiga Kickstart ROM (although UAE does include a ROM emulation which
+ may work with some old games). The Amiga Kickstart ROMs are copyrighted
+ material and may not be freely distributed (so don't ask me for a copy).
+ .
+ Homepage: https://github.com/GnoStiC/PUAE

debian/copyright

@@ -0,0 +1,24 @@
+This package was debianized by Mustafa Tufan <mustafa.tufan@gmail.com> and
+adjusted for Debian by Florian Ernst <florian@debian.org>.
+
+The sources were obtained from <https://github.com/GnoStiC/PUAE>
+
+Copyright Holders:
+
+  Copyright 2006-2011 Mustafa 'GnoStiC' Tufan (p-uae)
+  Copyright 2003-2005 Richard Drummond (e-uae)
+  Copyright 1999-2011 Toni Wilen (winuae)
+  Copyright 1995-2002 Bernd Schmidt (uae)
+
+  P-UAE continues where E-UAE left off trying to sync to latest WinUAE.
+
+  E-UAE is based on the work of dozens of contributors including Bernd Schmidt
+  (the original author and maintainer of UAE), Bernie Meyer (the author of the
+  x86 JIT compiler), Toni Wilen (the current maintainer of WinUAE), and many
+  more.
+
+P-UAE license:
+
+  P-UAE is open-source software and is made available under the terms of the
+  GPL.  On Debian systems, the complete text of the GNU General Public License
+  can be found in `/usr/share/common-licenses/GPL'.

debian/docs

@@ -0,0 +1,2 @@
+README
+docs

debian/linda.overrides

@@ -0,0 +1,2 @@
+Tag: exec-not-elf-or-script
+Data: /usr/share/p-uae/amiga/*

debian/lintian.overrides

@@ -0,0 +1 @@
+p-uae: executable-not-elf-or-script

debian/manpages

@@ -0,0 +1,2 @@
+debian/p-uae.1
+debian/p-uae_readdisk.1

debian/menu

@@ -0,0 +1,4 @@
+?package(p-uae):command="/usr/bin/p-uae"\
+              title="E-UAE"\
+              needs="X11"\
+              section="Apps/Emulators"

debian/p-uae.1

@@ -0,0 +1,13 @@
+.TH P-UAE 1
+.SH NAME
+\fBP-UAE\fR	\- a fork of UAE, the Ubiquitous Amiga Emulator.
+.SH DESCRIPTION
+\fBP-UAE\fR is a fork of E-UAE, the Ubiquitous Amiga Emulator, with an emulation
+core based on WinUAE. It attempts to bring many of the great features of WinUAE
+to non-Windows platforms. P-UAE was meant to be a Pandora Amiga emulator,
+thus P-UAE, but later become the 'Portable' UAE.
+
+For more information please browse the program documentation in
+.IR /usr/share/doc/p-uae/docs .
+.SH "SEE ALSO"
+.BR uae (1)

debian/p-uae_readdisk.1

@@ -0,0 +1,17 @@
+.TH P-UAE_READDISK 1 "23 Nov 2005" "3rd party" "Contributed application"
+.SH NAME
+\fBp-uae_readdisk\fR	\- Read files from Amiga Disk Files.
+.SH DESCRIPTION
+If you have a disk image file, and you want to retrieve the files from it, you
+can use the "readdisk" tool. It is automatically built by "make". If you have
+a disk image of a disk called "Workbench1.3D" as df0.adf, and you do
+   readdisk df0.adf
+the whole directory structure of the disk image will be stored in a newly
+created subdirectory called "Workbench1.3D". You can optionally give a second
+parameter to specify a directory where to create the output other than the
+current directory.
+readdisk only understands about the OFS right now. FFS disks will cheerfully
+be regarded as being unreadable. Use the unixfs.device from within the
+emulator if you want to transfer files from FFS disks.
+.SH "SEE ALSO"
+.BR uae_readdisk (1)

debian/postinst

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install /usr/bin/uae uae /usr/bin/p-uae 80
+
+#DEBHELPER#

debian/prerm

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" != "upgrade"; then
+    update-alternatives --remove uae /usr/bin/p-uae
+fi
+
+#DEBHELPER#

debian/rules

@@ -0,0 +1,93 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Simple debian/rules for UAE
+# Based on sample rules  GNU copyright 1997 to 1999 by Joey Hess.
+
+#export DH_VERBOSE=1
+
+DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_CPU	?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+# Build only the SDL target for just now
+CFG_OPTIONS += --with-sdl-gfx --with-sdl-sound
+
+# Use 'new' bsdsocket emulation on these architectures:
+ifneq (,$(findstring $(DEB_HOST_ARCH),i386 amd64 powerpc))
+    CFG_OPTIONS += --enable-bsdsock-new
+else
+    CFG_OPTIONS += --enable-bsdsock
+endif
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	ln -sf /usr/share/misc/config.sub	config.sub
+	ln -sf /usr/share/misc/config.guess	config.guess
+	CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure \
+		--prefix=/usr \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--with-caps --with-caps-prefix=$(CURDIR)/src \
+		$(CFG_OPTIONS)
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	-rm build-stamp
+	[ ! -f Makefile ] || $(MAKE) -i distclean
+	dh_clean config.sub config.guess
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs usr/share/p-uae
+	install -D src/uae debian/p-uae/usr/bin/p-uae
+	install -D src/readdisk debian/p-uae/usr/bin/p-uae_readdisk
+	cp -a amiga debian/p-uae/usr/share/p-uae
+	rm -rf debian/p-uae/usr/share/p-uae/amiga/source
+	install -D -m 644 debian/lintian.overrides \
+		debian/p-uae/usr/share/lintian/overrides/p-uae
+	install -D -m 644 debian/linda.overrides \
+		debian/p-uae/usr/share/linda/overrides/p-uae
+
+binary-indep: build install
+# We have nothing to do by default.
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+#	dh_installchangelogs ChangeLog
+	dh_installchangelogs CHANGES
+	dh_installdocs
+	dh_installmenu
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+configure: bootstrap.sh
+	${SHELL} $<
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

debian/watch

@@ -0,0 +1,2 @@
+version=3
+http://githubredir.debian.net/github/GnoStiC/PUAE

release_.sh

@@ -30,7 +30,7 @@ rm -rf `find . -type f -name *.a`
 rm -rf `find . -type f -name configure`
 rm -rf `find . -type f -name config.log`
 rm -rf `find . -type f -name config.status`
-rm -rf `find . -type f -name sysconfig.h`
+rm -rf `find . -type f -name .DS_Store`
 
 rm -rf Makefile.in
 rm -rf src/Makefile.in

src/audio.c

@@ -1627,8 +1627,8 @@ void set_audio (void)
 	delay = currprefs.sound_mixed_stereo_delay = changed_prefs.sound_mixed_stereo_delay;
 	mixed_mul1 = MIXED_STEREO_SCALE / 2 - sep;
 	mixed_mul2 = MIXED_STEREO_SCALE / 2 + sep;
-	mixed_stereo_size = delay > 0 ? (1 << (delay - 1)) - 1 : 0;
+	mixed_stereo_size = delay > 0 ? (1 << delay) - 1 : 0;
-	mixed_on = (sep > 0 && sep < MIXED_STEREO_MAX) || mixed_stereo_size > 0;
+	mixed_on = sep < MIXED_STEREO_MAX || mixed_stereo_size > 0;
 	if (mixed_on && old_mixed_size != mixed_stereo_size) {
 		saved_ptr = 0;
 		memset (right_word_saved, 0, sizeof right_word_saved);

src/memory.c

@@ -171,7 +171,7 @@ static int REGPARAM3 dummy_check (uaecptr addr, uae_u32 size) REGPARAM;
 
 static void dummylog (int rw, uaecptr addr, int size, uae_u32 val, int ins)
 {
-	if (illegal_count >= MAX_ILG)
+	if (illegal_count >= MAX_ILG && MAX_ILG > 0)
 		return;
 	/* ignore Zorro3 expansion space */
 	if (addr >= 0xff000000 && addr <= 0xff000200)
@@ -1643,28 +1643,30 @@ static int read_kickstart (struct zfile *f, uae_u8 *mem, int size, int dochecksu
 	return i;
 }
 
-static int load_extendedkickstart (void)
+static bool load_extendedkickstart (const TCHAR *romextfile, int type)
 {
 	struct zfile *f;
 	int size, off;
+	bool ret = false;
 
-	if (_tcslen (currprefs.romextfile) == 0)
+	if (_tcslen (romextfile) == 0)
-		return 0;
+		return false;
 #ifdef ARCADIA
-	if (is_arcadia_rom (currprefs.romextfile) == ARCADIA_BIOS) {
+	if (is_arcadia_rom (romextfile) == ARCADIA_BIOS) {
 		extendedkickmem_type = EXTENDED_ROM_ARCADIA;
-		return 0;
+		return false;
 	}
 #endif
-	f = read_rom_name (currprefs.romextfile);
+	f = read_rom_name (romextfile);
 	if (!f) {
 		gui_message ("No extended ROM found.");
-		return 0;
+		return false;
 	}
 	zfile_fseek (f, 0, SEEK_END);
 	size = zfile_ftell (f);
 	extendedkickmem_size = 524288;
 	off = 0;
+	if (type == 0) {
 	if (currprefs.cs_cd32cd) {
 		extendedkickmem_type = EXTENDED_ROM_CD32;
 	} else if (currprefs.cs_cdtvcd || currprefs.cs_cdtvram) {
@@ -1673,9 +1675,11 @@ static int load_extendedkickstart (void)
 		extendedkickmem_type = EXTENDED_ROM_CD32;
 	} else if (need_uae_boot_rom () != 0xf00000) {
 		extendedkickmem_type = EXTENDED_ROM_CDTV;
-	} else
+		}	
-		return 0;
+	} else {
-
+		extendedkickmem_type = type;
+	}
+	if (extendedkickmem_type) {
 	zfile_fseek (f, off, SEEK_SET);
 	switch (extendedkickmem_type) {
 	case EXTENDED_ROM_CDTV:
@@ -1687,10 +1691,14 @@ static int load_extendedkickstart (void)
 		extendedkickmem_bank.baseaddr = extendedkickmemory;
 		break;
 	}
+		if (extendedkickmemory) {
 	read_kickstart (f, extendedkickmemory, extendedkickmem_size, 0, 1);
 	extendedkickmem_mask = extendedkickmem_size - 1;
+			ret = true;
+		}
+	}
 	zfile_fclose (f);
-	return 1;
+	return ret;
 }
 
 static int patch_shapeshifter (uae_u8 *kickmemory)
@@ -2479,7 +2487,8 @@ void memory_reset (void)
 		extendedkickmemory2 = 0;
 		extendedkickmem2_size = 0;
 		extendedkickmem_type = 0;
-		load_extendedkickstart ();
+		load_extendedkickstart (currprefs.romextfile, 0);
+		load_extendedkickstart (currprefs.romextfile2, EXTENDED_ROM_CDTV);
 		kickmem_mask = 524288 - 1;
 		if (!load_kickstart ()) {
 			if (_tcslen (currprefs.romfile) > 0) {
@@ -2549,8 +2558,8 @@ void memory_reset (void)
 		int t = currprefs.bogomem_size >> 16;
 		if (t > 0x1C)
 			t = 0x1C;
-		if (t > 0x10 && ((currprefs.chipset_mask & CSMASK_AGA) || (currprefs.cpu_model >= 68020 && !currprefs.address_space_24)))
+		if (t > 0x18 && ((currprefs.chipset_mask & CSMASK_AGA) || (currprefs.cpu_model >= 68020 && !currprefs.address_space_24)))
-			t = 0x10;
+			t = 0x18;
 		map_banks (&bogomem_bank, 0xC0, t, 0);
 	}
 #ifdef GAYLE