1:18 p.m.
commit f9ae42891046461648399db5fdc011568d6f8b55
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jul 7 15:18:36 2016 +0200
Sync with SheepShaver package
BasiliskII.spec | 49 +++++++++++++++++++++---------------------
cxmon-3.2-fpermissive.patch | 48 +++++++++++++++++++++++++++++++++++++++++
macemu-not-finding-cxmon.patch | 21 ++++++++++++++++++
3 files changed, 94 insertions(+), 24 deletions(-)
---
diff --git a/BasiliskII.spec b/BasiliskII.spec
index 06eed4b..7d85cd8 100644
--- a/BasiliskII.spec
+++ b/BasiliskII.spec
@@ -8,14 +8,15 @@ Version: 1.0
Release: 0.%{date}.6%{?dist}
License: GPLv2+
URL: http://basilisk.cebix.net/
-Source0:
https://github.com/cebix/macemu/archive/%{commit}/%{name}-%{version}-%{sh...
-Source1: BasiliskII.desktop
-Source2: BasiliskII.png
-Source3: BasiliskII.appdata.xml
+Source0:
https://github.com/cebix/macemu/archive/%{commit}/BasiliskII-1.0-%{shortc...
+Source1: %{name}.desktop
+Source2: %{name}.png
+Source3: %{name}.appdata.xml
Patch0: macemu-not-finding-cxmon.patch
# For some reason AC_PATH_XTRA does not work on the rpmfusion buildsys ?
# I've tried reproducing this with mock on both x86_64 and arm, without success
-patch1: macemu-work-around-ac_path_xtra-not-working.patch
+Patch1: macemu-work-around-ac_path_xtra-not-working.patch
+# Patch 10+ because these are for cxmon
Patch10: cxmon-3.2-hide-symbols.patch
Patch11: cxmon-3.2-strfmt.patch
Patch12: cxmon-3.2-fpermissive.patch
@@ -39,20 +40,20 @@ a Macintosh ROM image to use Basilisk II.
%patch11 -p1
%patch12 -p1
# cleanup
-iconv -f ISO_8859-1 -t UTF8 BasiliskII/README > README
-touch -r BasiliskII/README README
-iconv -f ISO_8859-1 -t UTF8 BasiliskII/ChangeLog > ChangeLog
-touch -r ChangeLog BasiliskII/ChangeLog
-sed -i 's/\r//' BasiliskII/src/Unix/tinyxml2.cpp
-chmod -x BasiliskII/src/Unix/tinyxml2.cpp BasiliskII/src/Unix/tinyxml2.h
+iconv -f ISO_8859-1 -t UTF8 %{name}/README > README
+touch -r %{name}/README README
+iconv -f ISO_8859-1 -t UTF8 %{name}/ChangeLog > ChangeLog
+touch -r ChangeLog %{name}/ChangeLog
+sed -i 's/\r//' %{name}/src/Unix/tinyxml2.cpp
+chmod -x %{name}/src/Unix/tinyxml2.cpp %{name}/src/Unix/tinyxml2.h
# autogen
-pushd BasiliskII/src/Unix
+pushd %{name}/src/Unix
NO_CONFIGURE=1 ./autogen.sh
popd
%build
-pushd BasiliskII/src/Unix
+pushd %{name}/src/Unix
%configure --datadir=%{_sysconfdir} \
--disable-xf86-dga --enable-sdl-audio --with-bincue
make %{?_smp_mflags}
@@ -60,7 +61,7 @@ popd
%install
-pushd BasiliskII/src/Unix
+pushd %{name}/src/Unix
%make_install
popd
chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tunconfig
@@ -69,7 +70,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
install -D -p -m 0644 %{SOURCE2} \
- %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/BasiliskII.png
+ %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
install -D -p -m 0644 %{SOURCE3} \
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
@@ -91,17 +92,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%files
-%doc ChangeLog README BasiliskII/TECH BasiliskII/TODO
-%license BasiliskII/COPYING
-%dir %{_sysconfdir}/BasiliskII/
-%config(noreplace) %{_sysconfdir}/BasiliskII/fbdevices
-%config(noreplace) %{_sysconfdir}/BasiliskII/keycodes
-%{_sysconfdir}/BasiliskII/tunconfig
-%{_bindir}/BasiliskII
+%doc ChangeLog README %{name}/TECH %{name}/TODO
+%license %{name}/COPYING
+%dir %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/fbdevices
+%config(noreplace) %{_sysconfdir}/%{name}/keycodes
+%{_sysconfdir}/%{name}/tunconfig
+%{_bindir}/%{name}
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/128x128/apps/BasiliskII.png
-%{_mandir}/man1/BasiliskII.1*
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_mandir}/man1/%{name}.1*
%changelog
diff --git a/cxmon-3.2-fpermissive.patch b/cxmon-3.2-fpermissive.patch
index f17cec7..987b146 100644
--- a/cxmon-3.2-fpermissive.patch
+++ b/cxmon-3.2-fpermissive.patch
@@ -22,3 +22,51 @@ diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/cxmon/src/mon.h~ macemu
/*
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp 2016-07-07
14:44:00.099249460 +0200
+@@ -67,7 +67,7 @@ void powerpc_cpu::execute_illegal(uint32
+ disass_ppc(stdout, pc(), opcode);
+
+ // Start up mon in real-mode
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ abort();
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp 2016-07-07
14:45:33.741857603 +0200
+@@ -83,7 +83,7 @@ static void enter_mon(void)
+ {
+ // Start up mon in real-mode
+ #if ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ }
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-cpu.cpp 2016-07-07
14:48:51.031138859 +0200
+@@ -527,7 +527,7 @@ bool powerpc_cpu::check_spcflags()
+ spcflags().clear(SPCFLAG_CPU_ENTER_MON);
+ #if ENABLE_MON
+ // Start up mon in real-mode
+- char *arg[] = {
++ const char *arg[] = {
+ "mon",
+ #ifdef SHEEPSHAVER
+ "-m",
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-translate.cpp 2016-07-07
14:48:12.805890613 +0200
+@@ -95,7 +95,7 @@ static void disasm_block(int target, uin
+ target == TARGET_POWERPC ? "d" : "x",
+ start, start + length - 1);
+
+- char *arg[] = {"mon",
++ const char *arg[] = {"mon",
+ #ifdef SHEEPSHAVER
+ "-m",
+ #endif
diff --git a/macemu-not-finding-cxmon.patch b/macemu-not-finding-cxmon.patch
index 147d9c3..b54913f 100644
--- a/macemu-not-finding-cxmon.patch
+++ b/macemu-not-finding-cxmon.patch
@@ -15,3 +15,24 @@ diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/BasiliskII/src/Unix/con
CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
AC_CHECK_LIB(ncurses, tgetent, ,
[AC_CHECK_LIB(termcap, tgetent, ,
+diff -up
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac~
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac
+---
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac~ 2016-01-31
16:00:57.000000000 +0100
++++
macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/Unix/configure.ac 2016-07-07
14:40:04.682720595 +0200
+@@ -114,7 +114,7 @@ x/* | x.*)
+ WANT_MON=yes
+ ;;
+ xyes)
+- mon_srcdir=../../../mon/src
++ mon_srcdir=../../../cxmon/src
+ ;;
+ esac
+ if [[ "x$WANT_MON" = "xyes" ]]; then
+@@ -122,7 +122,7 @@ if [[ "x$WANT_MON" = "xyes" ]]; then
+ if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
+- MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp
$mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp
$mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c
$mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c $mon_srcdir/disass/mips-dis.c
$mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
++ MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp
$mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp
$mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c
$mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
+ CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
+ AC_CHECK_LIB(ncurses, tgetent, ,
+ [AC_CHECK_LIB(termcap, tgetent, ,