commit f6c5f50429fea630d4a3f567e6a3b8826ebab5d0 Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Fri Jul 6 16:09:27 2018 +0200 Updated to new upstream release Added gcc-c++ dependency Used new AppData directory Removed obsolete scriptlets .gitignore | 1 + Nestopia-1.48-use-system-nes_ntsc.patch | 42 --------------------------------- Nestopia-1.49-use-system-nes_ntsc.patch | 42 +++++++++++++++++++++++++++++++++ Nestopia.spec | 41 ++++++++++++++------------------ sources | 2 +- 5 files changed, 62 insertions(+), 66 deletions(-) --- diff --git a/.gitignore b/.gitignore index a9fd0b3..5f21d02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ nestopia-1.45.tgz /nestopia-1.47.tgz /nestopia-1.48.tar.gz +/nestopia-1.49.tar.gz diff --git a/Nestopia-1.49-use-system-nes_ntsc.patch b/Nestopia-1.49-use-system-nes_ntsc.patch new file mode 100644 index 0000000..f963073 --- /dev/null +++ b/Nestopia-1.49-use-system-nes_ntsc.patch @@ -0,0 +1,42 @@ +diff -durN nestopia-1.49/Makefile.am nestopia-1.49.patch/Makefile.am +--- nestopia-1.49/Makefile.am 2018-06-25 01:26:58.000000000 +0200 ++++ nestopia-1.49.patch/Makefile.am 2018-06-27 17:38:51.570810744 +0200 +@@ -10,6 +10,7 @@ + -I$(top_srcdir)/source/common \ + -I$(top_srcdir)/source/gtkui \ + -I$(top_srcdir)/source/sdl \ ++ -I$(top_srcdir)/source/nes_ntsc \ + -DDATADIR=\"$(datadir)/nestopia\" \ + -DDATAROOTDIR=\"$(datarootdir)\" \ + -DNST_PRAGMA_ONCE \ +@@ -20,6 +21,7 @@ + $(LIBEPOXY_CFLAGS) + nestopia_LDADD = \ + $(ZLIB_LIBS) \ ++ -lnes_ntsc \ + $(LIBARCHIVE_LIBS) \ + $(SDL2_LIBS) \ + $(LIBEPOXY_LIBS) +diff -durN nestopia-1.49/source/core/NstVideoFilterNtscCfg.cpp nestopia-1.49.patch/source/core/NstVideoFilterNtscCfg.cpp +--- nestopia-1.49/source/core/NstVideoFilterNtscCfg.cpp 2018-06-25 01:26:58.000000000 +0200 ++++ nestopia-1.49.patch/source/core/NstVideoFilterNtscCfg.cpp 2018-06-27 17:38:02.518381800 +0200 +@@ -34,7 +34,6 @@ + #endif + + #define NES_NTSC_NO_BLITTERS +-#include "../nes_ntsc/nes_ntsc.inl" + + #ifdef _MSC_VER + #pragma warning( pop ) +diff -durN nestopia-1.49/source/core/NstVideoFilterNtsc.hpp nestopia-1.49.patch/source/core/NstVideoFilterNtsc.hpp +--- nestopia-1.49/source/core/NstVideoFilterNtsc.hpp 2018-06-25 01:26:58.000000000 +0200 ++++ nestopia-1.49.patch/source/core/NstVideoFilterNtsc.hpp 2018-06-27 17:38:02.518381800 +0200 +@@ -25,7 +25,7 @@ + #ifndef NST_VIDEO_FILTER_NTSC_H + #define NST_VIDEO_FILTER_NTSC_H + +-#include "../nes_ntsc/nes_ntsc.h" ++#include <nes_ntsc.h> + + #ifdef NST_PRAGMA_ONCE + #pragma once diff --git a/Nestopia.spec b/Nestopia.spec index 05ca2f1..c7481c8 100644 --- a/Nestopia.spec +++ b/Nestopia.spec @@ -1,8 +1,8 @@ %global realname nestopia Name: Nestopia -Version: 1.48 -Release: 2%{?dist} +Version: 1.49 +Release: 1%{?dist} Summary: A portable open source NES/Famicom emulator License: GPLv2+ @@ -13,8 +13,9 @@ Source1: %{realname}.6 # AppData from Debian Source2: %{realname}.appdata.xml # Use system nes_ntsc -Patch0: %{name}-1.48-use-system-nes_ntsc.patch +Patch0: %{name}-1.49-use-system-nes_ntsc.patch +BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake @@ -48,7 +49,10 @@ find source/nes_ntsc/ -type f -not -name "nes_ntsc_config.h" -delete %build autoreconf -fvi -%configure --disable-silent-rules +%configure \ + --enable-gui \ + --with-ao \ + --disable-silent-rules %make_build @@ -67,37 +71,28 @@ install -d %{buildroot}%{_mandir}/man6 install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man6/ # Install AppData file -install -d %{buildroot}%{_datadir}/appdata -install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml - - -%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 || : +install -d %{buildroot}%{_datadir}/metainfo +install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml %files %{_bindir}/%{realname} %{_datadir}/%{realname} %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/appdata/%{realname}.appdata.xml %{_datadir}/applications/%{realname}.desktop +%{_datadir}/metainfo/%{realname}.appdata.xml %{_mandir}/man6/* %license COPYING %doc %{_pkgdocdir} %changelog +* Wed Jun 27 2018 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.49-1 +- Updated to new upstream release +- Added gcc-c++ dependency +- Used new AppData directory +- Removed obsolete scriptlets + * Wed Feb 28 2018 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 1.48-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 2e47723..c74266c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b88c026ed368d43cd90335a90e998982 nestopia-1.48.tar.gz +e6313a45344b6f9c2c48c3315d0b93e3 nestopia-1.49.tar.gz