diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 7ff24211d..ca26c92ae 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -3,8 +3,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glibc" -PKG_VERSION="2.36" -PKG_SHA256="1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75" +PKG_VERSION="2.37" PKG_LICENSE="GPL" PKG_SITE="https://www.gnu.org/software/libc/" PKG_URL="https://ftp.gnu.org/pub/gnu/glibc/${PKG_NAME}-${PKG_VERSION}.tar.xz" @@ -14,11 +13,14 @@ PKG_LONGDESC="The Glibc package contains the main C library." PKG_BUILD_FLAGS="+bfd -gold" case "${DEVICE}" in + RG*) + OPT_ENABLE_KERNEL=4.4.0 + ;; RK3588) OPT_ENABLE_KERNEL=5.10.0 - ;; + ;; *) - OPT_ENABLE_KERNEL=5.15.0 + OPT_ENABLE_KERNEL=6.1.0 ;; esac diff --git a/packages/graphics/libmali/package.mk b/packages/graphics/libmali/package.mk new file mode 100644 index 000000000..af03f2620 --- /dev/null +++ b/packages/graphics/libmali/package.mk @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) +# Copyright (C) 2021-present Fewtarius + +PKG_NAME="libmali" +PKG_ARCH="arm aarch64" +PKG_LICENSE="nonfree" +PKG_SITE="https://github.com/JustEnoughLinuxOS/libmali" +PKG_URL="${PKG_SITE}.git" +PKG_VERSION="db64674" +MALI_LIB_VERSION="1.9.0" +GET_HANDLER_SUPPORT="git" +PKG_DEPENDS_TARGET="toolchain libdrm" +PKG_LONGDESC="OpenGL ES user-space binary for the ARM Mali GPU family" +PKG_PATCH_DIRS+="${DEVICE}" + +if [ "${TARGET_ARCH}" = "aarch64" ]; then + INSTARCH="aarch64-linux-gnu" +elif [ "${TARGET_ARCH}" = "arm" ]; then + INSTARCH="arm-linux-gnueabihf" +fi + +PKG_CMAKE_OPTS_TARGET+=" -DMALI_ARCH=${INSTARCH}" + +PKG_MESON_OPTS_TARGET+=" -Darch=${TARGET_ARCH} \ + -Dgpu=${MALI_FAMILY} \ + -Dversion=${MALI_VERSION} \ + -Dplatform=gbm \ + -Dkhr-header=true" + +post_makeinstall_target() { + for lib in libEGL.so.1 libgbm.so.1 libGLESv1_CM.so.1 libGLESv2.so.2 libMaliOpenCL.so.1 + do + rm -f ${PKG_BUILD}/.install_pkg/usr/lib/${lib} + ln -s libmali.so.${MALI_LIB_VERSION} ${PKG_BUILD}/.install_pkg/usr/lib/${lib} + rm -f ${SYSROOT_PREFIX}/usr/lib/${lib} + ln -s libmali.so.${MALI_LIB_VERSION} ${SYSROOT_PREFIX}/usr/lib/${lib} + done +} diff --git a/packages/graphics/libmali/system.d/libmali-setup.service b/packages/graphics/libmali/system.d/libmali-setup.service new file mode 100644 index 000000000..b1eb1b42d --- /dev/null +++ b/packages/graphics/libmali/system.d/libmali-setup.service @@ -0,0 +1,12 @@ +[Unit] +Description=Setup symlink for ARM Mali library +Before=graphical.target +After=multi-user.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/libmali-setup + +[Install] +WantedBy=multi-user.target diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk index da2631fc7..abc37cc88 100644 --- a/packages/network/iptables/package.mk +++ b/packages/network/iptables/package.mk @@ -12,6 +12,12 @@ PKG_TOOLCHAIN="autotools" case ${DEVICE} in + RG*) + PKG_VERSION="1.8.3" + PKG_PATCH_DIRS+="4.x" + PKG_CONFIGURE_OPTS_TARGET="--with-kernel=$(kernel_path) + CPPFLAGS=-I${SYSROOT_PREFIX}/usr/include" + ;; *) PKG_VERSION="1.8.8" PKG_PATCH_DIRS+="5.x" diff --git a/packages/network/tailscale/package.mk b/packages/network/tailscale/package.mk index c7669a418..c320a210c 100644 --- a/packages/network/tailscale/package.mk +++ b/packages/network/tailscale/package.mk @@ -10,6 +10,12 @@ PKG_DEPENDS_TARGET="toolchain wireguard-tools" PKG_SHORTDESC="Zero config VPN. Installs on any device in minutes, manages firewall rules for you, and works from anywhere." PKG_TOOLCHAIN="manual" +case ${DEVICE} in + RG*) + PKG_DEPENDS_TARGET+=" wireguard-linux-compat" + ;; +esac + pre_unpack() { mkdir -p ${PKG_BUILD} tar --strip-components=1 -xf $SOURCES/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tgz -C ${PKG_BUILD} tailscale_${PKG_VERSION}_arm64 diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 242c30220..27493ac38 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -37,4 +37,7 @@ case "${DEVICE}" in RK3588) PKG_DEPENDS_TARGET+=" aethersx2" ;; + RG*) + PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders" + ;; esac