From: Sergio Prado Date: Sun, 19 Apr 2020 20:33:11 +0000 (-0300) Subject: package/stella: bump to version 6.1.1 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7210c24e343a13e58d1d45b7e0c4bdb51854857;p=buildroot.git package/stella: bump to version 6.1.1 Drop patch already applied upstream. Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- diff --git a/package/stella/0002-Do-not-strip-when-installing.patch b/package/stella/0002-Do-not-strip-when-installing.patch deleted file mode 100644 index 8a95a81a5a..0000000000 --- a/package/stella/0002-Do-not-strip-when-installing.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d506a586b299682a425d3c3de68baefb7221fa9a Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sun, 30 Jul 2017 18:25:12 -0300 -Subject: [PATCH 2/2] Do not strip when installing - -Signed-off-by: Sergio Prado ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 346640e53bea..fedaed05a4d6 100644 ---- a/Makefile -+++ b/Makefile -@@ -173,7 +173,7 @@ config.mak: $(srcdir)/configure - - install: all - $(INSTALL) -d "$(DESTDIR)$(BINDIR)" -- $(INSTALL) -c -s -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)" -+ $(INSTALL) -c -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)" - $(INSTALL) -d "$(DESTDIR)$(DOCDIR)" - $(INSTALL) -c -m 644 "$(srcdir)/Announce.txt" "$(srcdir)/Changes.txt" "$(srcdir)/Copyright.txt" "$(srcdir)/License.txt" "$(srcdir)/README-SDL.txt" "$(srcdir)/Readme.txt" "$(srcdir)/Todo.txt" "$(srcdir)/docs/index.html" "$(srcdir)/docs/debugger.html" "$(DESTDIR)$(DOCDIR)/" - $(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics" --- -1.9.1 - diff --git a/package/stella/0002-undef-PAGE_SIZE.patch b/package/stella/0002-undef-PAGE_SIZE.patch new file mode 100644 index 0000000000..f5c60fa3b3 --- /dev/null +++ b/package/stella/0002-undef-PAGE_SIZE.patch @@ -0,0 +1,53 @@ +From d14065257b24a9e4a722d1fa1125f26f6599006d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 9 Mar 2019 20:47:27 +0100 +Subject: [PATCH] undef PAGE_SIZE + +PAGE_SIZE is sometimes already defined by the toolchain so undef it: + +/home/naourr/work/instance-3/output/host/bin/x86_64-linux-g++ -MMD -MF "src/debugger/.deps/CpuDebug.d" -MQ "src/debugger/CpuDebug.o" -MP -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -x c++ -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 -fomit-frame-pointer -D_GLIBCXX_USE_CXX11_ABI=1 -DUNIX -DBSPF_UNIX -DWINDOWED_SUPPORT -DSOUND_SUPPORT -DDEBUGGER_SUPPORT -DJOYSTICK_SUPPORT -DCHEATCODE_SUPPORT -Isrc/emucore -Isrc/common -Isrc/common/tv_filters -Isrc/gui -Isrc/emucore/tia -Isrc/emucore/tia/frame-manager -I/home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/SDL2 -D_REENTRANT -Isrc/unix -Isrc/debugger -Isrc/debugger/gui -Isrc/yacc -Isrc/cheat -c src/debugger/CpuDebug.cxx -o src/debugger/CpuDebug.o +In file included from /home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/limits.h:8:0, + from /home/naourr/work/instance-3/output/host/opt/ext-toolchain/x86_64-buildroot-linux-musl/include/c++/7.4.0/climits:42, + from src/common/bspf.hxx:28, + from src/debugger/CartDebug.cxx:18: +src/emucore/System.hxx:64:29: error: expected unqualified-id before numeric constant + static constexpr uInt16 PAGE_SIZE = (1 << PAGE_SHIFT); + +Fixes: + - http://autobuild.buildroot.org/results/22a9b009749af2a0862750a1fb2b2dc7167cd589 + +Signed-off-by: Fabrice Fontaine +--- + src/emucore/MT24LC256.hxx | 2 ++ + src/emucore/System.hxx | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/emucore/MT24LC256.hxx b/src/emucore/MT24LC256.hxx +index fc5d6a49..bb7468b4 100644 +--- a/src/emucore/MT24LC256.hxx ++++ b/src/emucore/MT24LC256.hxx +@@ -23,6 +23,8 @@ class System; + #include "Control.hxx" + #include "bspf.hxx" + ++#undef PAGE_SIZE ++ + /** + Emulates a Microchip Technology Inc. 24LC256, a 32KB Serial Electrically + Erasable PROM accessed using the I2C protocol. Thanks to J. Payson +diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx +index e31202df..85a54f28 100644 +--- a/src/emucore/System.hxx ++++ b/src/emucore/System.hxx +@@ -30,6 +30,8 @@ class NullDevice; + #include "Random.hxx" + #include "Serializable.hxx" + ++#undef PAGE_SIZE ++ + /** + This class represents a system consisting of a 6502 microprocessor + and a set of devices. The devices are mapped into an addressing +-- +2.20.1 + diff --git a/package/stella/0003-undef-PAGE_SIZE.patch b/package/stella/0003-undef-PAGE_SIZE.patch deleted file mode 100644 index f5c60fa3b3..0000000000 --- a/package/stella/0003-undef-PAGE_SIZE.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d14065257b24a9e4a722d1fa1125f26f6599006d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Mar 2019 20:47:27 +0100 -Subject: [PATCH] undef PAGE_SIZE - -PAGE_SIZE is sometimes already defined by the toolchain so undef it: - -/home/naourr/work/instance-3/output/host/bin/x86_64-linux-g++ -MMD -MF "src/debugger/.deps/CpuDebug.d" -MQ "src/debugger/CpuDebug.o" -MP -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -x c++ -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 -fomit-frame-pointer -D_GLIBCXX_USE_CXX11_ABI=1 -DUNIX -DBSPF_UNIX -DWINDOWED_SUPPORT -DSOUND_SUPPORT -DDEBUGGER_SUPPORT -DJOYSTICK_SUPPORT -DCHEATCODE_SUPPORT -Isrc/emucore -Isrc/common -Isrc/common/tv_filters -Isrc/gui -Isrc/emucore/tia -Isrc/emucore/tia/frame-manager -I/home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/SDL2 -D_REENTRANT -Isrc/unix -Isrc/debugger -Isrc/debugger/gui -Isrc/yacc -Isrc/cheat -c src/debugger/CpuDebug.cxx -o src/debugger/CpuDebug.o -In file included from /home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/limits.h:8:0, - from /home/naourr/work/instance-3/output/host/opt/ext-toolchain/x86_64-buildroot-linux-musl/include/c++/7.4.0/climits:42, - from src/common/bspf.hxx:28, - from src/debugger/CartDebug.cxx:18: -src/emucore/System.hxx:64:29: error: expected unqualified-id before numeric constant - static constexpr uInt16 PAGE_SIZE = (1 << PAGE_SHIFT); - -Fixes: - - http://autobuild.buildroot.org/results/22a9b009749af2a0862750a1fb2b2dc7167cd589 - -Signed-off-by: Fabrice Fontaine ---- - src/emucore/MT24LC256.hxx | 2 ++ - src/emucore/System.hxx | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/emucore/MT24LC256.hxx b/src/emucore/MT24LC256.hxx -index fc5d6a49..bb7468b4 100644 ---- a/src/emucore/MT24LC256.hxx -+++ b/src/emucore/MT24LC256.hxx -@@ -23,6 +23,8 @@ class System; - #include "Control.hxx" - #include "bspf.hxx" - -+#undef PAGE_SIZE -+ - /** - Emulates a Microchip Technology Inc. 24LC256, a 32KB Serial Electrically - Erasable PROM accessed using the I2C protocol. Thanks to J. Payson -diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx -index e31202df..85a54f28 100644 ---- a/src/emucore/System.hxx -+++ b/src/emucore/System.hxx -@@ -30,6 +30,8 @@ class NullDevice; - #include "Random.hxx" - #include "Serializable.hxx" - -+#undef PAGE_SIZE -+ - /** - This class represents a system consisting of a 6502 microprocessor - and a set of devices. The devices are mapped into an addressing --- -2.20.1 - diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 395ee18d35..dcc56aadf6 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 bcbd82294f97d00457fdb727e9b08ff73b685dc7f77704cea1eceb58d8967387 stella-6.0.2-src.tar.xz +sha256 ddf53bb782c63c97c4e5d0fefa9eb256c62e0d5a328c78cc18f06eea45ba7369 stella-6.1.1-src.tar.xz sha256 062e708b8b88ea911b5c08000f1c4a5588235aa0c303bc893b5d92fb45cafd04 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index 1295b75274..74c131e72d 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.0.2 +STELLA_VERSION = 6.1.1 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+