Merge pull request #1147 from JustEnoughLinuxOS/dev

PR for release

.github/workflows/build-main.yaml

@@ -99,8 +99,6 @@ jobs:
 
             Download: [[Ayaneo Handhelds, Atari VCS, and other x86_64 devices](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[Orange Pi 5](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[Anbernic RG353P/M/V/VS, RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz)]
 
-            ## Upgrading
-            * Download and install the update online via the System Settings menu.
             ## Upgrading
             * Download and install the update online via the System Settings menu.
             * If you are unable to update online

Makefile

@@ -28,6 +28,7 @@ world: x86_64
 x86_64: handheld RK3588 RK3566
 
 handheld:
+	PROJECT=PC DEVICE=handheld ARCH=i686 ./scripts/build_distro
 	PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/build_distro
 
 RK3588:

config/arch.i686

@@ -0,0 +1,24 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "${TARGET_CPU}" ]; then
+    TARGET_CPU=i686
+  fi
+
+  # 64bit userland
+  if [ -z "${TARGET_FEATURES}" ]; then
+    TARGET_FEATURES="32bit"
+  else
+    TARGET_FEATURES+=" 32bit"
+  fi
+
+# determine architecture's family
+  TARGET_SUBARCH=i686
+
+  TARGET_GCC_ARCH="${TARGET_SUBARCH/-/}"
+  TARGET_KERNEL_ARCH=x86
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-march=${TARGET_CPU}"
+  TARGET_LDFLAGS="-march=${TARGET_CPU}"
+
+# build with SIMD support ( yes / no )
+  TARGET_FEATURES+=" mmx sse sse2"

config/functions

@@ -494,6 +494,9 @@ setup_toolchain() {
         "x86_64")
           RUST_HOST="x86_64-unknown-linux-gnu"
           ;;
+        "i686")
+          RUST_HOST="i686-unknown-linux-gnu"
+          ;;
       esac
 
       export CARGO_TARGET_DIR="${PKG_BUILD}/.${RUST_HOST}/target"

config/options

@@ -56,7 +56,7 @@ KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
 
 LINUX_DEPENDS="${PROJECT_DIR}/${PROJECT}/linux ${PROJECT_DIR}/${PROJECT}/patches/linux ${PROJECT_DIR}/${PROJECT}/packages/linux ${ROOT}/packages/linux"
 [ -n "${DEVICE}" ] && LINUX_DEPENDS+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/linux"
-[ "${TARGET_ARCH}" = "x86_64" ] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
+[[ "${TARGET_ARCH}" =~ i*86|x86_64 ]] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC does not point to it

config/show_config

@@ -4,7 +4,7 @@ show_config() {
 
   dashes="==========================="
   config_message="${config_message}\n ${dashes}${dashes}${dashes}"
-  config_message="${config_message}\n Configuration for ${DISTRO}NAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
+  config_message="${config_message}\n Configuration for ${DISTRONAME}"
   config_message="${config_message}\n ${dashes}${dashes}${dashes}"
 
   # Build options
@@ -131,7 +131,7 @@ show_config() {
 
   config_message="${config_message}\n"
   config_message="${config_message}\n ${dashes}${dashes}${dashes}"
-  config_message="${config_message}\n End Configuration for ${DISTRO}NAME"
+  config_message="${config_message}\n End Configuration for ${DISTRONAME}"
   config_message="${config_message}\n ${dashes}${dashes}${dashes}"
   config_message="${config_message}\n\n\n"
 

packages/apps/moonlight/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="moonlight"
-PKG_VERSION="4c58ac9f3923c11ff75620dacf7c79317de456cf"
+PKG_VERSION="a8a4e8908e5685c93e616fc5827fb96604e0a7cb"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/moonlight-stream/moonlight-embedded"

packages/compat/box64/config/box64.box64rc

@@ -0,0 +1,72 @@
+# System-wide .box64rc
+
+# Note that process name are case insensitive!
+
+#
+# Linux process
+#
+
+BOX64_LD_LIBRARY_PATH="/usr/share/box64/lib"
+BOX64_BASH="/usr/bin/bash-x64"
+BOX64_LOG=0
+
+[3dSen.x86_64]
+BOX64_DYNAREC_BLEEDING_EDGE=0   # avoid the use of STRONGMEM for much better performances
+BOX64_DYNAREC_HOTPAGE=0 # disabling hotpage seems to give better performances here
+
+[7z]
+# Those are safe to use on 7z and give a bit of a boost
+BOX64_DYNAREC_SAFEFLAGS=0
+BOX64_DYNAREC_BIGBLOCK=2
+BOX64_DYNAREC_CALLRET=1
+
+[dav1d]
+# Speed hacks (those 3 gives ~10% speedup)
+BOX64_DYNAREC_SAFEFLAGS=0
+BOX64_DYNAREC_BIGBLOCK=2
+BOX64_DYNAREC_CALLRET=1
+
+[deadcells]
+BOX64_PREFER_EMULATED=1
+
+[dontstarve]
+# use emulated sdl2
+BOX64_EMULATED_LIBS=libSDL2-2.0.so.0
+
+[dontstarve_steam_x64]
+BOX64_EMULATED_LIBS=libSDL2-2.0.so.0
+
+[dota2]
+BOX64_CRASHHANDLER=1
+BOX64_DYNAREC_STRONGMEM=1
+
+[heroic]
+BOX64_NOSANDBOX=1
+
+[pressure-vessel-wrap]
+BOX64_NOGTK=1
+
+[steam]
+BOX64_CRASHHANDLER=1
+BOX64_EMULATED_LIBS=libudev.so.0
+
+[streaming_client]
+BOX64_EMULATED_LIBS=libSDL2-2.0.so.0:libSDL2_ttf-2.0.so.0
+
+[steamwebhelper]
+BOX64_NOSANDBOX=1
+BOX64_EXIT=1
+
+[steam-runtime-check-requirements]
+BOX64_EXIT=1
+
+#
+# Wine process
+#
+
+[DOOMx64.exe]
+BOX64_DYNAREC_SAFEFLAGS=0
+
+[DOOMx64vk.exe]
+BOX64_DYNAREC_SAFEFLAGS=0
+

packages/compat/box64/config/box64.conf

@@ -0,0 +1,2 @@
+# /etc/binfmt.d/box64.conf
+:x86_64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00:\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/box64:

packages/compat/box64/package.mk

@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2023-present Fewtarius
+
+PKG_NAME="box64"
+PKG_VERSION="1e0fee739eb4fae2f7fa6224e4330ae0650d3fbd"
+PKG_ARCH="aarch64"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/ptitSeb/box64"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain gl4es ncurses SDL_sound"
+PKG_LONGDESC="Box64 lets you run x86_64 Linux programs (such as games) on non-x86_64 Linux systems, like ARM."
+PKG_TOOLCHAIN="cmake"
+
+PKG_CMAKE_OPTS_TARGET+=" -DCMAKE_BUILD_TYPE=Release"
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/share/box64/lib
+  cp ${PKG_BUILD}/x64lib/* ${INSTALL}/usr/share/box64/lib
+
+  mkdir -p ${INSTALL}/usr/bin
+  cp ${PKG_BUILD}/.${TARGET_NAME}/box64 ${INSTALL}/usr/bin
+  cp ${PKG_BUILD}/tests/bash ${INSTALL}/usr/bin/bash-x64
+
+  mkdir -p ${INSTALL}/usr/config
+  cp ${PKG_DIR}/config/box64.box64rc ${INSTALL}/usr/config/box64.box64rc
+
+  mkdir -p ${INSTALL}/etc
+  ln -sf /storage/.config/box64.box64rc ${INSTALL}/etc/box64.box64rc
+
+  mkdir -p ${INSTALL}/etc/binfmt.d
+  cp -f ${PKG_DIR}/config/box64.conf ${INSTALL}/etc/binfmt.d/box64.conf
+}

packages/compat/box64/profile.d/98-box64

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2020-present Fewtarius
+
+export BOX64_PREFER_EMULATED=1
+export BOX64_LD_LIBRARY_PATH="/usr/share/box64/lib"
+export BOX64_BASH="/usr/bin/bash-x64"
+export BOX64_LOG=0

packages/compat/box86/config/box86.box86rc

@@ -0,0 +1,94 @@
+# System-wide .box86rc
+
+# Note that process name are case insensitive!
+
+#
+# Linux process
+#
+
+[7z]
+# Those are safe to use on 7z and give a bit of a boost
+BOX86_DYNAREC_SAFEFLAGS=0
+BOX86_DYNAREC_BIGBLOCK=2
+
+[A_Golden_Wake.bin.x86]
+BOX86_PREFER_EMULATED=1
+
+[dontstarve]
+# use emulated sdl2
+BOX86_EMULATED_LIBS=libSDL2-2.0.so.0
+
+[dontstarve_steam]
+BOX86_EMULATED_LIBS=libSDL2-2.0.so.0
+
+[GeminiRue.bin.x86]
+BOX86_PREFER_EMULATED=1
+
+[LittleInferno.bin.x86]
+# Little Inferno use an old libvorbis
+BOX86_EMULATED_LIBS=libvorbis.so.0
+
+[hl_linux]
+BOX86_PREFER_EMULATED=1
+
+[hl2_linux]
+#it seems emulated SDL2 have mouse issue for now. That might be a problem with box86
+#BOX86_PREFER_EMULATED=1
+
+[retrocityrampage]
+BOX86_DYNAREC_SAFEFLAGS=0
+BOX86_DYNAREC_BIGBLOCK=2
+
+[sof-bin]
+BOX86_LD_PRELOAD=libX11.so.6
+
+[steam]
+BOX86_EMULATED_LIBS=libudev.so.0:libSDL2-2.0.so.0
+BOX86_NOGTK=1
+BOX86_DYNAREC_STRONGMEM=1
+BOX86_X11COLOR16=1
+
+[streaming_client]
+BOX86_EMULATED_LIBS=libSDL2-2.0.so.0:libSDL2_ttf-2.0.so.0
+
+[UnrealLinux.bin]
+BOX86_DYNAREC_SAFEFLAGS=0
+BOX86_DYNAREC_BIGBLOCK=2
+
+[WorldOfGoo.bin.x86]
+# This is the newer 1.53 version
+BOX86_DYNAREC_SAFEFLAGS=0
+BOX86_DYNAREC_BIGBLOCK=2
+
+[WorldOfGoo.bin32]
+# This is the old version of the game
+BOX86_DYNAREC_SAFEFLAGS=0
+BOX86_DYNAREC_BIGBLOCK=2
+
+[X3R_main]
+# X3Reunion needs emulated libjpeg
+BOX86_EMULATED_LIBS=libjpeg.so.62
+
+[zsnes]
+BOX86_DYNAREC_SAFEFLAGS=0
+BOX86_DYNAREC_BIGBLOCK=2
+
+
+#
+# Wine process
+#
+
+[Crysis.exe]
+#Crysis needs this or you get some strange physics behaviour
+BOX86_DYNAREC_X87DOUBLE=1
+BOX86_DYNAREC_SAFEFLAGS=0   # this will help perf a bit
+BOX86_DYNAREC_BIGBLOCK=3    # Wine app will need 3 for bigblock to do anything
+
+[VARA.exe]
+BOX86_DYNAREC_SAFEFLAGS=2
+
+[VARAFM.exe]
+BOX86_DYNAREC_SAFEFLAGS=2
+
+[VARASAT.exe]
+BOX86_DYNAREC_SAFEFLAGS=2

packages/compat/box86/config/box86.conf

@@ -0,0 +1,2 @@
+# /etc/binfmt.d/box86.conf
+:x86:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/box86:

packages/compat/box86/package.mk

@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2023-present Fewtarius
+
+PKG_NAME="box86"
+PKG_VERSION="70a2a2dd1b1e2686f50dc1d17a8873caa554b405"
+PKG_ARCH="arm aarch64"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/ptitSeb/box86"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain gl4es ncurses SDL_sound"
+PKG_LONGDESC="Box86 lets you run x86 Linux programs (such as games) on non-x86 Linux systems, like ARM."
+PKG_TOOLCHAIN="cmake"
+
+
+PKG_CMAKE_OPTS_TARGET+=" -DCMAKE_BUILD_TYPE=Release"
+
+case ${TARGET_ARCH} in
+  aarch64)
+    make_target() {
+      true
+    }
+  ;;
+esac
+
+makeinstall_target() {
+  case ${TARGET_ARCH} in
+    arm)
+      mkdir -p ${INSTALL}/usr/share/box86/lib
+      cp ${PKG_BUILD}/x86lib/* ${INSTALL}/usr/share/box86/lib
+
+      mkdir -p ${INSTALL}/usr/bin
+      cp ${PKG_BUILD}/.${TARGET_NAME}/box86 ${INSTALL}/usr/bin/
+      cp ${PKG_BUILD}/tests/bash ${INSTALL}/usr/bin/bash-x86
+    ;;
+    aarch64)
+      mkdir -p ${INSTALL}/usr/share/box86/lib
+      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/${PKG_NAME}-*/.install_pkg/usr/share/box86/lib/* ${INSTALL}/usr/share/box86/lib
+
+      mkdir -p ${INSTALL}/usr/bin
+      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/${PKG_NAME}-*/.install_pkg/usr/bin/* ${INSTALL}/usr/bin
+      cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/${PKG_NAME}-*/tests/bash ${INSTALL}/usr/bin/bash-x86
+    ;;
+  esac
+
+  mkdir -p ${INSTALL}/usr/config
+  cp ${PKG_DIR}/config/box86.box86rc ${INSTALL}/usr/config/box86.box86rc
+
+  mkdir -p ${INSTALL}/etc
+  ln -sf /storage/.config/box86.box86rc ${INSTALL}/etc/box86.box86rc
+
+  mkdir -p ${INSTALL}/etc/binfmt.d
+  cp -f ${PKG_DIR}/config/box86.conf ${INSTALL}/etc/binfmt.d/box86.conf
+}

packages/compat/box86/profile.d/98-box86

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2020-present Fewtarius
+
+export BOX86_PREFER_EMULATED=1
+export BOX86_LD_LIBRARY_PATH="/usr/share/box86/lib"
+export BOX86_BASH="/usr/bin/bash-x86"
+export BOX86_LOG=0
+alias box86='LD_LIBRARY_PATH=/usr/lib32:/usr/lib32/gles /usr/bin/box86'

packages/compat/lib32/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="lib32"
 PKG_VERSION="$(date +%Y%m%d)"
-PKG_ARCH="aarch64"
+PKG_ARCH="aarch64 x86_64"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain retroarch SDL2 libsndfile libmodplug"
 PKG_SHORTDESC="ARM 32bit bundle for aarch64"
@@ -11,21 +11,36 @@ PKG_PRIORITY="optional"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
+
+  case ${TARGET_ARCH} in
+    aarch64)
+      LIBARCH="arm"
+      LDSO="ld-linux-armhf.so.3"
+    ;;
+    x86_64)
+      LIBARCH="i686"
+      LDSO="ld-linux.so.2"
+    ;;
+  esac
+
   cd ${PKG_BUILD}
-  LIBROOT="${ROOT}/build.${DISTRO}-${DEVICE}.arm/image/system/"
-  if [ "${ARCH}" = "aarch64" ]; then
-    mkdir -p ${INSTALL}/usr/lib32
-    rsync -al ${LIBROOT}/usr/lib/* ${INSTALL}/usr/lib32 >/dev/null 2>&1
-    chmod -f +x ${INSTALL}/usr/lib32/* || :
-  fi
+  LIBROOT="${ROOT}/build.${DISTRO}-${DEVICE}.${LIBARCH}/image/system/"
+  mkdir -p ${INSTALL}/usr/lib32
+  rsync -al ${LIBROOT}/usr/lib/* ${INSTALL}/usr/lib32 >/dev/null 2>&1
+  chmod -f 0755 ${INSTALL}/usr/lib32/* || :
   mkdir -p ${INSTALL}/usr/lib
-  ln -s /usr/lib32/ld-linux-armhf.so.3 ${INSTALL}/usr/lib/ld-linux-armhf.so.3
+  ln -s /usr/lib32/${LDSO} ${INSTALL}/usr/lib/${LDSO}
 
   mkdir -p "${INSTALL}/etc/ld.so.conf.d"
-  echo "/usr/lib32" > "${INSTALL}/etc/ld.so.conf.d/arm-lib32.conf"
-  echo "/usr/lib32/pulseaudio" >"${INSTALL}/etc/ld.so.conf.d/arm-lib32-pulseaudio.conf"
+  echo "/usr/lib32" > "${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32.conf"
+  echo "/usr/lib32/pulseaudio" >"${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32-pulseaudio.conf"
+
   if [ -d "${LIBROOT}/usr/lib/dri" ]
   then
-    echo "/usr/lib32/dri" >"${INSTALL}/etc/ld.so.conf.d/arm-lib32-dri.conf"
+    echo "/usr/lib32/dri" >"${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32-dri.conf"
+  fi
+  if [ -d "${LIBROOT}/usr/lib/gl4es" ]
+  then
+     echo "/usr/lib/gl4es" >"${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32-gl4es.conf"
   fi
 }

packages/compat/lutris-wine/package.mk

@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present Fewtarius
+# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
+
+PKG_NAME="lutris-wine"
+PKG_VERSION="7.2-2"
+PKG_ARCH="x86_64 i686"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/lutris/wine"
+PKG_URL="${PKG_SITE}/archive/refs/tags/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain bison flex lutris-wine:host"
+PKG_DEPENDS_HOST="toolchain bison:host flex:host"
+PKG_TOOLCHAIN="configure"
+
+pre_configure_host() {
+  PKG_CONFIGURE_OPTS_HOST+=" --enable-win64 --disable-tests"
+
+  case ${TARGET_ARCH} in
+    i686)
+      PKG_CONFIGURE_OPTS_HOST+=" --without-freetype"
+    ;;
+  esac
+}
+
+pre_configure_target() {
+  PKG_CONFIGURE_OPTS_TARGET+=" --disable-tests --with-wine-tools=${TOOLCHAIN}/wine"
+
+  case ${TARGET_ARCH} in
+    x86_64)
+      PKG_CONFIGURE_OPTS_TARGET+=" --enable-win64"
+    ;;
+    i686)
+      PKG_CONFIGURE_OPTS_TARGET+=" --without-freetype"
+    ;;
+  esac
+}
+
+make_host() {
+  make -C ${PKG_BUILD}/.${HOST_NAME}
+  make -C ${PKG_BUILD}/.${HOST_NAME}/tools
+  make -C ${PKG_BUILD}/.${HOST_NAME}/tools/sfnt2fon
+  make -C ${PKG_BUILD}/.${HOST_NAME}/tools/widl
+  make -C ${PKG_BUILD}/.${HOST_NAME}/tools/winebuild
+  make -C ${PKG_BUILD}/.${HOST_NAME}/tools/winegcc
+  make -C ${PKG_BUILD}/.${HOST_NAME}/tools/wmc
+  make -C ${PKG_BUILD}/.${HOST_NAME}/tools/wrc
+}
+
+makeinstall_host() {
+  mkdir -p ${TOOLCHAIN}/wine/tools
+  cp -rf ${PKG_BUILD}/.${HOST_NAME}/tools/* ${TOOLCHAIN}/wine/tools
+}
+
+post_install() {
+  case ${TARGET_ARCH} in
+    x86_64)
+     cp -vPr ${ROOT}/build.${DISTRO}-${DEVICE}.i686/lutris-wine-*/.install_pkg/usr/ ${INSTALL}/
+    ;;
+  esac
+}

packages/compat/wine-wayland/package.mk

@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
+
+PKG_NAME="wine-wayland"
+PKG_VERSION="8.2.1"
+PKG_LICENSE="free"
+PKG_SITE="https://github.com/varmd/wine-wayland"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="wine wayland"
+PKG_TOOLCHAIN="manual"
+
+PKG_SITE_X32="${PKG_SITE}/releases/download/v${PKG_VERSION}/lib32-${PKG_NAME}-8.2-1-x86_64.pkg.tar.zst"
+PKG_SITE_X64="${PKG_SITE}/releases/download/v${PKG_VERSION}/${PKG_NAME}-8.2-1-x86_64.pkg.tar.zst"
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/bin
+  mkdir -p ${INSTALL}/usr/config
+  mkdir -p ${INSTALL}/usr/lib
+  mkdir -p ${INSTALL}/usr/lib32
+
+  #Download Wine Wayland x32 packages
+  curl -Lo ${PKG_BUILD}/${PKG_NAME}_X32.tar.zst ${PKG_SITE_X32}
+  unzstd ${PKG_BUILD}/${PKG_NAME}_X32.tar.zst
+  tar -xvf ${PKG_BUILD}/${PKG_NAME}_X32.tar -C ${INSTALL}/
+
+
+  #Download Wine Wayland x64 packages
+  curl -Lo ${PKG_BUILD}/${PKG_NAME}_X64.tar.zst ${PKG_SITE_X64}
+  unzstd ${PKG_BUILD}/${PKG_NAME}_X64.tar.zst
+  tar -xvf ${PKG_BUILD}/${PKG_NAME}_X64.tar -C ${INSTALL}/
+}

packages/devel/ncurses/package.mk

@@ -82,4 +82,11 @@ post_makeinstall_target() {
     ln -sf lib${f}w.a ${SYSROOT_PREFIX}/usr/lib/lib${f}.a
     ln -sf ${f}w.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig/${f}.pc
   done
+  cd ${INSTALL}/usr/lib
+  for LIB in *w*.so*
+  do
+    NOWLIB=$(echo ${LIB} | sed "s#w##g")
+    ln -sf ${LIB} ${INSTALL}/usr/lib/${NOWLIB}
+  done
+  cd -
 }

packages/emulators/libretro/TIC-80/package.mk

@@ -20,13 +20,14 @@
 ################################################################################
 
 PKG_NAME="TIC-80"
-PKG_VERSION="7be33dc4b5bc54e417639333fbd1c67582aeff21"
+PKG_VERSION="40c5f2d8ef8f221933e9f3fabe3c5e2980e32fee"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/nesbox/TIC-80"
 PKG_URL="${PKG_SITE}.git"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_HOST="toolchain"
+PKG_DEPENDS_TARGET="toolchain TIC-80:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
 PKG_SHORTDESC="Tic80"
@@ -37,13 +38,26 @@ PKG_BUILD_FLAGS="+pic"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CMAKE_OPTS_TARGET="-DBUILD_PLAYER=ON \
+pre_configure_host() {
+  PKG_CMAKE_OPTS_HOST="-DBUILD_PLAYER=OFF \
+                       -DBUILD_WITH_JANET=ON \
+                       -DBUILD_SOKOL=OFF \
+                       -DBUILD_SDL=OFF \
+                       -DBUILD_DEMO_CARTS=OFF \
+                       -DBUILD_LIBRETRO=OFF \
+                       -DBUILD_WITH_MRUBY=OFF \
+                       -DCMAKE_BUILD_TYPE=Release"
+}
+
+pre_configure_target() {
+  PKG_CMAKE_OPTS_TARGET="-DBUILD_PLAYER=ON \
                        -DBUILD_SOKOL=OFF \
                        -DBUILD_SDL=OFF \
                        -DBUILD_DEMO_CARTS=OFF \
                        -DBUILD_LIBRETRO=ON \
 		       -DBUILD_WITH_MRUBY=OFF \
 		       -DCMAKE_BUILD_TYPE=Release"
+}
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/lib/libretro

packages/emulators/libretro/beetle-pce-fast/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-fast"
-PKG_VERSION="d041a54968e0553f9c64ea72060564376e7b8e94"
+PKG_VERSION="cbde74e8341a696e6691d81479c6bfa273e086cc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/beetle-pce/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce"
-PKG_VERSION="2807a21280061fd590cb22236818e254e7b0cf80"
+PKG_VERSION="b6edc6300ca949bea983dcc517c318cec792ba74"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/beetle-psx/package.mk

@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
+
+PKG_NAME="beetle-psx"
+PKG_VERSION="234433f9190227ec3e91f63dd97db95dba0bfa40"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://git.libretro.com/libretro/beetle-psx-libretro"
+PKG_URL="${PKG_SITE}.git"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SHORTDESC="Fork of Mednafen PSX"
+PKG_TOOLCHAIN="make"
+
+if [ ! "${OPENGL}" = "no" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
+fi
+
+if [ "${OPENGLES_SUPPORT}" = yes ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+fi
+
+if [ "${VULKAN_SUPPORT}" = "yes" ]
+then
+  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
+fi
+
+PKG_MAKE_OPTS_TARGET+=" LINK_STATIC_LIBCPLUSPLUS=0"
+
+case ${DEVICE} in
+  handheld)
+    PKG_MAKE_OPTS_TARGET+=" HAVE_HW=1"
+  ;;
+esac
+
+makeinstall_target() {
+
+mkdir -p ${INSTALL}/usr/lib/libretro
+
+case ${DEVICE} in
+  handheld)
+    cp mednafen_psx_hw_libretro.so ${INSTALL}/usr/lib/libretro/beetle_psx_libretro.so
+    cp -vP ${PKG_BUILD}/../core-info-*/beetle_psx_hw_libretro.info ${INSTALL}/usr/lib/libretro/beetle_psx_libretro.info
+    sed -i 's/Beetle PSX HW/Beetle PSX/g' ${INSTALL}/usr/lib/libretro/beetle_psx_libretro.info
+  ;;
+  *)
+    cp mednafen_psx_libretro.so ${INSTALL}/usr/lib/libretro/beetle_psx_libretro.so
+  ;;
+esac
+}

packages/emulators/libretro/beetle-supergrafx/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-supergrafx"
-PKG_VERSION="454b32eac32e9626ade1631d41b0416777fe3d32"
+PKG_VERSION="1ff2daa9377114d5394142f75f1c388b706567ed"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/beetle-wswan/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-wswan"
-PKG_VERSION="64652b47248340f2f02576db6ee5a6a2a3825f65"
+PKG_VERSION="d9b85ec8503bb54269b9cfc642a7052d3915a8fa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/bsnes/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="bsnes"
-PKG_VERSION="cc5b0b9993909d0ccc3aa3c402f962723274fe9e"
+PKG_VERSION="4da970a334ba4644cef72e560985ea3f31fa40f7"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-libretro"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

packages/emulators/libretro/core-info/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="core-info"
-PKG_VERSION="a8e9ddd9d5cb50d35d9fa8655a0867d15c64e133"
+PKG_VERSION="6f381ae47aa55f2f0464d30cbc6db54a7e633e03"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/libretro-core-info"
 PKG_URL="https://github.com/libretro/libretro-core-info/archive/${PKG_VERSION}.tar.gz"

packages/emulators/libretro/fake08/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Lakka (https://www.lakka.tv)
 
 PKG_NAME="fake08"
-PKG_VERSION="cb82c99767e0f04876c96755f4675385f9b6259f"
+PKG_VERSION="769c98ca5d9ad8c8e91257abe0a28cc59619b44d"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/jtothebell/fake-08"
 PKG_URL="${PKG_SITE}.git"

packages/emulators/libretro/fbneo/package.mk

@@ -3,7 +3,7 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)
 
 PKG_NAME="fbneo"
-PKG_VERSION="72b9d1e56550b6717ac79049d735c3bea5da677d"
+PKG_VERSION="aad581f27fbc0777dfd24be7536f8fd6facf857b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

packages/emulators/libretro/fceumm/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="fceumm"
-PKG_VERSION="c795a25647614ee68cc3c8c187566fae3acfde60"
+PKG_VERSION="b205d707f1df4c3af4e2f47b9a38cf8cf317fe78"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/flycast/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="flycast"
-PKG_VERSION="a1472fb190a315eef8f4ba77432fa04b75c20c5d"
+PKG_VERSION="27b6bafd0f003c8f8bcd1fb3bfd48a3523b298f5"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain libzip"
@@ -40,7 +40,7 @@ pre_configure_target() {
                          -DUSE_OPENMP=ON"
 }
 makeinstall_target() {
-mkdir -p ${INSTALL}/usr/lib/libretro
+  mkdir -p ${INSTALL}/usr/lib/libretro
   case ${TARGET_ARCH} in
     aarch64)
       cp -vP ${ROOT}/build.${DISTRO}-${DEVICE}.arm/flycast-*/.install_pkg/usr/lib/libretro/flycast32_libretro.so ${INSTALL}/usr/lib/libretro
@@ -49,7 +49,7 @@ mkdir -p ${INSTALL}/usr/lib/libretro
     arm)
       cp flycast_libretro.so ${INSTALL}/usr/lib/libretro/flycast32_libretro.so
     ;;
-    *)
+    x86_64)
       cp flycast_libretro.so ${INSTALL}/usr/lib/libretro/flycast_libretro.so
     ;;
   esac

packages/emulators/libretro/gambatte/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="gambatte"
-PKG_VERSION="15daa102de559454cc386a26a620f5e38eeeae83"
+PKG_VERSION="7bd0260b907befaccdd8f92157a691cf9961ae1b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/genesis-plus-gx/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx"
-PKG_VERSION="2e456ca6ef6f75717565d24d22ea05f70013365c"
+PKG_VERSION="7146b1aeadd3e3c73d7db3f7ebf10bf154ee6323"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"