From 1de25643cfd1a6e7f2bc1911a0f79536b4790e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 6 Jul 2021 23:17:28 +0200 Subject: [PATCH] stella: upgrade 6.1.2 -> 6.5.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...omize-configure-and-Makefile-to-our-needs.patch | 14 +++++++------- .../stella/{stella_6.1.2.bb => stella_6.5.3.bb} | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) rename recipes-emulators/stella/{stella_6.1.2.bb => stella_6.5.3.bb} (77%) diff --git a/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch b/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch index f010cb8..1680a87 100644 --- a/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch +++ b/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch @@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configure b/configure -index 4fb2cf0..37f502e 100755 +index df91054..81690b2 100755 --- a/configure +++ b/configure -@@ -331,6 +331,7 @@ mingw32-cross) +@@ -323,6 +323,7 @@ mingw32-cross) _host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` _host_os=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` _host_vendor=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` @@ -26,7 +26,7 @@ index 4fb2cf0..37f502e 100755 ;; esac -@@ -557,8 +558,9 @@ if test -n "$_host"; then +@@ -549,8 +550,9 @@ if test -n "$_host"; then _host_os=unix ;; *) @@ -38,7 +38,7 @@ index 4fb2cf0..37f502e 100755 ;; esac -@@ -802,7 +804,7 @@ fi +@@ -762,7 +764,7 @@ fi # Now, add the appropriate defines/libraries/headers # echo @@ -47,16 +47,16 @@ index 4fb2cf0..37f502e 100755 SRC="src" CORE="$SRC/emucore" -@@ -821,7 +823,7 @@ SQLITE="$SRC/common/repository/sqlite" +@@ -783,7 +785,7 @@ JSON="$SRC/json" - INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER" + INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER -I$JSON -I$SQLITE_REPO -I$SQLITE_LIB" -INCLUDES="$INCLUDES `$_sdlconfig --cflags`" +INCLUDES="$INCLUDES `pkg-config --cflags sdl2`" if test "$_build_static" = yes ; then _sdl_conf_libs="--static-libs" LDFLAGS="-static $LDFLAGS" -@@ -829,7 +831,7 @@ else +@@ -791,7 +793,7 @@ else _sdl_conf_libs="--libs" fi diff --git a/recipes-emulators/stella/stella_6.1.2.bb b/recipes-emulators/stella/stella_6.5.3.bb similarity index 77% rename from recipes-emulators/stella/stella_6.1.2.bb rename to recipes-emulators/stella/stella_6.5.3.bb index aef9bda..037a6e7 100644 --- a/recipes-emulators/stella/stella_6.1.2.bb +++ b/recipes-emulators/stella/stella_6.5.3.bb @@ -13,7 +13,6 @@ SRC_URI = " \ https://github.com/stella-emu/stella/releases/download/${PV}/${BPN}-${PV}-src.tar.xz \ file://0001-custtomize-configure-and-Makefile-to-our-needs.patch \ " -SRC_URI[md5sum] = "36b927c46ca0be0ae7dee06760b9091b" -SRC_URI[sha256sum] = "8086e57c231625f0b840ca361f493969247d20476cbb53609d778d37bda17c34" +SRC_URI[sha256sum] = "b49d5e5a5aa872e1f4b6f24eabd72304abdd577801d6ec349760c73b99e7f14d" CLEANBROKEN = "1"