diff --git a/CHANGES.md b/CHANGES.md
index 91018f1b67b..192e80fb896 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+# v3.7.4
+* Maintenance release
+* Update RetroArch to 1.14.0
+* Update libretro cores to the same version as on 4.x
+* Add new libretro core: `fake_08`
+* Add new libretro core: `mojozark`
+* Add new libretro core: `puae2021`
+
 # v3.7.3
 * Maintenance release
 * Update RetroArch to 1.10.3
diff --git a/build_all.sh b/build_all.sh
index 578e6f64ffc..9f7df12997b 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -136,6 +136,7 @@ do
 		then
 			exit ${ret_nondb}
 		fi
+		count=$(ls target/${distro}-${target_name}-*{.img.gz,kernel,system}* 2>/dev/null | wc -l)
 	else
 		# remove the old dashboard, so we don't show old/stale dashboard
 		rm -f ${statusfile}
diff --git a/distributions/Lakka/options b/distributions/Lakka/options
index 1f5bcbd78e3..39a92051782 100644
--- a/distributions/Lakka/options
+++ b/distributions/Lakka/options
@@ -213,6 +213,7 @@ DISTRO_SRC="http://sources.libreelec.tv/$LIBREELEC_VERSION"
 " ecwolf "\
 " emux-sms"\
 " easyrpg "\
+" fake_08 "\
 " fbneo "\
 " fceumm "\
 " flycast "\
@@ -244,6 +245,7 @@ DISTRO_SRC="http://sources.libreelec.tv/$LIBREELEC_VERSION"
 " mesen "\
 " mesen-s "\
 " mgba "\
+" mojozork "\
 " mrboom "\
 " mu "\
 " mupen64plus_next "\
diff --git a/distributions/Lakka/version b/distributions/Lakka/version
index df7aef1cbc8..cdc01ecdc49 100644
--- a/distributions/Lakka/version
+++ b/distributions/Lakka/version
@@ -2,4 +2,4 @@
   LIBREELEC_VERSION="devel"
 
 # OS_VERSION: OS Version
-  OS_VERSION="3.7.3"
+  OS_VERSION="3.7.4"
diff --git a/packages/libretro/2048/package.mk b/packages/libretro/2048/package.mk
index 074627c8c79..9bfcfc37d6e 100644
--- a/packages/libretro/2048/package.mk
+++ b/packages/libretro/2048/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="2048"
-PKG_VERSION="a8899c9"
+PKG_VERSION="0edef01"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
diff --git a/packages/libretro/81/package.mk b/packages/libretro/81/package.mk
index 7549d8511ad..04502513863 100644
--- a/packages/libretro/81/package.mk
+++ b/packages/libretro/81/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="81"
-PKG_VERSION="2e34567"
+PKG_VERSION="340a51b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
diff --git a/packages/libretro/a5200/package.mk b/packages/libretro/a5200/package.mk
index 06d40878184..ad3c2bd44aa 100644
--- a/packages/libretro/a5200/package.mk
+++ b/packages/libretro/a5200/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="a5200"
-PKG_VERSION="599a2e5"
+PKG_VERSION="b8f8571"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/a5200"
diff --git a/packages/libretro/atari800/package.mk b/packages/libretro/atari800/package.mk
index 60e75f56120..bd065552ac4 100644
--- a/packages/libretro/atari800/package.mk
+++ b/packages/libretro/atari800/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="atari800"
-PKG_VERSION="beab30e"
+PKG_VERSION="9403328"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/libretro-atari800"
diff --git a/packages/libretro/beetle-lynx/package.mk b/packages/libretro/beetle-lynx/package.mk
index bd7d4c14b4f..ef2791f88f9 100644
--- a/packages/libretro/beetle-lynx/package.mk
+++ b/packages/libretro/beetle-lynx/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-lynx"
-PKG_VERSION="de0d520"
+PKG_VERSION="e3da38c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/beetle-ngp/package.mk b/packages/libretro/beetle-ngp/package.mk
index 6900c43c248..546eaf03776 100644
--- a/packages/libretro/beetle-ngp/package.mk
+++ b/packages/libretro/beetle-ngp/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-ngp"
-PKG_VERSION="facf8e1"
+PKG_VERSION="00c7cb8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/beetle-pce-fast/package.mk b/packages/libretro/beetle-pce-fast/package.mk
index 8d231c0bf66..9c61b1f6666 100644
--- a/packages/libretro/beetle-pce-fast/package.mk
+++ b/packages/libretro/beetle-pce-fast/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-fast"
-PKG_VERSION="e880168"
+PKG_VERSION="617a8dd"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/beetle-pce/package.mk b/packages/libretro/beetle-pce/package.mk
index 66ee5136cb4..92ba05b9f8b 100644
--- a/packages/libretro/beetle-pce/package.mk
+++ b/packages/libretro/beetle-pce/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce"
-PKG_VERSION="ccb9096"
+PKG_VERSION="3a1d5ee"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/beetle-pcfx/package.mk b/packages/libretro/beetle-pcfx/package.mk
index 2aeed89b457..df45b9fb919 100644
--- a/packages/libretro/beetle-pcfx/package.mk
+++ b/packages/libretro/beetle-pcfx/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pcfx"
-PKG_VERSION="bfc0954"
+PKG_VERSION="d1f3e57"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/beetle-psx/package.mk b/packages/libretro/beetle-psx/package.mk
index 42b6217dce2..f8c47a3a2da 100644
--- a/packages/libretro/beetle-psx/package.mk
+++ b/packages/libretro/beetle-psx/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-psx"
-PKG_VERSION="88929ae"
+PKG_VERSION="02303bd"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-psx-libretro"
diff --git a/packages/libretro/beetle-saturn/package.mk b/packages/libretro/beetle-saturn/package.mk
index 3fffb719588..a290cebacd8 100644
--- a/packages/libretro/beetle-saturn/package.mk
+++ b/packages/libretro/beetle-saturn/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-saturn"
-PKG_VERSION="ae30f29"
+PKG_VERSION="054862a"
 PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/beetle-supafaust/package.mk b/packages/libretro/beetle-supafaust/package.mk
index d1e693ed6af..f9de5959527 100644
--- a/packages/libretro/beetle-supafaust/package.mk
+++ b/packages/libretro/beetle-supafaust/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-supafaust"
-PKG_VERSION="85b5527"
+PKG_VERSION="75c658c"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/supafaust"
diff --git a/packages/libretro/beetle-supergrafx/package.mk b/packages/libretro/beetle-supergrafx/package.mk
index 912994e0f14..b6e4a67f3fa 100644
--- a/packages/libretro/beetle-supergrafx/package.mk
+++ b/packages/libretro/beetle-supergrafx/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-supergrafx"
-PKG_VERSION="59991a9"
+PKG_VERSION="5a4563b"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-supergrafx-libretro"
diff --git a/packages/libretro/beetle-vb/package.mk b/packages/libretro/beetle-vb/package.mk
index abab54ef56a..26ee1cb8d56 100644
--- a/packages/libretro/beetle-vb/package.mk
+++ b/packages/libretro/beetle-vb/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-vb"
-PKG_VERSION="246555f"
+PKG_VERSION="162918f"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-vb-libretro"
diff --git a/packages/libretro/beetle-wswan/package.mk b/packages/libretro/beetle-wswan/package.mk
index 021ae21a41f..f8840dfb174 100644
--- a/packages/libretro/beetle-wswan/package.mk
+++ b/packages/libretro/beetle-wswan/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="beetle-wswan"
-PKG_VERSION="d1fb3f3"
+PKG_VERSION="3cac80a"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-wswan-libretro"
diff --git a/packages/libretro/bk_emulator/package.mk b/packages/libretro/bk_emulator/package.mk
index f191d8b2c6c..93dee9715d0 100644
--- a/packages/libretro/bk_emulator/package.mk
+++ b/packages/libretro/bk_emulator/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="bk_emulator"
-PKG_VERSION="30c605a"
+PKG_VERSION="cf70ce5"
 PKG_LICENSE="Opensource"
 PKG_SITE="https://github.com/libretro/bk-emulator"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/libretro/blastem/package.mk b/packages/libretro/blastem/package.mk
index 9433e0acb54..e44a99ea485 100644
--- a/packages/libretro/blastem/package.mk
+++ b/packages/libretro/blastem/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="blastem"
-PKG_VERSION="0786858"
+PKG_VERSION="277e4a6"
 PKG_ARCH="x86_64 i386"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/libretro/blastem"
diff --git a/packages/libretro/bluemsx/package.mk b/packages/libretro/bluemsx/package.mk
index 11a23ef23c6..d421316c99c 100644
--- a/packages/libretro/bluemsx/package.mk
+++ b/packages/libretro/bluemsx/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bluemsx"
-PKG_VERSION="92d0c41"
+PKG_VERSION="acf358b"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/blueMSX-libretro"
diff --git a/packages/libretro/bsnes-mercury/package.mk b/packages/libretro/bsnes-mercury/package.mk
index d4337573bf7..9c9cc00583c 100644
--- a/packages/libretro/bsnes-mercury/package.mk
+++ b/packages/libretro/bsnes-mercury/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bsnes-mercury"
-PKG_VERSION="4ba6d8d"
+PKG_VERSION="fb9a41f"
 PKG_REV="1"
 PKG_ARCH="x86_64 i386"
 PKG_LICENSE="GPLv3"
diff --git a/packages/libretro/bsnes2014/package.mk b/packages/libretro/bsnes2014/package.mk
index 34c33aa3a5a..88b3923522d 100644
--- a/packages/libretro/bsnes2014/package.mk
+++ b/packages/libretro/bsnes2014/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bsnes2014"
-PKG_VERSION="a8f232a"
+PKG_VERSION="78dc66f"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/bsnes2014"
diff --git a/packages/libretro/bsnes_hd/package.mk b/packages/libretro/bsnes_hd/package.mk
index 9a4a1c5baeb..2fbe662b79a 100644
--- a/packages/libretro/bsnes_hd/package.mk
+++ b/packages/libretro/bsnes_hd/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="bsnes_hd"
-PKG_VERSION="65f24e5"
+PKG_VERSION="0482170"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/DerKoun/bsnes-hd"
diff --git a/packages/libretro/cap32/package.mk b/packages/libretro/cap32/package.mk
index 4ccddf9c7e0..e8e91fb8a0f 100644
--- a/packages/libretro/cap32/package.mk
+++ b/packages/libretro/cap32/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="cap32"
-PKG_VERSION="a1b2329"
+PKG_VERSION="73dc9ce"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/libretro-cap32"
diff --git a/packages/libretro/chailove/package.mk b/packages/libretro/chailove/package.mk
index ea368932f3b..ffb01900192 100644
--- a/packages/libretro/chailove/package.mk
+++ b/packages/libretro/chailove/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="chailove"
-PKG_VERSION="0fedc82"
+PKG_VERSION="9677b14"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/libretro/libretro-chailove"
diff --git a/packages/libretro/citra/package.mk b/packages/libretro/citra/package.mk
index 03a13321220..fb1cd531ead 100644
--- a/packages/libretro/citra/package.mk
+++ b/packages/libretro/citra/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="citra"
-PKG_VERSION="44e01f9"
+PKG_VERSION="f0b09a5"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv2+"
 PKG_SITE="https://github.com/libretro/citra"
diff --git a/packages/libretro/core-info/package.mk b/packages/libretro/core-info/package.mk
index de023bd65e4..52515920f45 100644
--- a/packages/libretro/core-info/package.mk
+++ b/packages/libretro/core-info/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="core-info"
-PKG_VERSION="06dac63"
+PKG_VERSION="3d9b20d"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/libretro-core-info"
diff --git a/packages/libretro/crocods/package.mk b/packages/libretro/crocods/package.mk
index 946ccd61867..10bf8b317b1 100644
--- a/packages/libretro/crocods/package.mk
+++ b/packages/libretro/crocods/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="crocods"
-PKG_VERSION="86eeccf"
+PKG_VERSION="f1b4b91"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/libretro/libretro-crocods"
diff --git a/packages/libretro/daphne/package.mk b/packages/libretro/daphne/package.mk
index 6923f2fa86e..a09ad02d2e9 100644
--- a/packages/libretro/daphne/package.mk
+++ b/packages/libretro/daphne/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="daphne"
-PKG_VERSION="0a7e6f0"
+PKG_VERSION="b5481ba"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2+"
 PKG_SITE="https://github.com/libretro/daphne"
diff --git a/packages/libretro/desmume/package.mk b/packages/libretro/desmume/package.mk
index 4ec65df7599..eba79164588 100644
--- a/packages/libretro/desmume/package.mk
+++ b/packages/libretro/desmume/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="desmume"
-PKG_VERSION="5d0ae2b"
+PKG_VERSION="fbd368c"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/desmume"
diff --git a/packages/libretro/dolphin/package.mk b/packages/libretro/dolphin/package.mk
index 32a66ccdb6b..430b95dfc70 100644
--- a/packages/libretro/dolphin/package.mk
+++ b/packages/libretro/dolphin/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dolphin"
-PKG_VERSION="6a0b6ee"
+PKG_VERSION="0df1b5b"
 PKG_ARCH="x86_64 aarch64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/dolphin"
diff --git a/packages/libretro/dosbox-pure/package.mk b/packages/libretro/dosbox-pure/package.mk
index 7dee6c4b6eb..498076bbf5b 100644
--- a/packages/libretro/dosbox-pure/package.mk
+++ b/packages/libretro/dosbox-pure/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="dosbox-pure"
-PKG_VERSION="d22a43d"
+PKG_VERSION="4fdb557"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/dosbox-pure"
diff --git a/packages/libretro/dosbox-svn/package.mk b/packages/libretro/dosbox-svn/package.mk
index fd52d8625c3..5ff1bdfd0f3 100644
--- a/packages/libretro/dosbox-svn/package.mk
+++ b/packages/libretro/dosbox-svn/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox-svn"
-PKG_VERSION="4f2b9ca"
+PKG_VERSION="c23be77"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/dosbox/package.mk b/packages/libretro/dosbox/package.mk
index 44a762a7bc5..6ceea517897 100644
--- a/packages/libretro/dosbox/package.mk
+++ b/packages/libretro/dosbox/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox"
-PKG_VERSION="74cd17e"
+PKG_VERSION="b7b2426"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/ecwolf/package.mk b/packages/libretro/ecwolf/package.mk
index 8698cce5b42..87e0bf670e6 100644
--- a/packages/libretro/ecwolf/package.mk
+++ b/packages/libretro/ecwolf/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="ecwolf"
-PKG_VERSION="e86cd4c"
+PKG_VERSION="f098da0"
 PKG_ARCH="any"
 PKG_LICENSE="Unknown"
 PKG_SITE="https://github.com/libretro/ecwolf"
diff --git a/packages/libretro/fake_08/package.mk b/packages/libretro/fake_08/package.mk
new file mode 100644
index 00000000000..cfc7bee493a
--- /dev/null
+++ b/packages/libretro/fake_08/package.mk
@@ -0,0 +1,15 @@
+PKG_NAME="fake_08"
+PKG_VERSION="49f4eb1"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/jtothebell/fake-08"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="A Pico-8 player/emulator for console homebrew"
+PKG_TOOLCHAIN="make"
+
+PKG_MAKE_OPTS_TARGET="-C platform/libretro"
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/lib/libretro
+  cp -v platform/libretro/fake08_libretro.so ${INSTALL}/usr/lib/libretro/
+}
diff --git a/packages/libretro/fbneo/package.mk b/packages/libretro/fbneo/package.mk
index c55b38f18ec..768cbba562b 100644
--- a/packages/libretro/fbneo/package.mk
+++ b/packages/libretro/fbneo/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="fbneo"
-PKG_VERSION="01bf2e1"
+PKG_VERSION="db9f7e9"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
 PKG_SITE="https://github.com/libretro/fbneo"
@@ -57,7 +57,7 @@ makeinstall_target() {
 
   # copy DATs for manual content scanning
   mkdir -p $INSTALL/usr/share/libretro-database/fbneo
-    cp dats/* $INSTALL/usr/share/libretro-database/fbneo
+    cp -r dats/* $INSTALL/usr/share/libretro-database/fbneo
 
   # copy hiscore.dat to RetroArch system folder
   mkdir -p $INSTALL/usr/share/retroarch-system/fbneo
diff --git a/packages/libretro/fceumm/package.mk b/packages/libretro/fceumm/package.mk
index f3be07af94f..0f8ce43aa6a 100644
--- a/packages/libretro/fceumm/package.mk
+++ b/packages/libretro/fceumm/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="fceumm"
-PKG_VERSION="b3c35b6"
+PKG_VERSION="8c3f690"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/libretro-fceumm"
diff --git a/packages/libretro/flycast/package.mk b/packages/libretro/flycast/package.mk
index 7a7fa69b8d8..131f3fcdf0c 100644
--- a/packages/libretro/flycast/package.mk
+++ b/packages/libretro/flycast/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="flycast"
-PKG_VERSION="fd50529"
+PKG_VERSION="c684faf"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
diff --git a/packages/libretro/fmsx/package.mk b/packages/libretro/fmsx/package.mk
index 706e46c2144..948a4f1a8c5 100644
--- a/packages/libretro/fmsx/package.mk
+++ b/packages/libretro/fmsx/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="fmsx"
-PKG_VERSION="11fa9f3"
+PKG_VERSION="1360c9f"
 PKG_LICENSE="Non-commercial"
 PKG_SITE="https://github.com/libretro/fmsx-libretro"
 PKG_URL="$PKG_SITE.git"
diff --git a/packages/libretro/freechaf/package.mk b/packages/libretro/freechaf/package.mk
index b0d4d955859..651732b4507 100644
--- a/packages/libretro/freechaf/package.mk
+++ b/packages/libretro/freechaf/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="freechaf"
-PKG_VERSION="bc5a4ee"
+PKG_VERSION="4d1d5cb"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/libretro/FreeChaF"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/libretro/freeintv/package.mk b/packages/libretro/freeintv/package.mk
index 81437a3506a..d02cebe5efd 100644
--- a/packages/libretro/freeintv/package.mk
+++ b/packages/libretro/freeintv/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="freeintv"
-PKG_VERSION="295dd3c"
+PKG_VERSION="9a65ec6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
diff --git a/packages/libretro/fsuae/package.mk b/packages/libretro/fsuae/package.mk
index 2d5c90284a0..139c2a61685 100644
--- a/packages/libretro/fsuae/package.mk
+++ b/packages/libretro/fsuae/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="fsuae"
-PKG_VERSION="6b98f85"
+PKG_VERSION="06e3030"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/libretro-fsuae"
diff --git a/packages/libretro/fuse-libretro/package.mk b/packages/libretro/fuse-libretro/package.mk
index 802f5759953..8d386c8172c 100644
--- a/packages/libretro/fuse-libretro/package.mk
+++ b/packages/libretro/fuse-libretro/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="fuse-libretro"
-PKG_VERSION="8b734a9"
+PKG_VERSION="3f9344d"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/fuse-libretro"
diff --git a/packages/libretro/gambatte/package.mk b/packages/libretro/gambatte/package.mk
index 9628a117531..9bd5858ac06 100644
--- a/packages/libretro/gambatte/package.mk
+++ b/packages/libretro/gambatte/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gambatte"
-PKG_VERSION="1553621"
+PKG_VERSION="7e02df6"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/gambatte-libretro"
diff --git a/packages/libretro/gearboy/package.mk b/packages/libretro/gearboy/package.mk
index 390f7b059c7..80cb13b1e24 100644
--- a/packages/libretro/gearboy/package.mk
+++ b/packages/libretro/gearboy/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="gearboy"
-PKG_VERSION="2cb66cd"
+PKG_VERSION="2c5b8b4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/drhelius/Gearboy"
diff --git a/packages/libretro/gearsystem/package.mk b/packages/libretro/gearsystem/package.mk
index 914b873eb6c..cf8db13e517 100644
--- a/packages/libretro/gearsystem/package.mk
+++ b/packages/libretro/gearsystem/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gearsystem"
-PKG_VERSION="a6849bf"
+PKG_VERSION="e3ab748"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/drhelius/Gearsystem"
diff --git a/packages/libretro/genesis-plus-gx/package.mk b/packages/libretro/genesis-plus-gx/package.mk
index 936f85ac8ba..528394a80df 100644
--- a/packages/libretro/genesis-plus-gx/package.mk
+++ b/packages/libretro/genesis-plus-gx/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx"
-PKG_VERSION="7d4ae7d"
+PKG_VERSION="46652c7"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
 PKG_SITE="https://github.com/ekeeke/Genesis-Plus-GX"
diff --git a/packages/libretro/genesis_plus_gx_wide/package.mk b/packages/libretro/genesis_plus_gx_wide/package.mk
index a8af5ce2b60..4ef57000d60 100644
--- a/packages/libretro/genesis_plus_gx_wide/package.mk
+++ b/packages/libretro/genesis_plus_gx_wide/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="genesis_plus_gx_wide"
-PKG_VERSION="fa71a16"
+PKG_VERSION="bd80994"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
 PKG_SITE="https://github.com/libretro/Genesis-Plus-GX-Wide"
diff --git a/packages/libretro/glsl-shaders/package.mk b/packages/libretro/glsl-shaders/package.mk
index 5b987bc6912..8bca15fbd01 100644
--- a/packages/libretro/glsl-shaders/package.mk
+++ b/packages/libretro/glsl-shaders/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="glsl-shaders"
-PKG_VERSION="8f6b264"
+PKG_VERSION="66cd391"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/libretro/gme/package.mk b/packages/libretro/gme/package.mk
index 32dced0fd41..813d6a313fd 100644
--- a/packages/libretro/gme/package.mk
+++ b/packages/libretro/gme/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gme"
-PKG_VERSION="5fb30eb"
+PKG_VERSION="635b1e9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
diff --git a/packages/libretro/gpsp/package.mk b/packages/libretro/gpsp/package.mk
index 877a5b61efb..1594e2aab38 100644
--- a/packages/libretro/gpsp/package.mk
+++ b/packages/libretro/gpsp/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gpsp"
-PKG_VERSION="f0f0b31"
+PKG_VERSION="81649a2"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/gpsp"
diff --git a/packages/libretro/gw-libretro/package.mk b/packages/libretro/gw-libretro/package.mk
index a2e58f1fa48..8f8b8663ac1 100644
--- a/packages/libretro/gw-libretro/package.mk
+++ b/packages/libretro/gw-libretro/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gw-libretro"
-PKG_VERSION="d08a081"
+PKG_VERSION="19a1cb3"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/gw-libretro"
diff --git a/packages/libretro/handy/package.mk b/packages/libretro/handy/package.mk
index 52ec7377d8f..1c56b3d75ee 100644
--- a/packages/libretro/handy/package.mk
+++ b/packages/libretro/handy/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="handy"
-PKG_VERSION="8133b0a"
+PKG_VERSION="517bb2d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Zlib"
diff --git a/packages/libretro/hatari/package.mk b/packages/libretro/hatari/package.mk
index 376abb13b4a..5d819145fb1 100644
--- a/packages/libretro/hatari/package.mk
+++ b/packages/libretro/hatari/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="hatari"
-PKG_VERSION="e5e36a5"
+PKG_VERSION="1ebf0a0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/imame4all/package.mk b/packages/libretro/imame4all/package.mk
index 97d3a74c124..9396126d626 100644
--- a/packages/libretro/imame4all/package.mk
+++ b/packages/libretro/imame4all/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="imame4all"
-PKG_VERSION="f35db38"
+PKG_VERSION="0208517"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
diff --git a/packages/libretro/kronos/package.mk b/packages/libretro/kronos/package.mk
index f93239687d5..cf664c9236b 100644
--- a/packages/libretro/kronos/package.mk
+++ b/packages/libretro/kronos/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="kronos"
-PKG_VERSION="a387dec"
+PKG_VERSION="869c46c"
 PKG_GIT_CLONE_BRANCH="kronos"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/yabause"
diff --git a/packages/libretro/libretro-database/package.mk b/packages/libretro/libretro-database/package.mk
index c89149b7fee..e0c9ecd6f4f 100644
--- a/packages/libretro/libretro-database/package.mk
+++ b/packages/libretro/libretro-database/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libretro-database"
-PKG_VERSION="f3b10ec"
+PKG_VERSION="183babc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/libretro/lutro/package.mk b/packages/libretro/lutro/package.mk
index a5f96c4e344..b9fe2cc9023 100644
--- a/packages/libretro/lutro/package.mk
+++ b/packages/libretro/lutro/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="lutro"
-PKG_VERSION="cc6b06d"
+PKG_VERSION="bb24fcb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
diff --git a/packages/libretro/mame/package.mk b/packages/libretro/mame/package.mk
index 8bd30dd3090..6ef83a523e4 100644
--- a/packages/libretro/mame/package.mk
+++ b/packages/libretro/mame/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mame"
-PKG_VERSION="b7dd999"
+PKG_VERSION="85581d6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
diff --git a/packages/libretro/mame2000/package.mk b/packages/libretro/mame2000/package.mk
index 430e396ba06..6c8798d89fc 100644
--- a/packages/libretro/mame2000/package.mk
+++ b/packages/libretro/mame2000/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mame2000"
-PKG_VERSION="f35db38"
+PKG_VERSION="0208517"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
diff --git a/packages/libretro/mame2003-plus/package.mk b/packages/libretro/mame2003-plus/package.mk
index 6670800fd52..5c3ae3ce82d 100644
--- a/packages/libretro/mame2003-plus/package.mk
+++ b/packages/libretro/mame2003-plus/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mame2003-plus"
-PKG_VERSION="e5ee29e"
+PKG_VERSION="c3cc141"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
 PKG_SITE="https://github.com/libretro/mame2003-plus-libretro"
diff --git a/packages/libretro/mame2010/package.mk b/packages/libretro/mame2010/package.mk
index d19e35ce996..ddeeca0fb45 100644
--- a/packages/libretro/mame2010/package.mk
+++ b/packages/libretro/mame2010/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mame2010"
-PKG_VERSION="932e6f2"
+PKG_VERSION="5f524dd"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
diff --git a/packages/libretro/mame2015/package.mk b/packages/libretro/mame2015/package.mk
index 8215d717221..4a27deb4f8d 100644
--- a/packages/libretro/mame2015/package.mk
+++ b/packages/libretro/mame2015/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="mame2015"
-PKG_VERSION="e6a7aa4"
+PKG_VERSION="2599c8a"
 PKG_REV="1"
 PKG_ARCH="x86_64 aarch64 arm"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/melonds/package.mk b/packages/libretro/melonds/package.mk
index 1096c956fbf..1a60ee79664 100644
--- a/packages/libretro/melonds/package.mk
+++ b/packages/libretro/melonds/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="melonds"
-PKG_VERSION="e93ec3e"
+PKG_VERSION="0e1f06d"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/melonds"
 PKG_URL="$PKG_SITE.git"
diff --git a/packages/libretro/mesen-s/package.mk b/packages/libretro/mesen-s/package.mk
index 648b8a44a3f..ae5135d760f 100644
--- a/packages/libretro/mesen-s/package.mk
+++ b/packages/libretro/mesen-s/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mesen-s"
-PKG_VERSION="b0b5340"
+PKG_VERSION="32a7adf"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/Mesen-S"
diff --git a/packages/libretro/mesen/package.mk b/packages/libretro/mesen/package.mk
index 9c11631a036..0d8a50ef3ca 100644
--- a/packages/libretro/mesen/package.mk
+++ b/packages/libretro/mesen/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mesen"
-PKG_VERSION="bb9ea02"
+PKG_VERSION="c89474c"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/Mesen"
diff --git a/packages/libretro/mgba/package.mk b/packages/libretro/mgba/package.mk
index e7d9ade6335..21ffa363a11 100644
--- a/packages/libretro/mgba/package.mk
+++ b/packages/libretro/mgba/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mgba"
-PKG_VERSION="5d48e07"
+PKG_VERSION="ec5ecb2"
 PKG_ARCH="any"
 PKG_LICENSE="MPLv2.0"
 PKG_SITE="https://github.com/libretro/mgba"
diff --git a/packages/libretro/mojozork/package.mk b/packages/libretro/mojozork/package.mk
new file mode 100644
index 00000000000..a5179ffb019
--- /dev/null
+++ b/packages/libretro/mojozork/package.mk
@@ -0,0 +1,21 @@
+PKG_NAME="mojozork"
+PKG_VERSION="22b638c"
+PKG_LICENSE="zlib"
+PKG_SITE="https://github.com/icculus/mojozork"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="A simple Z-Machine implementation in a single C file."
+PKG_TOOLCHAIN="cmake"
+
+PKG_CMAKE_OPTS_TARGET="-DLIBRETRO=ON"
+
+pre_make_target() {
+  find ${PKG_BUILD} -name flags.make -exec sed -i "s:isystem :I:g" \{} \;
+  find ${PKG_BUILD} -name build.ninja -exec sed -i "s:isystem :I:g" \{} \;
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/lib/libretro
+  cp -v ${PKG_BUILD}/.${TARGET_NAME}/mojozork_libretro.so ${INSTALL}/usr/lib/libretro/
+}
+
diff --git a/packages/libretro/mrboom/package.mk b/packages/libretro/mrboom/package.mk
index 9d706880584..53c629b8a92 100644
--- a/packages/libretro/mrboom/package.mk
+++ b/packages/libretro/mrboom/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mrboom"
-PKG_VERSION="64e874a"
+PKG_VERSION="1bc0933"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
diff --git a/packages/libretro/mu/package.mk b/packages/libretro/mu/package.mk
index e42d542edb5..d7bfe38961e 100644
--- a/packages/libretro/mu/package.mk
+++ b/packages/libretro/mu/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mu"
-PKG_VERSION="1361da0"
+PKG_VERSION="4a3fee9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/libretro/mupen64plus_next/package.mk b/packages/libretro/mupen64plus_next/package.mk
index 1c1ef5655e1..3efecb88dc3 100644
--- a/packages/libretro/mupen64plus_next/package.mk
+++ b/packages/libretro/mupen64plus_next/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mupen64plus_next"
-PKG_VERSION="6e9dcd2"
+PKG_VERSION="bc24153"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mupen64plus-libretro-nx"
diff --git a/packages/libretro/neocd/package.mk b/packages/libretro/neocd/package.mk
index c0e04db02da..aeefa43908c 100644
--- a/packages/libretro/neocd/package.mk
+++ b/packages/libretro/neocd/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="neocd"
-PKG_VERSION="327aece"
+PKG_VERSION="53f5453"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv3"
 PKG_SITE="https://github.com/libretro/neocd_libretro"
diff --git a/packages/libretro/nestopia/package.mk b/packages/libretro/nestopia/package.mk
index 2eef1f72a61..b4bdfdb008d 100644
--- a/packages/libretro/nestopia/package.mk
+++ b/packages/libretro/nestopia/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="nestopia"
-PKG_VERSION="a9e197f"
+PKG_VERSION="d30c550"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/nestopia"
diff --git a/packages/libretro/np2kai/package.mk b/packages/libretro/np2kai/package.mk
index c70a5ac2dd5..f07340752e4 100644
--- a/packages/libretro/np2kai/package.mk
+++ b/packages/libretro/np2kai/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="np2kai"
-PKG_VERSION="2b09ea6"
+PKG_VERSION="606fafa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
diff --git a/packages/libretro/nxengine/package.mk b/packages/libretro/nxengine/package.mk
index 4815675829f..c24f21951cf 100644
--- a/packages/libretro/nxengine/package.mk
+++ b/packages/libretro/nxengine/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="nxengine"
-PKG_VERSION="fc102fa"
+PKG_VERSION="e271c62"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/nxengine-libretro"
diff --git a/packages/libretro/o2em/package.mk b/packages/libretro/o2em/package.mk
index 737aa4a5155..172efbd7eb0 100644
--- a/packages/libretro/o2em/package.mk
+++ b/packages/libretro/o2em/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="o2em"
-PKG_VERSION="641f06d"
+PKG_VERSION="3303cc1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Artistic License"
diff --git a/packages/libretro/openlara/package.mk b/packages/libretro/openlara/package.mk
index 9c303049994..cf698339b42 100644
--- a/packages/libretro/openlara/package.mk
+++ b/packages/libretro/openlara/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="openlara"
-PKG_VERSION="fe88d74"
+PKG_VERSION="96989ac"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
diff --git a/packages/libretro/opera/package.mk b/packages/libretro/opera/package.mk
index 368130d5acc..e860ba61014 100644
--- a/packages/libretro/opera/package.mk
+++ b/packages/libretro/opera/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="opera"
-PKG_VERSION="3849c96"
+PKG_VERSION="8a49bb8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL with additional notes"
diff --git a/packages/libretro/parallel-n64/package.mk b/packages/libretro/parallel-n64/package.mk
index 18b8ba18647..3c2da04a5b8 100644
--- a/packages/libretro/parallel-n64/package.mk
+++ b/packages/libretro/parallel-n64/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="parallel-n64"
-PKG_VERSION="b804ab1"
+PKG_VERSION="a03fdcb"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/parallel-n64"
diff --git a/packages/libretro/pcsx2/package.mk b/packages/libretro/pcsx2/package.mk
index 69bea12c6df..a50f6c4be89 100644
--- a/packages/libretro/pcsx2/package.mk
+++ b/packages/libretro/pcsx2/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pcsx2"
-PKG_VERSION="0251730"
+PKG_VERSION="4c06133"
 PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/pcsx_rearmed/package.mk b/packages/libretro/pcsx_rearmed/package.mk
index bfb4a90c117..2980e32f778 100644
--- a/packages/libretro/pcsx_rearmed/package.mk
+++ b/packages/libretro/pcsx_rearmed/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pcsx_rearmed"
-PKG_VERSION="e247320"
+PKG_VERSION="0739265"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/pcsx_rearmed"
diff --git a/packages/libretro/picodrive/package.mk b/packages/libretro/picodrive/package.mk
index 4694ecd76ac..61f0da12536 100644
--- a/packages/libretro/picodrive/package.mk
+++ b/packages/libretro/picodrive/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="picodrive"
-PKG_VERSION="bb6a52f"
+PKG_VERSION="0a4ec83"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
 PKG_SITE="https://github.com/libretro/picodrive"
diff --git a/packages/libretro/play/package.mk b/packages/libretro/play/package.mk
index 5d918b3207b..5906cae9d3f 100644
--- a/packages/libretro/play/package.mk
+++ b/packages/libretro/play/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="play"
-PKG_VERSION="fd530d0"
+PKG_VERSION="38d3775"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/jpd002/Play-"
@@ -47,8 +47,7 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_LIBRETRO_CORE=yes \
                        -DBUILD_TESTS=no \
                        -DENABLE_AMAZON_S3=no \
 		       -DUSE_GLEW=no \
-                       -DCMAKE_BUILD_TYPE=Release \
-                       --target play_libretro"
+                       -DCMAKE_BUILD_TYPE=Release"
 
 if [ "$OPENGL_SUPPORT" = no -a "$OPENGLES_SUPPORT" = yes ]; then
   PKG_CMAKE_OPTS_TARGET="-DUSE_GLES=yes $PKG_CMAKE_OPTS_TARGET"
diff --git a/packages/libretro/pocketcdg/package.mk b/packages/libretro/pocketcdg/package.mk
index c534244227c..65057e81e8a 100644
--- a/packages/libretro/pocketcdg/package.mk
+++ b/packages/libretro/pocketcdg/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pocketcdg"
-PKG_VERSION="1559b4e"
+PKG_VERSION="afb88fb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
diff --git a/packages/libretro/pokemini/package.mk b/packages/libretro/pokemini/package.mk
index ba07a7f6f9e..30cd70205dd 100644
--- a/packages/libretro/pokemini/package.mk
+++ b/packages/libretro/pokemini/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="pokemini"
-PKG_VERSION="684e7ea"
+PKG_VERSION="9ba2c2d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
diff --git a/packages/libretro/potator/package.mk b/packages/libretro/potator/package.mk
index 5162a3781c8..9d4b31c1bb7 100644
--- a/packages/libretro/potator/package.mk
+++ b/packages/libretro/potator/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="potator"
-PKG_VERSION="3e3bfd7"
+PKG_VERSION="06ec3b7"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/libretro/potator"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/libretro/ppsspp/package.mk b/packages/libretro/ppsspp/package.mk
index d568249aa1a..3f478d1face 100644
--- a/packages/libretro/ppsspp/package.mk
+++ b/packages/libretro/ppsspp/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="ppsspp"
-PKG_VERSION="ce0a45c"
+PKG_VERSION="cd53526"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
diff --git a/packages/libretro/prboom/package.mk b/packages/libretro/prboom/package.mk
index 814a83edde1..9e7bbfd3338 100644
--- a/packages/libretro/prboom/package.mk
+++ b/packages/libretro/prboom/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="prboom"
-PKG_VERSION="b22a6b1"
+PKG_VERSION="4e671fa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/prosystem/package.mk b/packages/libretro/prosystem/package.mk
index 40a0f997077..2dc2fc72052 100644
--- a/packages/libretro/prosystem/package.mk
+++ b/packages/libretro/prosystem/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="prosystem"
-PKG_VERSION="fbf62c3"
+PKG_VERSION="cf544d3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/puae/package.mk b/packages/libretro/puae/package.mk
index e3796f95058..4c7201158c1 100644
--- a/packages/libretro/puae/package.mk
+++ b/packages/libretro/puae/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="puae"
-PKG_VERSION="fd52745"
+PKG_VERSION="d9a8dfb"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/libretro-uae"
diff --git a/packages/libretro/puae2021/package.mk b/packages/libretro/puae2021/package.mk
index 0534eb63760..25dc6ba29d2 100644
--- a/packages/libretro/puae2021/package.mk
+++ b/packages/libretro/puae2021/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="puae2021"
-PKG_VERSION="7a2f6f1da8b4c949c26806a3fa23f7455f44cd39"
+PKG_VERSION="d6576ca"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/libretro-uae"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/libretro/px68k/package.mk b/packages/libretro/px68k/package.mk
index 05f253221c2..0007de6ebe0 100644
--- a/packages/libretro/px68k/package.mk
+++ b/packages/libretro/px68k/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="px68k"
-PKG_VERSION="0183381"
+PKG_VERSION="84a982f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Unknown"
diff --git a/packages/libretro/quicknes/package.mk b/packages/libretro/quicknes/package.mk
index 0daeb56dbf0..be5a5eb4d61 100644
--- a/packages/libretro/quicknes/package.mk
+++ b/packages/libretro/quicknes/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="quicknes"
-PKG_VERSION="e6f08c1"
+PKG_VERSION="1b88a09"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
diff --git a/packages/libretro/race/package.mk b/packages/libretro/race/package.mk
index e2dcb5b1b27..da44ccaa031 100644
--- a/packages/libretro/race/package.mk
+++ b/packages/libretro/race/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="race"
-PKG_VERSION="b8264bb"
+PKG_VERSION="cb00204"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/libretro/RACE"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/libretro/retro8/package.mk b/packages/libretro/retro8/package.mk
index a2378d9a64a..fde5d6de614 100644
--- a/packages/libretro/retro8/package.mk
+++ b/packages/libretro/retro8/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="retro8"
-PKG_VERSION="afa143a"
+PKG_VERSION="bc388ec"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/libretro/retro8"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/libretro/retroarch-assets/package.mk b/packages/libretro/retroarch-assets/package.mk
index 1e4d414d740..bad6f2f91ef 100644
--- a/packages/libretro/retroarch-assets/package.mk
+++ b/packages/libretro/retroarch-assets/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-assets"
-PKG_VERSION="f45dd13"
+PKG_VERSION="4ec80fa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/libretro/retroarch-joypad-autoconfig/package.mk b/packages/libretro/retroarch-joypad-autoconfig/package.mk
index 358bd13c258..ca23868c0ab 100644
--- a/packages/libretro/retroarch-joypad-autoconfig/package.mk
+++ b/packages/libretro/retroarch-joypad-autoconfig/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-joypad-autoconfig"
-PKG_VERSION="760b057"
+PKG_VERSION="dc625d5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/libretro/retroarch-overlays/package.mk b/packages/libretro/retroarch-overlays/package.mk
index d2de89d1f41..1a6ce203b8d 100644
--- a/packages/libretro/retroarch-overlays/package.mk
+++ b/packages/libretro/retroarch-overlays/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-overlays"
-PKG_VERSION="db9744f"
+PKG_VERSION="b3827a2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/libretro/retroarch/package.mk b/packages/libretro/retroarch/package.mk
index 5c38d7f1e6e..0c6593c9eee 100644
--- a/packages/libretro/retroarch/package.mk
+++ b/packages/libretro/retroarch/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch"
-PKG_VERSION="9b282aa"
+PKG_VERSION="ad89b0c"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/RetroArch"
diff --git a/packages/libretro/same_cdi/package.mk b/packages/libretro/same_cdi/package.mk
new file mode 100644
index 00000000000..0ced992009d
--- /dev/null
+++ b/packages/libretro/same_cdi/package.mk
@@ -0,0 +1,45 @@
+PKG_NAME="same_cdi"
+PKG_VERSION="2ee1200"
+PKG_LICENSE="MAME"
+PKG_SITE="https://github.com/libretro/same_cdi"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain expat zlib flac sqlite"
+PKG_LONGDESC="SAME_CDI is a libretro core to play CD-i games. This is a fork and modification of the MAME libretro core"
+PKG_TOOLCHAIN="make"
+
+PKG_MAKE_OPTS_TARGET="-f Makefile.libretro REGENIE=1 VERBOSE=1 NOWERROR=1 OPENMP=0 CROSS_BUILD=1 TOOLS=0 RETRO=1 \
+PYTHON_EXECUTABLE=${TOOLCHAIN}/bin/${PKG_PYTHON_VERSION} CONFIG=libretro LIBRETRO_OS=unix TARGET=mame OSD=retro \
+USE_SYSTEM_LIB_EXPAT=1 USE_SYSTEM_LIB_ZLIB=1 USE_SYSTEM_LIB_FLAC=1 USE_SYSTEM_LIB_SQLITE3=1 LIBRETRO_CPU= ARCH= PROJECT="
+
+case ${ARCH} in
+  x86_64)
+    PKG_MAKE_OPTS_TARGET+=" NOASM=0 PTR64=1 PLATFORM=x86_64"
+    ;;
+  i386)
+    PKG_MAKE_OPTS_TARGET+=" NOASM=0 PTR64=0 PLATFORM=x86"
+    ;;
+  aarch64)
+    PKG_MAKE_OPTS_TARGET+=" NOASM=0 PTR64=0 PLATFORM=arm64"
+    ;;
+  arm)
+    PKG_MAKE_OPTS_TARGET+=" NOASM=1 PTR64=0 PLATFORM=arm"
+    ;;
+esac
+
+pre_make_target() {
+  PKG_MAKE_OPTS_TARGET+=" OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${LD}"
+  sed -i scripts/genie.lua \
+      -e 's|-static-libstdc++||g'
+}
+
+make_target() {
+  unset DISTRO
+  [ "${ARCH}" = "aarch64" ] && export ARCHOPTS="-D__aarch64__ -DASMJIT_BUILD_X86"
+  make ${PKG_MAKE_OPTS_TARGET}
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/lib/libretro
+    cp -v same_cdi_libretro.so ${INSTALL}/usr/lib/libretro/
+}
+
diff --git a/packages/libretro/same_cdi/patches/same_cdi-crosscompile.patch b/packages/libretro/same_cdi/patches/same_cdi-crosscompile.patch
new file mode 100644
index 00000000000..49f1ff3763f
--- /dev/null
+++ b/packages/libretro/same_cdi/patches/same_cdi-crosscompile.patch
@@ -0,0 +1,54 @@
+--- a/3rdparty/genie/build/gmake.linux/genie.make	2018-08-11 00:17:44.000000000 +0200
++++ b/3rdparty/genie/build/gmake.linux/genie.make	2019-04-03 11:57:27.671223016 +0200
+@@ -28,8 +28,8 @@
+   RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
+ endif
+ 
+-CC  = gcc
+-CXX = g++
++CC  = $(HOST_CC)
++CXX = $(HOST_CXX)
+ AR  = ar
+ 
+ ifndef RESCOMP
+@@ -50,12 +50,12 @@
+   INCLUDES           += -I"../../src/host/lua-5.3.0/src"
+   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
+-  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
+-  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
+-  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
+-  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
++  ALL_CFLAGS         += $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
++  ALL_CXXFLAGS       += $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
++  ALL_OBJCFLAGS      += $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
++  ALL_OBJCPPFLAGS    += $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -Wno-implicit-fallthrough
+   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+-  ALL_LDFLAGS        += $(LDFLAGS) -L"." -s -rdynamic
++  ALL_LDFLAGS        += -L"." -s -rdynamic
+   LIBDEPS            +=
+   LDDEPS             +=
+   LDRESP              =
+--- a/3rdparty/genie/src/host/scripts.c	2019-05-21 22:41:14.207745861 +0200
++++ b/3rdparty/genie/src/host/scripts.c	2019-05-21 22:42:43.159893481 +0200
+@@ -147,7 +147,7 @@
+ 
+ 	/* tools/gcc.lua */
+ 	"premake.gcc = { }\npremake.gcc.cc     = \"gcc\"\npremake.gcc.cxx    = \"g++\"\npremake.gcc.ar     = \"ar\"\npremake.gcc.rc     = \"windres\"\npremake.gcc.llvm   = false\nlocal cflags =\n{\nEnableSSE        = \"-msse\",\nEnableSSE2       = \"-msse2\",\nEnableAVX        = \"-mavx\",\nEnableAVX2       = \"-mavx2\",\nPedanticWarnings = \"-Wall -Wextra -pedantic\",\nExtraWarnings    = \"-Wall -Wextra\",\nFatalWarnings    = \"-Werror\",\nFloatFast        = \"-ffast-math\",\nFloatStrict      = \"-ffloat-store\",\nNoFramePointer   = \"-fomit-frame-pointer\",\nOptimize         = \"-O2\",\nOptimizeSize     = \"-Os\",\nOptimizeSpeed    = \"-O3\",\nSymbols          = \"-g\",\n}\nlocal cxxflags =\n{\nCpp11        = \"-std=c++11\",\nCpp14        = \"-std=c++14\",\nCpp17        = \"-std=c++17\",\nCppLatest    = \"-std=c++2a\",\nNoExceptions = \"-fno-exceptions\",\nNoRTTI       = \"-fno-rtti\",\nUnsignedChar = \"-funsigned-char\",\n}\nlocal objcflags =\n{\nObjcARC = \"-fobjc-arc\",\n}\npremake.gcc.platforms =\n{\nNative = {\n"
+-	"cppflags = \"-MMD -MP\",\n},\nx32 = {\ncppflags = \"-MMD -MP\",\nflags    = \"-m32\",\n},\nx64 = {\ncppflags = \"-MMD -MP\",\nflags    = \"-m64\",\n},\nUniversal = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch i386 -arch x86_64 -arch ppc -arch ppc64\",\n},\nUniversal32 = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch i386 -arch ppc\",\n},\nUniversal64 = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch x86_64 -arch ppc64\",\n},\nPS3 = {\ncc         = \"ppu-lv2-g++\",\ncxx        = \"ppu-lv2-g++\",\nar         = \"ppu-lv2-ar\",\ncppflags   = \"-MMD -MP\",\n},\nWiiDev = {\ncppflags    = \"-MMD -MP -I$(LIBOGC_INC) $(MACHDEP)\",\nldflags= \"-L$(LIBOGC_LIB) $(MACHDEP)\",\ncfgsettings = [[\n  ifeq ($(strip $(DEVKITPPC)),)\n    $(error \"DEVKITPPC environment variable is not set\")'\n  endif\n  include $(DEVKITPPC)/wii_rules']],\n},\nOrbis = {\ncc         = \"orbis-clang\",\ncxx        = \"orbis-clang++\",\nar         = \"orbis-ar\",\ncppflag"
++	"cppflags = \"-MMD -MP\",\n},\nx32 = {\ncppflags = \"-MMD -MP\"\n},\nx64 = {\ncppflags = \"-MMD -MP\",\nflags    = \"-m64\",\n},\nUniversal = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch i386 -arch x86_64 -arch ppc -arch ppc64\",\n},\nUniversal32 = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch i386 -arch ppc\",\n},\nUniversal64 = {\nar       = \"libtool\",\ncppflags = \"-MMD -MP\",\nflags    = \"-arch x86_64 -arch ppc64\",\n},\nPS3 = {\ncc         = \"ppu-lv2-g++\",\ncxx        = \"ppu-lv2-g++\",\nar         = \"ppu-lv2-ar\",\ncppflags   = \"-MMD -MP\",\n},\nWiiDev = {\ncppflags    = \"-MMD -MP -I$(LIBOGC_INC) $(MACHDEP)\",\nldflags= \"-L$(LIBOGC_LIB) $(MACHDEP)\",\ncfgsettings = [[\n  ifeq ($(strip $(DEVKITPPC)),)\n    $(error \"DEVKITPPC environment variable is not set\")'\n  endif\n  include $(DEVKITPPC)/wii_rules']],\n},\nOrbis = {\ncc         = \"orbis-clang\",\ncxx        = \"orbis-clang++\",\nar         = \"orbis-ar\",\ncppflag"
+ 	"s   = \"-MMD -MP\",\n},\nEmscripten = {\ncc         = \"$(EMSCRIPTEN)/emcc\",\ncxx        = \"$(EMSCRIPTEN)/em++\",\nar         = \"$(EMSCRIPTEN)/emar\",\ncppflags   = \"-MMD -MP\",\n}\n}\nlocal platforms = premake.gcc.platforms\nfunction premake.gcc.getcppflags(cfg)\nlocal flags = { }\ntable.insert(flags, platforms[cfg.platform].cppflags)\nif flags[1]:startswith(\"-MMD\") then\ntable.insert(flags, \"-MP\")\nend\nreturn flags\nend\nfunction premake.gcc.getcflags(cfg)\nlocal result = table.translate(cfg.flags, cflags)\ntable.insert(result, platforms[cfg.platform].flags)\nif cfg.system ~= \"windows\" and cfg.kind == \"SharedLib\" then\ntable.insert(result, \"-fPIC\")\nend\nreturn result\nend\nfunction premake.gcc.getcxxflags(cfg)\nlocal result = table.translate(cfg.flags, cxxflags)\nreturn result\nend\nfunction premake.gcc.getobjcflags(cfg)\nreturn table.translate(cfg.flags, objcflags)\nend\nfunction premake.gcc.getldflags(cfg)\nlocal result = { }\nif not cfg.flags.Symbols then\nif cfg.system == \"macosx\" then"
+ 	"\nelse\ntable.insert(result, \"-s\")\nend\nend\nif cfg.kind == \"Bundle\" then\ntable.insert(result, \"-bundle\")\nend\nif cfg.kind == \"SharedLib\" then\nif cfg.system == \"macosx\" then\ntable.insert(result, \"-dynamiclib\")\nelse\ntable.insert(result, \"-shared\")\nend\nif cfg.system == \"windows\" and not cfg.flags.NoImportLib then\ntable.insert(result, '-Wl,--out-implib=\"' .. cfg.linktarget.fullpath .. '\"')\nend\nend\nif cfg.kind == \"WindowedApp\" and cfg.system == \"windows\" then\ntable.insert(result, \"-mwindows\")\nend\nlocal platform = platforms[cfg.platform]\ntable.insert(result, platform.flags)\ntable.insert(result, platform.ldflags)\nreturn result\nend\nfunction premake.gcc.getlibdirflags(cfg)\nlocal result = { }\nfor _, value in ipairs(premake.getlinks(cfg, \"all\", \"directory\")) do\ntable.insert(result, '-L\\\"' .. value .. '\\\"')\nend\nreturn result\nend\nfunction premake.gcc.islibfile(p)\nif path.getextension(p) == \".a\" then\nreturn true\nend\nreturn false\nend\nfunction premake.gcc.ge"
+ 	"tlibfiles(cfg)\nlocal result = {}\nfor _, value in ipairs(premake.getlinks(cfg, \"system\", \"fullpath\")) do\nif premake.gcc.islibfile(value) then\ntable.insert(result, _MAKE.esc(value))\nend\nend\nreturn result\nend\nfunction premake.gcc.getlinkflags(cfg)\nlocal result = {}\nfor _, value in ipairs(premake.getlinks(cfg, \"system\", \"fullpath\")) do\nif premake.gcc.islibfile(value) then\nvalue = path.rebase(value, cfg.project.location, cfg.location)\ntable.insert(result, _MAKE.esc(value))\nelseif path.getextension(value) == \".framework\" then\ntable.insert(result, '-framework ' .. _MAKE.esc(path.getbasename(value)))\nelse\ntable.insert(result, '-l' .. _MAKE.esc(path.getname(value)))\nend\nend\nreturn result\nend\nfunction premake.gcc.wholearchive(lib)\nif premake.gcc.llvm then\nreturn {\"-force_load\", lib}\nelse\nreturn {\"-Wl,--whole-archive\", lib, \"-Wl,--no-whole-archive\"}\nend\nend\nfunction premake.gcc.getarchiveflags(prj, cfg, ndx)\nlocal result = {}\nif cfg.platform:startswith(\"Universal\") then\n"
+--- a/scripts/toolchain.lua	2019-04-30 15:47:21.000000000 +0200
++++ b/scripts/toolchain.lua	2019-05-21 22:51:48.116148725 +0200
+@@ -698,9 +698,6 @@
+ 
+ 	configuration { "linux-gcc", "x32" }
+ 		objdir (_buildDir .. "linux_gcc" .. "/obj")
+-		buildoptions {
+-			"-m32",
+-		}
+ 
+ 	configuration { "linux-gcc", "x32", "Release" }
+ 		targetdir (_buildDir .. "linux_gcc" .. "/bin/x32/Release")
diff --git a/packages/libretro/same_cdi/patches/same_cdi-fix_makefile.patch b/packages/libretro/same_cdi/patches/same_cdi-fix_makefile.patch
new file mode 100644
index 00000000000..295749b3f37
--- /dev/null
+++ b/packages/libretro/same_cdi/patches/same_cdi-fix_makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.libretro b/Makefile.libretro
+index 46e24f0b..03aa739f 100644
+--- a/Makefile.libretro
++++ b/Makefile.libretro
+@@ -2,7 +2,7 @@
+ VERBOSE ?= 1
+ RETRO ?= 1
+ NOWERROR ?= 1
+-CONFIG ?= libretro"
++CONFIG ?= libretro
+ NO_USE_MIDI ?= 1
+ NO_USE_PORTAUDIO ?= 1
+ PTR64 ?= 1
diff --git a/packages/libretro/same_cdi/patches/same_cdi-remove-bgfx.patch b/packages/libretro/same_cdi/patches/same_cdi-remove-bgfx.patch
new file mode 100644
index 00000000000..d8c5704133b
--- /dev/null
+++ b/packages/libretro/same_cdi/patches/same_cdi-remove-bgfx.patch
@@ -0,0 +1,80 @@
+diff --git a/Makefile.libretro b/Makefile.libretro
+index 31c414be..8de62064 100644
+--- a/Makefile.libretro
++++ b/Makefile.libretro
+@@ -55,6 +55,8 @@ VERBOSE ?= 1
+ # scripts/toolchain.lua)
+ # PTR64 = 1
+ 
++USE_BGFX ?= 0
++
+ ###########################################################################
+ #
+ #   LIBRETRO PLATFORM GUESSING
+diff --git a/scripts/genie.lua b/scripts/genie.lua
+index 4655b3f4..495308a8 100644
+--- a/scripts/genie.lua
++++ b/scripts/genie.lua
+@@ -387,8 +387,22 @@ newoption {
+ 	description = "Arguments for running debug build.",
+ }
+ 
++newoption {
++	trigger = "USE_BGFX",
++	description = "Use bgfx.",
++	allowed = {
++		{ "0",   "Disabled"     },
++		{ "1",   "Enabled"      },
++	}
++}
++
+ dofile ("extlib.lua")
+ 
++if not _OPTIONS["USE_BGFX"] then
++	_OPTIONS["USE_BGFX"] = "0"
++end
++
++
+ if _OPTIONS["SHLIB"]=="1" then
+ 	LIBTYPE = "SharedLib"
+ else
+diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
+index 664898d1..d720578d 100644
+--- a/scripts/src/3rdparty.lua
++++ b/scripts/src/3rdparty.lua
+@@ -1249,7 +1249,7 @@
+ --------------------------------------------------
+ -- BGFX library objects
+ --------------------------------------------------
+-
++if not _OPTIONS["use_bgfx"]=="0" then
+ project "bgfx"
+ 	uuid "d3e7e119-35cf-4f4f-aba0-d3bdcd1b879a"
+ 	kind "StaticLib"
+@@ -1433,7 +1433,7 @@
+ 			"-x objective-c++",
+ 		}
+ 	end
+-
++end
+ 
+ --------------------------------------------------
+ -- PortAudio library objects
+diff --git a/scripts/src/main.lua b/scripts/src/main.lua
+index 0b47e662..b19eb646 100644
+--- a/scripts/src/main.lua	2019-05-22 00:15:58.983419982 +0200
++++ b/scripts/src/main.lua	2019-05-22 00:17:39.675345144 +0200
+@@ -380,8 +380,12 @@
+ 			ext_lib("portmidi"),
+ 		}
+ 	end
++	if _OPTIONS["USE_BGFX"]~="0" then
++		links {
++			"bgfx",
++		}
++	end
+ 	links {
+-		"bgfx",
+ 		"bimg",
+ 		"bx",
+ 		"ocore_" .. _OPTIONS["osd"],
diff --git a/packages/libretro/sameboy/package.mk b/packages/libretro/sameboy/package.mk
index 96f92a46721..4bb1919b71c 100644
--- a/packages/libretro/sameboy/package.mk
+++ b/packages/libretro/sameboy/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="sameboy"
-PKG_VERSION="b154b7d"
+PKG_VERSION="0913833"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/libretro/sameboy"
diff --git a/packages/libretro/sameduck/package.mk b/packages/libretro/sameduck/package.mk
index bf685ba7b15..44094e231f5 100644
--- a/packages/libretro/sameduck/package.mk
+++ b/packages/libretro/sameduck/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="sameduck"
-PKG_VERSION="a5e5462"
+PKG_VERSION="5cc014b"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/LIJI32/SameBoy"
 PKG_GIT_CLONE_BRANCH="SameDuck"
diff --git a/packages/libretro/scummvm/package.mk b/packages/libretro/scummvm/package.mk
index 70cad404cf7..aa5f7e9ec01 100644
--- a/packages/libretro/scummvm/package.mk
+++ b/packages/libretro/scummvm/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="scummvm"
-PKG_VERSION="2fb2e4c"
+PKG_VERSION="a055474"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/scummvm"
@@ -29,7 +29,6 @@ PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
 PKG_SHORTDESC="ScummVM with libretro backend."
 PKG_LONGDESC="ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files."
-PKG_BUILD_FLAGS="-lto"
 PKG_TOOLCHAIN="make"
 
 PKG_IS_ADDON="no"
@@ -37,31 +36,29 @@ PKG_AUTORECONF="no"
 
 make_target() {
   export CXXFLAGS="$CXXFLAGS -DHAVE_POSIX_MEMALIGN=1"
-  cd ../backends/platform/libretro/build/
-if [ "$DEVICE" == "OdroidGoAdvance" ]; then
-  make platform=oga_a35_neon_hardfloat
-else
-  make
-fi
+  if [ "$DEVICE" = "OdroidGoAdvance" ]; then
+    make all platform=oga_a35_neon_hardfloat
+  else
+    make all platform=$TARGET_NAME
+  fi
 }
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
   cp scummvm_libretro.so $INSTALL/usr/lib/libretro/
+  cp scummvm_libretro.info $INSTALL/usr/lib/libretro/
 
   # unpack files to retroarch-system folder and create basic ini file
-  if [ -f $PKG_BUILD/backends/platform/libretro/aux-data/scummvm.zip ]; then
+  if [ -f scummvm.zip ]; then
     mkdir -p $INSTALL/usr/share/retroarch-system
-      unzip $PKG_BUILD/backends/platform/libretro/aux-data/scummvm.zip \
-            -d $INSTALL/usr/share/retroarch-system
+      unzip scummvm.zip -d $INSTALL/usr/share/retroarch-system
+  fi
 
-      cat << EOF > $INSTALL/usr/share/retroarch-system/scummvm.ini
+  cat << EOF > $INSTALL/usr/share/retroarch-system/scummvm.ini
 [scummvm]
 extrapath=/tmp/system/scummvm/extra
 browser_lastpath=/tmp/system/scummvm/extra
 themepath=/tmp/system/scummvm/theme
 guitheme=scummmodern
 EOF
-
-  fi
 }
diff --git a/packages/libretro/scummvm/patches/scummvm-01-add-oga-platform.patch b/packages/libretro/scummvm/patches/scummvm-01-add-oga-platform.patch
deleted file mode 100644
index b09e47f9d24..00000000000
--- a/packages/libretro/scummvm/patches/scummvm-01-add-oga-platform.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/backends/platform/libretro/build/Makefile
-+++ b/backends/platform/libretro/build/Makefile
-@@ -226,6 +226,18 @@
- endif
-    DEFINES += -DARM
- 
-+else ifneq (,$(findstring oga_a35_neon_hardfloat,$(platform)))
-+   TARGET := $(TARGET_NAME)_libretro.so
-+   DEFINES += -fPIC -Wno-multichar -D_ARM_ASSEM_
-+   LDFLAGS += -shared -Wl,--version-script=../link.T -fPIC
-+   USE_VORBIS = 0
-+   USE_THEORADEC = 0
-+   USE_TREMOR = 1
-+   HAVE_MT32EMU = 0
-+   DEFINES +=  -marm -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard -march=armv8-a+crc
-+   HAVE_NEON = 1
-+   DEFINES += -DARM
-+
- # Emscripten
- else ifeq ($(platform), emscripten)
- 	TARGET := $(TARGET_NAME)_libretro_$(platform).bc
diff --git a/packages/libretro/slang-shaders/package.mk b/packages/libretro/slang-shaders/package.mk
index 34f56aac805..1f25777fd61 100644
--- a/packages/libretro/slang-shaders/package.mk
+++ b/packages/libretro/slang-shaders/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="slang-shaders"
-PKG_VERSION="148c57d"
+PKG_VERSION="feb1fca"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/libretro/snes9x/package.mk b/packages/libretro/snes9x/package.mk
index cbb0827619e..105209564ab 100644
--- a/packages/libretro/snes9x/package.mk
+++ b/packages/libretro/snes9x/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="snes9x"
-PKG_VERSION="92e5907"
+PKG_VERSION="2ed8d68"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
 PKG_SITE="https://github.com/libretro/snes9x"
diff --git a/packages/libretro/snes9x2002/package.mk b/packages/libretro/snes9x2002/package.mk
index 98257700d6f..851e2ef7285 100644
--- a/packages/libretro/snes9x2002/package.mk
+++ b/packages/libretro/snes9x2002/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="snes9x2002"
-PKG_VERSION="c4397de"
+PKG_VERSION="540baad"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/libretro/snes9x2005/package.mk b/packages/libretro/snes9x2005/package.mk
index 2caf2e398e9..5238d2da98a 100644
--- a/packages/libretro/snes9x2005/package.mk
+++ b/packages/libretro/snes9x2005/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="snes9x2005"
-PKG_VERSION="23f759b"
+PKG_VERSION="fd45b0e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/libretro/snes9x2005_plus/package.mk b/packages/libretro/snes9x2005_plus/package.mk
index 07cbd4b53a1..27c54a4d0b5 100644
--- a/packages/libretro/snes9x2005_plus/package.mk
+++ b/packages/libretro/snes9x2005_plus/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="snes9x2005_plus"
-PKG_VERSION="23f759b"
+PKG_VERSION="fd45b0e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/libretro/snes9x2010/package.mk b/packages/libretro/snes9x2010/package.mk
index 1f3ebda9384..8cf9129f43f 100644
--- a/packages/libretro/snes9x2010/package.mk
+++ b/packages/libretro/snes9x2010/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="snes9x2010"
-PKG_VERSION="c98224b"
+PKG_VERSION="e86e546"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/libretro/stella/package.mk b/packages/libretro/stella/package.mk
index 3047b5b0c11..0e50b9dc3eb 100644
--- a/packages/libretro/stella/package.mk
+++ b/packages/libretro/stella/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="stella"
-PKG_VERSION="df49008"
+PKG_VERSION="e8543ba"
 PKG_ARCH="any"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
@@ -33,11 +33,11 @@ PKG_LONGDESC="Stella is a multi-platform Atari 2600 VCS emulator released under
 PKG_TOOLCHAIN="make"
 
 pre_configure_target() {
-PKG_MAKE_OPTS_TARGET=" -C $PKG_BUILD/src/libretro -f Makefile"
+  PKG_MAKE_OPTS_TARGET=" -C $PKG_BUILD/src/os/libretro -f Makefile"
 }
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/libretro
-  cp $PKG_BUILD/src/libretro/stella_libretro.so $INSTALL/usr/lib/libretro/
+  cp $PKG_BUILD/src/os/libretro/stella_libretro.so $INSTALL/usr/lib/libretro/
 }
 
diff --git a/packages/libretro/stella/patches/stella-01-do_not-use_static_libgcc_libstdc++.patch b/packages/libretro/stella/patches/stella-01-do_not-use_static_libgcc_libstdc++.patch
index 36c44c5c43e..8e3d447d9f5 100644
--- a/packages/libretro/stella/patches/stella-01-do_not-use_static_libgcc_libstdc++.patch
+++ b/packages/libretro/stella/patches/stella-01-do_not-use_static_libgcc_libstdc++.patch
@@ -1,7 +1,7 @@
 diff --git a/src/libretro/Makefile b/src/libretro/Makefile
 index a170992343..6a828521e5 100644
---- a/src/libretro/Makefile
-+++ b/src/libretro/Makefile
+--- a/src/os/libretro/Makefile
++++ b/src/os/libretro/Makefile
 @@ -57,11 +57,10 @@ ifneq ($(GIT_VERSION)," unknown")
     CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
  endif
diff --git a/packages/libretro/swanstation/package.mk b/packages/libretro/swanstation/package.mk
index 14c8b5fc479..ef0908359c4 100644
--- a/packages/libretro/swanstation/package.mk
+++ b/packages/libretro/swanstation/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Lakka Team)
 
 PKG_NAME="swanstation"
-PKG_VERSION="0e27584"
+PKG_VERSION="f2e335b"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_LICENSE="GPL-3.0-or-later"
 PKG_SITE="https://github.com/libretro/swanstation"
diff --git a/packages/libretro/tgbdual/package.mk b/packages/libretro/tgbdual/package.mk
index 10c26f1ca8d..633f7b2da88 100644
--- a/packages/libretro/tgbdual/package.mk
+++ b/packages/libretro/tgbdual/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tgbdual"
-PKG_VERSION="1e0c4f9"
+PKG_VERSION="a6f3018"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/theodore/package.mk b/packages/libretro/theodore/package.mk
index 1c5de1b49c0..8ddb277d407 100644
--- a/packages/libretro/theodore/package.mk
+++ b/packages/libretro/theodore/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="theodore"
-PKG_VERSION="563fb98"
+PKG_VERSION="7889613"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/tic80/package.mk b/packages/libretro/tic80/package.mk
index bc9c4486f14..0bdd72e9f38 100644
--- a/packages/libretro/tic80/package.mk
+++ b/packages/libretro/tic80/package.mk
@@ -19,10 +19,10 @@
 ################################################################################
 
 PKG_NAME="tic80"
-PKG_VERSION="e9f62f8"
+PKG_VERSION="ade10ba"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
-PKG_SITE="https://github.com/libretro/TIC-80"
+PKG_SITE="https://github.com/nesbox/TIC-80"
 PKG_URL="$PKG_SITE.git"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
@@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 configure_package() {
-  PKG_CMAKE_SCRIPT="$PKG_BUILD/core/CMakeLists.txt"
+  PKG_CMAKE_SCRIPT="$PKG_BUILD/CMakeLists.txt"
 
   PKG_CMAKE_OPTS_TARGET="-DBUILD_PLAYER=OFF \
                          -DBUILD_SDL=OFF \
diff --git a/packages/libretro/tyrquake/package.mk b/packages/libretro/tyrquake/package.mk
index 42d096d7309..c3f17c9c654 100644
--- a/packages/libretro/tyrquake/package.mk
+++ b/packages/libretro/tyrquake/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tyrquake"
-PKG_VERSION="c516c1f"
+PKG_VERSION="89f3e03"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/uae4arm/package.mk b/packages/libretro/uae4arm/package.mk
index aa73a8aae78..c3567f67415 100644
--- a/packages/libretro/uae4arm/package.mk
+++ b/packages/libretro/uae4arm/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="uae4arm"
-PKG_VERSION="96fd90b"
+PKG_VERSION="177c2f0"
 PKG_REV="1"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPL"
diff --git a/packages/libretro/uzem/package.mk b/packages/libretro/uzem/package.mk
index b1128524c95..20607ab6aaa 100644
--- a/packages/libretro/uzem/package.mk
+++ b/packages/libretro/uzem/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="uzem"
-PKG_VERSION="4c70043"
+PKG_VERSION="08e39e1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
diff --git a/packages/libretro/vbam/package.mk b/packages/libretro/vbam/package.mk
index 52f09822cfb..24dc1ad7188 100644
--- a/packages/libretro/vbam/package.mk
+++ b/packages/libretro/vbam/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vbam"
-PKG_VERSION="cbd7d7d"
+PKG_VERSION="cf60089"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/visualboyadvance-m/visualboyadvance-m"
diff --git a/packages/libretro/vecx/package.mk b/packages/libretro/vecx/package.mk
index fc9920c0cce..8f80328812e 100644
--- a/packages/libretro/vecx/package.mk
+++ b/packages/libretro/vecx/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vecx"
-PKG_VERSION="141af28"
+PKG_VERSION="b5c17bb"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2|LGPLv2.1"
 PKG_SITE="https://github.com/libretro/libretro-vecx"
diff --git a/packages/libretro/vice/package.mk b/packages/libretro/vice/package.mk
index c29b8adce22..e8fcd3c6157 100644
--- a/packages/libretro/vice/package.mk
+++ b/packages/libretro/vice/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vice"
-PKG_VERSION="af8368a"
+PKG_VERSION="a4e51e8"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/vice-libretro"
diff --git a/packages/libretro/virtualjaguar/package.mk b/packages/libretro/virtualjaguar/package.mk
index fc0bea29306..005ebdb70ac 100644
--- a/packages/libretro/virtualjaguar/package.mk
+++ b/packages/libretro/virtualjaguar/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="virtualjaguar"
-PKG_VERSION="263c979"
+PKG_VERSION="2cc0689"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/virtualjaguar-libretro"
diff --git a/packages/libretro/wasm4/package.mk b/packages/libretro/wasm4/package.mk
index 71ac4a86cdb..854b718d4ab 100644
--- a/packages/libretro/wasm4/package.mk
+++ b/packages/libretro/wasm4/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="wasm4"
-PKG_VERSION="6e01840"
+PKG_VERSION="fb27490"
 PKG_ARCH="any"
 PKG_LICENSE="ISC"
 PKG_SITE="https://github.com/aduros/wasm4"
diff --git a/packages/libretro/xmil/package.mk b/packages/libretro/xmil/package.mk
index f164b20aeed..861bca993f9 100644
--- a/packages/libretro/xmil/package.mk
+++ b/packages/libretro/xmil/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="xmil"
-PKG_VERSION="fc18430"
+PKG_VERSION="4cb1e4e"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/libretro/xmil-libretro"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/libretro/xrick/package.mk b/packages/libretro/xrick/package.mk
index 964b3308621..147ae1af1ed 100644
--- a/packages/libretro/xrick/package.mk
+++ b/packages/libretro/xrick/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xrick"
-PKG_VERSION="10d7318"
+PKG_VERSION="7ee449e"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/xrick-libretro"
diff --git a/packages/libretro/yabasanshiro/package.mk b/packages/libretro/yabasanshiro/package.mk
index 914b85f185c..5a86f9e75b5 100644
--- a/packages/libretro/yabasanshiro/package.mk
+++ b/packages/libretro/yabasanshiro/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="yabasanshiro"
-PKG_VERSION="2848d50"
+PKG_VERSION="fd45996"
 PKG_GIT_CLONE_BRANCH="yabasanshiro"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/libretro/yabause/package.mk b/packages/libretro/yabause/package.mk
index e755a0fc4ce..9cc06270e15 100644
--- a/packages/libretro/yabause/package.mk
+++ b/packages/libretro/yabause/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="yabause"
-PKG_VERSION="17dfcd8"
+PKG_VERSION="c7e0272"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/yabause"