* Fix battery reporting on RK3566 devices.
* Update Linux kernel to 6.1.13. * Update PPSSPP. * Fix jelos-info hang if temp device doesn't exist.
This commit is contained in:
parent
dbc37adfb2
commit
17317a81ab
7 changed files with 44 additions and 21 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -7,6 +7,7 @@
|
|||
/.egg_cache
|
||||
/.ccache-*
|
||||
/.env
|
||||
/.ant
|
||||
|
||||
# automatically downloaded source files
|
||||
/sources/
|
||||
|
|
|
@ -9,7 +9,6 @@ PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
|
|||
PKG_SHORTDESC="PPSSPPDL"
|
||||
PKG_LONGDESC="PPSSPP Standalone"
|
||||
GET_HANDLER_SUPPORT="git"
|
||||
PKG_BUILD_FLAGS="+lto"
|
||||
|
||||
PKG_PATCH_DIRS+="${DEVICE}"
|
||||
|
||||
|
@ -20,12 +19,26 @@ case ${DEVICE} in
|
|||
PKG_URL="${PKG_SITE}.git"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="cd53526"
|
||||
PKG_VERSION="be83355"
|
||||
PKG_SITE="https://github.com/hrydgard/ppsspp"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
;;
|
||||
esac
|
||||
|
||||
PKG_CMAKE_OPTS_TARGET=" -DUSE_SYSTEM_FFMPEG=OFF \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SYSTEM_NAME=Linux \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DANDROID=OFF \
|
||||
-DWIN32=OFF \
|
||||
-DAPPLE=OFF \
|
||||
-DCMAKE_CROSSCOMPILING=ON \
|
||||
-DUSING_QT_UI=OFF \
|
||||
-DUNITTEST=OFF \
|
||||
-DSIMULATOR=OFF \
|
||||
-DHEADLESS=OFF \
|
||||
-DUSE_DISCORD=OFF"
|
||||
|
||||
if [ ! "${OPENGL}" = "no" ]; then
|
||||
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew"
|
||||
PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=OFF \
|
||||
|
@ -60,21 +73,6 @@ else
|
|||
PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=OFF"
|
||||
fi
|
||||
|
||||
PKG_CMAKE_OPTS_TARGET+="${PKG_CMAKE_OPTS_TARGET} \
|
||||
-DUSE_SYSTEM_FFMPEG=OFF \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SYSTEM_NAME=Linux \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DANDROID=OFF \
|
||||
-DWIN32=OFF \
|
||||
-DAPPLE=OFF \
|
||||
-DCMAKE_CROSSCOMPILING=ON \
|
||||
-DUSING_QT_UI=OFF \
|
||||
-DUNITTEST=OFF \
|
||||
-DSIMULATOR=OFF \
|
||||
-DHEADLESS=OFF \
|
||||
-DUSE_DISCORD=OFF"
|
||||
|
||||
pre_configure_target() {
|
||||
sed -i 's/\-O[23]//g' ${PKG_BUILD}/CMakeLists.txt
|
||||
sed -i "s|include_directories(/usr/include/drm)|include_directories(${SYSROOT_PREFIX}/usr/include/drm)|" ${PKG_BUILD}/CMakeLists.txt
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
From 335788a932b56149a3204aeda6c885c9136ea4aa Mon Sep 17 00:00:00 2001
|
||||
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
|
||||
Date: Thu, 16 Feb 2023 19:34:44 -0800
|
||||
Subject: [PATCH] Vulkan: Remove logspam.
|
||||
|
||||
---
|
||||
Common/GPU/Vulkan/VulkanContext.cpp | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp
|
||||
index 23b0f8adb036..676860285219 100644
|
||||
--- a/Common/GPU/Vulkan/VulkanContext.cpp
|
||||
+++ b/Common/GPU/Vulkan/VulkanContext.cpp
|
||||
@@ -1663,7 +1663,6 @@ void VulkanDeleteList::PerformDeletes(VulkanContext *vulkan, VmaAllocator alloca
|
||||
}
|
||||
imagesWithAllocs_.clear();
|
||||
for (auto &imageView : imageViews_) {
|
||||
- INFO_LOG(G3D, "deleting imageview %p", imageView);
|
||||
vkDestroyImageView(device, imageView, nullptr);
|
||||
}
|
||||
imageViews_.clear();
|
|
@ -75,7 +75,10 @@ esac
|
|||
|
||||
# temperature
|
||||
# Unit: millidegree Celsius
|
||||
TEMPE=$(cat ${DEVICE_TEMP_SENSOR} 2>/dev/null | sort -rn | head -1 | sed -e s+"[0-9][0-9][0-9]$"++)
|
||||
if [ -e "${DEVICE_TEMP_SENSOR}" ]
|
||||
then
|
||||
TEMPE=$(cat ${DEVICE_TEMP_SENSOR} 2>/dev/null | sort -rn | head -1 | sed -e s+"[0-9][0-9][0-9]$"++)
|
||||
fi
|
||||
echo "SYSTEM INFORMATION:"
|
||||
echo "OPERATING SYSTEM: ${OS_NAME}"
|
||||
echo "VERSION: ${OS_VERSION}"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
PKG_NAME="linux"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_VERSION="6.1.12"
|
||||
PKG_VERSION="6.1.13"
|
||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_SITE="http://www.kernel.org"
|
||||
PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
|
||||
|
|
|
@ -2784,7 +2784,7 @@ CONFIG_CHARGER_BQ24735=y
|
|||
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
||||
# CONFIG_CHARGER_RT9455 is not set
|
||||
# CONFIG_CHARGER_CROS_USBPD is not set
|
||||
# CONFIG_BATTERY_CW2015 is not set
|
||||
CONFIG_BATTERY_CW2015=y
|
||||
# CONFIG_BATTERY_RK816 is not set
|
||||
CONFIG_BATTERY_RK817=y
|
||||
CONFIG_CHARGER_RK817=y
|
||||
|
|
|
@ -26,7 +26,7 @@ case ${DEVICE} in
|
|||
;;
|
||||
RK3566)
|
||||
PKG_URL="${PKG_SITE}/rk356x-kernel.git"
|
||||
PKG_VERSION="96accfa77"
|
||||
PKG_VERSION="22a0a3344"
|
||||
GET_HANDLER_SUPPORT="git"
|
||||
PKG_GIT_CLONE_BRANCH="main"
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue