From b05e2d6ca323320e844c5d8866a42dff7e9868e4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 26 Nov 2022 00:19:11 +0200 Subject: [PATCH] supertuxkart: Update to 1.4 Signed-off-by: Marko Lindqvist --- .../0001-Fix-MIPS-compilation.patch | 50 ------------------- ...upertuxkart_1.3.bb => supertuxkart_1.4.bb} | 3 +- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 recipes-games/supertuxkart/supertuxkart/0001-Fix-MIPS-compilation.patch rename recipes-games/supertuxkart/{supertuxkart_1.3.bb => supertuxkart_1.4.bb} (89%) diff --git a/recipes-games/supertuxkart/supertuxkart/0001-Fix-MIPS-compilation.patch b/recipes-games/supertuxkart/supertuxkart/0001-Fix-MIPS-compilation.patch deleted file mode 100644 index e2396a6..0000000 --- a/recipes-games/supertuxkart/supertuxkart/0001-Fix-MIPS-compilation.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1cce43b2fa368152b83b12c21b3183c7affc9fa9 Mon Sep 17 00:00:00 2001 -From: Benau -Date: Thu, 7 Oct 2021 16:30:32 +0800 -Subject: [PATCH] Fix MIPS compilation - ---- - src/graphics/sp/sp_texture.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/graphics/sp/sp_texture.cpp b/src/graphics/sp/sp_texture.cpp -index 383db7030..000d66cff 100644 ---- a/src/graphics/sp/sp_texture.cpp -+++ b/src/graphics/sp/sp_texture.cpp -@@ -797,27 +797,27 @@ std::vector > - assert(c->getReferenceCount() == 1); - std::shared_ptr compressed(c); - -- uint8_t* mips = new uint8_t[image->getDimension().getArea() * 4](); -- uint8_t* mips_loc = mips; -+ uint8_t* mipmaps = new uint8_t[image->getDimension().getArea() * 4](); -+ uint8_t* mipmaps_loc = mipmaps; - uint8_t* compressed_loc = (uint8_t*)compressed->lock(); - squishCompressImage((uint8_t*)image->lock(), - mipmap_sizes[0].first.Width, mipmap_sizes[0].first.Height, - mipmap_sizes[0].first.Width * 4, compressed->lock(), tc_flag); - - // Now compress mipmap -- generateHQMipmap(image->lock(), mipmap_sizes, mips); -+ generateHQMipmap(image->lock(), mipmap_sizes, mipmaps); - compressed_loc += mipmap_sizes[0].second; - for (unsigned mip = 1; mip < mipmap_sizes.size(); mip++) - { -- squishCompressImage(mips_loc, -+ squishCompressImage(mipmaps_loc, - mipmap_sizes[mip].first.Width, mipmap_sizes[mip].first.Height, - mipmap_sizes[mip].first.Width * 4, compressed_loc, tc_flag); -- mips_loc += mipmap_sizes[mip].first.Width * -+ mipmaps_loc += mipmap_sizes[mip].first.Width * - mipmap_sizes[mip].first.Height * 4; - compressed_loc += mipmap_sizes[mip].second; - } - -- delete [] mips; -+ delete [] mipmaps; - image.swap(compressed); - #endif - return mipmap_sizes; --- -2.34.1 - diff --git a/recipes-games/supertuxkart/supertuxkart_1.3.bb b/recipes-games/supertuxkart/supertuxkart_1.4.bb similarity index 89% rename from recipes-games/supertuxkart/supertuxkart_1.3.bb rename to recipes-games/supertuxkart/supertuxkart_1.4.bb index 604edc1..1d92883 100644 --- a/recipes-games/supertuxkart/supertuxkart_1.3.bb +++ b/recipes-games/supertuxkart/supertuxkart_1.4.bb @@ -26,10 +26,9 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ https://github.com/supertuxkart/stk-code/releases/download/${PV}/SuperTuxKart-${PV}-src.tar.xz \ - file://0001-Fix-MIPS-compilation.patch \ " -SRC_URI[sha256sum] = "eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd" +SRC_URI[sha256sum] = "9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03" S = "${WORKDIR}/SuperTuxKart-${PV}-src"