commit 190aa842d7e4cc8535e43f105516afb7aebbdc44 Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Wed May 26 15:14:16 2021 +0200 Updated to new upstream release .gitignore | 1 + Nestopia-1.49-use-system-nes_ntsc.patch | 42 ------------------------------- Nestopia-1.51.0-use-system-nes_ntsc.patch | 42 +++++++++++++++++++++++++++++++ Nestopia.spec | 16 ++++++------ sources | 2 +- 5 files changed, 52 insertions(+), 51 deletions(-) --- diff --git a/.gitignore b/.gitignore index 7a30d3a..7b264c8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ nestopia-1.45.tgz /nestopia-1.48.tar.gz /nestopia-1.49.tar.gz /nestopia-1.50.tar.gz +/nestopia-1.51.0.tar.gz diff --git a/Nestopia-1.51.0-use-system-nes_ntsc.patch b/Nestopia-1.51.0-use-system-nes_ntsc.patch new file mode 100644 index 0000000..504af66 --- /dev/null +++ b/Nestopia-1.51.0-use-system-nes_ntsc.patch @@ -0,0 +1,42 @@ +diff -durN nestopia-1.51.0.orig/Makefile.am nestopia-1.51.0/Makefile.am +--- nestopia-1.51.0.orig/Makefile.am 2021-05-19 22:42:36.000000000 +0200 ++++ nestopia-1.51.0/Makefile.am 2021-05-24 12:13:04.369985601 +0200 +@@ -8,6 +8,7 @@ + nestopia_CPPFLAGS = \ + -I$(top_srcdir)/source \ + -I$(top_srcdir)/source/fltkui \ ++ -I$(top_srcdir)/source/nes_ntsc \ + -DDATADIR=\"$(datadir)/nestopia\" \ + -DDATAROOTDIR=\"$(datarootdir)\" \ + -DNST_PRAGMA_ONCE \ +@@ -17,6 +18,7 @@ + $(FLTK_CFLAGS) + nestopia_LDADD = \ + $(ZLIB_LIBS) \ ++ -lnes_ntsc \ + $(LIBARCHIVE_LIBS) \ + $(SDL2_LIBS) \ + $(FLTK_LIBS) +diff -durN nestopia-1.51.0.orig/source/core/NstVideoFilterNtscCfg.cpp nestopia-1.51.0/source/core/NstVideoFilterNtscCfg.cpp +--- nestopia-1.51.0.orig/source/core/NstVideoFilterNtscCfg.cpp 2021-05-19 22:42:36.000000000 +0200 ++++ nestopia-1.51.0/source/core/NstVideoFilterNtscCfg.cpp 2021-05-24 12:13:04.369985601 +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.51.0.orig/source/core/NstVideoFilterNtsc.hpp nestopia-1.51.0/source/core/NstVideoFilterNtsc.hpp +--- nestopia-1.51.0.orig/source/core/NstVideoFilterNtsc.hpp 2021-05-19 22:42:36.000000000 +0200 ++++ nestopia-1.51.0/source/core/NstVideoFilterNtsc.hpp 2021-05-24 12:13:04.370985611 +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 91d17a2..4f6b9c4 100644 --- a/Nestopia.spec +++ b/Nestopia.spec @@ -1,31 +1,30 @@ %global realname nestopia Name: Nestopia -Version: 1.50 -Release: 4%{?dist} +Version: 1.51.0 +Release: 1%{?dist} Summary: A portable open source NES/Famicom emulator License: GPLv2+ URL: http://0ldsk00l.ca/nestopia/ -Source0: https://github.com/rdanbrook/%{realname}/archive/%{version}/%{realname}-%... +Source0: https://github.com/0ldsk00l/%{realname}/archive/%{version}.tar.gz#/%{real... # Debian man page Source1: %{realname}.6 # AppData from Debian Source2: %{realname}.appdata.xml # Use system nes_ntsc -Patch0: %{name}-1.49-use-system-nes_ntsc.patch +Patch0: %{name}-1.51.0-use-system-nes_ntsc.patch BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake -BuildRequires: gtk3-devel +BuildRequires: fltk-devel BuildRequires: SDL2-devel BuildRequires: libarchive-devel BuildRequires: zlib-devel BuildRequires: libepoxy-devel BuildRequires: nes_ntsc-devel -BuildRequires: libao-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib Requires: hicolor-icon-theme @@ -50,8 +49,6 @@ find source/nes_ntsc/ -type f -not -name "nes_ntsc_config.h" -delete %build autoreconf -fvi %configure \ - --enable-gui \ - --with-ao \ --disable-silent-rules %make_build @@ -87,6 +84,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %doc %{_pkgdocdir} %changelog +* Mon May 24 2021 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.51.0-1 +- Updated to new upstream release + * Tue Feb 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.50-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d28bb1a..77aba07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nestopia-1.50.tar.gz) = 6ea389d4891c7cfa36517495735ea0f34ba9427e51757113d0fe2b72d5ce5b11d7e6b7c02fd1e4e347a13bba06823e334800ff15036872e09b8561c10c7cb568 +SHA512 (nestopia-1.51.0.tar.gz) = 5f035f83a389f92efa7ae86ca0cb04dd4b3646030081eedaec4ce2af0b29c77a1894d5106078ac155522c14d41364d09bf9ceb916df10a2a55e9a7f92462579d