diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 89e2a7aa2..3a5d28792 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -96,15 +96,20 @@ jobs: limitations under the License. ## Installation - * Download the latest [version of JELOS](https://github.com/JustEnoughLinuxOS/distribution/releases) (.img.gz) for your device. + * Download the latest version of JELOS for your device. * Decompress the image. * Write the image to an SDCARD using an imaging tool. Common imaging tools include [Balena Etcher](https://www.balena.io/etcher/), [Raspberry Pi Imager](https://www.raspberrypi.com/software/), and [Win32 Disk Imager](https://sourceforge.net/projects/win32diskimager/). If you're skilled with the command line, dd works fine too. + Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)] + ## Upgrading * Download and install the update online via the System Settings menu. - * Download the latest [version of JELOS](https://github.com/JustEnoughLinuxOS/distribution/releases) (.tar) for your device. - * Copy the update to your device over the network or to the sdcard's update folder. - * Reboot the device, and the update will begin automatically. + * If you are unable to update online + * Download the latest version of JELOS from Github + * Copy the update to your device over the network or to the sdcard's update folder. + * Reboot the device, and the update will begin automatically. + + Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution-dev/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.tar)] ## Documentation * [Home](https://github.com/JustEnoughLinuxOS/distribution/wiki) diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml index bef1e4f8a..c71973fd5 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -8,14 +8,6 @@ name: build-main on: repository_dispatch: types: [release-main] - push: - paths-ignore: - - '.github/**' - - 'README.md' - - 'Dockerfile' - - '.dockerignore' - branches: - - main concurrency: group: main @@ -27,7 +19,7 @@ jobs: steps: - uses: hmarr/debug-action@v2 name: debug - - name: get current branch as it may not be default branch; + - name: get current branch as it may not be 'default branch; id: branch run: | branch_arg="${{ github.event.client_payload.branch }}" @@ -43,6 +35,9 @@ jobs: - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d')" + - name: Get short SHA for artifacts + id: sha + run: echo "::set-output name=sha::$(git rev-parse --short HEAD)" - name: Get version id: version run: | @@ -51,7 +46,7 @@ jobs: if [[ "${{ github.event.client_payload.release_tag }}" != "" ]]; then echo "::set-output name=version::${{ github.event.client_payload.release_tag }}" else - echo "::set-output name=version::${{ steps.date.outputs.date }}" + echo "::set-output name=version::${{ steps.date.outputs.date }}-${{ steps.sha.outputs.sha }}" fi - name: Build World run: | @@ -98,15 +93,22 @@ jobs: limitations under the License. ## Installation - * Download the latest [version of JELOS](https://github.com/JustEnoughLinuxOS/distribution/releases) (.img.gz) for your device. + * Download the latest version of JELOS. * Decompress the image. * Write the image to an SDCARD using an imaging tool. Common imaging tools include [Balena Etcher](https://www.balena.io/etcher/), [Raspberry Pi Imager](https://www.raspberrypi.com/software/), and [Win32 Disk Imager](https://sourceforge.net/projects/win32diskimager/). If you're skilled with the command line, dd works fine too. + Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.img.gz)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.img.gz)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.img.gz)] + ## Upgrading * Download and install the update online via the System Settings menu. - * Download the latest [version of JELOS](https://github.com/JustEnoughLinuxOS/distribution/releases) (.tar) for your device. - * Copy the update to your device over the network or to the sdcard's update folder. - * Reboot the device, and the update will begin automatically. + ## Upgrading + * Download and install the update online via the System Settings menu. + * If you are unable to update online + * Download the latest version of JELOS from Github + * Copy the update to your device over the network or to the sdcard's update folder. + * Reboot the device, and the update will begin automatically. + + Download: [[Win600/x86_64](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-handheld.x86_64-${{ steps.version.outputs.version }}.tar)] [[RG353V/RG353P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG353P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG503](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG503.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG552](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG552.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351P](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351P.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351V](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351V.aarch64-${{ steps.version.outputs.version }}.tar)] [[RG351MP](https://github.com/JustEnoughLinuxOS/distribution/releases/download/JELOS-RG351MP.aarch64-${{ steps.version.outputs.version }}.tar)] ## Documentation * [Home](https://github.com/JustEnoughLinuxOS/distribution/wiki) diff --git a/.github/workflows/release-main.yaml b/.github/workflows/release-main.yaml index b9eb9b9cc..71611446c 100644 --- a/.github/workflows/release-main.yaml +++ b/.github/workflows/release-main.yaml @@ -6,6 +6,17 @@ name: release-main on: + push: + paths-ignore: + - '.github/**' + - '*.md' + - 'Dockerfile' + - '.dockerignore' + - '.gitignore' + - 'licenses/**' + - 'tools/**' + branches: + - main workflow_dispatch: env: @@ -31,6 +42,16 @@ jobs: run: | echo "::set-output name=full_name::$(git config --get remote.origin.url | sed 's|^.*github.com/||g' | sed 's/.git$//g')" + - name: changes + id: changes + run: | + prevrelcommit="$(git rev-list --tags --max-count=1)" + release_notes="$(git log ${prevrelcommit}..HEAD --pretty=format:"* %h: %s")" + release_notes="${release_notes//'%'/'%25'}" + release_notes="${release_notes//$'\n'/'%0A'}" + release_notes="${release_notes//$'\r'/'%0D'}" + echo "::set-output name=changes::$(echo ${release_notes} | wc -l)" + echo "::set-output name=release_notes::${release_notes}" - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d')" @@ -46,5 +67,6 @@ jobs: { "branch" : "${{ env.BRANCH }}", "release_tag" : "${{steps.date.outputs.date}}", + "release_notes" : ${{toJSON(steps.changes.outputs.release_notes)}} } diff --git a/packages/audio/openal-soft/package.mk b/packages/audio/openal-soft/package.mk index 66a17265a..c76730851 100644 --- a/packages/audio/openal-soft/package.mk +++ b/packages/audio/openal-soft/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openal-soft" -PKG_VERSION="1.21.1" -PKG_SHA256="8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f" +PKG_VERSION="b2ab8841d2d37296db317a1174392ed041faed97" +PKG_SHA256="0e7359bc5eed38b10e9977ebcb6ee3ba198276b5b13f4cb7f54b01d298aab7fd" PKG_LICENSE="GPL" PKG_SITE="http://www.openal.org/" PKG_URL="https://github.com/kcat/openal-soft/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/games/emulators/PPSSPPSDL/package.mk b/packages/games/emulators/PPSSPPSDL/package.mk index a56eafe4f..f7b5c8cab 100644 --- a/packages/games/emulators/PPSSPPSDL/package.mk +++ b/packages/games/emulators/PPSSPPSDL/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert) # Copyright (C) 2022-present Fewtarius PKG_NAME="PPSSPPSDL" -PKG_VERSION="bc1975bc9975e5e96f09bceca9ae036d92877fc9" +PKG_VERSION="317ecdaad1ec9768b3ad234bb8b35c186b7e2916" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" @@ -17,7 +17,7 @@ PKG_BUILD_FLAGS="+lto" PKG_PATCH_DIRS+="${DEVICE}" if [ ! "${OPENGL}" = "no" ]; then - PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew" PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=OFF \ -DUSING_GLES2=OFF" fi diff --git a/packages/games/emulators/amiberry/package.mk b/packages/games/emulators/amiberry/package.mk index 1d8d147b7..5683eea89 100644 --- a/packages/games/emulators/amiberry/package.mk +++ b/packages/games/emulators/amiberry/package.mk @@ -3,7 +3,7 @@ PKG_NAME="amiberry" PKG_ARCH="arm aarch64" -PKG_VERSION="d82ab5b674266ac5825fd78e63cc993ed798a07f" +PKG_VERSION="d64358d725e27e7273f93ce290b31abf4ab3b4a9" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/midwan/amiberry" PKG_URL="${PKG_SITE}.git" @@ -47,7 +47,7 @@ makeinstall_target() { ln -s /storage/roms/bios ${INSTALL}/usr/config/amiberry/kickstarts # Create links to Retroarch controller files - ln -s "/etc/retroarch-joypad-autoconfig" "${INSTALL}/usr/config/amiberry/controller" + ln -s "/usr/share/libretro/autoconfig" "${INSTALL}/usr/config/amiberry/controller" # Copy binary, scripts & link libcapsimg cp -a amiberry* ${INSTALL}/usr/bin/amiberry diff --git a/packages/games/emulators/dolphinsa/patches/legacy/001-libevdev.patch b/packages/games/emulators/dolphinsa/patches/legacy/001-libevdev.patch new file mode 100644 index 000000000..aa578802a --- /dev/null +++ b/packages/games/emulators/dolphinsa/patches/legacy/001-libevdev.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/FindLibevdev.cmake b/CMake/FindLibevdev.cmake +index e89a5f229d..a7c73e0536 100644 +--- a/CMake/FindLibevdev.cmake ++++ b/CMake/FindLibevdev.cmake +@@ -12,6 +12,7 @@ FIND_PATH( + HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS} + /usr/include + /usr/local/include ++ /usr/include/libevdev-1.0 + ${LIBEVDEV_PATH_INCLUDES} + ) + diff --git a/packages/games/emulators/flycastsa/package.mk b/packages/games/emulators/flycastsa/package.mk index c0a43c69b..1ac600a83 100644 --- a/packages/games/emulators/flycastsa/package.mk +++ b/packages/games/emulators/flycastsa/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="flycastsa" -PKG_VERSION="b821ece0527188d51475fdbaa9d8e0d21ccb3d5a" +PKG_VERSION="d22fa54f7bf66866c3cae258ffbb13c4ca4b2d85" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/flyinghead/flycast" PKG_URL="${PKG_SITE}.git" diff --git a/packages/games/emulators/hatarisa/package.mk b/packages/games/emulators/hatarisa/package.mk index bcdbc8d53..46afe6787 100644 --- a/packages/games/emulators/hatarisa/package.mk +++ b/packages/games/emulators/hatarisa/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present 5schatten (https://github.com/5schatten) PKG_NAME="hatarisa" -PKG_VERSION="9d0d4ffc8df8625f88f5705ffeb1904c31ed7f0e" -PKG_SHA256="86e0b841b890119e5c7fda62f68ff46fad8323301b60df02a9d339ec26f312a6" +PKG_VERSION="a72c58bae34edc2c77b93909396e8722e4cfb04f" +PKG_SHA256="c3497c7ea24a830ce774bd0b79b891675d14f55e0738f9dc4534a4cae257fcaf" PKG_LICENSE="GPL" PKG_SITE="https://github.com/hatari/hatari" PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/games/emulators/hypseus-singe/sources/start_hypseus.sh b/packages/games/emulators/hypseus-singe/sources/start_hypseus.sh index 224a00a56..9e97ae87c 100755 --- a/packages/games/emulators/hypseus-singe/sources/start_hypseus.sh +++ b/packages/games/emulators/hypseus-singe/sources/start_hypseus.sh @@ -17,7 +17,7 @@ GAMEPADINFO="$(sdljoytest -skip_loop)" JOYNAME=$(echo "${GAMEPADINFO}" | grep "Joystick 0 name " | sed "s|Joystick 0 name ||" | sed "s|'||g") # -for file in /etc/retroarch-joypad-autoconfig/*.cfg; do +for file in /usr/share/libretro/autoconfig/*.cfg; do GAMEPAD=$(cat "$file" | grep input_device| cut -d'"' -f 2) if [ "${JOYNAME}" == "${GAMEPAD}" ]; then GPFILE="${file}" diff --git a/packages/games/emulators/retroarch/package.mk b/packages/games/emulators/retroarch/package.mk index eb8f92f30..be623d1bc 100644 --- a/packages/games/emulators/retroarch/package.mk +++ b/packages/games/emulators/retroarch/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC) PKG_NAME="retroarch" -PKG_VERSION="284466b04b0dcf8c086bfa33a8c2df61fc4afc2b" +PKG_VERSION="f8a9b0a197258c27c00fc575675668088b132bd2" PKG_SITE="https://github.com/libretro/RetroArch" PKG_URL="${PKG_SITE}.git" PKG_LICENSE="GPLv3" @@ -129,14 +129,7 @@ makeinstall_target() { } post_install() { - mkdir -p ${INSTALL}/etc/retroarch-joypad-autoconfig - if [ -d "${PKG_DIR}/gamepads/device/${DEVICE}" ] - then - cp -r ${PKG_DIR}/gamepads/device/${DEVICE}/* ${INSTALL}/etc/retroarch-joypad-autoconfig ||: - fi - enable_service tmp-cores.mount - enable_service tmp-joypads.mount enable_service tmp-database.mount enable_service tmp-assets.mount enable_service tmp-shaders.mount diff --git a/packages/games/emulators/retroarch/patches/0009-hide-wayland-checkerboard.patch b/packages/games/emulators/retroarch/patches/0009-hide-wayland-checkerboard.patch new file mode 100644 index 000000000..40425b257 --- /dev/null +++ b/packages/games/emulators/retroarch/patches/0009-hide-wayland-checkerboard.patch @@ -0,0 +1,13 @@ +diff --git a/gfx/common/wayland_common.c b/gfx/common/wayland_common.c +index 03cb91ba49..15356f8002 100644 +--- a/gfx/common/wayland_common.c ++++ b/gfx/common/wayland_common.c +@@ -442,7 +442,7 @@ static bool draw_splash_screen(gfx_ctx_wayland_data_t *wl) + + shm_buffer_paint_checkerboard(buffer, wl->width, + wl->height, wl->buffer_scale, +- 16, 0xffbcbcbc, 0xff8e8e8e); ++ 16, 0xff000000, 0xff000000); + + wl_surface_attach(wl->surface, buffer->wl_buffer, 0, 0); + wl_surface_set_buffer_scale(wl->surface, wl->buffer_scale); diff --git a/packages/games/emulators/scummvmsa/package.mk b/packages/games/emulators/scummvmsa/package.mk index b6dd05f52..dc0c1c4a7 100644 --- a/packages/games/emulators/scummvmsa/package.mk +++ b/packages/games/emulators/scummvmsa/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="scummvmsa" -PKG_VERSION="101b47623f4916e96698987f8ad6404bfa7fcfbf" -PKG_SHA256="df8ff1afad0bc9d40a4910149429ae3a21ef047bfb3055c72e55d8285fd4536c" +PKG_VERSION="1cc9c401096f50a95e7026ebf8506bbe36337a9c" +PKG_SHA256="23d7efde6a983d6347dacda5c4813363a54d0f5d16d91ab0c272a7f6bb731c7b" PKG_REV="1" PKG_LICENSE="GPL2" PKG_SITE="https://github.com/scummvm/scummvm" diff --git a/packages/games/libretro/cap32/package.mk b/packages/games/libretro/cap32/package.mk index ad7858e77..48737f6fb 100644 --- a/packages/games/libretro/cap32/package.mk +++ b/packages/games/libretro/cap32/package.mk @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="cap32" -PKG_VERSION="4bda5aafde4af3727a59cb6794fb0340b53fcbd9" -PKG_SHA256="07a6522f8318bfde889dff8d6087dbc37166f5b71bb2e1cea4773ef848034a45" +PKG_VERSION="29c5440fd2a047ec06e3db1986c80f1c7d524450" +PKG_SHA256="44ec9889438024a733764bf28addf9242fd77bca37549e05593a64a8cf9d2f02" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" diff --git a/packages/games/libretro/core-info/package.mk b/packages/games/libretro/core-info/package.mk index fbd6342da..d0912c6d9 100644 --- a/packages/games/libretro/core-info/package.mk +++ b/packages/games/libretro/core-info/package.mk @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="core-info" -PKG_VERSION="6be161a7cb5e0fa12986cbbff2f878832ebcf00c" -PKG_SHA256="8dbfba48683af364a414d1543b69365c6cf0cc3a29c525adde80df36214bd806" +PKG_VERSION="90eff5d4e72db1b5929af7210c9b665c33034536" +PKG_SHA256="81cf84ef5d9b15698641dd976ee175e365199df0e34012d4c501fa78490aa6a5" 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" diff --git a/packages/games/libretro/fbneo/package.mk b/packages/games/libretro/fbneo/package.mk index 00747053d..881984318 100644 --- a/packages/games/libretro/fbneo/package.mk +++ b/packages/games/libretro/fbneo/package.mk @@ -3,8 +3,8 @@ # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC) PKG_NAME="fbneo" -PKG_VERSION="8678b0fcd02c4049c0cfa40a0ab87fded1bbedd8" -PKG_SHA256="e395e951418fb5ae94563c3378de5abaed623b3ef3c79ac0bdbf8bb5ff7d8718" +PKG_VERSION="e34f5cae4de1f30a52fd22cb57ff139fea095376" +PKG_SHA256="704893b63bff37afcc43925bad2aa23ac8f4310ef58207f4129d115dfbeb6f88" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Non-commercial" diff --git a/packages/games/libretro/flycast/package.mk b/packages/games/libretro/flycast/package.mk index 447448e7a..74bb78bbf 100644 --- a/packages/games/libretro/flycast/package.mk +++ b/packages/games/libretro/flycast/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="flycast" -PKG_VERSION="b821ece0527188d51475fdbaa9d8e0d21ccb3d5a" +PKG_VERSION="d22fa54f7bf66866c3cae258ffbb13c4ca4b2d85" PKG_SITE="https://github.com/flyinghead/flycast" PKG_URL="${PKG_SITE}.git" PKG_DEPENDS_TARGET="toolchain libzip" diff --git a/packages/games/libretro/libretro-database/package.mk b/packages/games/libretro/libretro-database/package.mk index 09731816b..0b84fb13f 100644 --- a/packages/games/libretro/libretro-database/package.mk +++ b/packages/games/libretro/libretro-database/package.mk @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="libretro-database" -PKG_VERSION="772011a54392aab6be1302bf1bd8aa1cc0c0c6c2" -PKG_SHA256="f1178a0be09826eed5680ff1ddbba80145fc95b2128eb844a9f1e097db4d2fd8" +PKG_VERSION="bc488c79cdc36ea1076a2941f2e6e32365d5f53e" +PKG_SHA256="00367a61ab8014f82d1b36b72c44ed948ad7d9d6d5c6f801d178c23ea3f5d863" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/games/libretro/mame2003-plus/package.mk b/packages/games/libretro/mame2003-plus/package.mk index 66952378e..c775bb1ef 100644 --- a/packages/games/libretro/mame2003-plus/package.mk +++ b/packages/games/libretro/mame2003-plus/package.mk @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="mame2003-plus" -PKG_VERSION="36d6eb427dd44beb25d689e4d7173252d4715837" -PKG_SHA256="7becce6fdd28736d2e524fb5507012414553f57ef43e6681be0e3719f61b9554" +PKG_VERSION="8d842197cc19a3330d34307da8fd820ccb1ccf21" +PKG_SHA256="87bcad95652750b4ecf22aaa59d3cf45446cf463afc0766377c0b5640a1e27c8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MAME" diff --git a/packages/games/libretro/melonds/package.mk b/packages/games/libretro/melonds/package.mk index ce5b1b4ba..313f10b98 100644 --- a/packages/games/libretro/melonds/package.mk +++ b/packages/games/libretro/melonds/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="melonds" -PKG_VERSION="6a03f3f11a729dbf698ec53954c735a0680aca01" +PKG_VERSION="5e52c245fb38cabe881fbfa6513280ee44fc5bd8" PKG_REV="1" PKG_LICENSE="GPLv3" PKG_SITE="https://git.libretro.com/libretro/melonDS" diff --git a/packages/games/libretro/pcsx_rearmed/package.mk b/packages/games/libretro/pcsx_rearmed/package.mk index 5342ae8d4..47a1c0284 100644 --- a/packages/games/libretro/pcsx_rearmed/package.mk +++ b/packages/games/libretro/pcsx_rearmed/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="pcsx_rearmed" -PKG_VERSION="d0abba5d3a7198788b42ff943894a0ac8f17d931" -PKG_SHA256="052247284a8d750df44d4616e7808bb5caf5d82a557ec2c2e49fe0ddbaf8b0d1" +PKG_VERSION="f94d3b198b9b7afa5b9025ba70652bed11b12052" +PKG_SHA256="f6c295a28fa771da378de88cb9573b0eaac7d03b3d413424b33981872c0ef6b4" PKG_REV="1" PKG_ARCH="arm aarch64" PKG_LICENSE="GPLv2" diff --git a/packages/games/libretro/ppsspp/package.mk b/packages/games/libretro/ppsspp/package.mk index c1d48059e..b1bf030fb 100644 --- a/packages/games/libretro/ppsspp/package.mk +++ b/packages/games/libretro/ppsspp/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="ppsspp" -PKG_VERSION="bc1975bc9975e5e96f09bceca9ae036d92877fc9" +PKG_VERSION="317ecdaad1ec9768b3ad234bb8b35c186b7e2916" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/hrydgard/ppsspp" PKG_URL="https://github.com/hrydgard/ppsspp.git" diff --git a/packages/games/libretro/puae/package.mk b/packages/games/libretro/puae/package.mk index 668a7899a..840545d6a 100644 --- a/packages/games/libretro/puae/package.mk +++ b/packages/games/libretro/puae/package.mk @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="puae" -PKG_VERSION="1b7dd443ff89d667d99f8c44454a91ed59bcabd9" -PKG_SHA256="8a0944a80e9f8f7862ba82c87bc80266606f151f50c59d5f87e0cf9b535446b3" +PKG_VERSION="4d8ebafe3f91c4998e8d73940e9558d863ecf93b" +PKG_SHA256="c56496335513f7942387f569c39ee4726d4074a90a4eafb22143abceb78b22e5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/games/libretro/swanstation/package.mk b/packages/games/libretro/swanstation/package.mk index cdd46d821..f58bda193 100644 --- a/packages/games/libretro/swanstation/package.mk +++ b/packages/games/libretro/swanstation/package.mk @@ -3,8 +3,8 @@ # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC) PKG_NAME="swanstation" -PKG_VERSION="b6a18318bd7bf0d3b28b50d2b554810ea11b30cb" -PKG_SHA256="c2dadee188abb90c30bd3579457a9063c8a55b65400a29a17e9bbe300914d5fd" +PKG_VERSION="1b12727c91f441f203a6d067ec123f181cf35360" +PKG_SHA256="1a4fa7da4f88c1cc83750479df7c3604c97e412a57050251b6beaed7a15225ef" PKG_ARCH="" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/swanstation" diff --git a/packages/games/libretro/yabasanshiro/package.mk b/packages/games/libretro/yabasanshiro/package.mk index ad318feb3..4c48b9df2 100644 --- a/packages/games/libretro/yabasanshiro/package.mk +++ b/packages/games/libretro/yabasanshiro/package.mk @@ -45,12 +45,12 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi pre_configure_target() { - case ${PROJECT} in - Rockchip) - PKG_MAKE_OPTS_TARGET+=" -C yabause/src/libretro platform=rockpro64 HAVE_NEON=0" + case ${DEVICE} in + RG351P|RG351V|RG351MP|RG353P|RG503|RG552) + PKG_MAKE_OPTS_TARGET+=" -C yabause/src/libretro platform=rockpro64 HAVE_NEON=0 FORCE_GLES=1" ;; *) - PKG_MAKE_OPTS_TARGET+=" -C yabause/src/libretro FORCE_GLES=1" + PKG_MAKE_OPTS_TARGET+=" -C yabause/src/libretro" ;; esac } diff --git a/packages/games/native/moonlight/package.mk b/packages/games/native/moonlight/package.mk index 94741e081..055db9c7c 100644 --- a/packages/games/native/moonlight/package.mk +++ b/packages/games/native/moonlight/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="moonlight" -PKG_VERSION="758dc6895867825efefeb621dc3f1beaaf85b5b6" +PKG_VERSION="13390594f56b56220ba301b6bfcffc38178b3fd8" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/moonlight-stream/moonlight-embedded" diff --git a/packages/games/tools/portmaster/package.mk b/packages/games/tools/portmaster/package.mk index c5a3c3dc3..57b48b41a 100644 --- a/packages/games/tools/portmaster/package.mk +++ b/packages/games/tools/portmaster/package.mk @@ -11,14 +11,20 @@ PKG_SECTION="tools" PKG_SHORTDESC="A simple tool that allows you to download various game ports that are available for Jelos" PKG_TOOLCHAIN="manual" +case ${DEVICE} in + RG552|handheld) + PKG_DEPENDS_TARGET="glew" + ;; +esac + pre_unpack() { unzip sources/portmaster/portmaster-.zip -d ${PKG_BUILD} } makeinstall_target() { - mkdir -p $INSTALL/usr/share/ + mkdir -p ${INSTALL}/usr/share/ cp -r ${PKG_BUILD}/PortMaster ${INSTALL}/usr/share/ - chmod 0755 $INSTALL/usr/share/PortMaster + chmod 0755 ${INSTALL}/usr/share/PortMaster mkdir -p ${INSTALL}/usr/lib/autostart/common cp ${PKG_DIR}/sources/autostart/common/* ${INSTALL}/usr/lib/autostart/common diff --git a/packages/games/emulators/retroarch/gamepads/device/RG351MP/GO-Super Gamepad.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/RG351MP/GO-Super Gamepad.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/RG351MP/GO-Super Gamepad.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/RG351MP/GO-Super Gamepad.cfg diff --git a/packages/games/emulators/retroarch/gamepads/device/RG351P/OpenSimHardware OSH PB Controller.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/RG351P/OpenSimHardware OSH PB Controller.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/RG351P/OpenSimHardware OSH PB Controller.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/RG351P/OpenSimHardware OSH PB Controller.cfg diff --git a/packages/games/emulators/retroarch/gamepads/device/RG351P/OpenSimHardware OSH PB Controller_SDL.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/RG351P/OpenSimHardware OSH PB Controller_SDL.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/RG351P/OpenSimHardware OSH PB Controller_SDL.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/RG351P/OpenSimHardware OSH PB Controller_SDL.cfg diff --git a/packages/games/emulators/retroarch/gamepads/device/RG351V/OpenSimHardware OSH PB Controller.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/RG351V/OpenSimHardware OSH PB Controller.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/RG351V/OpenSimHardware OSH PB Controller.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/RG351V/OpenSimHardware OSH PB Controller.cfg diff --git a/packages/games/emulators/retroarch/gamepads/device/RG353P b/packages/games/tools/retroarch-joypads/gamepads/device/RG353P similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/RG353P rename to packages/games/tools/retroarch-joypads/gamepads/device/RG353P diff --git a/packages/games/emulators/retroarch/gamepads/device/RG503/retrogame_joypad.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/RG503/retrogame_joypad.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/RG503/retrogame_joypad.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/RG503/retrogame_joypad.cfg diff --git a/packages/games/emulators/retroarch/gamepads/device/RG552/retrogame_joypad.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/RG552/retrogame_joypad.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/RG552/retrogame_joypad.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/RG552/retrogame_joypad.cfg diff --git a/packages/games/tools/retroarch-joypads/gamepads/device/X86_64/Atari Classic Controller.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/X86_64/Atari Classic Controller.cfg new file mode 100644 index 000000000..a4815613a --- /dev/null +++ b/packages/games/tools/retroarch-joypads/gamepads/device/X86_64/Atari Classic Controller.cfg @@ -0,0 +1,14 @@ +input_driver = "udev" +input_device = "Atari Classic Controller" +input_vendor_id = "12880" +input_product_id = "4098" +input_b_btn = "2" +input_select_btn = "4" +input_start_btn = "3" +input_up_btn = "h0up" +input_down_btn = "h0down" +input_left_btn = "h0left" +input_right_btn = "h0right" +input_a_btn = "1" +input_x_btn = "5" +input_gun_trigger_mbtn = "1" diff --git a/packages/games/emulators/retroarch/gamepads/device/X86_64/Atari Game Controller.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/X86_64/Atari Game Controller.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/X86_64/Atari Game Controller.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/X86_64/Atari Game Controller.cfg diff --git a/packages/games/emulators/retroarch/gamepads/device/X86_64/Microsoft X-Box 360 pad.cfg b/packages/games/tools/retroarch-joypads/gamepads/device/X86_64/Microsoft X-Box 360 pad.cfg similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/X86_64/Microsoft X-Box 360 pad.cfg rename to packages/games/tools/retroarch-joypads/gamepads/device/X86_64/Microsoft X-Box 360 pad.cfg diff --git a/packages/games/emulators/retroarch/gamepads/device/handheld b/packages/games/tools/retroarch-joypads/gamepads/device/handheld similarity index 100% rename from packages/games/emulators/retroarch/gamepads/device/handheld rename to packages/games/tools/retroarch-joypads/gamepads/device/handheld diff --git a/packages/games/tools/retroarch-joypads/package.mk b/packages/games/tools/retroarch-joypads/package.mk new file mode 100644 index 000000000..9142a619f --- /dev/null +++ b/packages/games/tools/retroarch-joypads/package.mk @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2020-present Fewtarius + +PKG_NAME="retroarch-joypads" +PKG_VERSION="b598316" +PKG_LICENSE="GPL" +PKG_SITE="https://github.com/libretro/retroarch-joypad-autoconfig" +PKG_URL="${PKG_SITE}.git" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="RetroArch joypad autoconfigs." +PKG_TOOLCHAIN="manual" + +make_target() { + : +} + +makeinstall_target() { + INSTALLDIR="${INSTALL}/usr/share/libretro/autoconfig" + mkdir -p ${INSTALLDIR} + for JOYDIR in linuxraw sdl2 udev x xinput + do + cp ${PKG_BUILD}/${JOYDIR}/*cfg ${INSTALLDIR} + done + if [ -d "${PKG_DIR}/gamepads/device/${DEVICE}" ] + then + cp -r ${PKG_DIR}/gamepads/device/${DEVICE}/* ${INSTALLDIR} ||: + fi +} + +post_install() { + enable_service tmp-joypads.mount +} diff --git a/packages/games/emulators/retroarch/system.d/tmp-joypads.mount b/packages/games/tools/retroarch-joypads/system.d/tmp-joypads.mount similarity index 62% rename from packages/games/emulators/retroarch/system.d/tmp-joypads.mount rename to packages/games/tools/retroarch-joypads/system.d/tmp-joypads.mount index b828ebd3d..bbd802fd2 100644 --- a/packages/games/emulators/retroarch/system.d/tmp-joypads.mount +++ b/packages/games/tools/retroarch-joypads/system.d/tmp-joypads.mount @@ -7,7 +7,7 @@ DefaultDependencies=no What=none Where=/tmp/joypads Type=overlay -Options=lowerdir=/etc/retroarch-joypad-autoconfig,upperdir=/storage/joypads,workdir=/storage/.tmp/joypads-workdir +Options=lowerdir=/usr/share/libretro/autoconfig,upperdir=/storage/joypads,workdir=/storage/.tmp/joypads-workdir [Install] WantedBy=jelos.target diff --git a/packages/graphics/glew/package.mk b/packages/graphics/glew/package.mk index dd82415e3..3803756bf 100644 --- a/packages/graphics/glew/package.mk +++ b/packages/graphics/glew/package.mk @@ -6,24 +6,32 @@ PKG_VERSION="2.2.0" PKG_LICENSE="BSD" PKG_SITE="http://glew.sourceforge.net/" PKG_URL="${SOURCEFORGE_SRC}/glew/glew/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tgz" -PKG_DEPENDS_TARGET="toolchain libX11" +PKG_DEPENDS_TARGET="toolchain" PKG_SHORTDESC="GLEW - The OpenGL Extension Wrangler Library" PKG_TOOLCHAIN="cmake" +if [ "${DISPLAYSERVER}" = "wl" ]; then + PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi libX11" + PKG_CMAKE_OPTS_TARGET+=" -DGLEW_X11=ON" +fi + +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd" +fi + pre_configure() { PKG_CMAKE_SCRIPT=${PKG_BUILD}/build/cmake/CMakeLists.txt } pre_configure_target() { - PKG_CMAKE_OPTS_TARGET+=" -DBUILD_UTILS=OFF \ - -DGLEW_REGAL=OFF \ - -DGLEW_OSMESA=OFF \ - -DGLEW_X11=ON \ - -DGLEW_EGL=ON \ - -DBUILD_SHARED_LIBS=ON" - } + PKG_CMAKE_OPTS_TARGET+=" -DBUILD_UTILS=OFF \ + -DGLEW_REGAL=OFF \ + -DGLEW_OSMESA=OFF \ + -DGLEW_EGL=ON \ + -DBUILD_SHARED_LIBS=ON" +} makeinstall_target() { - mkdir -p $INSTALL/usr/lib/ - cp $PKG_BUILD/lib/libGLEW* $INSTALL/usr/lib/ + mkdir -p ${INSTALL}/usr/lib + cp ${PKG_BUILD}/lib/libGLEW* ${INSTALL}/usr/lib/ } diff --git a/packages/graphics/glfw/package.mk b/packages/graphics/glfw/package.mk index 0d70a0e06..4c1c967c3 100644 --- a/packages/graphics/glfw/package.mk +++ b/packages/graphics/glfw/package.mk @@ -2,7 +2,8 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="glfw" -PKG_VERSION="6b57e08bb0078c9834889eab871bac2368198c15" +PKG_VERSION="dd8a678a66f1967372e5a5e3deac41ebf65ee127" +PKG_SHA256="4bc4f4efd561ed063aa654b4867f1cebed9044c7711b401693ddda19634ebf99" PKG_ARCH="any" PKG_LICENSE="zlib" PKG_DEPENDS_TARGET="toolchain expat libdrm libxkbcommon libXrandr libXinerama libXcursor libXi Mako:host " @@ -29,13 +30,9 @@ if [ "${DISPLAYSERVER}" = "wl" ]; then PKG_CMAKE_OPTS_TARGET+=" -DGLFW_BUILD_WAYLAND=ON" fi -case ${ARCH} in - arm) - PKG_CMAKE_OPTS_TARGET+=" -DGLFW_BUILD_X11=OFF" - ;; -esac - makeinstall_target() { - mkdir -p $INSTALL/usr/lib/ - cp $PKG_BUILD/.$TARGET_NAME/src/libglfw* $INSTALL/usr/lib/ + mkdir -p ${INSTALL}/usr/lib/ + cp ${PKG_BUILD}/.${TARGET_NAME}/src/libglfw* $INSTALL/usr/lib/ + cp -rf ${PKG_BUILD}/include/* ${SYSROOT_PREFIX}/usr/include } + diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 9f21e63b5..65fc6a3dd 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -32,13 +32,13 @@ PKG_MESON_OPTS_TARGET="-Ddri-drivers= \ -Dosmesa=false" if [ "${DISPLAYSERVER}" = "x11" ]; then - PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd glfw glew" + PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd glfw" export X11_INCLUDES= PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 -Ddri3=enabled -Dglx=dri -Dglvnd=true" elif [ "${DISPLAYSERVER}" = "wl" ]; then PKG_DEPENDS_TARGET+=" wayland wayland-protocols libglvnd glfw" PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland,x11 -Ddri3=enabled -Dglx=dri -Dglvnd=true" - PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd glew" + PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd" export X11_INCLUDES= else PKG_MESON_OPTS_TARGET+=" -Dplatforms="" -Ddri3=disabled -Dglx=disabled -Dglvnd=false" diff --git a/packages/jelos/sources/post-update b/packages/jelos/sources/post-update index 6f926e893..ce160ac79 100644 --- a/packages/jelos/sources/post-update +++ b/packages/jelos/sources/post-update @@ -27,12 +27,8 @@ then ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png fi -cp -f /usr/config/modules/gamelist.xml /storage/.config/modules +rsync -a /usr/config/modules/* /storage/.config/modules/ cp -f /usr/config/retroarch/retroarch-core-options.cfg /storage/.config/retroarch/retroarch-core-options.cfg -rm -rf /storage/roms/ports/JelosAddOns* -cp -r /usr/share/JelosAddOns /storage/roms/ports/ -mv /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns.sh -chmod +x /storage/roms/ports/JelosAddOns.sh cd /usr/share/themes for theme in * @@ -59,7 +55,7 @@ for es_cfg in es_features.cfg es_systems.cfg do if [ -e "/storage/.config/emulationstation/${es_cfg}" ] then - mv /storage/.config/emulationstation/${es_cfg} /storage/.config/emulationstation/last_${es_cfg} + mv -f /storage/.config/emulationstation/${es_cfg} /storage/.config/emulationstation/last_${es_cfg} fi ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg} done @@ -72,7 +68,7 @@ fi rsync -a --delete /usr/share/PortMaster/* /storage/roms/ports/PortMaster/ chmod +x /storage/roms/ports/PortMaster -R -mv -f /storage/roms/ports/PortMaster/PortMaster.sh /storage/roms/ports/PortMaster.sh +cp -f /storage/roms/ports/PortMaster/PortMaster.sh /storage/roms/ports/PortMaster.sh # Ensure JelosAddOns is in sync if [ ! -d "/storage/roms/ports/JelosAddOns" ] @@ -82,7 +78,17 @@ fi rsync -a /usr/share/JelosAddOns/* /storage/roms/ports/JelosAddOns/ chmod -R 755 /storage/roms/ports/JelosAddOns -mv -f /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns +cp -f /storage/roms/ports/JelosAddOns/JelosAddOns.sh /storage/roms/ports/JelosAddOns.sh + +# Make sure ThemeMaster is in sync +if [ ! -d "/storage/roms/ports/ThemeMaster" ] +then + mkdir -p /storage/roms/ports/ThemeMaster +fi + +rsync -a /usr/share/ThemeMaster/* /storage/roms/ports/ThemeMaster/ +chmod -R 755 /storage/roms/ports/ThemeMaster +cp -f /storage/roms/ports/ThemeMaster/ThemeMaster /storage/roms/ports/ThemeMaster.sh # Default modules need to be updated to use the new stop/start ui function. rsync -av /usr/config/modules/* /storage/.config/modules/ diff --git a/packages/jelos/sources/scripts/run b/packages/jelos/sources/scripts/run index 563768894..2a1e3218e 100755 --- a/packages/jelos/sources/scripts/run +++ b/packages/jelos/sources/scripts/run @@ -1,14 +1,19 @@ #!/bin/bash +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2020-present Fewtarius + . /etc/profile +RUN=$(echo ${1} | sed 's# #\\ #g') + if [ "${UI_SERVICE}" = "weston.service" ] then - weston-terminal --command="${1}" + weston-terminal --command="${RUN}" else systemctl stop ${UI_SERVICE} - clear - "${1}" >/dev/console 2>&1 - clear + clear >/dev/console 2>&1 + "$*" >/dev/console 2>&1 + clear >/dev/console 2>&1 fi if [ ! "${UI_SERVICE}" = "weston.service" ] then diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 8b1820f0e..eb57d2b9d 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -120,8 +120,6 @@ if [ "${FFMPEG_TESTING}" = "yes" ]; then if [ "${PROJECT}" = "RPi" ]; then PKG_FFMPEG_TESTING+=" --enable-vout-drm --enable-outdev=vout_drm" fi -else - PKG_FFMPEG_TESTING="--disable-programs" fi configure_target() { diff --git a/packages/sysutils/rclone/package.mk b/packages/sysutils/rclone/package.mk index 45677bf61..d93731278 100644 --- a/packages/sysutils/rclone/package.mk +++ b/packages/sysutils/rclone/package.mk @@ -4,7 +4,6 @@ PKG_NAME="rclone" PKG_VERSION="1.58.0" -PKG_ARCH="aarch64" PKG_URL="https://downloads.rclone.org/v${PKG_VERSION}/rclone-v${PKG_VERSION}-linux-arm64.zip" PKG_DEPENDS_TARGET="toolchain fuse rsync" PKG_SECTION="tools" diff --git a/packages/tools/SDL2_ttf/package.mk b/packages/tools/SDL2_ttf/package.mk index 6f8c77411..e9aa69957 100644 --- a/packages/tools/SDL2_ttf/package.mk +++ b/packages/tools/SDL2_ttf/package.mk @@ -10,7 +10,6 @@ PKG_SITE="http://www.libsdl.org/" PKG_URL="https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain SDL2 freetype" PKG_LONGDESC="This is a sample library which allows you to use TrueType fonts in your SDL applications" -PACKAGE_TOOLCHAIN="autoconf" if [ ! "$DISPLAYSERVER" = "x11" ]; then X11="--without-x" diff --git a/packages/ui/emulationstation/config/device/RG351MP/es_input.cfg b/packages/ui/emulationstation/config/device/RG351MP/es_input.cfg index 3ab23a661..11c8513ed 100644 --- a/packages/ui/emulationstation/config/device/RG351MP/es_input.cfg +++ b/packages/ui/emulationstation/config/device/RG351MP/es_input.cfg @@ -1,8 +1,19 @@ - - - + + + + + + + + + + + + + + diff --git a/packages/ui/emulationstation/config/device/RG351P/es_input.cfg b/packages/ui/emulationstation/config/device/RG351P/es_input.cfg index e0efb165a..55c7a68ce 100644 --- a/packages/ui/emulationstation/config/device/RG351P/es_input.cfg +++ b/packages/ui/emulationstation/config/device/RG351P/es_input.cfg @@ -1,8 +1,19 @@ - - - + + + + + + + + + + + + + + diff --git a/packages/ui/emulationstation/config/device/RG351V/es_input.cfg b/packages/ui/emulationstation/config/device/RG351V/es_input.cfg index e0efb165a..55c7a68ce 100644 --- a/packages/ui/emulationstation/config/device/RG351V/es_input.cfg +++ b/packages/ui/emulationstation/config/device/RG351V/es_input.cfg @@ -1,8 +1,19 @@ - - - + + + + + + + + + + + + + + diff --git a/packages/ui/emulationstation/config/device/RG503/es_input.cfg b/packages/ui/emulationstation/config/device/RG503/es_input.cfg index b6155e75a..fe470fcb0 100644 --- a/packages/ui/emulationstation/config/device/RG503/es_input.cfg +++ b/packages/ui/emulationstation/config/device/RG503/es_input.cfg @@ -1,8 +1,19 @@ - - - + + + + + + + + + + + + + + diff --git a/packages/ui/emulationstation/config/device/RG552/es_input.cfg b/packages/ui/emulationstation/config/device/RG552/es_input.cfg index bd18c6d00..93372fffb 100644 --- a/packages/ui/emulationstation/config/device/RG552/es_input.cfg +++ b/packages/ui/emulationstation/config/device/RG552/es_input.cfg @@ -1,7 +1,18 @@ - + + + + + + + + + + + + diff --git a/packages/ui/emulationstation/config/device/X86_64/es_input.cfg b/packages/ui/emulationstation/config/device/X86_64/es_input.cfg index c22d4956a..3aae7e501 100644 --- a/packages/ui/emulationstation/config/device/X86_64/es_input.cfg +++ b/packages/ui/emulationstation/config/device/X86_64/es_input.cfg @@ -1,13 +1,24 @@ - + + + + + + + + + + + + - + @@ -57,4 +68,3505 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg b/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg index 0877bf0af..0bdb8b1ea 100644 --- a/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg +++ b/packages/ui/emulationstation/config/device/X86_64/es_systems.cfg @@ -1799,12 +1799,12 @@ - yabasanshiroSA + yabasanshiroSA - yabasanshiro + yabasanshiro diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index 2cd13715c..079103cd5 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="emulationstation" -PKG_VERSION="448ace5" +PKG_VERSION="7664fd9" PKG_GIT_CLONE_BRANCH="main" PKG_REV="1" PKG_ARCH="any" diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 6f582523a..857f5daf8 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -13,7 +13,7 @@ PKG_EMUS="hatarisa openbor hypseus-singe moonlight hypseus-singe pico-8 flycasts mupen64plussa-core mupen64plussa-rsp-hle mupen64plussa-rsp-cxd4 mupen64plussa-video-glide64mk2 \ mupen64plussa-video-gliden64 lzdoom gzdoom ecwolf amiberry raze drastic" -PKG_RETROARCH="retroarch retroarch-overlays retroarch-assets libretro-database core-info" +PKG_RETROARCH="retroarch retroarch-overlays retroarch-joypads retroarch-assets libretro-database core-info" LIBRETRO_CORES="2048 81 a5200 atari800 beetle-gba beetle-lynx beetle-ngp beetle-pce beetle-pce-fast beetle-pcfx \ beetle-supafaust beetle-supergrafx beetle-vb beetle-wswan bluemsx cannonball cap32 \ diff --git a/packages/wayland/weston/patches/002-console.patch b/packages/wayland/weston/patches/002-console.patch index 9a167ea06..8f167afcf 100644 --- a/packages/wayland/weston/patches/002-console.patch +++ b/packages/wayland/weston/patches/002-console.patch @@ -16,7 +16,7 @@ diff -rupN weston-10.0.1.orig/clients/terminal.c weston-10.0.1/clients/terminal. setenv("COLORTERM", option_term, 1); + + if (option_command) { -+ if (execl(path, path, "-e", option_command, NULL)) { ++ if (execl(path, path, "-c", option_command, NULL)) { + fprintf(stderr, "command '%s' couldn't executed: %m", + option_command); + }