diff --git a/packages/games/emulators/drastic/package.mk b/packages/games/emulators/drastic/package.mk index 1280493e4..24d417bfe 100644 --- a/packages/games/emulators/drastic/package.mk +++ b/packages/games/emulators/drastic/package.mk @@ -3,7 +3,7 @@ PKG_NAME="drastic" PKG_VERSION="" -PKG_SHA256="173c272fa41b136f3be7266f730d1c89cfc2b60a40112d14f0fc8e033d33ee1b" +PKG_SHA256="1f5d42364d39a1a5bebb21fe69fea4a9d58b4be98897c2f72e9042b447e898e1" PKG_ARCH="any" PKG_URL="https://github.com/brooksytech/JelosAddOns/raw/main/drastic.zip" PKG_PRIORITY="optional" diff --git a/packages/games/emulators/flycastsa/package.mk b/packages/games/emulators/flycastsa/package.mk index d8b541939..f8cdbf6ef 100644 --- a/packages/games/emulators/flycastsa/package.mk +++ b/packages/games/emulators/flycastsa/package.mk @@ -6,8 +6,8 @@ PKG_NAME="flycastsa" PKG_VERSION="15ca7e82bd0b6c9ef5e100541dddbf6435e906a1" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/flyinghead/flycast" -PKG_URL="$PKG_SITE.git" -PKG_DEPENDS_TARGET="toolchain $OPENGLES alsa SDL2 libzip zip" +PKG_URL="${PKG_SITE}.git" +PKG_DEPENDS_TARGET="toolchain ${OPENGLES} alsa SDL2 libzip zip" PKG_LONGDESC="Flycast is a multiplatform Sega Dreamcast, Naomi and Atomiswave emulator" PKG_TOOLCHAIN="cmake" @@ -19,10 +19,10 @@ PKG_CMAKE_OPTS_TARGET+="-DUSE_GLES=ON \ } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/.${TARGET_NAME}/flycast $INSTALL/usr/bin/flycast - cp $PKG_DIR/scripts/* $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_BUILD}/.${TARGET_NAME}/flycast ${INSTALL}/usr/bin/flycast + cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin - chmod +x $INSTALL/usr/bin/start_flycastsa.sh - chmod +x $INSTALL/usr/bin/set_flycast_joy.sh + chmod +x ${INSTALL}/usr/bin/start_flycastsa.sh + chmod +x ${INSTALL}/usr/bin/set_flycast_joy.sh } diff --git a/packages/games/emulators/flycastsa/patches/RG351MP b/packages/games/emulators/flycastsa/patches/RG351MP deleted file mode 120000 index 0067f8043..000000000 --- a/packages/games/emulators/flycastsa/patches/RG351MP +++ /dev/null @@ -1 +0,0 @@ -RG351P \ No newline at end of file diff --git a/packages/games/emulators/flycastsa/patches/RG351P/01-platform.patch b/packages/games/emulators/flycastsa/patches/RG351P/01-platform.patch deleted file mode 100644 index a8665d578..000000000 --- a/packages/games/emulators/flycastsa/patches/RG351P/01-platform.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rupN flycast.orig/Makefile flycast/Makefile ---- flycast.orig/Makefile 2022-04-08 18:10:23.156125702 -0400 -+++ flycast/Makefile 2022-04-08 18:59:10.972092728 -0400 -@@ -610,6 +610,30 @@ else ifneq (,$(findstring RK,$(platform) - WITH_DYNAREC=arm - HAVE_GENERIC_JIT = 0 - -+else ifeq ($(platform), RG351x) -+ EXT ?= so -+ TARGET := $(TARGET_NAME)_libretro.$(EXT) -+ SHARED += -shared -Wl,--version-script=link.T -+ fpic = -fPIC -+ LIBS += -lrt -+ ARM_FLOAT_ABI_HARD = 0 -+ FORCE_GLES = 1 -+ SINGLE_PREC_FLAGS = 1 -+ HAVE_LTCG = 0 -+ HAVE_OPENMP = 0 -+ CFLAGS += -Ofast \ -+ -fuse-linker-plugin \ -+ -fno-stack-protector -fno-ident -fomit-frame-pointer \ -+ -fmerge-all-constants -ffast-math -funroll-all-loops \ -+ -mcpu=cortex-a35 -mtune=cortex-a35 -+ CXXFLAGS += $(CFLAGS) -+ LDFLAGS += -mcpu=cortex-a35 -mtune=cortex-a35 -Ofast -flto -fuse-linker-plugin -+ PLATFORM_EXT := unix -+ CORE_DEFINES += -DLOW_END -DLOW_RES -+ WITH_DYNAREC=arm64 -+ PLATFORM_EXT := unix -+ HAVE_GENERIC_JIT = 0 -+ - # RockPro64 - else ifeq ($(platform), rockpro64) - EXT ?= so diff --git a/packages/games/emulators/flycastsa/patches/RG351V b/packages/games/emulators/flycastsa/patches/RG351V deleted file mode 120000 index 0067f8043..000000000 --- a/packages/games/emulators/flycastsa/patches/RG351V +++ /dev/null @@ -1 +0,0 @@ -RG351P \ No newline at end of file diff --git a/packages/games/emulators/flycastsa/patches/RG552/01-platform.patch b/packages/games/emulators/flycastsa/patches/RG552/01-platform.patch deleted file mode 100644 index c73a29ae3..000000000 --- a/packages/games/emulators/flycastsa/patches/RG552/01-platform.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -rupN flycast.orig/Makefile flycast/Makefile ---- flycast.orig/Makefile 2022-04-08 18:10:23.156125702 -0400 -+++ flycast/Makefile 2022-04-08 18:48:44.236265589 -0400 -@@ -610,6 +610,24 @@ else ifneq (,$(findstring RK,$(platform) - WITH_DYNAREC=arm - HAVE_GENERIC_JIT = 0 - -+else ifeq ($(platform), RG552) -+ EXT ?= so -+ TARGET := $(TARGET_NAME)_libretro.$(EXT) -+ SHARED += -shared -Wl,--version-script=link.T -+ fpic = -fPIC -+ LIBS += -lrt -+ ARM_FLOAT_ABI_HARD = 0 -+ FORCE_GLES = 1 -+ SINGLE_PREC_FLAGS = 1 -+ FORCE_GLES = 1 -+ CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers -+ CFLAGS += -march=armv8-a+crc -mcpu=cortex-a72 -mtune=cortex-a72 $(CPUFLAGS) -+ CXXFLAGS += -march=armv8-a+crc -mcpu=cortex-a72 -mtune=cortex-a72 $(CPUFLAGS) -+ ASFLAGS += -march=armv8-a+crc -mcpu=cortex-a72 -c -+ WITH_DYNAREC=arm64 -+ PLATFORM_EXT := unix -+ HAVE_GENERIC_JIT = 0 -+ - # RockPro64 - else ifeq ($(platform), rockpro64) - EXT ?= so diff --git a/packages/ui/emulationstation/sources/es_profile b/packages/ui/emulationstation/sources/es_profile index 20fb8390c..fd688e392 100644 --- a/packages/ui/emulationstation/sources/es_profile +++ b/packages/ui/emulationstation/sources/es_profile @@ -1,3 +1,4 @@ #!/bin/sh . /etc/profile +set_audio alsa export SDL_AUDIODRIVER=alsa diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk index aabf28207..825b07db6 100644 --- a/packages/virtual/image/package.mk +++ b/packages/virtual/image/package.mk @@ -11,9 +11,6 @@ PKG_LONGDESC="Root package used to build and create complete image" # Graphic support [ ! "$DISPLAYSERVER" = "no" ] && PKG_DEPENDS_TARGET+=" $DISPLAYSERVER" -# Multimedia support -[ ! "$MEDIACENTER" = "no" ] && PKG_DEPENDS_TARGET+=" mediacenter" - # Sound support [ "$ALSA_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa" diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk deleted file mode 100644 index b23705c80..000000000 --- a/packages/virtual/mediacenter/package.mk +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="mediacenter" -PKG_VERSION="" -PKG_LICENSE="GPL" -PKG_SITE="https://libreelec.tv" -PKG_URL="" -PKG_DEPENDS_TARGET="toolchain $MEDIACENTER" -PKG_SECTION="virtual" -PKG_LONGDESC="Mediacenter: Metapackage" - -if [ "$MEDIACENTER" = "kodi" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $MEDIACENTER-theme-$SKIN_DEFAULT" - - for i in $SKINS; do - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $MEDIACENTER-theme-$i" - done - -# python-based tool for kodi management - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET texturecache.py" - -# some python stuff needed for various addons - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Pillow \ - simplejson \ - pycryptodome" - -# settings addon - if [ -n "$DISTRO_PKG_SETTINGS" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $DISTRO_PKG_SETTINGS" - fi - -# other packages - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xmlstarlet" - - if [ "$JOYSTICK_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET peripheral.joystick" - fi - - get_graphicdrivers - if listcontains "$GRAPHIC_DRIVERS" "(i915|i965)"; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-vaapi-driver" - fi - -fi diff --git a/projects/Rockchip/packages/sleep/sources/sleep.sh b/projects/Rockchip/packages/sleep/sources/sleep.sh index fb7ddb422..ce29a6a43 100755 --- a/projects/Rockchip/packages/sleep/sources/sleep.sh +++ b/projects/Rockchip/packages/sleep/sources/sleep.sh @@ -36,6 +36,7 @@ case $1 in if [[ "${HW_DEVICE}" =~ RG351 ]] then modprobe -i dwc2 + systemctl restart volume fi ;;