commit 24c6ff8bde7523bfc862a27a1f3217ad258cfdf3 Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Fri Dec 30 15:44:26 2022 +0100 Updated to new upstream release .gitignore | 1 + Nestopia-1.51.0-use-system-nes_ntsc.patch | 42 ------------------------------- Nestopia-1.52.0-use-system-nes_ntsc.patch | 42 +++++++++++++++++++++++++++++++ Nestopia.spec | 9 ++++--- sources | 2 +- 5 files changed, 50 insertions(+), 46 deletions(-) --- diff --git a/.gitignore b/.gitignore index ef47549..ca328c5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ nestopia-1.45.tgz /nestopia-1.50.tar.gz /nestopia-1.51.0.tar.gz /nestopia-1.51.1.tar.gz +/nestopia-1.52.0.tar.gz diff --git a/Nestopia-1.52.0-use-system-nes_ntsc.patch b/Nestopia-1.52.0-use-system-nes_ntsc.patch new file mode 100644 index 0000000..4ad6082 --- /dev/null +++ b/Nestopia-1.52.0-use-system-nes_ntsc.patch @@ -0,0 +1,42 @@ +diff -durN nestopia-1.52.0.orig/Makefile.am nestopia-1.52.0/Makefile.am +--- nestopia-1.52.0.orig/Makefile.am 2022-12-29 15:22:27.000000000 +0100 ++++ nestopia-1.52.0/Makefile.am 2022-12-30 15:12:22.768372316 +0100 +@@ -8,6 +8,7 @@ + nestopia_CPPFLAGS = \ + -I$(top_srcdir)/source \ + -I$(top_srcdir)/source/fltkui \ ++ -I$(top_srcdir)/source/nes_ntsc \ + -DNST_DATADIR=\"$(datadir)/nestopia\" \ + -DNST_DATAROOTDIR=\"$(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.52.0.orig/source/core/NstVideoFilterNtscCfg.cpp nestopia-1.52.0/source/core/NstVideoFilterNtscCfg.cpp +--- nestopia-1.52.0.orig/source/core/NstVideoFilterNtscCfg.cpp 2022-12-29 15:22:27.000000000 +0100 ++++ nestopia-1.52.0/source/core/NstVideoFilterNtscCfg.cpp 2022-12-30 15:11:26.227205958 +0100 +@@ -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.52.0.orig/source/core/NstVideoFilterNtsc.hpp nestopia-1.52.0/source/core/NstVideoFilterNtsc.hpp +--- nestopia-1.52.0.orig/source/core/NstVideoFilterNtsc.hpp 2022-12-29 15:22:27.000000000 +0100 ++++ nestopia-1.52.0/source/core/NstVideoFilterNtsc.hpp 2022-12-30 15:11:26.228205943 +0100 +@@ -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 40c85b3..69f7ac9 100644 --- a/Nestopia.spec +++ b/Nestopia.spec @@ -1,8 +1,8 @@ %global realname nestopia Name: Nestopia -Version: 1.51.1 -Release: 3%{?dist} +Version: 1.52.0 +Release: 1%{?dist} Summary: A portable open source NES/Famicom emulator License: GPLv2+ @@ -13,7 +13,7 @@ Source1: %{realname}.6 # AppData from Debian Source2: %{realname}.appdata.xml # Use system nes_ntsc -Patch0: %{name}-1.51.0-use-system-nes_ntsc.patch +Patch0: %{name}-1.52.0-use-system-nes_ntsc.patch BuildRequires: gcc-c++ BuildRequires: autoconf @@ -84,6 +84,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %doc %{_pkgdocdir} %changelog +* Fri Dec 30 2022 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.52.0-1 +- Updated to new upstream release + * Sat Aug 06 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.51.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index fdbab1e..e21ad3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nestopia-1.51.1.tar.gz) = 68da5e9ab7b848d895a8893a18ef50d90758258fbf7f86ca5df0fe95e74bad761aa436dca79b402439a12fd4dd1430b22e45ee202168be3f9f751190a7ae6131 +SHA512 (nestopia-1.52.0.tar.gz) = d7b36a07c1def146b3596124d3d084c39865916069092eceb3c1a22a030573c94fff7f3525e161d671fedd672f81ef536a42b4d0b37779c5993ffc158cdd3c0b