diff --git a/packages/games/emulators/retroarch/package.mk b/packages/games/emulators/retroarch/package.mk index 4c931310a..bfa2cda24 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="14f4f35445d9f4f2568ae1e4ef94952d23db8805" +PKG_VERSION="ab57d3cab7d870b5dd55ddf9d9c584775bcdf03d" PKG_SITE="https://github.com/libretro/RetroArch" PKG_URL="${PKG_SITE}.git" PKG_LICENSE="GPLv3" diff --git a/packages/games/libretro/common-shaders/package.mk b/packages/games/libretro/common-shaders/package.mk index 34f352e69..75eba25e9 100644 --- a/packages/games/libretro/common-shaders/package.mk +++ b/packages/games/libretro/common-shaders/package.mk @@ -27,7 +27,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libretro/common-shaders" PKG_URL="${PKG_SITE}.git" -PKG_DEPENDS_TARGET="toolchain glsl-shaders" +PKG_DEPENDS_TARGET="toolchain glsl-shaders slang-shaders" PKG_PRIORITY="optional" PKG_SECTION="libretro" PKG_SHORTDESC="Libretro common shaders" diff --git a/packages/games/libretro/slang-shaders/package.mk b/packages/games/libretro/slang-shaders/package.mk new file mode 100644 index 000000000..571ccbb16 --- /dev/null +++ b/packages/games/libretro/slang-shaders/package.mk @@ -0,0 +1,49 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2022-present Fewtarius +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="slang-shaders" +PKG_VERSION="379eeca" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="https://github.com/libretro/slang-shaders" +PKG_URL="${PKG_SITE}.git" +PKG_DEPENDS_TARGET="toolchain" +PKG_PRIORITY="optional" +PKG_SECTION="libretro" +PKG_SHORTDESC="Common SLANG shaders for RetroArch" +PKG_LONGDESC="Common SLANG shaders for RetroArch" + +PKG_IS_ADDON="no" +PKG_TOOLCHAIN="make" +PKG_AUTORECONF="no" + +configure_target() { + cd ${PKG_BUILD} +} + +makeinstall_target() { + if [ ! -d "${INSTALL}/usr/share/common-shaders" ] + then + mkdir -p ${INSTALL}/usr/share/common-shaders + fi + make install INSTALLDIR="${INSTALL}/usr/share/common-shaders" +} diff --git a/packages/jelos/sources/scripts/getshaders b/packages/jelos/sources/scripts/getshaders index 9a350ee14..f2abc71de 100755 --- a/packages/jelos/sources/scripts/getshaders +++ b/packages/jelos/sources/scripts/getshaders @@ -1,14 +1,23 @@ -#!/bin/sh +#!/bin/bash + +. /etc/profile # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert) # Copyright (C) 2022 Fewtarius (https://github.com/fewtarius) +if [[ "${UI_SERVICE}" =~ ^weston ]] +then + SHADERS='*.slang*' +else + SHADERS='*.glsl*' +fi + for dir in /tmp/shaders do if [ -d "${dir}" ] then - find ${dir} -name '*.glsl*' -print0 | + find ${dir} -name ${SHADERS} -print0 | while IFS= read -r -d '' line; do echo ${line#${dir}/}, done diff --git a/packages/jelos/sources/scripts/wifictl b/packages/jelos/sources/scripts/wifictl index 2c9928516..f185a662e 100755 --- a/packages/jelos/sources/scripts/wifictl +++ b/packages/jelos/sources/scripts/wifictl @@ -77,9 +77,10 @@ set_wifi() { Name=${OS_NAME} [service_${OS_NAME}_default] -Type=wifi -Name=${SSID} -Passphrase=${PSK} +Type = wifi +Name = ${SSID} +Passphrase = ${PSK} +AutoConnect = true EOF STATE=$(get_wifi_state) diff --git a/packages/sysutils/sleep/sources/sleep.sh b/packages/sysutils/sleep/sources/sleep.sh index 28aa8ddf7..381d7fbbd 100755 --- a/packages/sysutils/sleep/sources/sleep.sh +++ b/packages/sysutils/sleep/sources/sleep.sh @@ -9,12 +9,12 @@ case $1 in if [ "${DEVICE_FAKE_JACKSENSE}" == "true" ] then - nohup systemctl stop headphones & + systemctl stop headphones fi if [ "${DEVICE_VOLUMECTL}" == "true" ] then - nohup systemctl stop volume & + systemctl stop volume fi # RG351x devices are notorious for losing USB when they sleep. @@ -38,17 +38,17 @@ case $1 in if [ "${DEVICE_FAKE_JACKSENSE}" == "true" ] then - nohup systemctl start headphones & + systemctl start headphones fi if [ "${DEVICE_VOLUMECTL}" == "true" ] then - nohup systemctl start volume & + systemctl start volume fi if [ "$(get_setting wifi.enabled)" == "1" ] then - nohup wifictl reconnect & + wifictl reconnect fi DEVICE_VOLUME=$(get_setting "audio.volume" 2>/dev/null)