diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index eb0b41679..fbf44228f 100644 --- a/luci-app-amlogic/Makefile +++ b/luci-app-amlogic/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-amlogic -PKG_VERSION:=3.1.210 +PKG_VERSION:=3.1.211 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip index 715ad04e8..d23c0a4ed 100755 --- a/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip +++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-rockchip @@ -86,6 +86,30 @@ case $MYDEVICE_NAME in fi SOC="r68s" ;; + "HINLINK OPC-H66K Board"|"Hlink H66K") + if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h66k.dtb" ];then + MYDTB_FDTFILE="${CURRENT_FDTFILE}" + else + MYDTB_FDTFILE="rk3568-hlink-h66k.dtb" + fi + SOC="h66k" + ;; + "HINLINK OPC-H68K Board"|"Hlink H68K") + if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h68k.dtb" ];then + MYDTB_FDTFILE="${CURRENT_FDTFILE}" + else + MYDTB_FDTFILE="rk3568-hlink-h68k.dtb" + fi + SOC="h68k" + ;; + "HINLINK OPC-H69K Board"|"Hlink H69K") + if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h69k.dtb" ];then + MYDTB_FDTFILE="${CURRENT_FDTFILE}" + else + MYDTB_FDTFILE="rk3568-hlink-h69k.dtb" + fi + SOC="h69k" + ;; "Radxa E25") if [ -n "${CURRENT_FDTFILE}" ]; then MYDTB_FDTFILE="${CURRENT_FDTFILE}" @@ -94,6 +118,30 @@ case $MYDEVICE_NAME in fi SOC="e25" ;; + "HINLINK OWL H88K-V3 Board"|"Hlink H88K-V3") + if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-hinlink-h88k-v3.dtb" ];then + MYDTB_FDTFILE="${CURRENT_FDTFILE}" + else + MYDTB_FDTFILE="rk3588-hlink-h88k-v3.dtb" + fi + SOC="h88k-v3" + ;; + "HINLINK OWL H88K Board"|"Hlink H88K") + if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-hinlink-h88k.dtb" ];then + MYDTB_FDTFILE="${CURRENT_FDTFILE}" + else + MYDTB_FDTFILE="rk3588-hlink-h88k.dtb" + fi + SOC="ak88/h88k" + ;; + "Hlink H28K") + if [ -n "${CURRENT_FDTFILE}" ]; then + MYDTB_FDTFILE="${CURRENT_FDTFILE}" + else + MYDTB_FDTFILE="rk3528-hlink-h28k.dtb" + fi + SOC="h28k" + ;; "Ariaboard Photonicat") if [ -n "${CURRENT_FDTFILE}" ]; then MYDTB_FDTFILE="${CURRENT_FDTFILE}" diff --git a/luci-app-emby/Makefile b/luci-app-emby/Makefile index 0cc75224c..691d6b000 100644 --- a/luci-app-emby/Makefile +++ b/luci-app-emby/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20230619 +PKG_VERSION:=1.0.3-20231117 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Emby diff --git a/luci-app-emby/luasrc/model/cbi/emby.lua b/luci-app-emby/luasrc/model/cbi/emby.lua index f3a176826..5d6c07133 100644 --- a/luci-app-emby/luasrc/model/cbi/emby.lua +++ b/luci-app-emby/luasrc/model/cbi/emby.lua @@ -31,6 +31,7 @@ o = s:option(Value, "image_name", translate("Image").."*") o.rmempty = false o.datatype = "string" o:value("emby/embyserver", "emby/embyserver") +o:value("emby/embyserver:4.8.0.59", "emby/embyserver:4.8.0.59") o:value("emby/embyserver_arm32v7", "emby/embyserver_arm32v7") o:value("emby/embyserver_arm64v8", "emby/embyserver_arm64v8") o.default = "emby/embyserver" diff --git a/luci-app-emby/root/usr/libexec/istorec/emby.sh b/luci-app-emby/root/usr/libexec/istorec/emby.sh index a830ccaf4..f2d87d79c 100755 --- a/luci-app-emby/root/usr/libexec/istorec/emby.sh +++ b/luci-app-emby/root/usr/libexec/istorec/emby.sh @@ -25,7 +25,7 @@ do_install() { # not conflict with jellyfin [ -z "$http_port" ] && http_port=8097 - local cmd="docker run --restart=unless-stopped -d -v \"$config:/config\" " + local cmd="docker run --restart=unless-stopped -d -u 0 -e UID=0 -e GID=0 -e GIDLIST=0 -v \"$config:/config\" " if [ -d /dev/dri ]; then cmd="$cmd\ diff --git a/sing-box/Makefile b/sing-box/Makefile index 486cc3938..284a5512c 100644 --- a/sing-box/Makefile +++ b/sing-box/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.6.4 +PKG_VERSION:=1.6.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3b1008d8a4d0cb0c41841531b1845b9b859a5d8f73af2c9a137fec4c7ad1f18f +PKG_HASH:=a9a8f0ed22c566bfe7cabcbe947384639e7e0eb6f5f287c2b8c7c9d27820e289 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE