Merge branch 'le-master' into devel

This commit is contained in:
Tomáš Kelemen (vudiq) 2024-06-17 17:43:37 +02:00
commit 6733ca79f2
No known key found for this signature in database
GPG Key ID: 5CE55E600E0B3B22
110 changed files with 586 additions and 686 deletions

View File

@ -7,7 +7,7 @@ PKG_SHA256="9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623"
PKG_LICENSE="GPL-3.0-only"
PKG_SITE="https://ffmpeg.org"
PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis opus x264 zlib"
PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis libxml2 opus x264 zlib"
PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
PKG_BUILD_FLAGS="-sysroot"
@ -162,6 +162,7 @@ configure_target() {
--enable-pic \
--disable-gnutls \
--enable-openssl \
--enable-libxml2 \
\
`#Advanced options` \
--disable-hardcoded-tables \

View File

@ -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"
@ -29,8 +29,4 @@ addon() {
cp -PL $(get_install_dir x265)/usr/lib/libx265.so.209 \
${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
fi
if [ "${DISPLAYSERVER}" = "x11" ]; then
cp -PL $(get_install_dir libxcb)/usr/lib/{libxcb.so.1,libxcb-shm.so.0,libxcb-shape.so.0,libxcb-xfixes.so.0} \
${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
fi
}

View File

@ -12,11 +12,6 @@ PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="A CD-ROM reading and control library."
PKG_BUILD_FLAGS="+pic"
#workaround gcc-14 erroring with lseek64
if [ "${ARCH}" = "arm" ]; then
TARGET_CFLAGS+=" -Wno-implicit-function-declaration"
fi
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--enable-cxx \
--disable-cpp-progs \

View File

@ -0,0 +1,87 @@
From 79a15b760e0b5e81b29953acada3a963c3f8eba9 Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Mon, 20 May 2024 22:02:08 +0300
Subject: [PATCH] Do not use LFS shims, rely on _FILE_OFFSET_BITS=64
See https://savannah.gnu.org/bugs/?65751 and https://bugs.gentoo.org/918988
Setting _FILE_OFFSET_BITS=64 is enough to get the LFS interface,
using LFS shims is unnecessary on 64-bit systems and they may
not be available on 32-bit systems on glibc.
Signed-off-by: Alfred Wingate <parona@protonmail.com>
---
configure.ac | 8 ++++----
lib/driver/_cdio_generic.c | 12 +-----------
lib/driver/_cdio_stdio.c | 6 +-----
3 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0399a718..5ea300fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,10 +547,10 @@ AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH",
[Full path to libcdio top_sourcedir.])
AC_SUBST(LIBCDIO_SOURCE_PATH)
-AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \
- getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \
- seteuid setegid snprintf setenv strndup unsetenv tzset sleep \
- _stati64 usleep vsnprintf readlink realpath gmtime_r localtime_r] )
+AC_CHECK_FUNCS( [chdir drand48 fseeko ftruncate geteuid getgid getuid \
+ getpwuid gettimeofday lstat memcpy memset mkstemp rand seteuid \
+ setegid snprintf setenv strndup unsetenv tzset sleep _stati64 \
+ usleep vsnprintf readlink realpath gmtime_r localtime_r] )
# check for timegm() support
AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1,
diff --git a/lib/driver/_cdio_generic.c b/lib/driver/_cdio_generic.c
index 4a7fcadf..f5c8c402 100644
--- a/lib/driver/_cdio_generic.c
+++ b/lib/driver/_cdio_generic.c
@@ -55,16 +55,6 @@
#define PATH_MAX 4096
#endif
-/* If available and LFS is enabled, try to use lseek64 */
-#if defined(HAVE_LSEEK64) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-#if defined(_MSC_VER)
-#include <io.h>
-#endif
-#define CDIO_LSEEK lseek64
-#else
-#define CDIO_LSEEK lseek
-#endif
-
/*!
Eject media -- there's nothing to do here. We always return -2.
Should we also free resources?
@@ -170,7 +160,7 @@ off_t
cdio_generic_lseek (void *user_data, off_t offset, int whence)
{
generic_img_private_t *p_env = user_data;
- return CDIO_LSEEK(p_env->fd, offset, whence);
+ return lseek(p_env->fd, offset, whence);
}
/*!
diff --git a/lib/driver/_cdio_stdio.c b/lib/driver/_cdio_stdio.c
index 1d46b156..c26a35d0 100644
--- a/lib/driver/_cdio_stdio.c
+++ b/lib/driver/_cdio_stdio.c
@@ -47,11 +47,7 @@
#include "_cdio_stdio.h"
#include "cdio_assert.h"
-/* On 32 bit platforms, fseek can only access streams of 2 GB or less.
- Prefer fseeko/fseeko64, that take a 64 bit offset when LFS is enabled */
-#if defined(HAVE_FSEEKO64) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-#define CDIO_FSEEK fseeko64
-#elif defined(HAVE_FSEEKO)
+#if defined(HAVE_FSEEKO)
#define CDIO_FSEEK fseeko
#else
#define CDIO_FSEEK fseek
--
2.45.1

View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libopenmpt"
PKG_VERSION="0.7.7"
PKG_SHA256="58c6a28972126828a6f658e084aee7aa8f8bfdb75a0bd0e345c7ff2a6d9ef08c"
PKG_VERSION="0.7.8"
PKG_SHA256="87778c8046a226c6cbfb114f4c8e3e27c121b7b3dccce5cb7de45899250274cc"
PKG_LICENSE="BSD"
PKG_SITE="https://lib.openmpt.org/libopenmpt/"
PKG_URL="https://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="cmake"
PKG_VERSION="3.29.4"
PKG_SHA256="b1b48d7100bdff0b46e8c8f6a3c86476dbe872c8df39c42b8d104298b3d56a2c"
PKG_VERSION="3.29.5"
PKG_SHA256="dd63da7d763c0db455ca232f2c443f5234fe0b11f8bd6958a81d29cc987dfd6e"
PKG_LICENSE="BSD"
PKG_SITE="https://cmake.org/"
PKG_URL="https://cmake.org/files/v$(get_pkg_version_maj_min)/cmake-${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="fakeroot"
PKG_VERSION="1.34"
PKG_SHA256="5727f16d8903792588efa7a9f8ef8ce71f8756e746b62e45162e7735662e56bb"
PKG_VERSION="1.35"
PKG_SHA256="e5a427b4ab1eb4a2158b3312547a4155aede58735cd5c2910421988834b440a4"
PKG_LICENSE="GPL3"
PKG_SITE="https://tracker.debian.org/pkg/fakeroot"
PKG_URL="http://ftp.debian.org/debian/pool/main/f/fakeroot/${PKG_NAME}_${PKG_VERSION}.orig.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="fribidi"
PKG_VERSION="1.0.14"
PKG_SHA256="76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a"
PKG_VERSION="1.0.15"
PKG_SHA256="0bbc7ff633bfa208ae32d7e369cf5a7d20d5d2557a0b067c9aa98bcbf9967587"
PKG_LICENSE="LGPL"
PKG_SITE="http://fribidi.freedesktop.org/"
PKG_URL="https://github.com/fribidi/fribidi/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -15,7 +15,7 @@ PKG_BUILD_FLAGS="-parallel"
pre_configure_host() {
# configure step misconfigures with gcc 14 unless this error is degraded to a warning
export CFLAGS=-Wno-error=implicit-function-declaration
export CFLAGS+=" -Wno-error=implicit-function-declaration"
}
PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_COMPILE_ET=no \

View File

@ -0,0 +1,30 @@
From 898177b5ccf81a91bb3d73196b544c132a16a496 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 12 Jun 2024 12:03:50 +0000
Subject: [PATCH] fix assert issue with systemd udev
---
src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp b/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp
index 3cb49dd..27c8269 100644
--- a/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp
+++ b/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp
@@ -370,7 +370,12 @@ uint8_t CUSBCECAdapterDetection::FindAdaptersUdev(cec_adapter_descriptor *device
if (!dev)
continue;
- pdev = udev_device_get_parent(udev_device_get_parent(dev));
+ // do not call udev_device_get_parent(udev_device_get_parent(dev))
+ // directly as a null reurn on the parent will cause an assert in
+ // udev_device_get_parent
+ pdev = udev_device_get_parent(dev);
+ if (pdev)
+ pdev = udev_device_get_parent(pdev);
if (!pdev || !udev_device_get_sysattr_value(pdev, "idVendor") || !udev_device_get_sysattr_value(pdev, "idProduct"))
{
udev_device_unref(dev);
--
2.43.0

View File

@ -2,8 +2,8 @@
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mold"
PKG_VERSION="2.31.0"
PKG_SHA256="3dc3af83a5d22a4b29971bfad17261851d426961c665480e2ca294e5c74aa1e5"
PKG_VERSION="2.32.0"
PKG_SHA256="4b7e4146ea0f52be9adae8b417399f3676a041e65b55e3f25f088120d30a320b"
PKG_LICENSE="MIT"
PKG_SITE="https://github.com/rui314/mold"
PKG_URL="https://github.com/rui314/mold/archive/refs/tags/v${PKG_VERSION}.tar.gz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pcre2"
PKG_VERSION="10.43"
PKG_SHA256="e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb"
PKG_VERSION="10.44"
PKG_SHA256="d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96"
PKG_LICENSE="BSD"
PKG_SITE="http://www.pcre.org/"
PKG_URL="https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PKG_VERSION}/pcre2-${PKG_VERSION}.tar.bz2"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pango"
PKG_VERSION="1.52.2"
PKG_SHA256="d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b"
PKG_VERSION="1.54.0"
PKG_SHA256="8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8"
PKG_LICENSE="GPL"
PKG_SITE="http://www.pango.org/"
PKG_URL="https://download.gnome.org/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="spirv-llvm-translator"
PKG_VERSION="18.1.0"
PKG_SHA256="78a770eff24d5ffe2798479845adec4b909cbf058ddc55830ea00fa7d2c1698a"
PKG_VERSION="18.1.1"
PKG_SHA256="c1c7aee4ea23a6a1089bb7f7bad198c28ada65c5b7671434562fe0241d8674d6"
PKG_LICENSE="LLVM"
PKG_SITE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
PKG_URL="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vulkan-headers"
PKG_VERSION="1.3.287"
PKG_SHA256="514d5e2425979ffe313b77f71274f199654b2d895719047636cb46d10555cd6b"
PKG_VERSION="1.3.288"
PKG_SHA256="6f21dd9efe65fb7aeba6beaef2d274a0a31d32b4f494637b0d1a49853cf20ca6"
PKG_LICENSE="Apache-2.0"
PKG_SITE="https://github.com/KhronosGroup/Vulkan-Headers"
PKG_URL="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vulkan-loader"
PKG_VERSION="1.3.287"
PKG_SHA256="8501325eb301c9cbd147acf439ad243dc6b4b417c08adc413cdeb4e188537fb0"
PKG_VERSION="1.3.288"
PKG_SHA256="c3acc079f05a3943ad6ab468adc002bae74f77a54878902166160292f4a52ff1"
PKG_LICENSE="Apache-2.0"
PKG_SITE="https://github.com/KhronosGroup/Vulkan-Loader"
PKG_URL="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="vulkan-tools"
PKG_VERSION="1.3.287"
PKG_SHA256="960e438cf0d77ec651d118655a2265437e6befdb628899378e04f9bfd7658df2"
PKG_VERSION="1.3.288"
PKG_SHA256="f6f3bc87b2daba09c444aad49067ad204e19894babacb8a9b262571a94f321d2"
PKG_LICENSE="Apache-2.0"
PKG_SITE="https://github.com/KhronosGroup/Vulkan-Tools"
PKG_URL="https://github.com/KhronosGroup/Vulkan-tools/archive/v${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="llvm"
PKG_VERSION="18.1.6"
PKG_SHA256="bd4b4cb6374bcd5fc5a3ba60cb80425d29da34f316b8821abc12c0db225cf6b4"
PKG_VERSION="18.1.7"
PKG_SHA256="74446ab6943f686391954cbda0d77ae92e8a60c432eff437b8666e121d748ec4"
PKG_LICENSE="Apache-2.0"
PKG_SITE="http://llvm.org/"
PKG_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PKG_VERSION}/llvm-project-${PKG_VERSION/-/}.src.tar.xz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="iwlwifi-firmware"
PKG_VERSION="b33487854c14406a48ab161354f09da9d5d6fad2"
PKG_SHA256="83ebb2ef714d80e67bf666500a8bf3a27f92415066dfeb346cdd96725d8f9cad"
PKG_VERSION="1303badf099a4d85b084daf2cec5609c35472244"
PKG_SHA256="5f19bcb22bf52aa4ed214981c320d446655465f68d5ce52e65772f0765870b7d"
PKG_LICENSE="Free-to-use"
PKG_SITE="https://github.com/LibreELEC/iwlwifi-firmware"
PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/${PKG_VERSION}.tar.gz"

View File

@ -16,15 +16,15 @@ PKG_PATCH_DIRS="${LINUX}"
case "${LINUX}" in
amlogic)
PKG_VERSION="1b4861e32e461b6fae14dc49ed0f1c7f20af5146" # 6.9.3
PKG_SHA256="2502f1858175fc03ba38198df6b7ac62e167c9d2ee9b08b157bff66c73130e2c"
PKG_VERSION="380df7b7938d3c3ba1d0d0b472a810fd38061329" # 6.9.5
PKG_SHA256="740368c264d071200577ef745c1e06362564daefd941c7c562905853c6f16598"
PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
PKG_PATCH_DIRS="default rtlwifi/6.10 rtlwifi/6.11"
;;
raspberrypi)
PKG_VERSION="573f8fd0abf1d63ef719672a3c26e7abc0169620" # 6.6.31
PKG_SHA256="61f3e50e8841787ab3c8dff0e26ded2a4f4ff671603f6be8f7bcc61286eaf037"
PKG_VERSION="f54dbddefe179433c73ad6611ada5b25d452ce05" # 6.6.34
PKG_SHA256="229cae163c76c11f85d6d952e9ac750dbf3efd312f7986d3f3f241a1f4222309"
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
PKG_PATCH_DIRS="raspberrypi rtlwifi/6.9 rtlwifi/6.10 rtlwifi/6.11"
@ -55,8 +55,8 @@ case "${LINUX}" in
PKG_GIT_CLONE_BRANCH="sdm845-5.19.16"
;;
*)
PKG_VERSION="6.9.2"
PKG_SHA256="d46c5bdf2c5961cc2a4dedefe0434d456865e95e4a7cd9f93fff054f9090e5f9"
PKG_VERSION="6.9.5"
PKG_SHA256="a51fb4ab5003a6149bd9bf4c18c9b1f0f4945c272549095ab154b9d1052f95b1"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_PATCH_DIRS="default rtlwifi/6.10 rtlwifi/6.11"
;;

View File

@ -1,43 +0,0 @@
From b51a3b582d9626e5b896141c9b9edbf0d49d147d Mon Sep 17 00:00:00 2001
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Date: Thu, 25 Apr 2024 21:09:21 +0300
Subject: [PATCH 01/07] 6.10: wifi: rtlwifi: rtl8192de: Fix 5 GHz TX
power
Different channels have different TX power settings. rtl8192de is using
the TX power setting from the wrong channel in the 5 GHz band because
_rtl92c_phy_get_rightchnlplace expects an array which includes all the
channel numbers, but it's using an array which includes only the 5 GHz
channel numbers.
Use the array channel_all (defined in rtl8192de/phy.c) instead of
the incorrect channel5g (defined in core.c).
Tested only with rtl8192du, which will use the same TX power code.
Cc: stable@vger.kernel.org
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/c7653517-cf88-4f57-b79a-8edb0a8b32f0@gmail.com
---
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
index d835a27429f0..56b5cd032a9a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
@@ -892,8 +892,8 @@ static u8 _rtl92c_phy_get_rightchnlplace(u8 chnl)
u8 place = chnl;
if (chnl > 14) {
- for (place = 14; place < ARRAY_SIZE(channel5g); place++) {
- if (channel5g[place] == chnl) {
+ for (place = 14; place < ARRAY_SIZE(channel_all); place++) {
+ if (channel_all[place] == chnl) {
place++;
break;
}
--
2.34.1

View File

@ -1,83 +0,0 @@
From 93f781bf3955bd65a73ad8878c6f76439cdd4aaf Mon Sep 17 00:00:00 2001
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Date: Thu, 25 Apr 2024 21:12:38 +0300
Subject: [PATCH 02/07] 6.10: wifi: rtlwifi: rtl8192de: Fix low speed
with WPA3-SAE
Some (all?) management frames are incorrectly reported to mac80211 as
decrypted when actually the hardware did not decrypt them. This results
in speeds 3-5 times lower than expected, 20-30 Mbps instead of 100
Mbps.
Fix this by checking the encryption type field of the RX descriptor.
rtw88 does the same thing.
This fix was tested only with rtl8192du, which will use the same code.
Cc: stable@vger.kernel.org
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/4d600435-f0ea-46b0-bdb4-e60f173da8dd@gmail.com
---
.../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 5 ++---
.../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 14 ++++++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
index 192982ec8152..30b262c3f6d0 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
@@ -413,7 +413,8 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
stats->icv = (u16)get_rx_desc_icv(pdesc);
stats->crc = (u16)get_rx_desc_crc32(pdesc);
stats->hwerror = (stats->crc | stats->icv);
- stats->decrypted = !get_rx_desc_swdec(pdesc);
+ stats->decrypted = !get_rx_desc_swdec(pdesc) &&
+ get_rx_desc_enc_type(pdesc) != RX_DESC_ENC_NONE;
stats->rate = (u8)get_rx_desc_rxmcs(pdesc);
stats->shortpreamble = (u16)get_rx_desc_splcp(pdesc);
stats->isampdu = (bool)(get_rx_desc_paggr(pdesc) == 1);
@@ -426,8 +427,6 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
rx_status->band = hw->conf.chandef.chan->band;
if (get_rx_desc_crc32(pdesc))
rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
- if (!get_rx_desc_swdec(pdesc))
- rx_status->flag |= RX_FLAG_DECRYPTED;
if (get_rx_desc_bw(pdesc))
rx_status->bw = RATE_INFO_BW_40;
if (get_rx_desc_rxht(pdesc))
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
index 2992668c156c..f189ee2d9be2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
@@ -14,6 +14,15 @@
#define USB_HWDESC_HEADER_LEN 32
#define CRCLENGTH 4
+enum rtl92d_rx_desc_enc {
+ RX_DESC_ENC_NONE = 0,
+ RX_DESC_ENC_WEP40 = 1,
+ RX_DESC_ENC_TKIP_WO_MIC = 2,
+ RX_DESC_ENC_TKIP_MIC = 3,
+ RX_DESC_ENC_AES = 4,
+ RX_DESC_ENC_WEP104 = 5,
+};
+
/* macros to read/write various fields in RX or TX descriptors */
static inline void set_tx_desc_pkt_size(__le32 *__pdesc, u32 __val)
@@ -246,6 +255,11 @@ static inline u32 get_rx_desc_drv_info_size(__le32 *__pdesc)
return le32_get_bits(*__pdesc, GENMASK(19, 16));
}
+static inline u32 get_rx_desc_enc_type(__le32 *__pdesc)
+{
+ return le32_get_bits(*__pdesc, GENMASK(22, 20));
+}
+
static inline u32 get_rx_desc_shift(__le32 *__pdesc)
{
return le32_get_bits(*__pdesc, GENMASK(25, 24));
--
2.34.1

View File

@ -1,174 +0,0 @@
From 91b01523927c0e78c0c53c0c8347ee9d194d34f0 Mon Sep 17 00:00:00 2001
From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Date: Thu, 25 Apr 2024 21:13:12 +0300
Subject: [PATCH 03/07] 6.10: wifi: rtlwifi: rtl8192de: Fix endianness
issue in RX path
Structs rx_desc_92d and rx_fwinfo_92d will not work for big endian
systems.
Delete rx_desc_92d because it's big and barely used, and instead use
the get_rx_desc_rxmcs and get_rx_desc_rxht functions, which work on big
endian systems too.
Fix rx_fwinfo_92d by duplicating four of its members in the correct
order.
Tested only with RTL8192DU, which will use the same code.
Tested only on a little endian system.
Cc: stable@vger.kernel.org
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://msgid.link/698463da-5ef1-40c7-b744-fa51ad847caf@gmail.com
---
.../wireless/realtek/rtlwifi/rtl8192de/trx.c | 16 ++---
.../wireless/realtek/rtlwifi/rtl8192de/trx.h | 65 ++-----------------
2 files changed, 15 insertions(+), 66 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
index 30b262c3f6d0..cbc7b4dbea9a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c
@@ -35,7 +35,7 @@ static long _rtl92de_translate_todbm(struct ieee80211_hw *hw,
static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
struct rtl_stats *pstats,
- struct rx_desc_92d *pdesc,
+ __le32 *pdesc,
struct rx_fwinfo_92d *p_drvinfo,
bool packet_match_bssid,
bool packet_toself,
@@ -50,8 +50,10 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
u8 i, max_spatial_stream;
u32 rssi, total_rssi = 0;
bool is_cck_rate;
+ u8 rxmcs;
- is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);
+ rxmcs = get_rx_desc_rxmcs(pdesc);
+ is_cck_rate = rxmcs <= DESC_RATE11M;
pstats->packet_matchbssid = packet_match_bssid;
pstats->packet_toself = packet_toself;
pstats->packet_beacon = packet_beacon;
@@ -157,8 +159,8 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
pstats->rx_pwdb_all = pwdb_all;
pstats->rxpower = rx_pwr_all;
pstats->recvsignalpower = rx_pwr_all;
- if (pdesc->rxht && pdesc->rxmcs >= DESC_RATEMCS8 &&
- pdesc->rxmcs <= DESC_RATEMCS15)
+ if (get_rx_desc_rxht(pdesc) && rxmcs >= DESC_RATEMCS8 &&
+ rxmcs <= DESC_RATEMCS15)
max_spatial_stream = 2;
else
max_spatial_stream = 1;
@@ -364,7 +366,7 @@ static void _rtl92de_process_phyinfo(struct ieee80211_hw *hw,
static void _rtl92de_translate_rx_signal_stuff(struct ieee80211_hw *hw,
struct sk_buff *skb,
struct rtl_stats *pstats,
- struct rx_desc_92d *pdesc,
+ __le32 *pdesc,
struct rx_fwinfo_92d *p_drvinfo)
{
struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
@@ -440,9 +442,7 @@ bool rtl92de_rx_query_desc(struct ieee80211_hw *hw, struct rtl_stats *stats,
if (phystatus) {
p_drvinfo = (struct rx_fwinfo_92d *)(skb->data +
stats->rx_bufshift);
- _rtl92de_translate_rx_signal_stuff(hw,
- skb, stats,
- (struct rx_desc_92d *)pdesc,
+ _rtl92de_translate_rx_signal_stuff(hw, skb, stats, pdesc,
p_drvinfo);
}
/*rx_status->qual = stats->signal; */
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
index f189ee2d9be2..2d4887490f00 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h
@@ -394,10 +394,17 @@ struct rx_fwinfo_92d {
u8 csi_target[2];
u8 sigevm;
u8 max_ex_pwr;
+#ifdef __LITTLE_ENDIAN
u8 ex_intf_flag:1;
u8 sgi_en:1;
u8 rxsc:2;
u8 reserve:4;
+#else
+ u8 reserve:4;
+ u8 rxsc:2;
+ u8 sgi_en:1;
+ u8 ex_intf_flag:1;
+#endif
} __packed;
struct tx_desc_92d {
@@ -502,64 +509,6 @@ struct tx_desc_92d {
u32 reserve_pass_pcie_mm_limit[4];
} __packed;
-struct rx_desc_92d {
- u32 length:14;
- u32 crc32:1;
- u32 icverror:1;
- u32 drv_infosize:4;
- u32 security:3;
- u32 qos:1;
- u32 shift:2;
- u32 phystatus:1;
- u32 swdec:1;
- u32 lastseg:1;
- u32 firstseg:1;
- u32 eor:1;
- u32 own:1;
-
- u32 macid:5;
- u32 tid:4;
- u32 hwrsvd:5;
- u32 paggr:1;
- u32 faggr:1;
- u32 a1_fit:4;
- u32 a2_fit:4;
- u32 pam:1;
- u32 pwr:1;
- u32 moredata:1;
- u32 morefrag:1;
- u32 type:2;
- u32 mc:1;
- u32 bc:1;
-
- u32 seq:12;
- u32 frag:4;
- u32 nextpktlen:14;
- u32 nextind:1;
- u32 rsvd:1;
-
- u32 rxmcs:6;
- u32 rxht:1;
- u32 amsdu:1;
- u32 splcp:1;
- u32 bandwidth:1;
- u32 htc:1;
- u32 tcpchk_rpt:1;
- u32 ipcchk_rpt:1;
- u32 tcpchk_valid:1;
- u32 hwpcerr:1;
- u32 hwpcind:1;
- u32 iv0:16;
-
- u32 iv1;
-
- u32 tsfl;
-
- u32 bufferaddress;
- u32 bufferaddress64;
-
-} __packed;
-
void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
struct ieee80211_hdr *hdr, u8 *pdesc,
u8 *pbd_desc_tx, struct ieee80211_tx_info *info,
--
2.34.1

View File

@ -4,7 +4,7 @@
PKG_NAME="inputstream.ffmpegdirect"
PKG_VERSION="21.3.5-Omega"
PKG_SHA256="b28ccbd489d9b69779fd818ee158f69ebd6fd85b1f0410ffc8098ff0c8665bdc"
PKG_REV="2"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL2+"
PKG_SITE="https://github.com/xbmc/inputstream.ffmpegdirect"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.waipu"
PKG_VERSION="21.8.0-Omega"
PKG_SHA256="90309b19f03339a84645df88ab31b54a31e4c08e02864cf54aab834ec5766942"
PKG_VERSION="21.8.1-Omega"
PKG_SHA256="b1e354dccb60fff50ce9e6fe7ee3cc876de17aba43f89938196f5846cba1f891"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -0,0 +1,33 @@
From 8a78c59791ba408c3f03e285b68f9afbac2658d8 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 12 Jun 2024 21:45:23 +0000
Subject: [PATCH] PeripheralBusUSBLibUdev: fix assert issue with systemd udev
do not call udev_device_get_parent(udev_device_get_parent(dev))
directly as a null return on the parent will cause an assert in
udev_device_get_parent
---
.../platform/linux/peripherals/PeripheralBusUSBLibUdev.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/xbmc/platform/linux/peripherals/PeripheralBusUSBLibUdev.cpp b/xbmc/platform/linux/peripherals/PeripheralBusUSBLibUdev.cpp
index aeb5e71d9f..3b649652c3 100644
--- a/xbmc/platform/linux/peripherals/PeripheralBusUSBLibUdev.cpp
+++ b/xbmc/platform/linux/peripherals/PeripheralBusUSBLibUdev.cpp
@@ -108,7 +108,12 @@ bool CPeripheralBusUSB::PerformDeviceScan(PeripheralScanResults &results)
if (bContinue)
{
- dev = udev_device_get_parent(udev_device_get_parent(parent));
+ // do not call udev_device_get_parent(udev_device_get_parent(dev))
+ // directly as a null return on the parent will cause an assert in
+ // udev_device_get_parent
+ dev = udev_device_get_parent(parent);
+ if (dev)
+ dev = udev_device_get_parent(dev);
if (!dev || !udev_device_get_sysattr_value(dev,"idVendor") || !udev_device_get_sysattr_value(dev, "idProduct"))
bContinue = false;
}
--
2.43.0

View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="dav1d"
PKG_VERSION="1.4.2"
PKG_SHA256="7392cf4c432734eebb383319b5e05e994bffdcdfe66f82287c38873601a4ef0b"
PKG_VERSION="1.4.3"
PKG_SHA256="42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19"
PKG_LICENSE="BSD"
PKG_SITE="https://www.videolan.org/projects/dav1d.html"
PKG_URL="https://downloads.videolan.org/pub/videolan/dav1d/${PKG_VERSION}/dav1d-${PKG_VERSION}.tar.xz"

View File

@ -8,7 +8,7 @@ PKG_SHA256="9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623"
PKG_LICENSE="GPL-3.0-only"
PKG_SITE="https://ffmpeg.org"
PKG_URL="http://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain zlib bzip2 openssl speex"
PKG_DEPENDS_TARGET="toolchain zlib bzip2 openssl speex libxml2"
if [ "${DISTRO}" = "Lakka" ]; then
PKG_DEPENDS_TARGET+=" libx264 lame rtmpdump"
fi
@ -216,6 +216,7 @@ configure_target() {
--disable-libvpx \
--disable-libx264 \
--disable-libxavs \
--enable-libxml2 \
--disable-libxvid \
--enable-zlib \
--enable-asm \

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="gmmlib"
PKG_VERSION="22.3.19"
PKG_SHA256="ea9c418b0fd84a982850f230cb2d783dfe2e1f9923065f54b2fcaad1e9b33417"
PKG_VERSION="22.3.20"
PKG_SHA256="227c1614d4817154b4e6fbfb667ba2b231ea7aa53796d91f1800af9aeb703f59"
PKG_ARCH="x86_64"
PKG_LICENSE="MIT"
PKG_SITE="https://01.org/linuxmedia"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="media-driver"
PKG_VERSION="24.2.4"
PKG_SHA256="2f65a08ebd2f0111c079f2839621fab4f648ecd15cccdd8eecd96a1217880b63"
PKG_VERSION="24.2.5"
PKG_SHA256="dec2210c1f824a721e4ea6f66f5899e300801b3e7fae232d3f8a94db38c2edd1"
PKG_ARCH="x86_64"
PKG_LICENSE="MIT"
PKG_SITE="https://01.org/linuxmedia"

View File

@ -1,80 +0,0 @@
From d9e0cb598d21e6d46525d33721c2a62a0c264537 Mon Sep 17 00:00:00 2001
From: Jay Yang <jay.yang@intel.com>
Date: Fri, 31 May 2024 17:26:25 +0800
Subject: [PATCH] Fix GCC14 compilation issue
Fix: #1797
Signed-off-by: Jay Yang <jay.yang@intel.com>
---
media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h | 2 +-
media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h | 2 +-
media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h | 2 +-
media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h | 2 +-
media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h
index e1a1117fba..1d7692a5c6 100644
--- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h
+++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h
@@ -210,7 +210,7 @@ class MhwVdboxVdencInterfaceG11 : public MhwVdboxVdencInterfaceGeneric<TVdencCmd
//!
//! \brief Constructor
//!
- MhwVdboxVdencInterfaceG11<TVdencCmds>(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric<TVdencCmds>(osInterface)
+ MhwVdboxVdencInterfaceG11(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric<TVdencCmds>(osInterface)
{
MHW_FUNCTION_ENTER;
diff --git a/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h b/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h
index 00a0b7ed60..8b31c75a95 100644
--- a/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h
+++ b/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h
@@ -105,7 +105,7 @@ class MhwVdboxMfxInterfaceG8 : public MhwVdboxMfxInterfaceGeneric<TMfxCmds, mhw_
//!
//! \brief Constructor
//!
- MhwVdboxMfxInterfaceG8<TMfxCmds>(
+ MhwVdboxMfxInterfaceG8(
PMOS_INTERFACE osInterface,
MhwMiInterface *miInterface,
MhwCpInterface *cpInterface,
diff --git a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h
index 481dc78308..3a97379380 100644
--- a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h
+++ b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h
@@ -120,7 +120,7 @@ class MhwVdboxHcpInterfaceG9 : public MhwVdboxHcpInterfaceGeneric<THcpCmds>
//!
//! \brief Constructor
//!
- MhwVdboxHcpInterfaceG9<THcpCmds>(
+ MhwVdboxHcpInterfaceG9(
PMOS_INTERFACE osInterface,
MhwMiInterface *miInterface,
MhwCpInterface *cpInterface,
diff --git a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h
index 22cc9cb94e..f57e23c778 100644
--- a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h
+++ b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h
@@ -86,7 +86,7 @@ class MhwVdboxMfxInterfaceG9 : public MhwVdboxMfxInterfaceGeneric<TMfxCmds, mhw_
//!
//! \brief Constructor
//!
- MhwVdboxMfxInterfaceG9<TMfxCmds>(
+ MhwVdboxMfxInterfaceG9(
PMOS_INTERFACE osInterface,
MhwMiInterface *miInterface,
MhwCpInterface *cpInterface,
diff --git a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h
index ef70366457..951cab1278 100644
--- a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h
+++ b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h
@@ -51,7 +51,7 @@ class MhwVdboxVdencInterfaceG9 : public MhwVdboxVdencInterfaceGeneric<TVdencCmds
//!
//! \brief Constructor
//!
- MhwVdboxVdencInterfaceG9<TVdencCmds>(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric<TVdencCmds>(osInterface)
+ MhwVdboxVdencInterfaceG9(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric<TVdencCmds>(osInterface)
{
MHW_FUNCTION_ENTER;

View File

@ -2,13 +2,14 @@
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="zvbi"
PKG_VERSION="0.2.35"
PKG_SHA256="fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318"
PKG_VERSION="0.2.42"
PKG_SHA256="e7614a847ce7dd2c05f1db84d21dcf25085565932efb014f27107ae940884d7f"
PKG_LICENSE="GPL2"
PKG_SITE="http://zapping.sourceforge.net/ZVBI"
PKG_URL="https://downloads.sourceforge.net/sourceforge/zapping/zvbi-${PKG_VERSION}.tar.bz2"
PKG_SITE="https://github.com/zapping-vbi/zvbi"
PKG_URL="https://github.com/zapping-vbi/zvbi/archive/refs/tags/v${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain libpng zlib"
PKG_LONGDESC="Library to provide functions to capture and decode VBI data."
PKG_TOOLCHAIN="autotools"
PKG_CONFIGURE_OPTS_TARGET="--disable-dvb \
--disable-bktr \

View File

@ -1,16 +1,5 @@
--- a/configure
+++ b/configure
@@ -16515,7 +16515,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_destroy_write_struct" >&5
$as_echo "$ac_cv_lib_png_png_destroy_write_struct" >&6; }
if test "x$ac_cv_lib_png_png_destroy_write_struct" = x""yes; then :
- LIBS="$LIBS -lpng -lz"
+ LIBS="-lpng -lz $LIBS"
else
HAVE_PNG="no"
fi
--- a/configure.in
+++ b/configure.in
--- a/configure.ac
+++ b/configure.ac
@@ -244,7 +244,7 @@ dnl (PNG page export)
dnl
HAVE_PNG="yes"

View File

@ -12,14 +12,14 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
ETAGS = etags
CTAGS = ctags
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
-DIST_SUBDIRS = m4 src daemon contrib examples test po doc
+DIST_SUBDIRS = m4 src daemon contrib po doc
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/zvbi-0.2.pc.in $(srcdir)/zvbi.spec.in \
$(top_srcdir)/build-aux/compile \
@@ -268,8 +268,6 @@ SUBDIRS = \
src \
$(proxy_dirs) \
@ -29,35 +29,8 @@
po \
doc
--- a/configure
+++ b/configure
@@ -18591,7 +18591,7 @@ else
fi
-ac_config_files="$ac_config_files Makefile contrib/Makefile examples/Makefile daemon/Makefile daemon/zvbid.init doc/Doxyfile doc/Makefile m4/Makefile src/Makefile src/dvb/Makefile test/Makefile po/Makefile.in zvbi.spec zvbi-0.2.pc"
+ac_config_files="$ac_config_files Makefile contrib/Makefile daemon/Makefile daemon/zvbid.init doc/Doxyfile doc/Makefile m4/Makefile src/Makefile src/dvb/Makefile po/Makefile.in zvbi.spec zvbi-0.2.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -19726,7 +19726,6 @@ do
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
- "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
"daemon/zvbid.init") CONFIG_FILES="$CONFIG_FILES daemon/zvbid.init" ;;
"doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
@@ -19734,7 +19733,6 @@ do
"m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/dvb/Makefile") CONFIG_FILES="$CONFIG_FILES src/dvb/Makefile" ;;
- "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"zvbi.spec") CONFIG_FILES="$CONFIG_FILES zvbi.spec" ;;
"zvbi-0.2.pc") CONFIG_FILES="$CONFIG_FILES zvbi-0.2.pc" ;;
--- a/configure.in
+++ b/configure.in
--- a/configure.ac
+++ b/configure.ac
@@ -384,7 +384,6 @@ AM_CONDITIONAL(BUILD_STATIC_LIB, [test "x$enable_static" = xyes])
AC_OUTPUT([
Makefile

View File

@ -0,0 +1,51 @@
From 429cf9337588d6e028bd1dc4633953b4eff09597 Mon Sep 17 00:00:00 2001
From: Ileana Dumitrescu <ileanadumitrescu95@gmail.com>
Date: Wed, 13 Mar 2024 17:42:18 +0200
Subject: [PATCH] configure.ac: Move sincos function check to AC_CHECK_FUNCS
---
configure.ac | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index ba6f385..476fd69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ AC_CHECK_FUNCS([alarm dup2 gethostbyaddr gethostbyname getopt_long gettimeofday
inet_ntoa localtime_r memmove memset mkdir modf munmap
nl_langinfo putenv select setenv setlocale socket strcasecmp
strchr strdup strerror strncasecmp strndup strrchr strstr
- strtol strtoul tzset strptime getaddrinfo])
+ strtol strtoul tzset strptime getaddrinfo sincos])
AM_CONDITIONAL(HAVE_STRPTIME, [test "x$HAVE_STRPTIME" = xyes])
@@ -112,28 +112,6 @@ dnl autoconf 2.71 required additional quotations and usages of "AC_LANG_SOURCE".
dnl "Noteworthy changes in autoconf version 2.66 through 2.68"
dnl <https://autotools.info/forwardporting/autoconf.html>
-dnl sincos() is a GNU extension (a macro, not a function).
-dnl If not present we use a replacement.
-AC_MSG_CHECKING([for sincos])
-AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <stdio.h>
-#include <math.h>
-int main (void) {
-double s, c;
-/* Make sure the compiler does not optimize sincos() away
- so the linker can confirm its availability. */
-scanf ("%f", &s);
-sincos (s, &s, &c);
-printf ("%f %f", s, c);
-return 0;
-}
-])],[
- AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_SINCOS, 1, [Define if the sincos() function is available])
-],[
- AC_MSG_RESULT([no])
-])
-
dnl log2() is a GNU extension (a macro, not a function).
dnl If not present we use a replacement.
AC_MSG_CHECKING([for log2])

View File

@ -10,15 +10,15 @@ PKG_TOOLCHAIN="manual"
case "${MACHINE_HARDWARE_NAME}" in
"aarch64")
PKG_SHA256="5173f84a07d4cc6b19f27eda7464999c5886232ce8e54bf61b06617635d43fb9"
PKG_SHA256="4ca5e9bd141b0111387ea1aa0355f87eb8d0da52fbc616cefa4ecde4997aa65b"
PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
;;
"arm")
PKG_SHA256="3c69ce28099974d5b2698aca4c10c88b4f2e04a89f44627373d98a76f9b9efc7"
PKG_SHA256="60c8274fdfbf335f740fdb5987b5f2be24e74eda1ae40021ee94368999f29ed7"
PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnueabihf.tar.xz"
;;
"x86_64")
PKG_SHA256="f8aacf7a101eb10dc000b8bf26de90a9d0ce678d02ccf70430ed20dd31ecec6b"
PKG_SHA256="07fcadd27b645ad58ff4dae5ef166fd730311bbae8f25f6640fe1bfd2a1f3c3c"
PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
;;
esac

View File

@ -10,15 +10,15 @@ PKG_TOOLCHAIN="manual"
case "${MACHINE_HARDWARE_NAME}" in
"aarch64")
PKG_SHA256="66cf114dcd8056a596bf169f824ff95ff1837bc065daaafdbcaa02ce92903304"
PKG_SHA256="519abf4757fbd8d7e3bb4e4cfdc362ded972c1d95f04675684df2d31e8c0899b"
PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
;;
"arm")
PKG_SHA256="897271da9a11a6783b736f7d2a600e3a6782618ebe28cf24713986ab8f90c871"
PKG_SHA256="fa6f5f03b68faf9b4449266e4836bcae24027fba7a3822a48822d772fc76c064"
PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnueabihf.tar.xz"
;;
"x86_64")
PKG_SHA256="95aece42a336f237c5bac5c5d9aca051b7f0bd3e6a64fb3c5828e6d0d3af2e8c"
PKG_SHA256="2c914483c0882d44af2e50a181cbd2c953d672d50b31aa669ee2346cade1f108"
PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
;;
esac

View File

@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="rust"
PKG_VERSION="1.78.0"
PKG_SHA256="ff544823a5cb27f2738128577f1e7e00ee8f4c83f2a348781ae4fc355e91d5a9"
PKG_VERSION="1.79.0"
PKG_SHA256="172ecf3c7d1f9d9fb16cd2a628869782670416ded0129e524a86751f961448c0"
PKG_LICENSE="MIT"
PKG_SITE="https://www.rust-lang.org"
PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-src.tar.gz"

View File

@ -10,15 +10,15 @@ PKG_TOOLCHAIN="manual"
case "${MACHINE_HARDWARE_NAME}" in
"aarch64")
PKG_SHA256="e0450bef5537e6b0bb82872e9f837c3b3f6397cc8eba6f53211481c82426e1ce"
PKG_SHA256="9c847b42b81325d25a9240e33bf03fa8652f5dd321ae90a9a7a58b46bf124b17"
PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
;;
"arm")
PKG_SHA256="8e42581140e56ad55a67e2e8a3b562b86fa7571bbc394c0df8696f0276a8faf3"
PKG_SHA256="019a2b9792ee38a30823b96b6d63e5094b92a1dff197ab30b63f1a6568da533e"
PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnueabihf.tar.xz"
;;
"x86_64")
PKG_SHA256="3994971e5923716d54e4b574ce238f04c4e20cda03990670f7cc3f87d36e5499"
PKG_SHA256="a04cf42022d0a5faf01c31082bfb1dde9c38409f0ca6da90a3e40faa03e797ae"
PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
;;
esac

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="nettle"
PKG_VERSION="3.9.1"
PKG_SHA256="ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3"
PKG_VERSION="3.10"
PKG_SHA256="b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c"
PKG_LICENSE="GPL2"
PKG_SITE="http://www.lysator.liu.se/~nisse/nettle"
PKG_URL="https://ftp.gnu.org/gnu/nettle/nettle-${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="eventlircd"
PKG_VERSION="fd511a9cc7de6af4517604fdc2b3f0f5b64c2a81"
PKG_SHA256="4c7a93d31845085272e497611159910af69e37a0f70925f36880ba40f4693e23"
PKG_VERSION="8f20b3196bf7085b6c90d86f1602fb29e3965cbc"
PKG_SHA256="029ad9eb554bdfd65fe285c9bef9f5eea7c3b0d97a84dd99a2eb65f80c1848fe"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/LibreELEC/eventlircd"
PKG_URL="https://github.com/LibreELEC/eventlircd/archive/${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pciutils"
PKG_VERSION="3.12.0"
PKG_SHA256="f185d116d5ff99b797497efce8f19f1ee8ccc5a668b97a159e3d13472f674154"
PKG_VERSION="3.13.0"
PKG_SHA256="77f11f78298502634d1af50308f15a5788629f6cf45cba376f5009aea4cb4926"
PKG_LICENSE="GPL"
PKG_SITE="http://mj.ucw.cz/pciutils.shtml"
PKG_URL="https://www.kernel.org/pub/software/utils/pciutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="systemd"
PKG_VERSION="255.7"
PKG_SHA256="da29f2490c192ca743511098b1d15e385b1b5e7744979661dc30514c1ac61f0e"
PKG_VERSION="256"
PKG_SHA256="ca40487e044c9d6b7ad214d453b1cab696e5ccbd5244eca78460972cb0589a17"
PKG_LICENSE="LGPL2.1+"
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"

View File

@ -11,12 +11,12 @@ diff --git a/src/core/timer.c b/src/core/timer.c
index 03935ee..bfd5c02 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -144,11 +144,11 @@ static int timer_setup_persistent(Timer *t) {
@@ -138,11 +138,11 @@ static int timer_setup_persistent(Timer *t) {
if (MANAGER_IS_SYSTEM(UNIT(t)->manager)) {
- r = unit_require_mounts_for(UNIT(t), "/var/lib/systemd/timers", UNIT_DEPENDENCY_FILE);
+ r = unit_require_mounts_for(UNIT(t), "/storage/.cache/systemd/timers", UNIT_DEPENDENCY_FILE);
- r = unit_add_mounts_for(UNIT(t), "/var/lib/systemd/timers", UNIT_DEPENDENCY_FILE, UNIT_MOUNT_REQUIRES);
+ r = unit_add_mounts_for(UNIT(t), "/storage/.cache/systemd/timers", UNIT_DEPENDENCY_FILE, UNIT_MOUNT_REQUIRES);
if (r < 0)
return r;

View File

@ -3,14 +3,15 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libxml2"
PKG_VERSION="2.12.7"
PKG_SHA256="f86f918e2884675cc0778c644fbc15e3ccbf06fb7fcf24eacd286976c99a6266"
PKG_VERSION="2.13.0"
PKG_SHA256="94b458dd08b36111552bfd436922abb41608ae7e4ecb7ebd015aaae39b48cbb5"
PKG_LICENSE="MIT"
PKG_SITE="http://xmlsoft.org"
PKG_URL="https://gitlab.gnome.org/GNOME/${PKG_NAME}/-/archive/v${PKG_VERSION}/${PKG_NAME}-v${PKG_VERSION}.tar.bz2"
PKG_DEPENDS_HOST="zlib:host ninja:host Python3:host"
PKG_DEPENDS_TARGET="toolchain zlib"
PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files."
PKG_TOOLCHAIN="cmake"
PKG_CMAKE_OPTS_ALL="-DBUILD_SHARED_LIBS=ON \
-DLIBXML2_WITH_LZMA=OFF \

View File

@ -13,16 +13,16 @@ index e68f3684..c0661a0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,9 +68,7 @@ if(LIBXML2_WITH_PYTHON)
check_include_files(unistd.h HAVE_UNISTD_H)
check_symbol_exists(F_GETFL fcntl.h HAVE_F_GETFL)
find_package(Python COMPONENTS Interpreter Development REQUIRED)
- #set(LIBXML2_PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE PATH "Python bindings install directory")
- set(LIBXML2_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/python"
- CACHE PATH "Python bindings install directory")
+ set(LIBXML2_PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE PATH "Python bindings install directory")
check_include_files(unistd.h HAVE_UNISTD_H)
check_symbol_exists(F_GETFL fcntl.h HAVE_F_GETFL)
find_package(Python COMPONENTS Interpreter Development REQUIRED)
- #set(LIBXML2_PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE PATH "Python bindings install directory")
- set(LIBXML2_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/python"
- CACHE PATH "Python bindings install directory")
+ set(LIBXML2_PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE PATH "Python bindings install directory")
endif()
foreach(VARIABLE IN ITEMS WITH_AUTOMATA WITH_C14N WITH_CATALOG WITH_DEBUG WITH_EXPR WITH_FTP WITH_HTML WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LEGACY WITH_LZMA WITH_MEM_DEBUG WITH_MODULES WITH_OUTPUT WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON WITH_THREADS WITH_THREAD_ALLOC WITH_TREE WITH_UNICODE WITH_VALID WITH_WRITER WITH_XINCLUDE WITH_XPATH WITH_XPTR WITH_XPTR_LOCS WITH_ZLIB)
foreach(VARIABLE IN ITEMS WITH_AUTOMATA WITH_C14N WITH_CATALOG WITH_DEBUG WITH_EXPR WITH_HTML WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LEGACY WITH_LZMA WITH_MODULES WITH_OUTPUT WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON WITH_THREADS WITH_THREAD_ALLOC WITH_TREE WITH_UNICODE WITH_VALID WITH_WRITER WITH_XINCLUDE WITH_XPATH WITH_XPTR WITH_ZLIB)
--
2.34.1

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libxslt"
PKG_VERSION="1.1.39"
PKG_SHA256="2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0"
PKG_VERSION="1.1.40"
PKG_SHA256="194715db023035f65fb566402f2ad2b5eab4c29d541f511305c40b29b1f48d13"
PKG_LICENSE="MIT"
PKG_SITE="http://xmlsoft.org/xslt/"
PKG_URL="https://download.gnome.org/sources/libxslt/$(get_pkg_version_maj_min)/libxslt-${PKG_VERSION}.tar.xz"
@ -16,7 +16,6 @@ PKG_BUILD_FLAGS="+pic"
PKG_CMAKE_OPTS_ALL="-DBUILD_SHARED_LIBS=ON \
-DLIBXSLT_WITH_DEBUGGER=ON \
-DLIBXSLT_WITH_CRYPTO=OFF \
-DLIBXSLT_WITH_MEM_DEBUG=OFF \
-DLIBXSLT_WITH_MODULES=ON \
-DLIBXSLT_WITH_PROFILER=ON \
-DLIBXSLT_WITH_PYTHON=OFF \

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bcm2835-bootloader"
PKG_VERSION="33aead4c6edca751b33b794c7100fae6cf1d4784"
PKG_SHA256="10a851e39ca08713873ab28911f72cb9b6f64a14385c2bb0f828d9f7f02d9c75"
PKG_VERSION="645bdf63ebb5ffd754bc5bff90c3d38d6cc309da"
PKG_SHA256="e5f409519f8a66bbfcba388f55d54179de301e6ffe16f050e2833f4733531f4a"
PKG_ARCH="arm aarch64"
PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="rpi-eeprom"
PKG_VERSION="61fb89536fc94a57c1e0afd42617849b6d0cac37"
PKG_SHA256="952c6348b65cbeca05da449dce3fa5f307d54997b1a9788e235eb1ac403ae21e"
PKG_VERSION="80be2d6d14c44964fd807e079eb5ad7225e49e5a"
PKG_SHA256="0f893e35977e5b4dc62676c290f417a84ade155e8b88d9a40162668e4d516b93"
PKG_LICENSE="BSD-3/custom"
PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"
PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libinput"
PKG_VERSION="1.25.0"
PKG_SHA256="193bd592298bd9e369c0ef3e5d83a6a9d68ddc4cd3dfc84bbe77920a8d0d57df"
PKG_VERSION="1.26.0"
PKG_SHA256="8c582b86c6865aaee2516ee96b299cef60c98e113d1391bbd2683eac08221a07"
PKG_LICENSE="GPL"
PKG_SITE="https://www.freedesktop.org/wiki/Software/libinput/"
PKG_URL="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="weston"
PKG_VERSION="13.0.1"
PKG_SHA256="ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a"
PKG_VERSION="13.0.3"
PKG_SHA256="27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093"
PKG_LICENSE="MIT"
PKG_SITE="https://wayland.freedesktop.org/"
PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/releases/${PKG_VERSION}/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="xkeyboard-config"
PKG_VERSION="2.41"
PKG_SHA256="f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f"
PKG_VERSION="2.42"
PKG_SHA256="a6b06ebfc1f01fc505f2f05f265f95f67cc8873a54dd247e3c2d754b8f7e0807"
PKG_LICENSE="MIT"
PKG_SITE="https://www.X.org"
PKG_URL="https://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -1,7 +1,7 @@
From 623a57187a4893a78bf818f7852b0c4e40936b30 Mon Sep 17 00:00:00 2001
From 206700df130ec0f8d26200b06d654e43c50fef97 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 13 Apr 2019 05:41:51 +0000
Subject: [PATCH 01/69] LOCAL: set meson-gx cma pool to 896MB
Subject: [PATCH 01/52] LOCAL: set meson-gx cma pool to 896MB
This change sets the CMA pool to a larger 896MB! value for vdec use

View File

@ -1,7 +1,7 @@
From 927f228f7bff9640c8f848202401a24be426c8b7 Mon Sep 17 00:00:00 2001
From f0e9bd4a8b251fbc622ce375f7e5d3d7f2216601 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 14 Aug 2019 19:58:14 +0000
Subject: [PATCH 02/69] LOCAL: set meson-g12 cma pool to 896MB
Subject: [PATCH 02/52] LOCAL: set meson-g12 cma pool to 896MB
This change sets the CMA pool to a larger 896MB! value for vdec use

View File

@ -1,7 +1,7 @@
From 1cb9ad61f678caced45a9b84f19e55fb97add9d1 Mon Sep 17 00:00:00 2001
From 2f1610b87a7cf5dc0b03dce6306d340d40bfde43 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 13 Apr 2019 05:45:18 +0000
Subject: [PATCH 03/69] LOCAL: arm64: fix Kodi sysinfo CPU information
Subject: [PATCH 03/52] LOCAL: arm64: fix Kodi sysinfo CPU information
This allows the CPU information to show in the Kodi sysinfo screen, e.g.

View File

@ -1,7 +1,7 @@
From bd0e5a715d103bb88d73ae280655a849f7762ecc Mon Sep 17 00:00:00 2001
From 5f037501721e9a3be26d3ee1ae703967c40d5cea Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:23 +0100
Subject: [PATCH 04/69] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
Subject: [PATCH 04/52] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
The Amlogic Meson GX SoCs uses a non-standard argument to the
PSCI CPU_SUSPEND call to enter system suspend.

View File

@ -1,7 +1,7 @@
From 2e207659c996f765749e32d3ff932ab673965b42 Mon Sep 17 00:00:00 2001
From 50299761b13374df2c3b9c48fb1658b80787cb56 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:25 +0100
Subject: [PATCH 05/69] LOCAL: arm64: dts: meson: add support for GX PM and
Subject: [PATCH 05/52] LOCAL: arm64: dts: meson: add support for GX PM and
Virtual RTC
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

View File

@ -1,7 +1,7 @@
From 4c9bfede767b2c1e1ff43eda7fbb2b9b7d938761 Mon Sep 17 00:00:00 2001
From c7a09826dd87ac6276723b795d07b1d7b3402003 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 21 Jan 2021 01:35:36 +0000
Subject: [PATCH 06/69] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Subject: [PATCH 06/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Khadas VIM
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

View File

@ -1,7 +1,7 @@
From 36f210099326720a267df7108ef0ea7fb9ae88a7 Mon Sep 17 00:00:00 2001
From 650ba8c1646070e57055820228e28869f298f043 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 6 Nov 2021 13:01:08 +0000
Subject: [PATCH 07/69] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Subject: [PATCH 07/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
Khadas VIM2
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

View File

@ -1,7 +1,7 @@
From 2ca029008c662f81a80a7e694229d1950efe0d9a Mon Sep 17 00:00:00 2001
From 1dd902597bf4f23cb22ca21592d7dd5bbc055c3d Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 1 Feb 2021 19:27:40 +0000
Subject: [PATCH 08/69] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
Subject: [PATCH 08/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
NEO U9-H
Add node aliases to prevent meson-vrtc from claiming /dev/rtc0

View File

@ -1,7 +1,7 @@
From 465c8694439773f00bc9088e41354e6d348366ab Mon Sep 17 00:00:00 2001
From 57075cf3c64b7d8a5466a86acd2275ededdbb382 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Sun, 17 Apr 2022 04:37:48 +0000
Subject: [PATCH 09/69] LOCAL: ASoC: meson: assign internal PCM
Subject: [PATCH 09/52] LOCAL: ASoC: meson: assign internal PCM
chmap/ELD/IEC958 kctls to device 0
On SoC sound devices utilizing codec2codec DAI links with an HDMI codec the kctls

View File

@ -1,7 +1,7 @@
From 1bdbf76d2a7e0c715469d3bc67f71f8c41c323f1 Mon Sep 17 00:00:00 2001
From 9bc892b8d6af3441bbc7129818b370555830afff Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 5 Jan 2023 15:16:46 +0000
Subject: [PATCH 10/69] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware
Subject: [PATCH 10/52] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware
decoding
The MPEG1/2 decoder is broken and nobody has volunteered to poke

View File

@ -1,7 +1,7 @@
From e72bd54794e45ae480928111c53b03f178d81998 Mon Sep 17 00:00:00 2001
From b8bcc5874a5db72ac67f2db4f23b4c467d41f809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Sun, 20 Feb 2022 08:23:12 +0000
Subject: [PATCH 30/69] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
Subject: [PATCH 11/52] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
Micro Electronics
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8

View File

@ -1,7 +1,7 @@
From 1dd793f369319025118ca526d0fc899cc78eaeae Mon Sep 17 00:00:00 2001
From ec4c674f72dc4f18f83ed75c8d2ed973792c2572 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 20 Feb 2022 08:24:47 +0000
Subject: [PATCH 31/69] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro
Subject: [PATCH 12/52] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro
Electronics TM1628
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8

View File

@ -1,7 +1,7 @@
From 77408aa188572b17c585b3f8a2074e2dad8ad2ed Mon Sep 17 00:00:00 2001
From 3351eebeeffaa70b7738b78494156ceae8217993 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 20 Feb 2022 08:26:27 +0000
Subject: [PATCH 32/69] FROMLIST(v5): docs: ABI: document tm1628 attribute
Subject: [PATCH 13/52] FROMLIST(v5): docs: ABI: document tm1628 attribute
display-text
Document the attribute for reading / writing the text to be displayed on

View File

@ -1,7 +1,7 @@
From 41fa0e4796e981b1874233c36af38583a2f9d07d Mon Sep 17 00:00:00 2001
From 7dacf519d956d0b5892fd539891fc0f92111b95a Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:51:20 +0000
Subject: [PATCH 33/69] FROMLIST(v5): auxdisplay: add support for Titanmec
Subject: [PATCH 14/52] FROMLIST(v5): auxdisplay: add support for Titanmec
TM1628 7 segment display controller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8

View File

@ -1,7 +1,7 @@
From c248e93fb876f2131e823757aacb6770a4bb9a57 Mon Sep 17 00:00:00 2001
From 626fb337c8e9ff57ef8e27c9328a79848ab49f5e Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:52:34 +0000
Subject: [PATCH 34/69] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add
Subject: [PATCH 15/52] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add
support for the 7 segment display
This patch adds support for the 7 segment display of the device.

View File

@ -1,7 +1,7 @@
From 4b711a4fa9907a0b0c786619833015bad8940568 Mon Sep 17 00:00:00 2001
From c6b2c72494d81b6d552529d3931ce082985d44f1 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:53:32 +0000
Subject: [PATCH 35/69] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
Subject: [PATCH 16/52] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
auxdisplay driver
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

View File

@ -1,7 +1,7 @@
From 6949c51b8190a3ec6c82b0362ce45b9a87acf7b5 Mon Sep 17 00:00:00 2001
From 391b15bb569f5bc0b41ef31de5b9dd51e9a5ccf9 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 23 Dec 2018 02:24:38 +0100
Subject: [PATCH 36/69] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
Subject: [PATCH 17/52] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
allocation list
Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx().

View File

@ -1,7 +1,7 @@
From 94cbc52d4336ac9d9db13db90f0f2c7264368c81 Mon Sep 17 00:00:00 2001
From f31321b94656600652e7214785d80dd67607e9ef Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Mon, 22 Nov 2021 09:15:21 +0000
Subject: [PATCH 37/69] FROMLIST(v1): media: meson: vdec: esparser: check
Subject: [PATCH 18/52] FROMLIST(v1): media: meson: vdec: esparser: check
parsing state with hardware write pointer
Also check the hardware write pointer to check if ES Parser has stalled.

View File

@ -1,7 +1,7 @@
From 24058bc29c31131aed9f446b8d207f30e08c77be Mon Sep 17 00:00:00 2001
From ccfb2ced6c3bda64c6f41bd9c7837c0ca8c9ead7 Mon Sep 17 00:00:00 2001
From: Benjamin Roszak <benjamin545@gmail.com>
Date: Mon, 23 Jan 2023 10:56:46 +0000
Subject: [PATCH 38/69] FROMLIST(v2): media: meson: vdec: implement 10bit
Subject: [PATCH 19/52] FROMLIST(v2): media: meson: vdec: implement 10bit
bitstream handling
In order to support 10bit bitstream decoding, buffers and MMU

View File

@ -1,7 +1,7 @@
From 024027c2878c87f5ee0963439fae1c24164bc382 Mon Sep 17 00:00:00 2001
From 818b4f3161d46d9a2c440b8ba8021657b8121317 Mon Sep 17 00:00:00 2001
From: Maxime Jourdan <mjourdan@baylibre.com>
Date: Mon, 23 Jan 2023 11:07:04 +0000
Subject: [PATCH 39/69] FROMLIST(v2): media: meson: vdec: add HEVC decode codec
Subject: [PATCH 20/52] FROMLIST(v2): media: meson: vdec: add HEVC decode codec
Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using
the common "HEVC" decoder driver.

View File

@ -1,7 +1,7 @@
From 4663bf7102e82064d156a9a12e24139f516098c3 Mon Sep 17 00:00:00 2001
From 58bf6f6e59c22a472265a17a2420800c3136482b Mon Sep 17 00:00:00 2001
From: Anand Moon <linux.amoon@gmail.com>
Date: Wed, 22 Nov 2023 23:53:46 +0530
Subject: [PATCH 40/69] FROMLIST(v4): dt-bindings: usb: Add the binding example
Subject: [PATCH 21/52] FROMLIST(v4): dt-bindings: usb: Add the binding example
for the Genesys Logic GL3523 hub
Add the binding example for the USB3.1 Genesys Logic GL3523

View File

@ -1,7 +1,7 @@
From bfd238dd418d92920dc5d14c97bb6743a23fe187 Mon Sep 17 00:00:00 2001
From a8fd419e5ae7d4232d09caa73918192273dc74e0 Mon Sep 17 00:00:00 2001
From: Anand Moon <linux.amoon@gmail.com>
Date: Tue, 10 Oct 2023 08:54:43 +0530
Subject: [PATCH 41/69] FROMLIST(v4): arm64: dts: amlogic: Used onboard usb hub
Subject: [PATCH 22/52] FROMLIST(v4): arm64: dts: amlogic: Used onboard usb hub
reset on odroid n2
On Odroid n2/n2+ previously use gpio-hog to reset the usb hub,

View File

@ -1,7 +1,7 @@
From fb42c49d5c13762278e961748f99a135b16aa54e Mon Sep 17 00:00:00 2001
From 5ef1c858e834704d5ae23775d7e859f37a0ccdd4 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 30 Jan 2023 05:09:18 +0000
Subject: [PATCH 42/69] FROMLIST(v1): arm64: dts: meson: radxa-zero2: add
Subject: [PATCH 23/52] FROMLIST(v1): arm64: dts: meson: radxa-zero2: add
pwm-fan support
The A311D on Zero2 needs active cooling and the board includes a header to

View File

@ -1,7 +1,7 @@
From f88d7a934300717d0098341c27a069d263680f09 Mon Sep 17 00:00:00 2001
From b283f7314af96a207cbaaaf7cfb8baef6f5503d2 Mon Sep 17 00:00:00 2001
From: Haoran Liu <liuhaoran14@163.com>
Date: Wed, 29 Nov 2023 03:34:05 -0800
Subject: [PATCH 43/69] FROMLIST(v2): meson_plane: Add error handling
Subject: [PATCH 24/52] FROMLIST(v2): meson_plane: Add error handling
This patch adds robust error handling to the meson_plane_create
function in drivers/gpu/drm/meson/meson_plane.c. The function

View File

@ -1,7 +1,7 @@
From 0ada604eb1aee519e7014605061c20ef7763763c Mon Sep 17 00:00:00 2001
From 8a126faad7a89013f08e1988f046213c99af1a71 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 23 Mar 2024 20:04:49 +0100
Subject: [PATCH 44/69] FROMLIST(v1): iio: adc: meson: fix voltage reference
Subject: [PATCH 25/52] FROMLIST(v1): iio: adc: meson: fix voltage reference
selection field name typo
The field should be called "vref_voltage", without a typo in the word

View File

@ -1,7 +1,7 @@
From 590a7fda90807fbf9c58d644145426960a610fcc Mon Sep 17 00:00:00 2001
From 085649b4fb305f5280394b906ab8b9286fc7ebad Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 23 Mar 2024 20:30:02 +0100
Subject: [PATCH 45/69] FROMLIST(v1): iio: adc: consistently use bool and enum
Subject: [PATCH 26/52] FROMLIST(v1): iio: adc: consistently use bool and enum
in struct meson_sar_adc_param
Consistently use bool for any register bit that enables/disables

View File

@ -1,7 +1,7 @@
From 37255e6d2fa6341a76518a632ee556813539973f Mon Sep 17 00:00:00 2001
From 24720fcff9462db2603d6ccf1b67671676b50e52 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 23 Mar 2024 20:35:58 +0100
Subject: [PATCH 46/69] FROMLIST(v1): iio: adc: meson: simplify
Subject: [PATCH 27/52] FROMLIST(v1): iio: adc: meson: simplify
MESON_SAR_ADC_REG11 register access
Simply check the max_register value to decide whether

View File

@ -1,7 +1,7 @@
From 6e79b2f5914f98242351d29897c391c8778c2172 Mon Sep 17 00:00:00 2001
From c32f8f643e24d1e478cdd5056957e7e9e3b85077 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Mon, 29 Apr 2024 13:48:48 +0200
Subject: [PATCH 47/69] FROMLIST(v1): ASoC: meson: Constify static
Subject: [PATCH 28/52] FROMLIST(v1): ASoC: meson: Constify static
snd_pcm_hardware
Static 'struct snd_pcm_hardware' is not modified by the driver and its

View File

@ -1,7 +1,7 @@
From 6299ce68ab47b2c371cc707402bd1ea6f59e752d Mon Sep 17 00:00:00 2001
From 10f4ba40b8ac1125f3216427fad0d4ea82f03b6b Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Tue, 30 Apr 2024 16:02:20 +0200
Subject: [PATCH 48/69] FROMLIST(v1): ASoC: meson: Use
Subject: [PATCH 29/52] FROMLIST(v1): ASoC: meson: Use
snd_soc_substream_to_rtd() for accessing private_data
Do not open-code snd_soc_substream_to_rtd().

View File

@ -1,7 +1,7 @@
From 9bfbedf208542f00d5fcd39d7bee1601c655601b Mon Sep 17 00:00:00 2001
From 3c20e23dc64f192cfb74a546244b2a5804865231 Mon Sep 17 00:00:00 2001
From: Da Xue <da@libre.computer>
Date: Fri, 24 May 2024 15:17:37 +0000
Subject: [PATCH 49/69] FROMLIST(v1): net: mdio: meson-gxl set 28th bit in
Subject: [PATCH 30/52] FROMLIST(v1): net: mdio: meson-gxl set 28th bit in
eth_reg2
This bit is necessary to enable packets on the interface. Without this

View File

@ -1,7 +1,8 @@
From 37c40fe68da65de963064481ce98e1fb08ed9d06 Mon Sep 17 00:00:00 2001
From 019ce1acd2112465aafcd59be1c44b70aac58023 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 1 Jan 2024 07:48:39 +0000
Subject: [PATCH 62/69] WIP: soc: amlogic: meson-gx-socinfo: Add S905L ID
Subject: [PATCH 31/52] FROMLIST(v1): soc: amlogic: meson-gx-socinfo: Add S905L
ID
Add the S905L SoC ID observed in several P271 boards:

View File

@ -1,11 +1,11 @@
From da8832786aa94197e7bcf420aa78c5283b055dad Mon Sep 17 00:00:00 2001
From fbf4a552ce3e4cc22dd2a6efbf7f92133b8f2564 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 1 Jun 2024 15:46:42 +0000
Subject: [PATCH 65/69] WIP: dt-bindings: media: amlogic,gx-vdec: add the GXLX
SoC family
Subject: [PATCH 32/52] FROMLIST(v1): dt-bindings: media: amlogic,gx-vdec: add
the GXLX SoC family and update GXL
The GXLX SoC is a GXL variant that omits VP9 codec support. While we are here, add
S905W and S905Y as GXL chips and sort the GXL comment.
The GXLX SoC is a GXL variant that omits VP9 codec support. Also add S905W
and S905Y as GXL chips and sort the GXL comment.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---

View File

@ -1,16 +1,16 @@
From 1b994ed915398729aa50c709628176f928b2f0dc Mon Sep 17 00:00:00 2001
From 2ab0518984ce62d4492448fb574b88c9ffa8f3e7 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 1 Jun 2024 15:51:07 +0000
Subject: [PATCH 66/69] WIP: media: meson: vdec: add GXLX SoC platform
Subject: [PATCH 33/52] FROMLIST(v1): media: meson: vdec: add GXLX SoC platform
The GXLX SoC is a GXL variant that omits VP9 codec support.
Add the GXLX SoC platform which is based on GXL but omits the VP9 codec.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
drivers/staging/media/meson/vdec/vdec.c | 2 ++
.../staging/media/meson/vdec/vdec_platform.c | 34 +++++++++++++++++++
.../staging/media/meson/vdec/vdec_platform.h | 2 ++
3 files changed, 38 insertions(+)
drivers/staging/media/meson/vdec/vdec.c | 2 +
.../staging/media/meson/vdec/vdec_platform.c | 44 +++++++++++++++++++
.../staging/media/meson/vdec/vdec_platform.h | 2 +
3 files changed, 48 insertions(+)
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c
index de3e0345ab7c..5e5b296f93ba 100644
@ -26,27 +26,15 @@ index de3e0345ab7c..5e5b296f93ba 100644
.data = &vdec_platform_g12a },
{ .compatible = "amlogic,sm1-vdec",
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
index 083adf0d07d9..870e61dedd81 100644
index 083adf0d07d9..ca0cb417d793 100644
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
@@ -82,6 +82,34 @@ static const struct amvdec_format vdec_formats_gxl[] = {
@@ -82,6 +82,44 @@ static const struct amvdec_format vdec_formats_gxl[] = {
},
};
+static const struct amvdec_format vdec_formats_gxlx[] = {
+ {
+ .pixfmt = V4L2_PIX_FMT_HEVC,
+ .min_buffers = 4,
+ .max_buffers = 24,
+ .max_width = 3840,
+ .max_height = 2160,
+ .vdec_ops = &vdec_hevc_ops,
+ .codec_ops = &codec_hevc_ops,
+ .firmware_path = "meson/vdec/gxl_hevc.bin",
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
+ }, {
+ .pixfmt = V4L2_PIX_FMT_H264,
+ .min_buffers = 2,
+ .max_buffers = 24,
@ -58,13 +46,35 @@ index 083adf0d07d9..870e61dedd81 100644
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
+ }, {
+ .pixfmt = V4L2_PIX_FMT_MPEG1,
+ .min_buffers = 8,
+ .max_buffers = 8,
+ .max_width = 1920,
+ .max_height = 1080,
+ .vdec_ops = &vdec_1_ops,
+ .codec_ops = &codec_mpeg12_ops,
+ .firmware_path = "meson/vdec/gxl_mpeg12.bin",
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ }, {
+ .pixfmt = V4L2_PIX_FMT_MPEG2,
+ .min_buffers = 8,
+ .max_buffers = 8,
+ .max_width = 1920,
+ .max_height = 1080,
+ .vdec_ops = &vdec_1_ops,
+ .codec_ops = &codec_mpeg12_ops,
+ .firmware_path = "meson/vdec/gxl_mpeg12.bin",
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ },
+};
+
static const struct amvdec_format vdec_formats_gxm[] = {
{
.pixfmt = V4L2_PIX_FMT_VP9,
@@ -190,6 +218,12 @@ const struct vdec_platform vdec_platform_gxl = {
@@ -190,6 +228,12 @@ const struct vdec_platform vdec_platform_gxl = {
.revision = VDEC_REVISION_GXL,
};

View File

@ -1,13 +1,14 @@
From 357f7ec77196b67ef2c467b96b73e3267c9f2b39 Mon Sep 17 00:00:00 2001
From 940583242da6c14e1906abbc76cff986ed32e2a3 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 23 Mar 2024 20:38:59 +0100
Subject: [PATCH 63/69] WIP: dt-bindings: iio: adc: amlogic,meson-saradc: add
GXLX SoC compatible
Subject: [PATCH 34/52] FROMLIST(v1): dt-bindings: iio: adc:
amlogic,meson-saradc: add GXLX SoC compatible
Add a compatible string for the GXLX SoC. GXLX is very similar to GXL but has three
Add support for the GXLX SoC. GXLX is very similar to GXL but has three
additional bits in MESON_SAR_ADC_REG12 for the three MPLL clocks.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
.../devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml | 1 +
1 file changed, 1 insertion(+)

View File

@ -1,14 +1,16 @@
From e807a7ea1ca1eefcb39eafc9d4bfe88226fd93e6 Mon Sep 17 00:00:00 2001
From d284f5b692c07f5527129eefa708c1e47d38e3a0 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sat, 23 Mar 2024 20:44:41 +0100
Subject: [PATCH 64/69] WIP: iio: adc: meson: add support for the GXLX SoC
Subject: [PATCH 35/52] FROMLIST(v1): iio: adc: meson: add support for the GXLX
SoC
The SARADC IP on GXLX is identical to the one found on GXL SoCs: except GXLX requires
poking the first three bits in the MESON_SAR_ADC_REG12 register to get the three MPLL
clocks (used as clock generators for the audio frequencies) to work. Register values
are taken from the vendor kernel.
The SARADC IP on GXLX is identical to the one found on GXL SoCs: except
GXLX requires poking the first three bits in the MESON_SAR_ADC_REG12
register to get the three MPLL clocks (used as clock generators for the
audio frequencies) to work. Register bits are from the vendor kernel.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
drivers/iio/adc/meson_saradc.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)

View File

@ -1,12 +1,13 @@
From 07f53466522aa22a385caaa7893dc247441d863a Mon Sep 17 00:00:00 2001
From 3fe02d7f4044de21d61f70db4bef7f2f34bfaba6 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 1 Jan 2024 07:13:19 +0000
Subject: [PATCH 61/69] WIP: dt-bindings: arm: amlogic: add GXLX/S905L/p271
reference board
Subject: [PATCH 36/52] FROMLIST(v1): dt-bindings: arm: amlogic: add
GXLX/S905L/p271 reference board
Add bindings for the Amlogic GXLX based S905L SoC and P271 reference design board. The
S905L is a cost engineered design similar to the P281 (S905W) and is derived from P212
(S905X). S905L omits VP9 codec support and uses Mali 450-MP2 (not MP3).
Add support for an Amlogic GXLX based S905L SoC and P271 reference
design board. The S905L is a low-cost design similar to the P281
(S905W) and is similarly derived from P212 (S905X). However S905L
omits support for the VP9 codec and uses Mali 450-MP2 (not MP3).
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
@ -14,10 +15,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 7 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 5d52065abe72..79deb7bfe698 100644
index 949537cea6be..d2aa3a05850a 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -108,6 +108,13 @@ properties:
@@ -107,6 +107,13 @@ properties:
- const: amlogic,s905d
- const: amlogic,meson-gxl

View File

@ -1,13 +1,15 @@
From 85fd969f38153362aa6859fdd28f71367f4ee53e Mon Sep 17 00:00:00 2001
From 9beefd846bb397e116584c97d8b318e3ba7ee026 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 1 Jan 2024 07:40:15 +0000
Subject: [PATCH 67/69] WIP: arm64: dts: meson: add p271 support
Subject: [PATCH 37/52] FROMLIST(v1): arm64: dts: meson: add GXLX/S905L/p271
support
Add a device-tree for the GXLX Amlogic P271 (S905L) reference design board. This
is a low-cost design similar to P281 (S905W) and P212 (S905X) but with silicon
differences to omit VP9 and use Mali 450-MP2 (not MP3). The SoC is marked with
S905L and "2" (believed to denote MP2) resulting in some chip distributor stock
lists (and subsequent box vendor marketing) describing it as an S905L2 chip.
Add a device-tree for the GXLX Amlogic P271 (S905L) reference design
board. This is a low-cost design similar to P281 (S905W) but with
silicon differences to omit VP9 and use Mali 450-MP2 (not MP3). The
SoC is marked with S905L and "2" (believed to denote MP2) resulting
in chip distributor stock lists and Android STB marketing sometimes
describing it as an S905L2 chip.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
@ -17,10 +19,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index ccfac417ca10..d106a18c39a8 100644
index 1ab160bf928a..b046aaf76aeb 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -67,6 +67,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

View File

@ -1,8 +1,8 @@
From c63dc0d2975b01f94848480801d32ca9501bae32 Mon Sep 17 00:00:00 2001
From 49884838fc7caee92816149390d2cda95a5a1bf0 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 5 Apr 2021 13:48:34 +0000
Subject: [PATCH 51/69] WIP: dt-bindings: arm: amlogic: add support for
Dreambox One/Two
Subject: [PATCH 38/52] FROMLIST(v1): dt-bindings: arm: amlogic: add support
for Dreambox One/Two
The Dreambox One and Dreambox Two are DVBS/T2 receiver boxes based
on the Amlogic W400 reference board with an S922X chip.
@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 949537cea6be..0cb0721d83e3 100644
index d2aa3a05850a..d3fb1f0a159f 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -168,6 +168,8 @@ properties:
@@ -175,6 +175,8 @@ properties:
- azw,gtking
- azw,gtking-pro
- bananapi,bpi-m2s

View File

@ -1,8 +1,8 @@
From 1dc7d697233d1832d222e6e72afe2dcbc9ef19c9 Mon Sep 17 00:00:00 2001
From 1b9ab39300c9f76a273d37b6d664472be99be939 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 5 Apr 2021 13:51:20 +0000
Subject: [PATCH 52/69] WIP: arm64: dts: meson: add initial device-trees for
Dreambox One/Two
Subject: [PATCH 39/52] FROMLIST(v1): arm64: dts: meson: add initial
device-trees for Dreambox One/Two
Dreambox One and Dreambox Two are based on the Amlogic W400 reference
board with an S922X chip and the following specs:
@ -40,7 +40,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 1ab160bf928a..3b2e11a82df2 100644
index b046aaf76aeb..d4ad5b20610a 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -17,6 +17,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb

View File

@ -1,7 +1,8 @@
From 8be562d97c6499157ef7940362abeb62c42b8b51 Mon Sep 17 00:00:00 2001
From e18690779cce33887f27cfd97f8e8fc8351db02b Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 19 Jan 2022 02:40:20 +0000
Subject: [PATCH 59/69] WIP: dt-bindings: arm: amlogic: add OSMC Vero 4K
Subject: [PATCH 40/52] FROMLIST(v1): dt-bindings: arm: amlogic: add OSMC Vero
4K
Add support for the OSMC Vero 4K
@ -11,7 +12,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index 0cb0721d83e3..5d52065abe72 100644
index d3fb1f0a159f..79deb7bfe698 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -91,6 +91,7 @@ properties:

View File

@ -1,7 +1,8 @@
From f370eaf064a3dd1620d9e47edd6738eff74531fa Mon Sep 17 00:00:00 2001
From 6ee61e29f4863e930a49b5522438ce0e086f0902 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 19 Jan 2022 04:06:17 +0000
Subject: [PATCH 60/69] WIP: arm64: dts: meson: add support for OSMC Vero 4K
Subject: [PATCH 41/52] FROMLIST(v1): arm64: dts: meson: add support for OSMC
Vero 4K
The OSMC Vero 4K device is based on the Amlogic S905X (P212) reference
design with the following specifications:
@ -28,7 +29,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 3b2e11a82df2..ccfac417ca10 100644
index d4ad5b20610a..d106a18c39a8 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -51,6 +51,13 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

View File

@ -0,0 +1,68 @@
From a2eec503dc2236727808124d2d517b0ee86aa070 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 4 Jun 2024 10:49:58 +0000
Subject: [PATCH 42/52] WIP: media: meson: vdec: add HEVC and remove MPEG1/2
from GXLX
This patch is required until GXLX support has been merged upstream.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
.../staging/media/meson/vdec/vdec_platform.c | 34 +++++++------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c
index ca0cb417d793..870e61dedd81 100644
--- a/drivers/staging/media/meson/vdec/vdec_platform.c
+++ b/drivers/staging/media/meson/vdec/vdec_platform.c
@@ -84,6 +84,18 @@ static const struct amvdec_format vdec_formats_gxl[] = {
static const struct amvdec_format vdec_formats_gxlx[] = {
{
+ .pixfmt = V4L2_PIX_FMT_HEVC,
+ .min_buffers = 4,
+ .max_buffers = 24,
+ .max_width = 3840,
+ .max_height = 2160,
+ .vdec_ops = &vdec_hevc_ops,
+ .codec_ops = &codec_hevc_ops,
+ .firmware_path = "meson/vdec/gxl_hevc.bin",
+ .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
+ .flags = V4L2_FMT_FLAG_COMPRESSED |
+ V4L2_FMT_FLAG_DYN_RESOLUTION,
+ }, {
.pixfmt = V4L2_PIX_FMT_H264,
.min_buffers = 2,
.max_buffers = 24,
@@ -95,28 +107,6 @@ static const struct amvdec_format vdec_formats_gxlx[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
- }, {
- .pixfmt = V4L2_PIX_FMT_MPEG1,
- .min_buffers = 8,
- .max_buffers = 8,
- .max_width = 1920,
- .max_height = 1080,
- .vdec_ops = &vdec_1_ops,
- .codec_ops = &codec_mpeg12_ops,
- .firmware_path = "meson/vdec/gxl_mpeg12.bin",
- .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
- .flags = V4L2_FMT_FLAG_COMPRESSED,
- }, {
- .pixfmt = V4L2_PIX_FMT_MPEG2,
- .min_buffers = 8,
- .max_buffers = 8,
- .max_width = 1920,
- .max_height = 1080,
- .vdec_ops = &vdec_1_ops,
- .codec_ops = &codec_mpeg12_ops,
- .firmware_path = "meson/vdec/gxl_mpeg12.bin",
- .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 },
- .flags = V4L2_FMT_FLAG_COMPRESSED,
},
};
--
2.34.1

View File

@ -1,7 +1,7 @@
From 7fc9e86945350fc1be6e6c28274e2da7b7ec01c3 Mon Sep 17 00:00:00 2001
From c4bf5b5b549f9ec2bb7efa68f2deb87839160375 Mon Sep 17 00:00:00 2001
From: Andreas Baierl <ichgeh@imkreisrum.de>
Date: Tue, 2 Apr 2024 14:22:52 +0000
Subject: [PATCH 50/69] WIP: media: meson: vdec: reintroduce wiggle room
Subject: [PATCH 43/52] WIP: media: meson: vdec: reintroduce wiggle room
Without the wiggle room, it happens that matching offsets can't be found.
This results in non-matches and afterwards in frame drops in userspace apps.

View File

@ -0,0 +1,28 @@
From 84bba1f7c639992bf7beb27a777e366eb30d635f Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 14 Mar 2023 01:13:15 +0000
Subject: [PATCH 44/52] WIP: media: meson: vdec: fix memory leak of 'new_frame'
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://lore.kernel.org/r/202303120441.YFGHDOya-lkp@intel.com/
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
drivers/staging/media/meson/vdec/codec_hevc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c
index fcaaa1ad50b8..b0d8623c3c7d 100644
--- a/drivers/staging/media/meson/vdec/codec_hevc.c
+++ b/drivers/staging/media/meson/vdec/codec_hevc.c
@@ -731,6 +731,7 @@ codec_hevc_prepare_new_frame(struct amvdec_session *sess)
vbuf = v4l2_m2m_dst_buf_remove(sess->m2m_ctx);
if (!vbuf) {
dev_err(sess->core->dev, "No dst buffer available\n");
+ kfree(new_frame);
return NULL;
}
--
2.34.1

View File

@ -1,7 +1,7 @@
From afb8fdb7130c6d2a31dba2e0a66e4db299bae4ad Mon Sep 17 00:00:00 2001
From 3ef227118302ee6ab5afac361ad6261c07deed45 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 1 Jan 2024 06:15:40 +0000
Subject: [PATCH 53/69] WIP: arm64: dts: meson: increase SD speeds on Minix Neo
Subject: [PATCH 45/52] WIP: arm64: dts: meson: increase SD speeds on Minix Neo
U9-H
Lets see what happens/breaks when all the fancy modes are added

View File

@ -1,7 +1,7 @@
From df7565c87afd20714c96fbb3f5847ff6c20bd220 Mon Sep 17 00:00:00 2001
From 6b2ef08327a276b9760926bbbc62a5739b92bb28 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 5 Jan 2024 03:07:58 +0000
Subject: [PATCH 54/69] WIP: arm64: dts: meson: fixup Minix U9-H wifi
Subject: [PATCH 46/52] WIP: arm64: dts: meson: fixup Minix U9-H wifi
I think the 'drop compatible' change conflicted so remove this too.

View File

@ -1,7 +1,7 @@
From 089ad862d61790d7fca3f372762fd53f684299c0 Mon Sep 17 00:00:00 2001
From a3aa1beabdba84dedb6214641823870d5691e6e1 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 18 Jan 2022 15:09:12 +0000
Subject: [PATCH 55/69] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
Subject: [PATCH 47/52] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
100MHz
Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but

View File

@ -1,7 +1,7 @@
From a1afe83c0d099c5fe033d7e4e74aaae5edc874bd Mon Sep 17 00:00:00 2001
From 2fee9c1ed3b4acedb96d9cd6c56de114d18e80af Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 19 Jan 2022 06:45:06 +0000
Subject: [PATCH 56/69] WIP: arm64: dts: meson: add UHS SDIO capabilities to
Subject: [PATCH 48/52] WIP: arm64: dts: meson: add UHS SDIO capabilities to
p212/p23x/q20x
Add UHS capabilities to the SDIO node to enable 100MHz speeds.

Some files were not shown because too many files have changed in this diff Show More