mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #7264 from heitbaum/addon
[le11] Addon package updates
This commit is contained in:
CvH
GitHub
commit
e495088a29
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="containerd"
|
||||
PKG_VERSION="1.6.8"
|
||||
PKG_SHA256="f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407"
|
||||
PKG_VERSION="1.6.14"
|
||||
PKG_SHA256="158dd5aa5c6c4aa1f118baee3e30aaaf200b274b9eecfeb75297679a1609bfb7"
|
||||
PKG_LICENSE="APL"
|
||||
PKG_SITE="https://containerd.io"
|
||||
PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
|
||||
@ -13,7 +13,7 @@ PKG_LONGDESC="A daemon to control runC, built for performance and density."
|
||||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
# Git commit of the matching release https://github.com/containerd/containerd/releases
|
||||
PKG_GIT_COMMIT="10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1"
|
||||
PKG_GIT_COMMIT="78f51771157abb6c9ed224c22013cdf09962315d"
|
||||
|
||||
pre_make_target() {
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="x264"
|
||||
PKG_VERSION="20191217"
|
||||
PKG_SHA256="0bb67d095513391e637b3b47e8efc3ba4603c3844f1b4c2690f4d36da7763055"
|
||||
PKG_VERSION="baee400fa9ced6f5481a728138fed6e867b0ff7f" # r3095 stable 2022-06-01
|
||||
PKG_SHA256="ce6623b8b289765daee04a297c2fd1a293cb2565a1749c76d66c8d72c7ddc1ab"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.videolan.org/developers/x264.html"
|
||||
PKG_URL="https://download.videolan.org/x264/snapshots/x264-snapshot-${PKG_VERSION}-2245.tar.bz2"
|
||||
PKG_URL="https://code.videolan.org/videolan/x264/-/archive/${PKG_VERSION}/x264-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="x264 codec"
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libexif"
|
||||
PKG_VERSION="0.6.22"
|
||||
PKG_SHA256="5048f1c8fc509cc636c2f97f4b40c293338b6041a5652082d5ee2cf54b530c56"
|
||||
PKG_VERSION="0.6.24"
|
||||
PKG_SHA256="d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="https://libexif.github.io"
|
||||
PKG_URL="https://github.com/libexif/libexif/releases/download/libexif-${PKG_VERSION//./_}-release/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_URL="https://github.com/libexif/libexif/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="A library to parse an EXIF file and read the data from those tags."
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libvpx"
|
||||
PKG_VERSION="1.11.0"
|
||||
PKG_SHA256="965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83"
|
||||
PKG_VERSION="1.12.0"
|
||||
PKG_SHA256="f1acc15d0fd0cb431f4bf6eac32d5e932e40ea1186fe78e074254d6d003957bb"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="https://www.webmproject.org"
|
||||
PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="libzip"
|
||||
PKG_VERSION="1.8.0"
|
||||
PKG_SHA256="f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e"
|
||||
PKG_VERSION="1.9.2"
|
||||
PKG_SHA256="c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libzip.org/"
|
||||
PKG_URL="https://libzip.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
|
||||
@ -1,105 +0,0 @@
|
||||
From ca61524e05d785f0d14f40802c6a1a54a46b74bb Mon Sep 17 00:00:00 2001
|
||||
From: rezso <rezso@rezso.net>
|
||||
Date: Sat, 19 Jun 2021 01:50:26 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: add missing regex for zstd
|
||||
|
||||
Currently cmake provides an pc file with:
|
||||
Libs.private: -lbz2 -llzma -lZstd::Zstd -lz
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 93b46a61..defc8745 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -299,6 +299,7 @@ foreach(LIB ${LIBS_PRIVATE})
|
||||
endforeach()
|
||||
string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS})
|
||||
string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS})
|
||||
+string(REGEX REPLACE "-lZstd::Zstd" "-lzstd" LIBS ${LIBS})
|
||||
string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS})
|
||||
string(REGEX REPLACE "-lZLIB::ZLIB" "-lz" LIBS ${LIBS})
|
||||
string(REGEX REPLACE "-lGnuTLS::GnuTLS" "-lgnutls" LIBS ${LIBS})
|
||||
|
||||
From c4af9182efd9cbb127bb43486b55d9ddf4a521ca Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Klausner <tk@giga.or.at>
|
||||
Date: Mon, 28 Jun 2021 11:52:15 +0200
|
||||
Subject: [PATCH] Try having relative paths in pkg-config file.
|
||||
|
||||
Addresses #248
|
||||
---
|
||||
CMakeLists.txt | 11 ++++++-----
|
||||
libzip.pc.in | 7 +++----
|
||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8611a405..93f89df1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -281,11 +281,12 @@ endif()
|
||||
|
||||
|
||||
# pkgconfig file
|
||||
-set(prefix ${CMAKE_INSTALL_PREFIX})
|
||||
-set(exec_prefix \${prefix})
|
||||
-SET(bindir ${CMAKE_INSTALL_FULL_BINDIR})
|
||||
-SET(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
|
||||
-SET(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
|
||||
+file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR})
|
||||
+set(bindir "\${prefix}/${pc_relative_bindir}")
|
||||
+file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
|
||||
+set(libdir "\${prefix)/${pc_relative_libdir}")
|
||||
+file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
|
||||
+set(includedir "\${prefix}/${pc_relative_includedir}")
|
||||
if(CMAKE_SYSTEM_NAME MATCHES BSD)
|
||||
set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
|
||||
endif(CMAKE_SYSTEM_NAME MATCHES BSD)
|
||||
diff --git a/libzip.pc.in b/libzip.pc.in
|
||||
index 58b3dca7..d51b0ab6 100644
|
||||
--- a/libzip.pc.in
|
||||
+++ b/libzip.pc.in
|
||||
@@ -1,10 +1,10 @@
|
||||
-prefix=@prefix@
|
||||
-exec_prefix=@exec_prefix@
|
||||
+prefix=@CMAKE_INSTALL_PREFIX@
|
||||
+exec_prefix=${prefix}
|
||||
bindir=@bindir@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
-zipcmp=@bindir@/zipcmp
|
||||
+zipcmp=${bindir}/zipcmp
|
||||
|
||||
Name: libzip
|
||||
Description: library for handling zip archives
|
||||
@@ -12,4 +12,3 @@ Version: @PROJECT_VERSION@
|
||||
Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip
|
||||
Libs.private: @LIBS@
|
||||
Cflags: -I${includedir}
|
||||
-
|
||||
|
||||
From 28951cbf403ea3a788f823377bbc171d1e1359ba Mon Sep 17 00:00:00 2001
|
||||
From: Michael Heimpold <mhei@heimpold.de>
|
||||
Date: Sat, 3 Jul 2021 00:04:14 +0200
|
||||
Subject: [PATCH] Fix typo which prevents expansion of libdir in pkgconfig
|
||||
files
|
||||
|
||||
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 93f89df1..2fb87165 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -284,7 +284,7 @@ endif()
|
||||
file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR})
|
||||
set(bindir "\${prefix}/${pc_relative_bindir}")
|
||||
file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
|
||||
-set(libdir "\${prefix)/${pc_relative_libdir}")
|
||||
+set(libdir "\${prefix}/${pc_relative_libdir}")
|
||||
file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
|
||||
set(includedir "\${prefix}/${pc_relative_includedir}")
|
||||
if(CMAKE_SYSTEM_NAME MATCHES BSD)
|
||||
@ -2,10 +2,10 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="mpg123"
|
||||
PKG_VERSION="1.30.2"
|
||||
PKG_SHA256="c7ea863756bb79daed7cba2942ad3b267a410f26d2dfbd9aaf84451ff28a05d7"
|
||||
PKG_VERSION="1.31.1"
|
||||
PKG_SHA256="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a"
|
||||
PKG_LICENSE="LGPLv2"
|
||||
PKG_SITE="http://www.mpg123.org/"
|
||||
PKG_SITE="https://www.mpg123.org/"
|
||||
PKG_URL="https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain alsa-lib"
|
||||
PKG_LONGDESC="A console based real time MPEG Audio Player for Layer 1, 2 and 3."
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="mpv-drmprime"
|
||||
PKG_VERSION="0.34.1"
|
||||
PKG_SHA256="32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746"
|
||||
PKG_VERSION="0.35.0"
|
||||
PKG_SHA256="dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://mpv.io/"
|
||||
PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz"
|
||||
@ -58,6 +58,12 @@ else
|
||||
PKG_MANUAL_OPTS_TARGET+=" --disable-libbluray"
|
||||
fi
|
||||
|
||||
pre_configure_target() {
|
||||
#mpv does not build in the .TARGET_NAME
|
||||
cd ${PKG_BUILD}
|
||||
rm -rf .${TARGET_NAME}
|
||||
}
|
||||
|
||||
configure_target() {
|
||||
waf configure ${PKG_MANUAL_OPTS_TARGET}
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pngquant"
|
||||
PKG_VERSION="2.13.1"
|
||||
PKG_SHA256="4b911a11aa0c35d364b608c917d13002126185c8c314ba4aa706b62fd6a95a7a"
|
||||
PKG_VERSION="2.17.0"
|
||||
PKG_SHA256="a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_SITE="https://pngquant.org"
|
||||
PKG_URL="https://pngquant.org/pngquant-${PKG_VERSION}-src.tar.gz"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="asio"
|
||||
PKG_VERSION="1.21.0"
|
||||
PKG_SHA256="2edd7af3b5aa5746a0e552dfcd68b47d765a81695c4479c70027a378851a1bdc"
|
||||
PKG_VERSION="1.24.0"
|
||||
PKG_SHA256="6bb8139ebc1c97a4364f6e517b9258ecc96345a3bfc4d110f931ac123dbdc824"
|
||||
PKG_LICENSE="BSL"
|
||||
PKG_SITE="http://think-async.com/Asio"
|
||||
PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip"
|
||||
|
||||
@ -2,14 +2,15 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="hddtemp"
|
||||
PKG_VERSION="e16aed6d0145d7ad8b3308dd0b9199fc701c0417" # Jul 6, 2010
|
||||
PKG_SHA256="5d5af74ba7449b6e56a8f872a0e10d654a512ed65d62beaef1575b0c1826d9f3"
|
||||
PKG_VERSION="0.4.3"
|
||||
PKG_SHA256="592322c64f0d5f035132249e3d051b752f5d24867514522a17285d5e72d21075"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://savannah.nongnu.org/projects/hddtemp"
|
||||
PKG_URL="https://github.com/guzu/hddtemp/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_URL="https://github.com/vitlav/hddtemp/archive/v${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="A utility that gives you the temperature of your hard drive by reading S.M.A.R.T.."
|
||||
PKG_BUILD_FLAGS="-sysroot"
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db"
|
||||
|
||||
|
||||
@ -0,0 +1,80 @@
|
||||
commit ba91ffb6d96528fa2d449586f0757d1028cdaa6d
|
||||
Author: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Mon Dec 12 11:03:18 2022 +0000
|
||||
|
||||
add missing default Language PO header field
|
||||
|
||||
diff --git a/po/de.po b/po/de.po
|
||||
index 31d02c7..b0d8b7e 100644
|
||||
--- a/po/de.po
|
||||
+++ b/po/de.po
|
||||
@@ -13,7 +13,7 @@ msgstr ""
|
||||
"PO-Revision-Date: 2011-08-30 16:40+0200\n"
|
||||
"Last-Translator: Vinzenz Vietzke <vinz@v1nz.org>\n"
|
||||
"Language-Team: <debian-l10n-german@lists.debian.org>\n"
|
||||
-"Language: \n"
|
||||
+"Language: de_DE\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
diff --git a/po/fr.po b/po/fr.po
|
||||
index 2af6500..433ced0 100644
|
||||
--- a/po/fr.po
|
||||
+++ b/po/fr.po
|
||||
@@ -12,7 +12,7 @@ msgstr ""
|
||||
"PO-Revision-Date: 2011-08-30 16:38+0200\n"
|
||||
"Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n"
|
||||
"Language-Team: FRANCAIS <fr@li.org>\n"
|
||||
-"Language: \n"
|
||||
+"Language: fr_FR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=ISO-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
diff --git a/po/hddtemp.pot b/po/hddtemp.pot
|
||||
index 40936d9..a3d9af8 100644
|
||||
--- a/po/hddtemp.pot
|
||||
+++ b/po/hddtemp.pot
|
||||
@@ -12,6 +12,7 @@ msgstr ""
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
+"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
diff --git a/po/pt.po b/po/pt.po
|
||||
index 8583dd6..23c0e49 100644
|
||||
--- a/po/pt.po
|
||||
+++ b/po/pt.po
|
||||
@@ -11,6 +11,7 @@ msgstr ""
|
||||
"PO-Revision-Date: 2006-03-29 23:22+0000\n"
|
||||
"Last-Translator: Miguel Figueiredo <elmig@debianp.org>\n"
|
||||
"Language-Team: Portuguese <traduz@debianpt.org>\n"
|
||||
+"Language: pt_PT\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
diff --git a/po/ru.po b/po/ru.po
|
||||
index 3d06da3..7ebceb0 100644
|
||||
--- a/po/ru.po
|
||||
+++ b/po/ru.po
|
||||
@@ -11,6 +11,7 @@ msgstr ""
|
||||
"PO-Revision-Date: 2003-03-08 16:42+0300\n"
|
||||
"Last-Translator: Michael Shigorin <mike@altlinux.ru>\n"
|
||||
"Language-Team: Russian <ru@li.org>\n"
|
||||
+"Language: ru_RU\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=koi8-r\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
diff --git a/po/sv.po b/po/sv.po
|
||||
index d235e52..2729e59 100644
|
||||
--- a/po/sv.po
|
||||
+++ b/po/sv.po
|
||||
@@ -11,6 +11,7 @@ msgstr ""
|
||||
"PO-Revision-Date: 2005-11-02 19:03+0100\n"
|
||||
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
|
||||
"Language-Team: Swedish <sv@li.org>\n"
|
||||
+"Language: sv_SV\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=iso-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
@ -0,0 +1,38 @@
|
||||
commit 12eb958f85084485a4c9768e595c64993996f4a6
|
||||
Author: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Mon Dec 12 11:16:29 2022 +0000
|
||||
|
||||
Allow building with gettext ≥ 0.20
|
||||
|
||||
The use of AM_GNU_GETTEXT_VERSION in configure.ac instructs autopoint to
|
||||
copy po/Makefile.in.in from the exact gettext version. It is fine if the
|
||||
version of gettext installed on the system has the same minor version
|
||||
number with the requested version, but it fails if you have a newer
|
||||
version of gettext because of the mismatch between autoconf macros and
|
||||
Makefile.in.in.
|
||||
|
||||
*** error: gettext infrastructure mismatch: using a Makefile.in.in
|
||||
from gettext version 0.19 but the autoconf macros are from gettext
|
||||
version 0.20
|
||||
|
||||
Instead of specifying the exact version with AM_GNU_GETTEXT_VERSION, we
|
||||
can use AM_GNU_GETTEXT_REQUIRE_VERSION to ask autopoint to simply use
|
||||
the gettext version installed on the system to prevent the mismatch.
|
||||
|
||||
This also bumps the version requirement on gettext to 0.19.6 because
|
||||
AM_GNU_GETTEXT_REQUIRE_VERSION was added in this version.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6729c9f..d9c4128 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -26,7 +26,8 @@ AC_C_CONST
|
||||
AC_STRUCT_TM
|
||||
|
||||
dnl internationalization macros
|
||||
-AM_GNU_GETTEXT_VERSION([0.18.1])
|
||||
+AM_GNU_GETTEXT_VERSION([0.19.6])
|
||||
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
|
||||
AM_GNU_GETTEXT([external])
|
||||
|
||||
dnl reasonable guesses for where stuff is installed
|
||||
@ -1,410 +0,0 @@
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1801116
|
||||
|
||||
Description Constantine Gavrilov 2020-02-10 10:09:18 UTC
|
||||
Created attachment 1662111 [details]
|
||||
Patch that adds NVMe Drives Support
|
||||
|
||||
Description of problem: HDDTEMP cannot read temperature of MVME drives.
|
||||
|
||||
All versions are affected.
|
||||
|
||||
How reproducible: always (missing support)
|
||||
|
||||
Steps to Reproduce:
|
||||
1. Try to read temperature of NVME drive
|
||||
|
||||
Actual results:
|
||||
1. Error is reported (only SATA or SCSI drives supported).
|
||||
|
||||
Expected results:
|
||||
1. A temperature report would be appreciated, many GUI sensor frontends depend on HDDTEMP.
|
||||
|
||||
|
||||
Additional info:
|
||||
I have crated a patch that adds NVME drives support to HDDTEMP.
|
||||
|
||||
diff -uNr hddtemp-0.3-beta15.old/src/hddtemp.c hddtemp-0.3-beta15/src/hddtemp.c
|
||||
--- hddtemp-0.3-beta15.old/src/hddtemp.c 2020-02-03 14:23:19.781566750 +0200
|
||||
+++ hddtemp-0.3-beta15/src/hddtemp.c 2020-02-03 14:31:03.526209746 +0200
|
||||
@@ -61,6 +61,7 @@
|
||||
#include "utf8.h"
|
||||
#include "sata.h"
|
||||
#include "scsi.h"
|
||||
+#include "nvme.h"
|
||||
#include "db.h"
|
||||
#include "hddtemp.h"
|
||||
#include "backtrace.h"
|
||||
@@ -87,6 +88,7 @@
|
||||
bus[BUS_SATA] = &sata_bus;
|
||||
bus[BUS_ATA] = &ata_bus;
|
||||
bus[BUS_SCSI] = &scsi_bus;
|
||||
+ bus[BUS_NVME] = &nvme_bus;
|
||||
}
|
||||
|
||||
/*******************************************************
|
||||
@@ -130,6 +132,8 @@
|
||||
return BUS_ATA;
|
||||
else if(bus[BUS_SCSI]->probe(dsk->fd))
|
||||
return BUS_SCSI;
|
||||
+ else if (bus[BUS_NVME]->probe(dsk->fd))
|
||||
+ return BUS_NVME;
|
||||
else
|
||||
return BUS_UNKNOWN;
|
||||
}
|
||||
diff -uNr hddtemp-0.3-beta15.old/src/hddtemp.h hddtemp-0.3-beta15/src/hddtemp.h
|
||||
--- hddtemp-0.3-beta15.old/src/hddtemp.h 2020-02-03 14:23:19.781566750 +0200
|
||||
+++ hddtemp-0.3-beta15/src/hddtemp.h 2020-02-03 08:50:34.755411875 +0200
|
||||
@@ -35,7 +35,7 @@
|
||||
#define F_to_C(val) (int)(((double)(val)-32.0)/1.8)
|
||||
#define C_to_F(val) (int)(((double)(val)*(double)1.8) + (double)32.0)
|
||||
|
||||
-enum e_bustype { ERROR = 0, BUS_UNKNOWN, BUS_SATA, BUS_ATA, BUS_SCSI, BUS_TYPE_MAX };
|
||||
+enum e_bustype { ERROR = 0, BUS_UNKNOWN, BUS_SATA, BUS_ATA, BUS_SCSI, BUS_NVME, BUS_TYPE_MAX };
|
||||
enum e_gettemp {
|
||||
GETTEMP_ERROR, /* Error */
|
||||
GETTEMP_NOT_APPLICABLE, /* */
|
||||
diff -uNr hddtemp-0.3-beta15.old/src/Makefile.am hddtemp-0.3-beta15/src/Makefile.am
|
||||
--- hddtemp-0.3-beta15.old/src/Makefile.am 2005-03-15 02:23:13.000000000 +0200
|
||||
+++ hddtemp-0.3-beta15/src/Makefile.am 2020-02-03 08:50:34.737411657 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
scsi.c scsi.h \
|
||||
scsicmds.c scsicmds.h \
|
||||
backtrace.c backtrace.h \
|
||||
- utf8.c utf8.h
|
||||
+ utf8.c utf8.h nvme.o
|
||||
|
||||
hddtemp_CFLAGS = -Wall -W -rdynamic
|
||||
#hddtemp_CFLAGS = -Wall -fomit-frame-pointer -rdynamic
|
||||
diff -uNr hddtemp-0.3-beta15.old/src/Makefile.in hddtemp-0.3-beta15/src/Makefile.in
|
||||
--- hddtemp-0.3-beta15.old/src/Makefile.in 2005-10-17 21:20:28.000000000 +0200
|
||||
+++ hddtemp-0.3-beta15/src/Makefile.in 2020-02-03 08:50:34.790412300 +0200
|
||||
@@ -157,7 +157,7 @@
|
||||
scsi.c scsi.h \
|
||||
scsicmds.c scsicmds.h \
|
||||
backtrace.c backtrace.h \
|
||||
- utf8.c utf8.h
|
||||
+ utf8.c utf8.h nvme.c
|
||||
|
||||
|
||||
hddtemp_CFLAGS = -Wall -W -rdynamic
|
||||
@@ -180,7 +180,7 @@
|
||||
hddtemp-hddtemp.$(OBJEXT) hddtemp-sata.$(OBJEXT) \
|
||||
hddtemp-satacmds.$(OBJEXT) hddtemp-scsi.$(OBJEXT) \
|
||||
hddtemp-scsicmds.$(OBJEXT) hddtemp-backtrace.$(OBJEXT) \
|
||||
- hddtemp-utf8.$(OBJEXT)
|
||||
+ hddtemp-utf8.$(OBJEXT) hddtemp-nvme.$(OBJEXT)
|
||||
hddtemp_OBJECTS = $(am_hddtemp_OBJECTS)
|
||||
hddtemp_DEPENDENCIES =
|
||||
hddtemp_LDFLAGS =
|
||||
@@ -195,6 +195,7 @@
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/hddtemp-db.Po \
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/hddtemp-hddtemp.Po \
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/hddtemp-sata.Po \
|
||||
+@AMDEP_TRUE@ ./$(DEPDIR)/hddtemp-nvme.Po \
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/hddtemp-satacmds.Po \
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/hddtemp-scsi.Po \
|
||||
@AMDEP_TRUE@ ./$(DEPDIR)/hddtemp-scsicmds.Po \
|
||||
@@ -257,6 +258,7 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hddtemp-db.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hddtemp-hddtemp.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hddtemp-sata.Po@am__quote@
|
||||
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hddtemp-nvme.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hddtemp-satacmds.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hddtemp-scsi.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hddtemp-scsicmds.Po@am__quote@
|
||||
@@ -416,6 +418,28 @@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hddtemp_CFLAGS) $(CFLAGS) -c -o hddtemp-sata.obj `if test -f 'sata.c'; then $(CYGPATH_W) 'sata.c'; else $(CYGPATH_W) '$(srcdir)/sata.c'; fi`
|
||||
|
||||
+hddtemp-nvme.o: nvme.c
|
||||
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hddtemp_CFLAGS) $(CFLAGS) -MT hddtemp-nvme.o -MD -MP -MF "$(DEPDIR)/hddtemp-nvme.Tpo" \
|
||||
+@am__fastdepCC_TRUE@ -c -o hddtemp-nvme.o `test -f 'nvme.c' || echo '$(srcdir)/'`nvme.c; \
|
||||
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/hddtemp-nvme.Tpo" "$(DEPDIR)/hddtemp-nvme.Po"; \
|
||||
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/hddtemp-nvme.Tpo"; exit 1; \
|
||||
+@am__fastdepCC_TRUE@ fi
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nvme.c' object='hddtemp-nvme.o' libtool=no @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/hddtemp-nvme.Po' tmpdepfile='$(DEPDIR)/hddtemp-nvme.TPo' @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hddtemp_CFLAGS) $(CFLAGS) -c -o hddtemp-nvme.o `test -f 'nvme.c' || echo '$(srcdir)/'`nvme.c
|
||||
+
|
||||
+hddtemp-nvme.obj: nvme.c
|
||||
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hddtemp_CFLAGS) $(CFLAGS) -MT hddtemp-nvme.obj -MD -MP -MF "$(DEPDIR)/hddtemp-nvme.Tpo" \
|
||||
+@am__fastdepCC_TRUE@ -c -o hddtemp-nvme.obj `if test -f 'nvme.c'; then $(CYGPATH_W) 'nvme.c'; else $(CYGPATH_W) '$(srcdir)/nvme.c'; fi`; \
|
||||
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/hddtemp-nvme.Tpo" "$(DEPDIR)/hddtemp-nvme.Po"; \
|
||||
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/hddtemp-nvme.Tpo"; exit 1; \
|
||||
+@am__fastdepCC_TRUE@ fi
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nvme.c' object='hddtemp-nvme.obj' libtool=no @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/hddtemp-nvme.Po' tmpdepfile='$(DEPDIR)/hddtemp-nvme.TPo' @AMDEPBACKSLASH@
|
||||
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hddtemp_CFLAGS) $(CFLAGS) -c -o hddtemp-nvme.obj `if test -f 'nvme.c'; then $(CYGPATH_W) 'nvme.c'; else $(CYGPATH_W) '$(srcdir)/nvme.c'; fi`
|
||||
+
|
||||
hddtemp-satacmds.o: satacmds.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hddtemp_CFLAGS) $(CFLAGS) -MT hddtemp-satacmds.o -MD -MP -MF "$(DEPDIR)/hddtemp-satacmds.Tpo" \
|
||||
@am__fastdepCC_TRUE@ -c -o hddtemp-satacmds.o `test -f 'satacmds.c' || echo '$(srcdir)/'`satacmds.c; \
|
||||
diff -uNr hddtemp-0.3-beta15.old/src/nvme.c hddtemp-0.3-beta15/src/nvme.c
|
||||
--- hddtemp-0.3-beta15.old/src/nvme.c 1970-01-01 02:00:00.000000000 +0200
|
||||
+++ hddtemp-0.3-beta15/src/nvme.c 2020-02-03 15:36:20.217181895 +0200
|
||||
@@ -0,0 +1,234 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2020 Constantine Gavrilov <constantine.gavrilov@gmail.com>
|
||||
+ *
|
||||
+ * 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 of the License, 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 this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ */
|
||||
+
|
||||
+
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+#include <config.h>
|
||||
+#endif
|
||||
+
|
||||
+#include "hddtemp.h"
|
||||
+#include <sys/ioctl.h>
|
||||
+#include <linux/nvme_ioctl.h>
|
||||
+#include <stdint.h>
|
||||
+#include <stdbool.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
+struct nvme_smart_log {
|
||||
+ unsigned char critical_warning;
|
||||
+ unsigned char temperature[2];
|
||||
+ unsigned char avail_spare;
|
||||
+ unsigned char spare_thresh;
|
||||
+ unsigned char percent_used;
|
||||
+ unsigned char rsvd6[26];
|
||||
+ unsigned char data_units_read[16];
|
||||
+ unsigned char data_units_written[16];
|
||||
+ unsigned char host_reads[16];
|
||||
+ unsigned char host_writes[16];
|
||||
+ unsigned char ctrl_busy_time[16];
|
||||
+ unsigned char power_cycles[16];
|
||||
+ unsigned char power_on_hours[16];
|
||||
+ unsigned char unsafe_shutdowns[16];
|
||||
+ unsigned char media_errors[16];
|
||||
+ unsigned char num_err_log_entries[16];
|
||||
+ unsigned int warning_temp_time;
|
||||
+ unsigned int critical_comp_time;
|
||||
+ unsigned short temp_sensor[8];
|
||||
+ unsigned int thm_temp1_trans_count;
|
||||
+ unsigned int thm_temp2_trans_count;
|
||||
+ unsigned int thm_temp1_total_time;
|
||||
+ unsigned int thm_temp2_total_time;
|
||||
+ unsigned char rsvd232[280];
|
||||
+};
|
||||
+
|
||||
+struct nvme_id_power_state {
|
||||
+ unsigned short max_power; // centiwatts
|
||||
+ unsigned char rsvd2;
|
||||
+ unsigned char flags;
|
||||
+ unsigned int entry_lat; // microseconds
|
||||
+ unsigned int exit_lat; // microseconds
|
||||
+ unsigned char read_tput;
|
||||
+ unsigned char read_lat;
|
||||
+ unsigned char write_tput;
|
||||
+ unsigned char write_lat;
|
||||
+ unsigned short idle_power;
|
||||
+ unsigned char idle_scale;
|
||||
+ unsigned char rsvd19;
|
||||
+ unsigned short active_power;
|
||||
+ unsigned char active_work_scale;
|
||||
+ unsigned char rsvd23[9];
|
||||
+};
|
||||
+
|
||||
+struct nvme_id_ctrl {
|
||||
+ unsigned short vid;
|
||||
+ unsigned short ssvid;
|
||||
+ char sn[20];
|
||||
+ char mn[40];
|
||||
+ char fr[8];
|
||||
+ unsigned char rab;
|
||||
+ unsigned char ieee[3];
|
||||
+ unsigned char cmic;
|
||||
+ unsigned char mdts;
|
||||
+ unsigned short cntlid;
|
||||
+ unsigned int ver;
|
||||
+ unsigned int rtd3r;
|
||||
+ unsigned int rtd3e;
|
||||
+ unsigned int oaes;
|
||||
+ unsigned int ctratt;
|
||||
+ unsigned char rsvd100[156];
|
||||
+ unsigned short oacs;
|
||||
+ unsigned char acl;
|
||||
+ unsigned char aerl;
|
||||
+ unsigned char frmw;
|
||||
+ unsigned char lpa;
|
||||
+ unsigned char elpe;
|
||||
+ unsigned char npss;
|
||||
+ unsigned char avscc;
|
||||
+ unsigned char apsta;
|
||||
+ unsigned short wctemp;
|
||||
+ unsigned short cctemp;
|
||||
+ unsigned short mtfa;
|
||||
+ unsigned int hmpre;
|
||||
+ unsigned int hmmin;
|
||||
+ unsigned char tnvmcap[16];
|
||||
+ unsigned char unvmcap[16];
|
||||
+ unsigned int rpmbs;
|
||||
+ unsigned short edstt;
|
||||
+ unsigned char dsto;
|
||||
+ unsigned char fwug;
|
||||
+ unsigned short kas;
|
||||
+ unsigned short hctma;
|
||||
+ unsigned short mntmt;
|
||||
+ unsigned short mxtmt;
|
||||
+ unsigned int sanicap;
|
||||
+ unsigned char rsvd332[180];
|
||||
+ unsigned char sqes;
|
||||
+ unsigned char cqes;
|
||||
+ unsigned short maxcmd;
|
||||
+ unsigned int nn;
|
||||
+ unsigned short oncs;
|
||||
+ unsigned short fuses;
|
||||
+ unsigned char fna;
|
||||
+ unsigned char vwc;
|
||||
+ unsigned short awun;
|
||||
+ unsigned short awupf;
|
||||
+ unsigned char nvscc;
|
||||
+ unsigned char rsvd531;
|
||||
+ unsigned short acwu;
|
||||
+ unsigned char rsvd534[2];
|
||||
+ unsigned int sgls;
|
||||
+ unsigned char rsvd540[228];
|
||||
+ char subnqn[256];
|
||||
+ unsigned char rsvd1024[768];
|
||||
+ unsigned int ioccsz;
|
||||
+ unsigned int iorcsz;
|
||||
+ unsigned short icdoff;
|
||||
+ unsigned char ctrattr;
|
||||
+ unsigned char msdbd;
|
||||
+ unsigned char rsvd1804[244];
|
||||
+ struct nvme_id_power_state psd[32];
|
||||
+ unsigned char vs[1024];
|
||||
+};
|
||||
+
|
||||
+#include <stdio.h>
|
||||
+
|
||||
+static int nvme_probe(int fd)
|
||||
+{
|
||||
+ return (ioctl(fd, NVME_IOCTL_ID, NULL) > 0);
|
||||
+}
|
||||
+
|
||||
+static bool nvme_read_smart_log(int fd, struct nvme_smart_log *smart_log)
|
||||
+{
|
||||
+ unsigned int size = sizeof(*smart_log);
|
||||
+ struct nvme_passthru_cmd pt = { 0 };
|
||||
+
|
||||
+ memset(smart_log, 0, size);
|
||||
+ pt.opcode = 0x02;
|
||||
+ pt.nsid = 0xffffffff;
|
||||
+ pt.addr = (uint64_t)smart_log;
|
||||
+ pt.data_len = size;
|
||||
+ pt.cdw10 = 0x02 | (((size / 4) - 1) << 16);
|
||||
+ if (ioctl(fd, NVME_IOCTL_ADMIN_CMD, &pt) < 0)
|
||||
+ return false;
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+static bool nvme_read_id_ctrl(int fd, struct nvme_id_ctrl *id)
|
||||
+{
|
||||
+ memset(id, 0, sizeof(*id));
|
||||
+ struct nvme_passthru_cmd pt = { 0 };
|
||||
+ pt.opcode = 0x06;
|
||||
+ pt.nsid = 0;
|
||||
+ pt.addr = (uint64_t)id;
|
||||
+ pt.data_len = sizeof(*id);
|
||||
+ pt.cdw10 = 0x01;
|
||||
+ if (ioctl(fd, NVME_IOCTL_ADMIN_CMD, &pt) < 0)
|
||||
+ return false;
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+const char *nvme_model(int fd)
|
||||
+{
|
||||
+ struct nvme_id_ctrl id;
|
||||
+ unsigned int i;
|
||||
+ char *p;
|
||||
+ const unsigned int name_len = sizeof(id.mn);
|
||||
+
|
||||
+ if (nvme_read_id_ctrl(fd, &id) == false)
|
||||
+ return "NVME Disk";
|
||||
+ id.mn[name_len-1] = '\0';
|
||||
+ for (i = name_len - 2; i > 0; i--) {
|
||||
+ if (id.mn[i] == ' ')
|
||||
+ id.mn[i] = '\0';
|
||||
+ else
|
||||
+ break;
|
||||
+ }
|
||||
+ p = id.mn;
|
||||
+ for (i = 0; i < name_len; i++) {
|
||||
+ if (id.mn[i] == ' ')
|
||||
+ id.mn[i] = '\0';
|
||||
+ else
|
||||
+ break;
|
||||
+ }
|
||||
+ p = strdup(p);
|
||||
+ if (!p || strlen(p) == 0)
|
||||
+ return "NVME Disk";
|
||||
+ for (i = 0; p[i]; i++) {
|
||||
+ if (p[i] < 0x20 || p[i] > 0x7e)
|
||||
+ p[i] = '?';
|
||||
+ }
|
||||
+ return p;
|
||||
+}
|
||||
+
|
||||
+enum e_gettemp nvme_get_temperature(struct disk *disk)
|
||||
+{
|
||||
+ struct nvme_smart_log smart_log;
|
||||
+ if (nvme_read_smart_log(disk->fd, &smart_log) == false)
|
||||
+ return GETTEMP_UNKNOWN;
|
||||
+ disk->value = smart_log.temperature[0] + (smart_log.temperature[1] << 8) - 273;
|
||||
+ return GETTEMP_KNOWN;
|
||||
+}
|
||||
+
|
||||
+struct bustype nvme_bus = {
|
||||
+ "NVME",
|
||||
+ nvme_probe,
|
||||
+ nvme_model,
|
||||
+ nvme_get_temperature
|
||||
+};
|
||||
+
|
||||
+
|
||||
diff -uNr hddtemp-0.3-beta15.old/src/nvme.h hddtemp-0.3-beta15/src/nvme.h
|
||||
--- hddtemp-0.3-beta15.old/src/nvme.h 1970-01-01 02:00:00.000000000 +0200
|
||||
+++ hddtemp-0.3-beta15/src/nvme.h 2020-02-03 08:08:03.708300652 +0200
|
||||
@@ -0,0 +1,25 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2020 Constnatine Gavrilov <constantine.gavrilov@gmail.com>
|
||||
+ *
|
||||
+ * 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 of the License, 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 this program; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+ */
|
||||
+
|
||||
+#ifndef _HDDTEMP_NVME_H_
|
||||
+#define _HDDTEMP_NVME_H_
|
||||
+
|
||||
+extern struct bustype nvme_bus;
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="stress-ng"
|
||||
PKG_VERSION="0.14.06"
|
||||
PKG_SHA256="54f6c3f84b20efedafd3394ec168e53632a685cfdd76f24270653e898d9ede08"
|
||||
PKG_VERSION="0.15.01"
|
||||
PKG_SHA256="2168627350d8e3b7f4571732d6117ab054a9851600899c30ad82fd3c9649d644"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="https://github.com/ColinIanKing/stress-ng"
|
||||
PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="unrar"
|
||||
PKG_VERSION="6.2.2"
|
||||
PKG_SHA256="477d6ca7e246caec5412cc83b36c15a4ac837726a892df022919800129107cd5"
|
||||
PKG_VERSION="6.2.3"
|
||||
PKG_SHA256="120936e41f826cd63d77a580aeea64c1b79fd3e2434f58ce8184e783b51e5b01"
|
||||
PKG_LICENSE="free"
|
||||
PKG_SITE="https://www.rarlab.com/rar_add.htm"
|
||||
PKG_URL="https://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="vim"
|
||||
PKG_VERSION="9.0.0905"
|
||||
PKG_SHA256="7503d2fcefa79d1f7f4493eeaf2e9187dd09c071cc072179cfdc4a0246c27c51"
|
||||
PKG_VERSION="9.0.1065"
|
||||
PKG_SHA256="f3db36c8ebe665ee750f6b729d6fe25de9dac202829f1f7390ceb62955750dc9"
|
||||
PKG_LICENSE="VIM"
|
||||
PKG_SITE="http://www.vim.org/"
|
||||
PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz"
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="miniupnpc"
|
||||
PKG_VERSION="2.2.1"
|
||||
PKG_SHA256="3a3167e57727bf1d2a7b4861f7c7b57a663f58b9cf68227762ed2fc64e8ea11f"
|
||||
PKG_VERSION="2.2.4"
|
||||
PKG_SHA256="481a5e4aede64e9ef29895b218836c3608d973e77a35b4f228ab1f3629412c4b"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://miniupnp.free.fr"
|
||||
PKG_URL="http://miniupnp.free.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="docker"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="ASL"
|
||||
PKG_SITE="http://www.docker.com/"
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="inadyn"
|
||||
PKG_VERSION="2.9.1"
|
||||
PKG_SHA256="a5e5039a2eb5cd15799490e3ae54127c381a8a0ed05e1a78e798627895d8ab99"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="2.10.0"
|
||||
PKG_SHA256="a9bc24ea8d59644f909dd98bf3b8efcfb95c153f46d9cb62e99d744d44ed9465"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="http://troglobit.com/inadyn.html"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
PKG_NAME="minidlna"
|
||||
PKG_VERSION="1.3.2"
|
||||
PKG_SHA256="222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD-3c/GPLv2"
|
||||
PKG_SITE="https://sourceforge.net/projects/minidlna/"
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="mpd"
|
||||
PKG_VERSION="0.23.10"
|
||||
PKG_SHA256="605c8ceb42cc48144cbdbe9e9682b6dc0df0348258a4a62bde095a02ca24e6a8"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="0.23.11"
|
||||
PKG_SHA256="edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.musicpd.org"
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="prometheus-node-exporter"
|
||||
PKG_VERSION="1.4.0"
|
||||
PKG_SHA256="96f749928e3d6c952221aaca852d4c38545eaae03adc6bb925745bc3f2f827ca"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="1.5.0"
|
||||
PKG_SHA256="67c6d59359d8c484e1e28d0a52a971eebe687f083c5fbb35c5e651543e5d0ea4"
|
||||
PKG_REV="1"
|
||||
PKG_LICENSE="Apache License 2.0"
|
||||
PKG_SITE="https://github.com/prometheus/node_exporter"
|
||||
PKG_URL="https://github.com/prometheus/node_exporter/archive/refs/tags/v${PKG_VERSION}.tar.gz"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="snapclient"
|
||||
PKG_VERSION="0.26.0"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="snapserver"
|
||||
PKG_VERSION="0.26.0"
|
||||
PKG_REV="1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_DEPENDS_TARGET="toolchain nqptp shairport-sync snapcast"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
PKG_NAME="tinc"
|
||||
PKG_VERSION="1.1pre18"
|
||||
PKG_SHA256="bd2d010a1bdeb1dd767f6fbc769fce2a2169119fb3d177df928c27d1f20b5775"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_SITE="http://www.tinc-vpn.org/"
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="ttyd"
|
||||
PKG_VERSION="1.7.1"
|
||||
PKG_SHA256="e1e9993b1320c8623447304ae27031502569a1e37227ec48d4e21dae7db6eb66"
|
||||
PKG_REV="0"
|
||||
PKG_VERSION="1.7.2"
|
||||
PKG_SHA256="edc44cd5319c0c9d0858081496cae36fc5c54ee7722e0a547dde39537dfb63de"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="MIT"
|
||||
PKG_SITE="https://github.com/tsl0922/ttyd"
|
||||
|
||||
@ -5,7 +5,7 @@ PKG_NAME="tvheadend42"
|
||||
PKG_VERSION="5bdcfd8ac97b3337e1c7911ae24127df76fa693a"
|
||||
PKG_SHA256="b562a26248cdc02dc94cc62038deea172668fa4c079b2ea4e1b4220f3b1d34f5"
|
||||
PKG_VERSION_NUMBER="4.2.8-36"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvheadend.org"
|
||||
|
||||
@ -5,7 +5,7 @@ PKG_NAME="tvheadend43"
|
||||
PKG_VERSION="09a2c71abb01db8735437f233b8a54a0bb4939fc"
|
||||
PKG_SHA256="dd7950f6e5b2739040bd19ad0ea0516f73459f5ecb6bfd6f7f967d127ba37bc5"
|
||||
PKG_VERSION_NUMBER="4.3-1986"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.tvheadend.org"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
PKG_NAME="vdr-addon"
|
||||
PKG_VERSION="2.6.1"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="ffmpeg-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="multimedia-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PKG_NAME="system-tools"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_REV="0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://libreelec.tv"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user