[fs-uae/f27] (2 commits) ...Fixed FTBFS
by Andrea Musuruane
Summary of changes:
645414a... First import (*)
b6f0349... Fixed FTBFS (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 2 months
[fs-uae] Fixed FTBFS
by Andrea Musuruane
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
7 years, 2 months
[fs-uae] First import
by Andrea Musuruane
commit 645414a5679ead7ff911834990c1bf6454b78324
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Sep 9 18:19:39 2017 +0200
First import
.gitignore | 1 +
fs-uae.spec | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 117 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..d4a22d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/fs-uae-2.8.3.tar.gz
diff --git a/fs-uae.spec b/fs-uae.spec
new file mode 100644
index 0000000..44d9bd6
--- /dev/null
+++ b/fs-uae.spec
@@ -0,0 +1,115 @@
+Name: fs-uae
+Version: 2.8.3
+Release: 1%{?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
+
+BuildRequires: automake
+BuildRequires: libpng-devel
+BuildRequires: glew-devel
+BuildRequires: glib2-devel
+BuildRequires: openal-soft-devel
+BuildRequires: SDL2-devel
+BuildRequires: libXi-devel
+BuildRequires: libmpeg2-devel
+BuildRequires: zlib-devel
+BuildRequires: freetype-devel
+BuildRequires: zip
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
+
+
+%description
+FS-UAE is an Amiga emulator for Windows, Linux and Mac OS X
+based on UAE/WinUAE, with a focus on emulating games.
+
+Features include emulation of Amiga 500, 1200, 4000, CD32
+and CDTV, perfectly smooth scrolling on 50Hz displays, support
+for floppy images in ADF and IPF formats, CD-ROM images in ISO
+or BIN/CUE format, mounting folders on your computer as Amiga
+hard drives, support for Picasso 96 drivers for high-color and
+high-resolution Workbench displays, and more.
+
+A unique feature is support for cross-platform online play. You
+can now play Amiga games against (or with) friends over the
+Internet.
+
+The emulator uses the latest Amiga emulation code from the
+WinUAE project and requires a moderately fast computer with
+accelerated graphics (OpenGL) to work. A game pad or joystick is
+recommended, but not required (FS-UAE can emulate a joystick
+using the cursor keys and right ctrl/alt keys).
+
+
+%prep
+%setup -q
+
+# Do not use bundled libmpeg2
+rm -rf libmpeg2
+
+# Fix desktop file
+sed -i '/^MimeType=*/s/$/;/' \
+ share/applications/%{name}.desktop
+
+# Fix spurious executable permissions
+chmod -x src/specialmonitors.cpp
+
+
+%build
+%configure
+%make_build
+
+
+%install
+%make_install
+
+# Validate desktop file
+desktop-file-validate \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%find_lang %{name}
+
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files -f %{name}.lang
+%{_bindir}/%{name}
+%{_bindir}/%{name}-device-helper
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/mime/packages/%{name}.xml
+%doc %{_pkgdocdir}
+%exclude %{_pkgdocdir}/COPYING
+%license COPYING
+
+
+%changelog
+* Sat Sep 09 2017 Andrea Musuruane <musuruan(a)gmail.com> - 2.8.3-1
+- Updated to new upstream version
+- Improved macro usage
+- Dropped mimeinfo scriptlet
+
+* Wed May 18 2016 Andrea Musuruane <musuruan(a)gmail.com> - 2.6.2-2
+- Fix FTBFS with GCC 6
+
+* Sun Apr 03 2016 Andrea Musuruane <musuruan(a)gmail.com> - 2.6.2-1
+- First release
+
diff --git a/sources b/sources
index e69de29..323ca6b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+bb9096904619db0202370b1cc4dd1b55 fs-uae-2.8.3.tar.gz
7 years, 2 months
[openshot] bump required libopenshot verson
by Leigh Scott
commit 467b764354d9ad633ce9c34247d59cc29dc552f9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 8 13:52:48 2017 +0100
bump required libopenshot verson
openshot.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/openshot.spec b/openshot.spec
index e139f68..22b745d 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -20,7 +20,7 @@ BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-qt5-devel
BuildRequires: python3-setuptools
-BuildRequires: libopenshot >= 0.1.7
+BuildRequires: libopenshot >= 0.1.8
BuildRequires: libopenshot-audio
BuildRequires: desktop-file-utils
# To fix icon
7 years, 2 months
