rpmfusion-commits
October 2017
rpmfusion-commits@lists.rpmfusion.org
- 19 participants
- 373 discussions
[SheepShaver/f27] Sync version with BasiliskII package / latest upstream
by jwrdegoede
Summary of changes:
bb40c5c... Sync version with BasiliskII package / latest upstream (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 6 months
- 1
- 0
[SheepShaver] Sync version with BasiliskII package / latest upstream
by jwrdegoede
commit bb40c5c70179e99346fe9474bebfaf64c11136cb
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Sun Oct 1 19:47:24 2017 +0200
Sync version with BasiliskII package / latest upstream
.gitignore | 1 +
SheepShaver.spec | 16 ++++----
cxmon-3.2-fpermissive.patch | 89 ++++++++++++++++++++++++++++++++++++++++++
macemu-not-finding-cxmon.patch | 38 ------------------
sources | 2 +-
5 files changed, 98 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index beb602c..6c09151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
cxmon-3.2-cvs20130310.tar.gz
macemu-master.zip
BasiliskII-1.0-b58a926.tar.gz
+/BasiliskII-1.0-e273bb1.tar.gz
diff --git a/SheepShaver.spec b/SheepShaver.spec
index 7109f1c..c850998 100644
--- a/SheepShaver.spec
+++ b/SheepShaver.spec
@@ -1,6 +1,6 @@
-%global commit b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1
+%global commit e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%define date 20160322
+%define date 20171001
# Hardening breaks the jit
%undefine _hardened_build
@@ -8,14 +8,13 @@
Summary: Power Macintosh emulator
Name: SheepShaver
Version: 2.4
-Release: 0.4.%{date}%{?dist}
+Release: 0.5.%{date}%{?dist}
License: GPLv2+
URL: http://sheepshaver.cebix.net/
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
# Patch 10+ because these are for cxmon
Patch10: cxmon-3.2-hide-symbols.patch
Patch11: cxmon-3.2-strfmt.patch
@@ -39,11 +38,7 @@ G4 emulator, without MMU support, for non-PowerPC systems.
%prep
-%setup -q -n macemu-%{commit}
-%patch0 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+%autosetup -p1 -n macemu-%{commit}
sed -i 's/\r//' %{name}/src/Unix/tinyxml2.cpp
chmod -x %{name}/src/Unix/tinyxml2.cpp %{name}/src/Unix/tinyxml2.h
chmod -x %{name}/src/kpx_cpu/src/mathlib/ieeefp.hpp
@@ -109,6 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Oct 1 2017 Hans de Goede <j.w.r.degoede(a)gmail.com> - 2.4-0.5.20171001
+- Sync version with BasiliskII package / latest upstream
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.4-0.4.20160322
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/cxmon-3.2-fpermissive.patch b/cxmon-3.2-fpermissive.patch
index 987b146..e73eb97 100644
--- a/cxmon-3.2-fpermissive.patch
+++ b/cxmon-3.2-fpermissive.patch
@@ -70,3 +70,92 @@ diff -up macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu
#ifdef SHEEPSHAVER
"-m",
#endif
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/emul_op.cpp~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/emul_op.cpp 2017-10-01 18:12:37.352082375 +0200
+@@ -70,7 +70,7 @@ void EmulOp(uint16 opcode, M68kRegisters
+ r->sr);
+ VideoQuitFullScreen();
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+@@ -575,7 +575,7 @@ void EmulOp(uint16 opcode, M68kRegisters
+ r->a[0], r->a[1], r->a[2], r->a[3], r->a[4], r->a[5], r->a[6], r->a[7],
+ r->sr);
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ break;
+@@ -592,7 +592,7 @@ void EmulOp(uint16 opcode, M68kRegisters
+ r->a[0], r->a[1], r->a[2], r->a[3], r->a[4], r->a[5], r->a[6], r->a[7],
+ r->sr);
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/uae_cpu/newcpu.h~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/uae_cpu/newcpu.h 2017-10-01 18:15:57.469639476 +0200
+@@ -206,7 +206,7 @@ static __inline__ void m68k_setpc (uaecp
+ if (IS_BREAK_POINT(newpc)) {
+ printf("Stopped at break point address: %08lx. Last PC: %08lx\n", newpc, previous_pc);
+ m68k_dumpstate(NULL);
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ }
+ #endif // end of #if ENABLE_MON
+@@ -223,7 +223,7 @@ static __inline__ void m68k_incpc (uae_s
+ if (IS_BREAK_POINT(next_pc)) {
+ printf("Stopped at break point address: %08lx. Last PC: %08lx\n", next_pc, previous_pc);
+ m68k_dumpstate(NULL);
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ }
+ #endif // end of #if ENABLE_MON
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/Unix/main_unix.cpp~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/Unix/main_unix.cpp 2017-10-01 18:17:56.182563173 +0200
+@@ -291,7 +291,7 @@ static void sigsegv_dump_state(sigsegv_i
+ #endif
+ VideoQuitFullScreen();
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+@@ -948,7 +948,7 @@ static void sigint_handler(...)
+ m68k_dumpstate(&nextpc);
+ #endif
+ VideoQuitFullScreen();
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ QuitEmulator();
+ }
+@@ -1495,7 +1495,7 @@ ill: printf("SIGILL num %d, code %d\n",
+
+ VideoQuitFullScreen();
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/Unix/main_unix.cpp~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/Unix/main_unix.cpp 2017-10-01 18:18:04.246625919 +0200
+@@ -1402,7 +1402,7 @@ static void *tick_func(void *arg)
+ #ifdef ENABLE_MON
+ // Start up mon in real-mode
+ printf("Welcome to the sheep factory.\n");
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ return NULL;
diff --git a/sources b/sources
index 86c8ac1..802030b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bd39d7dea7f3f39d272064c2e6ccd85 BasiliskII-1.0-b58a926.tar.gz
+d6ecf5c991bd60dd38f03cf47bc3d07b BasiliskII-1.0-e273bb1.tar.gz
6 years, 6 months
- 1
- 0
[BasiliskII] BasiliskII git snapshot du-jour Fix FTBFS on F27+
by jwrdegoede
commit 83dbd5470c8e4db0335637180d91d77616066496
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Sun Oct 1 19:42:55 2017 +0200
BasiliskII git snapshot du-jour
Fix FTBFS on F27+
.gitignore | 1 +
BasiliskII.spec | 18 ++++-----
cxmon-3.2-fpermissive.patch | 89 ++++++++++++++++++++++++++++++++++++++++++
macemu-not-finding-cxmon.patch | 38 ------------------
sources | 2 +-
5 files changed, 99 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index beb602c..6c09151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
cxmon-3.2-cvs20130310.tar.gz
macemu-master.zip
BasiliskII-1.0-b58a926.tar.gz
+/BasiliskII-1.0-e273bb1.tar.gz
diff --git a/BasiliskII.spec b/BasiliskII.spec
index d04e5e0..429f535 100644
--- a/BasiliskII.spec
+++ b/BasiliskII.spec
@@ -1,18 +1,17 @@
-%global commit b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1
+%global commit e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%define date 20160322
+%define date 20171001
Summary: 68k Macintosh emulator
Name: BasiliskII
Version: 1.0
-Release: 0.%{date}.6%{?dist}.2
+Release: 0.%{date}.7%{?dist}
License: GPLv2+
URL: http://basilisk.cebix.net/
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
@@ -33,12 +32,7 @@ a Macintosh ROM image to use Basilisk II.
%prep
-%setup -q -n macemu-%{commit}
-%patch0 -p1
-%patch1 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+%autosetup -p1 -n macemu-%{commit}
# cleanup
iconv -f ISO_8859-1 -t UTF8 %{name}/README > README
touch -r %{name}/README README
@@ -107,6 +101,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Oct 1 2017 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.0-0.20171001.7
+- BasiliskII git snapshot du-jour
+- Fix FTBFS on F27+
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.0-0.20160322.6.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/cxmon-3.2-fpermissive.patch b/cxmon-3.2-fpermissive.patch
index 987b146..e73eb97 100644
--- a/cxmon-3.2-fpermissive.patch
+++ b/cxmon-3.2-fpermissive.patch
@@ -70,3 +70,92 @@ diff -up macemu-b58a9260bd1422a28e4c0b7b6bb71d26603bc3e1/SheepShaver/src/kpx_cpu
#ifdef SHEEPSHAVER
"-m",
#endif
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/emul_op.cpp~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/emul_op.cpp 2017-10-01 18:12:37.352082375 +0200
+@@ -70,7 +70,7 @@ void EmulOp(uint16 opcode, M68kRegisters
+ r->sr);
+ VideoQuitFullScreen();
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+@@ -575,7 +575,7 @@ void EmulOp(uint16 opcode, M68kRegisters
+ r->a[0], r->a[1], r->a[2], r->a[3], r->a[4], r->a[5], r->a[6], r->a[7],
+ r->sr);
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ break;
+@@ -592,7 +592,7 @@ void EmulOp(uint16 opcode, M68kRegisters
+ r->a[0], r->a[1], r->a[2], r->a[3], r->a[4], r->a[5], r->a[6], r->a[7],
+ r->sr);
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/uae_cpu/newcpu.h~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/uae_cpu/newcpu.h 2017-10-01 18:15:57.469639476 +0200
+@@ -206,7 +206,7 @@ static __inline__ void m68k_setpc (uaecp
+ if (IS_BREAK_POINT(newpc)) {
+ printf("Stopped at break point address: %08lx. Last PC: %08lx\n", newpc, previous_pc);
+ m68k_dumpstate(NULL);
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ }
+ #endif // end of #if ENABLE_MON
+@@ -223,7 +223,7 @@ static __inline__ void m68k_incpc (uae_s
+ if (IS_BREAK_POINT(next_pc)) {
+ printf("Stopped at break point address: %08lx. Last PC: %08lx\n", next_pc, previous_pc);
+ m68k_dumpstate(NULL);
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ }
+ #endif // end of #if ENABLE_MON
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/Unix/main_unix.cpp~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/BasiliskII/src/Unix/main_unix.cpp 2017-10-01 18:17:56.182563173 +0200
+@@ -291,7 +291,7 @@ static void sigsegv_dump_state(sigsegv_i
+ #endif
+ VideoQuitFullScreen();
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+@@ -948,7 +948,7 @@ static void sigint_handler(...)
+ m68k_dumpstate(&nextpc);
+ #endif
+ VideoQuitFullScreen();
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ QuitEmulator();
+ }
+@@ -1495,7 +1495,7 @@ ill: printf("SIGILL num %d, code %d\n",
+
+ VideoQuitFullScreen();
+ #ifdef ENABLE_MON
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ QuitEmulator();
+--- macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/Unix/main_unix.cpp~ 2017-09-04 20:56:34.000000000 +0200
++++ macemu-e273bb1a0b4f6e35bcdbf6cf918aa0ca3e6d99da/SheepShaver/src/Unix/main_unix.cpp 2017-10-01 18:18:04.246625919 +0200
+@@ -1402,7 +1402,7 @@ static void *tick_func(void *arg)
+ #ifdef ENABLE_MON
+ // Start up mon in real-mode
+ printf("Welcome to the sheep factory.\n");
+- char *arg[4] = {"mon", "-m", "-r", NULL};
++ const char *arg[4] = {"mon", "-m", "-r", NULL};
+ mon(3, arg);
+ #endif
+ return NULL;
diff --git a/sources b/sources
index 86c8ac1..802030b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bd39d7dea7f3f39d272064c2e6ccd85 BasiliskII-1.0-b58a926.tar.gz
+d6ecf5c991bd60dd38f03cf47bc3d07b BasiliskII-1.0-e273bb1.tar.gz
6 years, 6 months
- 1
- 0