[fs-uae] Fixed FTBFS
commit b6f03499e8d7c859951398eca0a540356b2489bf
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Sep 9 19:54:38 2017 +0200
Fixed FTBFS
fs-uae-2.8.3-define_unknown_CPUs.patch | 20 ++++++++++++++++++++
fs-uae.spec | 16 +++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/fs-uae-2.8.3-define_unknown_CPUs.patch
b/fs-uae-2.8.3-define_unknown_CPUs.patch
new file mode 100644
index 0000000..f554cc0
--- /dev/null
+++ b/fs-uae-2.8.3-define_unknown_CPUs.patch
@@ -0,0 +1,20 @@
+Description: Define unknown host CPU types as CPU_unknown
+ The latest upstream version of fs-uae introduced new JIT
+ support for x86-based architectures. Unfortunately, this
+ change also made the build bail out if the host CPU is not
+ among the list of supported types. With this patch, unknown
+ host CPUs no longer trigger an error but will just define
+ the CPU type as 'CPU_unknown'.
+ .
+
+--- fs-uae-2.8.0+dfsg.orig/src/include/sysdeps.h
++++ fs-uae-2.8.0+dfsg/src/include/sysdeps.h
+@@ -50,7 +50,7 @@ using namespace std;
+ #elif defined(__powerpc__) || defined(__ppc__) || defined(_M_PPC)
+ #define CPU_powerpc 1
+ #else
+-#error unrecognized CPU type
++#define CPU_unknown 1
+ #endif
+
+ #ifdef _WIN32
diff --git a/fs-uae.spec b/fs-uae.spec
index 44d9bd6..8f62cce 100644
--- a/fs-uae.spec
+++ b/fs-uae.spec
@@ -1,11 +1,14 @@
Name: fs-uae
Version: 2.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Amiga emulator with on-screen GUI and online play support
License: GPLv2+
URL: http://fs-uae.net/
Source0: http://fs-uae.net/fs-uae/stable/%{version}/%{name}-%{version}.tar.gz
+# Define unknown host CPU types as CPU_unknown
+#
https://github.com/glaubitz/fs-uae-debian/blob/master/debian/patches/0001...
+Patch0: %{name}-2.8.3-define_unknown_CPUs.patch
BuildRequires: automake
BuildRequires: libpng-devel
@@ -46,7 +49,7 @@ using the cursor keys and right ctrl/alt keys).
%prep
-%setup -q
+%autosetup -p1
# Do not use bundled libmpeg2
rm -rf libmpeg2
@@ -60,7 +63,11 @@ chmod -x src/specialmonitors.cpp
%build
-%configure
+%ifarch %{ix86} x86_64
+ %configure
+%else
+ %configure --disable-jit
+%endif
%make_build
@@ -102,6 +109,9 @@ fi
%changelog
+* Sat Sep 09 2017 Andrea Musuruane <musuruan(a)gmail.com> - 2.8.3-2
+- Fixed FTBFS
+
* Sat Sep 09 2017 Andrea Musuruane <musuruan(a)gmail.com> - 2.8.3-1
- Updated to new upstream version
- Improved macro usage