From ec99498dd20b3e2442096d6c486e80e4b21e0a50 Mon Sep 17 00:00:00 2001 From: paradadf Date: Fri, 1 Jan 2021 14:42:44 +0000 Subject: [PATCH 1/4] chore(tpt): fix attempt --- configs/recalbox-odroidgo2_defconfig | 1 + configs/recalbox-odroidxu4_defconfig | 2 +- configs/recalbox-rpi1_defconfig | 2 +- configs/recalbox-rpi2_defconfig | 2 +- configs/recalbox-rpi3_defconfig | 2 +- configs/recalbox-rpi4_defconfig | 1 + configs/recalbox-x86_64_defconfig | 2 +- configs/recalbox-x86_defconfig | 2 +- package/libretro-thepowdertoy/libretro-thepowdertoy.mk | 4 ++-- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configs/recalbox-odroidgo2_defconfig b/configs/recalbox-odroidgo2_defconfig index 6a16c5500f..05e1c78a1c 100644 --- a/configs/recalbox-odroidgo2_defconfig +++ b/configs/recalbox-odroidgo2_defconfig @@ -241,6 +241,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2005=y BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/configs/recalbox-odroidxu4_defconfig b/configs/recalbox-odroidxu4_defconfig index 317782b0f1..9ae8b32c5e 100644 --- a/configs/recalbox-odroidxu4_defconfig +++ b/configs/recalbox-odroidxu4_defconfig @@ -309,7 +309,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y #BR2_PACKAGE_LIBRETRO_STELLA2014=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y -#BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/configs/recalbox-rpi1_defconfig b/configs/recalbox-rpi1_defconfig index 5f78e9c950..378b170059 100644 --- a/configs/recalbox-rpi1_defconfig +++ b/configs/recalbox-rpi1_defconfig @@ -295,7 +295,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2005=y BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y -#BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/configs/recalbox-rpi2_defconfig b/configs/recalbox-rpi2_defconfig index e6fec9b9db..33b3e5c425 100644 --- a/configs/recalbox-rpi2_defconfig +++ b/configs/recalbox-rpi2_defconfig @@ -310,7 +310,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y #BR2_PACKAGE_LIBRETRO_STELLA2014=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y -#BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/configs/recalbox-rpi3_defconfig b/configs/recalbox-rpi3_defconfig index 560c944acc..1fe512c2e5 100644 --- a/configs/recalbox-rpi3_defconfig +++ b/configs/recalbox-rpi3_defconfig @@ -314,7 +314,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y #BR2_PACKAGE_LIBRETRO_STELLA2014=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y -#BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/configs/recalbox-rpi4_defconfig b/configs/recalbox-rpi4_defconfig index 287b7ccb33..44188f38ea 100644 --- a/configs/recalbox-rpi4_defconfig +++ b/configs/recalbox-rpi4_defconfig @@ -313,6 +313,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2005=y BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/configs/recalbox-x86_64_defconfig b/configs/recalbox-x86_64_defconfig index 77edaa7057..e156a06739 100644 --- a/configs/recalbox-x86_64_defconfig +++ b/configs/recalbox-x86_64_defconfig @@ -399,7 +399,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y #BR2_PACKAGE_LIBRETRO_STELLA2014=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y -#BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/configs/recalbox-x86_defconfig b/configs/recalbox-x86_defconfig index 472692614e..ffce010eff 100644 --- a/configs/recalbox-x86_defconfig +++ b/configs/recalbox-x86_defconfig @@ -384,7 +384,7 @@ BR2_PACKAGE_LIBRETRO_SNES9X2005=y BR2_PACKAGE_LIBRETRO_SNES9X2010=y BR2_PACKAGE_LIBRETRO_STELLA=y BR2_PACKAGE_LIBRETRO_TGBDUAL=y -#BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y +BR2_PACKAGE_LIBRETRO_THEPOWDERTOY=y BR2_PACKAGE_LIBRETRO_THEODORE=y BR2_PACKAGE_LIBRETRO_TIC80=y BR2_PACKAGE_LIBRETRO_TYRQUAKE=y diff --git a/package/libretro-thepowdertoy/libretro-thepowdertoy.mk b/package/libretro-thepowdertoy/libretro-thepowdertoy.mk index 4974865706..78f0102158 100644 --- a/package/libretro-thepowdertoy/libretro-thepowdertoy.mk +++ b/package/libretro-thepowdertoy/libretro-thepowdertoy.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBRETRO_THEPOWDERTOY_VERSION = 1f58ea93445672e5f9219ff47b268e27e06d2387 +LIBRETRO_THEPOWDERTOY_VERSION = 219774ea5a36311be26e1d860d9a161a525ae76e LIBRETRO_THEPOWDERTOY_SITE = git://github.com/libretro/ThePowderToy.git LIBRETRO_THEPOWDERTOY_LICENSE = GPLv3 LIBRETRO_THEPOWDERTOY_GIT_SUBMODULES=y -LIBRETRO_THEPOWDERTOY_CONF_OPTS=-DCMAKE_BUILD_TYPE=Release +LIBRETRO_THEPOWDERTOY_CONF_OPTS=-DBUILD_LIBRETRO=ON define LIBRETRO_THEPOWDERTOY_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/libretro -- GitLab From 8a436e622b10d53109d297672dc0a7fe1986fe54 Mon Sep 17 00:00:00 2001 From: paradadf Date: Fri, 1 Jan 2021 14:45:37 +0000 Subject: [PATCH 2/4] chore(tpt): add changelog --- CHANGELOG.md | 2 ++ RELEASE-NOTES.md | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6ef7595ee..3abc3985b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,8 @@ All notable changes to this project will be documented in this file. - Fix missing early logs - Bump emuscv (add sound support) - Bump hatari +- Bump emuscv (sound version) +- Add libretro's The Powder Toy game to ports ## [7.1.1-Reloaded] - Fix abnormally long boots diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 7753d82486..ea8eb84b2d 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -17,6 +17,7 @@ - Add Nintendo Switch joycon support (both solo or combined mode) - Add new libretro core for DOS games (dosbox-pure available on rpi3/4, x86/x64 & Xu4.Goa) - Add Pulseaudio support +- Add Libretro ThePowderToy to Ports ### Improvements - Bump supermodel to version 839 -- GitLab From 1a7505ebfb59b9df86cd6712d67bfda7163e9b7f Mon Sep 17 00:00:00 2001 From: paradadf Date: Thu, 7 Jan 2021 12:26:39 +0000 Subject: [PATCH 3/4] chore(tpt): readonly --- package/libretro-thepowdertoy/libretro-thepowdertoy.mk | 2 +- .../recalbox-romfs-thepowdertoy.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libretro-thepowdertoy/libretro-thepowdertoy.mk b/package/libretro-thepowdertoy/libretro-thepowdertoy.mk index 78f0102158..a0710f5748 100644 --- a/package/libretro-thepowdertoy/libretro-thepowdertoy.mk +++ b/package/libretro-thepowdertoy/libretro-thepowdertoy.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRETRO_THEPOWDERTOY_VERSION = 219774ea5a36311be26e1d860d9a161a525ae76e +LIBRETRO_THEPOWDERTOY_VERSION = c45c2dd844f9b44d47203daec334d3df02809b35 LIBRETRO_THEPOWDERTOY_SITE = git://github.com/libretro/ThePowderToy.git LIBRETRO_THEPOWDERTOY_LICENSE = GPLv3 LIBRETRO_THEPOWDERTOY_GIT_SUBMODULES=y diff --git a/package/recalbox-romfs/recalbox-romfs-thepowdertoy/recalbox-romfs-thepowdertoy.mk b/package/recalbox-romfs/recalbox-romfs-thepowdertoy/recalbox-romfs-thepowdertoy.mk index 13b6195fce..bf8e7bc57c 100644 --- a/package/recalbox-romfs/recalbox-romfs-thepowdertoy/recalbox-romfs-thepowdertoy.mk +++ b/package/recalbox-romfs/recalbox-romfs-thepowdertoy/recalbox-romfs-thepowdertoy.mk @@ -5,7 +5,7 @@ ################################################################################ # Package generated with : -# ./scripts/linux/empack.py --force --port --system thepowdertoy --extension '.game .cps' --fullname 'The Powder Toy' --platform thepowdertoy --theme thepowdertoy 1:libretro:thepowdertoy:BR2_PACKAGE_LIBRETRO_THEPOWDERTOY +# ./scripts/linux/empack.py --force --port --readonly --system thepowdertoy --extension '.game .cps' --fullname 'The Powder Toy' --platform thepowdertoy --theme thepowdertoy 1:libretro:thepowdertoy:BR2_PACKAGE_LIBRETRO_THEPOWDERTOY # Name the 3 vars as the package requires RECALBOX_ROMFS_THEPOWDERTOY_SOURCE = @@ -23,7 +23,7 @@ SOURCE_ROMDIR_THEPOWDERTOY = $(RECALBOX_ROMFS_THEPOWDERTOY_PKGDIR)/roms ifneq ($(BR2_PACKAGE_LIBRETRO_THEPOWDERTOY),) define CONFIGURE_MAIN_THEPOWDERTOY_START - $(call RECALBOX_ROMFS_CALL_ADD_PORT,$(SYSTEM_XML_THEPOWDERTOY),The Powder Toy,$(SYSTEM_NAME_THEPOWDERTOY),.game .cps,thepowdertoy,thepowdertoy) + $(call RECALBOX_ROMFS_CALL_ADD_PORT,$(SYSTEM_XML_THEPOWDERTOY),The Powder Toy,$(SYSTEM_NAME_THEPOWDERTOY),.game .cps,thepowdertoy,thepowdertoy,1) endef ifneq ($(BR2_PACKAGE_LIBRETRO_THEPOWDERTOY),) -- GitLab From bd26b40bfe4a8b42176c46156c4c4d32303ee57b Mon Sep 17 00:00:00 2001 From: paradadf Date: Thu, 7 Jan 2021 16:42:53 +0000 Subject: [PATCH 4/4] chore(tpt): add gamelist --- .../roms/ports/The Powder Toy/gamelist.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 package/recalbox-romfs/recalbox-romfs-thepowdertoy/roms/ports/The Powder Toy/gamelist.xml diff --git a/package/recalbox-romfs/recalbox-romfs-thepowdertoy/roms/ports/The Powder Toy/gamelist.xml b/package/recalbox-romfs/recalbox-romfs-thepowdertoy/roms/ports/The Powder Toy/gamelist.xml new file mode 100644 index 0000000000..bfa803ce0b --- /dev/null +++ b/package/recalbox-romfs/recalbox-romfs-thepowdertoy/roms/ports/The Powder Toy/gamelist.xml @@ -0,0 +1,12 @@ + + + + ./thepowdertoy.game + The Powder Toy + The Powder Toy is a free physics sandbox game, which simulates air pressure and velocity, heat, gravity and a countless number of interactions between different substances! The game provides you with various building materials, liquids, gases and electronic components which can be used to construct complex machines, guns, bombs, realistic terrains and almost anything else. You can then mine them and watch cool explosions, add intricate wirings, play with little stickmen or operate your machine. + 0.8 + 20101022T000000 + Stanislaw K Skowronek & Others + 1 + + -- GitLab