Skip to contentSkip to conversation

package/stella: drop unneeded patches

PATCH New Fabrice Fontaine 2 participants 4 messages Apr 20, 2020 – Apr 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/stella: drop unneeded patches

Patches are not needed since bump to version 6.1.1 thanks to
https://github.com/stella-emu/stella/commit/72932aa09e022ef38a9b58721d89a02a66c29aa4
https://github.com/stella-emu/stella/commit/74450028fcf28f521951631570093494f17c4d95

---
 .../0001-Add-cross-compilation-support.patch  | 29 ----------
 package/stella/0002-undef-PAGE_SIZE.patch     | 53 -------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 package/stella/0001-Add-cross-compilation-support.patch
 delete mode 100644 package/stella/0002-undef-PAGE_SIZE.patch
package/stella/0001-Add-cross-compilation-support.patch deleted +0 -29
deleted file mode 100644
index 1aefd86cf4..0000000000
@@ -1,29 +0,0 @@
-From ef1cffc526d3cf9562d50efbf8addc2aa4c06b52 Mon Sep 17 00:00:00 2001
-From: Sergio Prado <[email protected]>
-Date: Sun, 30 Jul 2017 18:23:23 -0300
-Subject: [PATCH 1/2] Add cross-compilation support
-
-Signed-off-by: Sergio Prado <[email protected]>
----
- configure | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index c2f304729651..b05321aac3da 100755
---- a/configure
-+++ b/configure
-@@ -499,8 +499,9 @@ if test -n "$_host"; then
- 			_host_os=win32
- 			;;
- 		*)
--			echo "Cross-compiling to unknown target, please add your target to configure."
--			exit 1
-+			echo "Cross-compiling to $_host target"
-+			DEFINES="$DEFINES -DUNIX"
-+			_host_os=unix
- 			;;
- 	esac
- 
--- 
-1.9.1
-
package/stella/0002-undef-PAGE_SIZE.patch deleted +0 -53

53 lines not on this page · raw message

Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/stella: drop unneeded patches

Quoted 11 lines · On Mon, 20 Apr 2020 17:04:51 +0200 Fabrice Fontaine…

Patches are not needed since bump to version 6.1.1 thanks to
https://github.com/stella-emu/stella/commit/72932aa09e022ef38a9b58721d89a02a66c29aa4
https://github.com/stella-emu/stella/commit/74450028fcf28f521951631570093494f17c4d95

---
 .../0001-Add-cross-compilation-support.patch  | 29 ----------
 package/stella/0002-undef-PAGE_SIZE.patch     | 53 -------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 package/stella/0001-Add-cross-compilation-support.patch
 delete mode 100644 package/stella/0002-undef-PAGE_SIZE.patch

Are you sure? These two patches are exactly the same as the commits you point... and the patches still apply. So I suspect that the commits you point are not part of this 6.1.1 release.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/stella: drop unneeded patches

Hi Thomas,

Le lun. 20 avr. 2020 ? 18:00, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 16 lines
Quoted 11 lines · On Mon, 20 Apr 2020 17:04:51 +0200 Fabrice Fontaine…

Patches are not needed since bump to version 6.1.1 thanks to
https://github.com/stella-emu/stella/commit/72932aa09e022ef38a9b58721d89a02a66c29aa4
https://github.com/stella-emu/stella/commit/74450028fcf28f521951631570093494f17c4d95

---
 .../0001-Add-cross-compilation-support.patch  | 29 ----------
 package/stella/0002-undef-PAGE_SIZE.patch     | 53 -------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 package/stella/0001-Add-cross-compilation-support.patch
 delete mode 100644 package/stella/0002-undef-PAGE_SIZE.patch
Quoted 3 lines

Are you sure? These two patches are exactly the same as the commits you point... and the patches still apply. So I suspect that the commits you point are not part of this 6.1.1 release.

Yes, I'm sure, the commit and the patches are not the same even if they have the same title and description.
First commit adds a *linux* target whereas the first patch updates the default target.
Second commit undefs PAGE_SIZE in src/common/bspf.hxx as requested by upstream in https://github.com/stella-emu/stella/pull/419 whereas second patch updates src/emucore/MT24LC256.hxx and src/emucore/System.hxx.

Quoted 8 lines

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 package/stella: drop unneeded patches

In reply to Fabrice Fontaine
Quoted 11 lines · On Mon, 20 Apr 2020 17:04:51 +0200 Fabrice Fontaine…

Patches are not needed since bump to version 6.1.1 thanks to
https://github.com/stella-emu/stella/commit/72932aa09e022ef38a9b58721d89a02a66c29aa4
https://github.com/stella-emu/stella/commit/74450028fcf28f521951631570093494f17c4d95

---
 .../0001-Add-cross-compilation-support.patch  | 29 ----------
 package/stella/0002-undef-PAGE_SIZE.patch     | 53 -------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 package/stella/0001-Add-cross-compilation-support.patch
 delete mode 100644 package/stella/0002-undef-PAGE_SIZE.patch

Thanks for providing additional explanations. I've applied your patch to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com