Merge pull request #10036 from heitbaum/ia11

[le11] inputstream.adaptive: update to githash dc604ff and addon (2)

.github/FUNDING.yml

@@ -0,0 +1 @@
+open_collective: libreelec

Makefile

@@ -1,5 +1,3 @@
-BUILD_DIRS=build.*
-
 all: release
 
 system:
@@ -15,10 +13,10 @@ noobs:
 	./scripts/image noobs
 
 clean:
-	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
+	./scripts/makefile_helper --clean
 
 distclean:
-	rm -rf ./.ccache ./$(BUILD_DIRS)
+	./scripts/makefile_helper --distclean
 
 src-pkg:
 	tar cvJf sources.tar.xz sources

README.md

@@ -8,7 +8,7 @@ Please ask questions in the [LibreELEC forum: Help & Support](https://forum.libr
 
 **Donations**
 
-Contributions towards current project funding goals can be sent via PayPal to donations@libreelec.tv
+Contributions towards current project funding goals can be made via [OpenCollective](https://opencollective.com/libreelec/donate).
 
 **License**
 

config/arch.aarch64

@@ -3,8 +3,15 @@
     TARGET_CPU=cortex-a53
   fi
 
+  # 64bit userland and neon required by armv8
+  if [ -z "${TARGET_FEATURES}" ]; then
+    TARGET_FEATURES="64bit neon"
+  else
+    TARGET_FEATURES+=" 64bit neon"
+  fi
+
 # TARGET_CPU:
-# generic cortex-a35 cortex-a53 cortex-a57 cortex-a72
+# generic cortex-a35 cortex-a53 cortex-a57 cortex-a72 cortex-a76
 # exynos-m1 qdf24xx thunderx xgene1 cortex-a57.cortex-a53
 # cortex-a72.cortex-a53
 
@@ -13,8 +20,10 @@
     generic|cortex-a35|cortex-a53|cortex-a57|cortex-a72|exynos-m1|qdf24xx|thunderx|xgene1|cortex-a57.cortex-a53|cortex-a72.cortex-a53|cortex-a73.cortex-a53)
       TARGET_SUBARCH=aarch64
       TARGET_VARIANT=armv8-a
-      TARGET_ABI=eabi
-      TARGET_FEATURES+=" neon"
+      ;;
+    cortex-a76)
+      TARGET_SUBARCH=aarch64
+      TARGET_VARIANT=armv8.2-a
       ;;
   esac
 
@@ -25,5 +34,5 @@
   TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi -mtune=$TARGET_CPU"
 # Disable runtime checking support of ARMv8.0's optional LSE feature. Breaks gdb and mesa compile.
   TARGET_CFLAGS="${TARGET_CFLAGS} -mno-outline-atomics"
-  TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
-  GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"
+  TARGET_LDFLAGS=""
+  TARGET_ARCH_GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"

config/arch.arm

@@ -3,6 +3,13 @@
     TARGET_CPU=cortex-a8
   fi
 
+  # 32bit userland
+  if [ -z "${TARGET_FEATURES}" ]; then
+    TARGET_FEATURES="32bit"
+  else
+    TARGET_FEATURES+=" 32bit"
+  fi
+
 # TARGET_CPU:
 # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
 # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
@@ -57,8 +64,12 @@
   TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
   TARGET_KERNEL_ARCH=${TARGET_KERNEL_ARCH:-arm}
 
+  if [ "${TARGET_KERNEL_ARCH}" = "arm64" ]; then
+    TARGET_KERNEL_PATCH_ARCH="aarch64"
+  fi
+
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_VARIANT -mtune=$TARGET_CPU -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"
-  TARGET_LDFLAGS="-march=$TARGET_VARIANT -mtune=$TARGET_CPU"
-  GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"
+  TARGET_LDFLAGS=""
+  TARGET_ARCH_GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"

config/arch.x86_64

@@ -1,17 +1,30 @@
 # determines TARGET_CPU, if not forced by user
-  if [ -z "$TARGET_CPU" ]; then
-    TARGET_CPU=core2
+  if [ -z "${TARGET_CPU}" ]; then
+    TARGET_CPU="x86-64"
   fi
 
 # determine architecture's family
-  TARGET_SUBARCH=x86_64
+  TARGET_SUBARCH="x86_64"
 
   TARGET_GCC_ARCH="${TARGET_SUBARCH/-/}"
-  TARGET_KERNEL_ARCH=x86
+  TARGET_KERNEL_ARCH="x86"
 
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_CPU -m64 -mmmx -msse -msse2 -mfpmath=sse"
-  TARGET_LDFLAGS="-march=$TARGET_CPU -m64"
+  TARGET_CFLAGS="-march=${TARGET_CPU}"
+  TARGET_LDFLAGS=""
 
-# build with SIMD support ( yes / no )
-  TARGET_FEATURES+=" mmx sse sse2"
+# build with microarchitecture feature support defined by the TARGET_CPU value
+# see https://gitlab.com/x86-psABIs/x86-64-ABI/-/wikis/home for further details
+  TARGET_FEATURES="64bit cmov cx8 fpu fxsr mmx osfxsr sce sse sse2"
+  TARGET_FEATURES_X86_64_V2="cmpxchg16b lahf-sahf popcnt sse3 sse4_1 sse4_2 ssse3"
+  TARGET_FEATURES_X86_64_V3="avx avx2 bmi1 bmi2 f16c fma lzcnt movbe osxsave"
+  if [ "${TARGET_CPU}" = "x86-64" ]; then
+    TARGET_FEATURES+=" no_sahf"
+  elif [ "${TARGET_CPU}" = "x86-64-v2" ]; then
+    TARGET_FEATURES+=" ${TARGET_FEATURES_X86_64_V2}"
+  elif [ "${TARGET_CPU}" = "x86-64-v3" ]; then
+    TARGET_FEATURES+=" ${TARGET_FEATURES_X86_64_V2} ${TARGET_FEATURES_X86_64_V3}"
+  else
+    TARGET_FEATURES+=" UNKNOWN_ADDITIONAL_CPU_SPECIFIC_FEATURES"
+  fi
+  TARGET_FEATURES="$(echo ${TARGET_FEATURES} | xargs -n1 | sort -u | xargs)"

config/functions

@@ -150,6 +150,33 @@ build_msg() {
   fi
 }
 
+print_qa_checks() {
+  if [ -n "${PKG_NAME}" ]; then
+    if [ -d "${PKG_QA_CHECKS}" ]; then
+      for qa_check in ${PKG_QA_CHECKS}/*; do
+        print_color CLR_WARNING "[QA CHECK] [${PKG_NAME}] [$(basename ${qa_check})]:\n$(cat ${qa_check})\n\n"
+      done
+    fi
+  fi
+}
+
+log_qa_check() {
+  local qa_check_title="${1}"
+  local qa_check_message="${2}"
+
+  if [ -n "${qa_check_title}" -a -n "${qa_check_message}" ]; then
+    if [ -n "${PKG_NAME}" ]; then
+      print_color CLR_WARNING "[QA CHECK] [${PKG_NAME}] [${qa_check_title}]:\n${qa_check_message}\n"
+      mkdir -p "${PKG_QA_CHECKS}"
+      echo -e "${qa_check_message}" >> ${PKG_QA_CHECKS}/${qa_check_title}
+    else
+      print_color CLR_WARNING "[QA CHECK] [general] [${qa_check_title}]:\n${qa_check_message}\n"
+      mkdir -p "${BUILD}/qa_checks/general"
+      echo -e "${qa_check_message}" >> ${BUILD}/qa_checks/general/${qa_check_title}
+    fi
+  fi
+}
+
 # prints a warning if the file slated for removal doesn't exist
 # this allows us to continue instead of bailing out with just "rm"
 safe_remove() {
@@ -158,10 +185,8 @@ safe_remove() {
   for path in "$@" ; do
     if [ -e "${path}" -o -L "${path}" ]; then
       rm -r "${path}"
-    elif [ -n "${PKG_NAME}" ]; then
-      print_color CLR_WARNING "safe_remove: path does not exist: [${PKG_NAME}]: ${path}\n"
     else
-      print_color CLR_WARNING "safe_remove: path does not exist: ${path}\n"
+     log_qa_check "safe_remove" "path does not exist: ${path}"
     fi
   done
 }
@@ -214,8 +239,11 @@ check_toolchain_config() {
   if [ "${toolchain}" == "AUTOTOOLS" ]; then
     toolchain="CONFIGURE"
   fi
+  if [ "${toolchain}" == "CMAKE-MAKE" ]; then
+    toolchain="CMAKE"
+  fi
   for var in "${!PKG_@}"; do
-    if [[ "${var}" =~ INSTALL_OPTS_ || "${var}" =~ _MAKE_OPTS ]]; then
+    if [[ "${var}" =~ INSTALL_OPTS_ || "${var}" =~ _MAKE_OPTS || "${var}" =~ _TAR_COPY_OPTS ]]; then
       continue
     fi
     if [[ "${var}" =~ _OPTS_${target}$ \
@@ -226,8 +254,50 @@ check_toolchain_config() {
   done
 }
 
+# args: linker, default availability yes/no
+linker_allowed() {
+  if flag_enabled "$1" "$2"; then
+    # bfd is always available, others need to be enabled with <LINKER>_SUPPORT="yes"
+    local linker_support="${1^^}_SUPPORT"
+    if [ "$1" = "bfd" ] || [ "${!linker_support}" = "yes" ]; then
+      return 0
+    fi
+  fi
+  return 1
+}
+
+# return target linker to use for a package
+get_target_linker() {
+  # all known linkers, in descending order of priority
+  # those are candidates for explicit opt-in via PKG_BUILD_FLAGS
+  local all_linkers="mold gold bfd"
+
+  # linkers to choose from unless disabled via PKG_BUILD_FLAGS
+  local linker_candidates="${DEFAULT_LINKER:-bfd} ${all_linkers}"
+
+  local linker
+
+  # check if package prefers a specific linker
+  for linker in ${all_linkers}; do
+    if linker_allowed "${linker}" "no"; then
+      echo "${linker}"
+      return
+    fi
+  done
+
+  # select linker which isn't disabled by PKG_BUILD_FLAGS
+  for linker in ${linker_candidates}; do
+    if linker_allowed "${linker}" "yes"; then
+      echo "${linker}"
+      return
+    fi
+  done
+
+  # none of our linkers matched, use the compiler's default linker
+  echo "compiler_default"
+}
+
 setup_toolchain() {
-  local have_gold="no"
   if [ "$LTO_SUPPORT" = "yes" ]; then
     if flag_enabled "lto-parallel" "no"; then
       TARGET_CFLAGS+=" $FLAGS_OPTIM_LTO_PARALLEL $FLAGS_OPTIM_LTO_NO_FAT"
@@ -250,15 +320,14 @@ setup_toolchain() {
     TARGET_LDFLAGS+=" $FLAGS_OPTIM_LTO_OFF"
   fi
 
-  # gold flag
-  if flag_enabled "gold" "$GOLD_SUPPORT" "only-disable"; then
-    TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_GOLD"
-    have_gold="yes"
-  fi
+  local linker="$(get_target_linker)"
+  local linker_opts="LDFLAGS_OPTIM_LINKER_${linker^^}"
+
+  TARGET_LDFLAGS+=" ${!linker_opts}"
 
   # compiler optimization, descending priority: speed, size, default
   if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
-    if [ "${SPLIT_DEBUG_INFO}" = "yes" -a "${have_gold}" = "yes" ]; then
+    if [ "${SPLIT_DEBUG_INFO}" = "yes" -a "${linker}" = "gold" ]; then
       TARGET_CFLAGS+=" $CFLAGS_OPTIM_DEBUG_SPLIT"
       TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_DEBUG_SPLIT"
       TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_DEBUG_SPLIT"
@@ -388,6 +457,9 @@ setup_toolchain() {
         echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
         echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_CPP_COMPILER $CPP)" >> $CMAKE_CONF
+        echo "SET(CMAKE_ASM_FLAGS_MINSIZEREL -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_CXX_FLAGS_MINSIZEREL -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_C_FLAGS_MINSIZEREL -DDUMMYOPT)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH  $SYSROOT_PREFIX)"   >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)"  >> $CMAKE_CONF
@@ -410,12 +482,28 @@ setup_toolchain() {
       export _python_sysroot="$SYSROOT_PREFIX"
       export _python_prefix=/usr
       export _python_exec_prefix=/usr
+
+      # rust
+      export CARGO_TARGET_DIR="${PKG_BUILD}/.${TARGET_NAME}/target"
+      export CARGO_HOME="$(get_build_dir rust)/cargo_home"
+      export RUST_TARGET_PATH="${TOOLCHAIN}/lib/rustlib/"
+
       ;;
     host:*|bootstrap:*)
       export DESTIMAGE="host"
       export AWK="gawk"
-      export CC="$TOOLCHAIN/bin/host-gcc"
-      export CXX="$TOOLCHAIN/bin/host-g++"
+      if [ "$1" = "host" ] && flag_enabled "local-cc" "no"; then
+        export CC="${LOCAL_CC}"
+        export CXX="${LOCAL_CXX}"
+        if [ -n "${LOCAL_CCACHE}" ]; then
+          export CCACHE_DIR="${LOCAL_CCACHE_DIR}"
+          export CC="${LOCAL_CCACHE} ${CC}";
+          export CXX="${LOCAL_CCACHE} ${CXX}";
+        fi
+      else
+        export CC="$TOOLCHAIN/bin/host-gcc"
+        export CXX="$TOOLCHAIN/bin/host-g++"
+      fi
       export CPP="cpp"
       export LD="ld"
       export AS="as"
@@ -440,6 +528,9 @@ setup_toolchain() {
         echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
         echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF
+        echo "SET(CMAKE_ASM_FLAGS_RELEASE -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_CXX_FLAGS_RELEASE -DDUMMYOPT)" >> $CMAKE_CONF
+        echo "SET(CMAKE_C_FLAGS_RELEASE -DDUMMYOPT)" >> $CMAKE_CONF
         echo "SET(CMAKE_AR $AR CACHE FILEPATH "Archiver")" >> $CMAKE_CONF # hum?
         echo "SET(CMAKE_FIND_ROOT_PATH  $TOOLCHAIN)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF
@@ -458,6 +549,23 @@ setup_toolchain() {
       export _python_sysroot="$TOOLCHAIN"
       export _python_prefix=/
       export _python_exec_prefix=/
+
+      # rust
+      case "${MACHINE_HARDWARE_NAME}" in
+        "arm")
+          RUST_HOST="arm-unknown-linux-gnueabihf"
+          ;;
+        "aarch64")
+          RUST_HOST="aarch64-unknown-linux-gnu"
+          ;;
+        "x86_64")
+          RUST_HOST="x86_64-unknown-linux-gnu"
+          ;;
+      esac
+
+      export CARGO_TARGET_DIR="${PKG_BUILD}/.${RUST_HOST}/target"
+      export CARGO_HOME="$(get_build_dir rust)/cargo_home"
+      export RUST_TARGET_PATH="${TOOLCHAIN}/lib/rustlib/"
       ;;
   esac
 }
@@ -473,21 +581,29 @@ cpp = '$CXX'
 ar = '$AR'
 strip = '$STRIP'
 pkgconfig = '$PKG_CONFIG'
-llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
+llvm-config = '$TOOLCHAIN/bin/llvm-config'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
+[build_machine]
+system = 'linux'
+cpu_family = '${MACHINE_HARDWARE_NAME}'
+cpu = '${MACHINE_HARDWARE_NAME}'
+endian = 'little'
+
 [host_machine]
 system = 'linux'
-cpu_family = '$TARGET_ARCH'
-cpu = '$TARGET_SUBARCH'
+cpu_family = '${MACHINE_HARDWARE_NAME}'
+cpu = '${MACHINE_HARDWARE_NAME}'
 endian = 'little'
 
-[properties]
-root = '$TOOLCHAIN'
+[built-in options]
 $(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))")
 $(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('CXXFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
+
+[properties]
+root = '$TOOLCHAIN'
 ${!properties}
 EOF
 }
@@ -503,21 +619,30 @@ cpp = '$TARGET_CXX'
 ar = '$TARGET_AR'
 strip = '$TARGET_STRIP'
 pkgconfig = '$PKG_CONFIG'
-llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
+llvm-config = '$SYSROOT_PREFIX/usr/bin/llvm-config'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
+[build_machine]
+system = 'linux'
+cpu_family = '${MACHINE_HARDWARE_NAME}'
+cpu = '${MACHINE_HARDWARE_NAME}'
+endian = 'little'
+
 [host_machine]
 system = 'linux'
 cpu_family = '$TARGET_ARCH'
 cpu = '$TARGET_SUBARCH'
 endian = 'little'
 
-[properties]
-root = '$SYSROOT_PREFIX/usr'
+[built-in options]
 $(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('TARGET_CFLAGS').split()]))")
 $(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('TARGET_CXXFLAGS').split()]))")
 $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
+
+[properties]
+needs_exe_wrapper = true
+root = '$SYSROOT_PREFIX/usr'
 ${!properties}
 EOF
 }
@@ -619,7 +744,7 @@ build_with_debug() {
     [ "${PKG_IS_KERNEL_PKG}" = "yes" ] && listcontains "${_DEBUG_DEPENDS_LIST}" "linux\+" && return 0
 
     # Build this package with debug if it's a resolved dependency
-    listcontains "${_DEBUG_DEPENDS_LIST}" "${PKG_NAME}" && return 0
+    listcontains "${_DEBUG_DEPENDS_LIST}" "${PKG_NAME}[+]?" && return 0
   fi
 
   return 1
@@ -661,7 +786,7 @@ init_package_cache() {
     export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
 
     # overwrite existing cache files only when they are invalid, or not yet created
-    mkdir -p "$(dirname "${_CACHE_PACKAGE_GLOBAL}")"
+    mkdir -p "${_CACHE_PACKAGE_GLOBAL%/*}"
     if [ -f "${_CACHE_PACKAGE_LOCAL}" ] && cmp -s "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"; then
       rm "${temp_local}"
     else
@@ -699,11 +824,11 @@ save_build_config() {
 check_path() {
   local dashes="===========================" path_err_msg
   if [ "${PWD##/usr}" != "${PWD}" ]; then
-    path_err_msg="\n $dashes$dashes$dashes"
-    path_err_msg="${path_err_msg}\n ERROR: Detected building inside /usr"
-    path_err_msg="${path_err_msg}\n $dashes$dashes$dashes"
-    path_err_msg="${path_err_msg}\n This is not supported with our buildsystem."
-    path_err_msg="${path_err_msg}\n Please use another dir (for example your \$HOME) to build ${DISTRONAME}"
+    path_err_msg="\n ${dashes}${dashes}${dashes}"
+    path_err_msg+="\n ERROR: Detected building inside /usr"
+    path_err_msg+="\n ${dashes}${dashes}${dashes}"
+    path_err_msg+="\n This is not supported by the buildsystem."
+    path_err_msg+="\n Please use another directory (for example your \$HOME) to build ${DISTRONAME}"
 
     die "${path_err_msg}"
   fi
@@ -712,13 +837,13 @@ check_path() {
 check_distro() {
   local dashes="===========================" distro_err_msg
   if [ -z "${DISTRO}" -o ! -d "${DISTRO_DIR}/${DISTRO}" ]; then
-    distro_err_msg="\n $dashes$dashes$dashes"
-    distro_err_msg="${distro_err_msg}\n ERROR: Distro not found, use a valid distro or create a new config"
-    distro_err_msg="${distro_err_msg}\n $dashes$dashes$dashes"
-    distro_err_msg="${distro_err_msg}\n\n Valid distros:"
+    distro_err_msg="\n ${dashes}${dashes}${dashes}"
+    distro_err_msg+="\n ERROR: Distro not found, use a valid distro or create a new config"
+    distro_err_msg+="\n ${dashes}${dashes}${dashes}"
+    distro_err_msg+="\n\n Valid distros:"
 
     for distros in ${DISTRO_DIR}/*; do
-      distro_err_msg="${distro_err_msg}\n - ${distros##*/}"
+      distro_err_msg+="\n - ${distros##*/}"
     done
     die "${distro_err_msg}"
   fi
@@ -727,13 +852,13 @@ check_distro() {
 check_project() {
   local dashes="===========================" project_err_msg
   if [ -z "${PROJECT}" -o ! -d "${PROJECT_DIR}/${PROJECT}" ]; then
-    project_err_msg="\n $dashes$dashes$dashes"
-    project_err_msg="${project_err_msg}\n ERROR: Project not found, use a valid project or create a new config"
-    project_err_msg="${project_err_msg}\n $dashes$dashes$dashes"
-    project_err_msg="${project_err_msg}\n\n Valid projects:"
+    project_err_msg="\n ${dashes}${dashes}${dashes}"
+    project_err_msg+="\n ERROR: Project not found. Use a valid project or create a new config"
+    project_err_msg+="\n ${dashes}${dashes}${dashes}"
+    project_err_msg+="\n\n Valid projects:"
 
     for projects in ${PROJECT_DIR}/*; do
-      project_err_msg="${project_err_msg}\n - ${projects##*/}"
+      project_err_msg+="\n - ${projects##*/}"
     done
     die "${project_err_msg}"
   fi
@@ -743,20 +868,20 @@ check_device() {
   local dashes="===========================" device_err_msg
   if [ -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices" ]; then
     device_err_msg="\n $dashes$dashes$dashes"
-    device_err_msg="${device_err_msg}\n ERROR: You must not specify DEVICE for the $PROJECT project"
-    device_err_msg="${device_err_msg}\n $dashes$dashes$dashes"
-    device_err_msg="${device_err_msg}\n\n There are no devices for project: ${PROJECT}"
+    device_err_msg+="\n ERROR: You must not specify DEVICE for the $PROJECT project"
+    device_err_msg+="\n $dashes$dashes$dashes"
+    device_err_msg+="\n\n There are no devices for project: ${PROJECT}"
 
     die "${device_err_msg}"
   elif [ \( -z "${DEVICE}" -a -d "${PROJECT_DIR}/${PROJECT}/devices" \) -o \
          \( -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}" \) ]; then
-    device_err_msg="\n $dashes$dashes$dashes"
-    device_err_msg="${device_err_msg}\n ERROR: You need to specify a valid device for the $PROJECT project"
-    device_err_msg="${device_err_msg}\n $dashes$dashes$dashes"
-    device_err_msg="${device_err_msg}\n\n Valid devices for project: ${PROJECT}"
+    device_err_msg="\n ${dashes}${dashes}${dashes}"
+    device_err_msg+="\n ERROR: Specify a valid device for the ${PROJECT} project"
+    device_err_msg+="\n ${dashes}${dashes}${dashes}"
+    device_err_msg+="\n\n Valid devices for project: ${PROJECT}"
 
     for device in ${PROJECT_DIR}/${PROJECT}/devices/*; do
-      device_err_msg="${device_err_msg}\n - ${device##*/}"
+      device_err_msg+="\n - ${device##*/}"
     done
     die "${device_err_msg}"
   fi
@@ -770,17 +895,17 @@ check_arch() {
     linux_config_dir="${PROJECT_DIR}/${PROJECT}/linux"
   fi
 
-  if [ ! -e "$linux_config_dir/linux.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf" ] &&
-       ! ls "$linux_config_dir/"*/linux.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf &>/dev/null; then
-    arch_err_msg="\n $dashes$dashes$dashes"
-    arch_err_msg="${arch_err_msg}\n ERROR: Architecture not found, use a valid Architecture"
-    arch_err_msg="${arch_err_msg}\n for your project or create a new config"
-    arch_err_msg="${arch_err_msg}\n $dashes$dashes$dashes"
-    arch_err_msg="${arch_err_msg}\n\n Valid Architectures for your project: ${PROJECT}"
+  if [ ! -e "${linux_config_dir}/linux.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf" ] &&
+       ! ls "${linux_config_dir}/"*/linux.${TARGET_KERNEL_PATCH_ARCH:-$TARGET_ARCH}.conf &>/dev/null; then
+    arch_err_msg="\n ${dashes}${dashes}${dashes}"
+    arch_err_msg+="\n ERROR: Architecture not found. Use a valid Architecture"
+    arch_err_msg+="\n for your project or create a new config"
+    arch_err_msg+="\n ${dashes}${dashes}${dashes}"
+    arch_err_msg+="\n\n Valid Architectures for project: ${PROJECT}"
 
-    for arch in $linux_config_dir/*.conf $linux_config_dir/*/linux.$TARGET_ARCH.conf; do
+    for arch in ${linux_config_dir}/*.conf ${linux_config_dir}/*/linux.${TARGET_ARCH}.conf; do
       [[ ${arch} =~ .*\*.* ]] && continue #ignore unexpanded wildcard
-      arch_err_msg="${arch_err_msg}\n - $(basename $arch | cut -f2 -d".")"
+      arch_err_msg+="\n - $(echo ${arch##*/} | cut -f2 -d".")"
     done
     die "${arch_err_msg}"
   fi
@@ -829,6 +954,15 @@ do_autoreconf() {
     export LIBTOOL=$TOOLCHAIN/bin/libtool
   fi
 
+  # >autoconf-2.69 will call gtkdocize when used in macros
+  # when called with --install parameter.
+  # use "true" unless gtkdocsize is in the toolchain.
+  if [ -e "$TOOLCHAIN/bin/gtkdocize" ]; then
+    export GTKDOCIZE=$TOOLCHAIN/bin/gtkdocize
+  else
+    export GTKDOCIZE=true
+  fi
+
   if [ -e "$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
     mkdir -p $ACLOCAL_DIR
     if [ -e "$LIBTOOLIZE" ]; then
@@ -845,6 +979,11 @@ is_sequential_build() {
   [ "${MTWITHLOCKS}" != "yes" ] && return 0 || return 1
 }
 
+# arg1: filename (libtool) to remove hardcode rpath when --disable-rpath is not supported by configure
+libtool_remove_rpath() {
+  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${1}
+  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${1}
+}
 
 ### PACKAGE HELPERS ###
 # get variable ($2) for package ($1).
@@ -1118,7 +1257,7 @@ source_package() {
   unset_functions
 
   if [ -n "${1}" ]; then
-    [ -f "${1}" ] && PKG_DIR="$(dirname "${1}")" || PKG_DIR="$(get_pkg_directory "${1}")"
+    [ -f "${1}" ] && PKG_DIR="${1%/*}" || PKG_DIR="$(get_pkg_directory "${1}")"
 
     [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist"
 
@@ -1170,10 +1309,10 @@ source_package() {
           ${PKG_NAME}-${PKG_VERSION}.*)
             PKG_SOURCE_NAME=$PKG_SOURCE_NAME
             ;;
-          *.tar | *.tbz | *.tgz | *.txz | *.7z | *.zip)
+          *.tar | *.tbz | *.tgz | *.txz | *.tzst | *.7z | *.zip)
             PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
             ;;
-          *.tar.bz2 | *.tar.gz | *.tar.xz)
+          *.tar.bz2 | *.tar.gz | *.tar.xz | *.tar.zst )
             PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.tar.${PKG_SOURCE_NAME##*\.}
             ;;
           *.diff | *.patch | *.diff.bz2 | *.patch.bz2 | patch-*.bz2 | *.diff.gz | *.patch.gz | patch-*.gz)
@@ -1193,6 +1332,8 @@ source_package() {
     elif [[ "${1}" =~ :init$ ]]; then
       PKG_INSTALL="$BUILD/install_init/${PKG_NAME}-${PKG_VERSION}"
     fi
+
+    PKG_QA_CHECKS="${BUILD}/qa_checks/${PKG_NAME}-${PKG_VERSION}"
   fi
 
   build_with_debug && BUILD_WITH_DEBUG="yes" || BUILD_WITH_DEBUG="no"
@@ -1330,23 +1471,6 @@ get_full_firmware_dir() {
   echo "$(get_kernel_overlay_dir $1)/lib/firmware"
 }
 
-fix_module_depends() {
-  # modify .modinfo section in kernel module to depends on other required modules
-  local MODULE="$1"
-  local DEPENDS="$2"
-  local OLD_DEPENDS=""
-  cp ${MODULE} ${MODULE}_orig
-  $OBJDUMP -s -j .modinfo ${MODULE}_orig | awk 'BEGIN{v=0;} /Contents/ {v=1; next;} {if (v==1) print $0;}' >new.modinfo1
-  cat new.modinfo1 | cut -c7-41 | awk '{printf($0);}' | sed 's/ //g;s/../\\\x&/g;' >new.modinfo2
-  /bin/echo -ne `cat new.modinfo2` | tr '\000' '\n' >new.modinfo3
-  cat new.modinfo3 | awk '/^depends=/ {next;} {print $0;}' | tr '\n' '\000' >new.modinfo
-  OLD_DEPENDS=$(awk '{FS="="} /depends=/ {print $2}' new.modinfo3)
-  [ -n "$OLD_DEPENDS" ] && DEPENDS="$OLD_DEPENDS,$DEPENDS"
-  /bin/echo -ne "depends=$DEPENDS\0" >>new.modinfo
-  $OBJCOPY --remove-section=.modinfo --add-section=.modinfo=new.modinfo --set-section-flags .modinfo=contents,alloc,load,readonly,data ${MODULE}_orig ${MODULE}
-  rm new.modinfo*
-}
-
 
 ### ADDON HELPERS ###
 install_binary_addon() {
@@ -1430,7 +1554,7 @@ done
 
   for f in $PKG_DIR/source/resources/screenshot-*.{jpg,png}; do
     if [ -f "$f" ]; then
-      screenshots+="<screenshot>resources/$(basename $f)</screenshot>\n"
+      screenshots+="<screenshot>resources/${f##*/}</screenshot>\n"
     fi
   done
 
@@ -1497,6 +1621,8 @@ add_user() {
   PASSWORD="$2"
   if [ "$PASSWORD" = "x" ]; then
     PASSWORD="*"
+  else
+    PASSWORD=$(openssl passwd -6 "${PASSWORD}")
   fi
   if ! grep -q "^$1:" ${INSTALL}/usr/cache/shadow; then
     echo "$1:$PASSWORD:::::::" >> ${INSTALL}/usr/cache/shadow
@@ -1728,6 +1854,24 @@ release_update_lock() {
   flock --unlock 97 2>/dev/null
 }
 
+# store current timestamp in TIMESTAMP_xxx variable (xxx set by arg)
+# timestamps are seconds.milliseconds since epoch
+record_timestamp() {
+  if [ -n "${TRACE_BUILD_TIMING}" ]; then
+    typeset -g "TIMESTAMP_$1=$(date +%s.%3N)"
+  fi
+}
+
+# args: text, start timestamp, end timestamp
+show_timestamp_diff() {
+  if [ -n "${TRACE_BUILD_TIMING}" ]; then
+    local start="TIMESTAMP_$2"
+    local end="TIMESTAMP_$3"
+    local timediff=$(echo "${!end}-${!start}" | bc)
+    printf '%20s: %10.3f\n' "$1" "${timediff}"
+  fi
+}
+
 # Use distribution functions if any
 if [ -f "distributions/$DISTRO/config/functions" ]; then
   . distributions/$DISTRO/config/functions

config/graphic

@@ -1,21 +1,32 @@
-if [ "${OPENGL}" = no ]; then
+[ -z "${OPENGL}" ] && OPENGL="no"
+[ -z "${OPENGLES}" ] && OPENGLES="no"
+[ -z "${VULKAN}" ] && VULKAN="no"
+
+if [ "${OPENGL}" = "no" ]; then
   OPENGL_SUPPORT="no"
 else
   OPENGL_SUPPORT="yes"
 fi
 
-if [ "${OPENGLES}" = no ]; then
+if [ "${OPENGLES}" = "no" ]; then
   OPENGLES_SUPPORT="no"
 else
   OPENGLES_SUPPORT="yes"
 fi
 
+if [ "${VULKAN}" = "no" ]; then
+  VULKAN_SUPPORT="no"
+else
+  VULKAN_SUPPORT="yes"
+fi
+
 get_graphicdrivers() {
 
   # set defaults
   GALLIUM_DRIVERS=""
-  DRI_DRIVERS=""
   XORG_DRIVERS=""
+  VULKAN_DRIVERS_CONFIG=""
+  VULKAN_DRIVERS_MESA=""
   LLVM_SUPPORT="no"
   COMPOSITE_SUPPORT="no"
   VDPAU_SUPPORT="no"
@@ -23,7 +34,14 @@ get_graphicdrivers() {
   V4L2_SUPPORT="no"
 
   if [ "${GRAPHIC_DRIVERS}" = "all" ]; then
-    GRAPHIC_DRIVERS="iris i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
+    GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia nvidia-legacy nvidia-ng vmware virtio vc4"
+  fi
+
+  if listcontains "${GRAPHIC_DRIVERS}" "crocus"; then
+    GALLIUM_DRIVERS+=" crocus"
+    XORG_DRIVERS+=" intel"
+    COMPOSITE_SUPPORT="yes"
+    VAAPI_SUPPORT="yes"
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
@@ -41,14 +59,7 @@ get_graphicdrivers() {
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "i915"; then
-    DRI_DRIVERS+=" i915"
-    XORG_DRIVERS+=" intel"
-    COMPOSITE_SUPPORT="yes"
-    VAAPI_SUPPORT="yes"
-  fi
-
-  if listcontains "${GRAPHIC_DRIVERS}" "i965"; then
-    DRI_DRIVERS+=" i965"
+    GALLIUM_DRIVERS+=" i915"
     XORG_DRIVERS+=" intel"
     COMPOSITE_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
@@ -57,6 +68,7 @@ get_graphicdrivers() {
   if listcontains "${GRAPHIC_DRIVERS}" "iris"; then
     GALLIUM_DRIVERS+=" iris"
     XORG_DRIVERS+=" intel"
+    VULKAN_DRIVERS_MESA+=" intel"
     COMPOSITE_SUPPORT="yes"
     VAAPI_SUPPORT="yes"
   fi
@@ -72,6 +84,7 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "nvidia"; then
     XORG_DRIVERS+=" nvidia"
+    VULKAN_DRIVERS_CONFIG+=" nvidia"
     VDPAU_SUPPORT="yes"
   fi
 
@@ -80,15 +93,15 @@ get_graphicdrivers() {
     VDPAU_SUPPORT="yes"
   fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
-    GALLIUM_DRIVERS+=" kmsro panfrost"
-    V4L2_SUPPORT="yes"
+  if listcontains "${GRAPHIC_DRIVERS}" "nvidia-ng"; then
+    VULKAN_DRIVERS_CONFIG+=" nvidia-ng"
+    VAAPI_SUPPORT="yes"
   fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "r200"; then
-    DRI_DRIVERS+=" r200"
-    XORG_DRIVERS+=" ati"
-    COMPOSITE_SUPPORT="yes"
+  if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
+    GALLIUM_DRIVERS+=" kmsro panfrost"
+    VULKAN_DRIVERS_MESA+=" panfrost"
+    V4L2_SUPPORT="yes"
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "r300"; then
@@ -111,6 +124,7 @@ get_graphicdrivers() {
   if listcontains "${GRAPHIC_DRIVERS}" "radeonsi"; then
     GALLIUM_DRIVERS+=" radeonsi"
     XORG_DRIVERS+=" ati amdgpu"
+    VULKAN_DRIVERS_MESA+=" amd"
     LLVM_SUPPORT="yes"
     COMPOSITE_SUPPORT="yes"
     VDPAU_SUPPORT="yes"
@@ -119,6 +133,7 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "vc4"; then
     GALLIUM_DRIVERS+=" vc4 v3d kmsro"
+    VULKAN_DRIVERS_MESA+=" broadcom"
     V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"
     VDPAU_SUPPORT="no"
@@ -134,8 +149,16 @@ get_graphicdrivers() {
     COMPOSITE_SUPPORT="yes"
   fi
 
+  # VDPAU Support depends on X11
+  if [ ! "${DISPLAYSERVER}" = "x11" ]; then
+    VDPAU_SUPPORT="no"
+  fi
+
   # remove duplicate entries
   GALLIUM_DRIVERS="$(echo ${GALLIUM_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  GRAPHIC_DRIVERS="$(echo ${GRAPHIC_DRIVERS} | xargs -n1 | sort -u | xargs)"
   XORG_DRIVERS="$(echo ${XORG_DRIVERS} | xargs -n1 | sort -u | xargs)"
-  DRI_DRIVERS="$(echo ${DRI_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  VULKAN_DRIVERS_MESA="$(echo ${VULKAN_DRIVERS_MESA} | xargs -n1 | sort -u | xargs)"
+  VULKAN_DRIVERS_CONFIG+=" ${VULKAN_DRIVERS_MESA}"
+  VULKAN_DRIVERS_CONFIG="$(echo ${VULKAN_DRIVERS_CONFIG} | xargs -n1 | sort -u | xargs)"
 }

config/noobs/partition_setup.sh

@@ -46,7 +46,7 @@ fi
 
 # create bootloader configuration
   echo "creating bootloader configuration..."
-  echo "boot=$id1 disk=$id2 quiet" > $MOUNTPOINT/cmdline.txt
+  echo "boot=$id1 disk=$id2 quiet @EXTRA_CMDLINE@" > $MOUNTPOINT/cmdline.txt
 
 # cleanup mountpoint
   umount $MOUNTPOINT

config/optimize

@@ -27,26 +27,29 @@ FLAGS_OPTIM_LTO_FAT="-ffat-lto-objects"
 FLAGS_OPTIM_LTO_OFF="-fno-lto"
 LDFLAGS_OPTIM_LTO_COMMON="-fuse-linker-plugin"
 
-# gold flags
-LDFLAGS_OPTIM_GOLD="-fuse-ld=gold"
+# linker specific flags
+LDFLAGS_OPTIM_LINKER_COMPILER_DEFAULT=""
+LDFLAGS_OPTIM_LINKER_BFD="-fuse-ld=bfd"
+LDFLAGS_OPTIM_LINKER_GOLD="-fuse-ld=gold"
+LDFLAGS_OPTIM_LINKER_MOLD="-fuse-ld=mold"
 
 # default compiler optimization
-CFLAGS_OPTIM_DEFAULT="-O2 -fomit-frame-pointer"
+CFLAGS_OPTIM_DEFAULT="-O2 -fomit-frame-pointer -DNDEBUG"
 CXXFLAGS_OPTIM_DEFAULT="$CFLAGS_OPTIM_DEFAULT"
 # speed flag
-CFLAGS_OPTIM_SPEED="-O3 -fomit-frame-pointer"
+CFLAGS_OPTIM_SPEED="-O3 -fomit-frame-pointer -DNDEBUG"
 CXXFLAGS_OPTIM_SPEED="$CFLAGS_OPTIM_SPEED"
 # size flag
-CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer"
+CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer -DNDEBUG"
 CXXFLAGS_OPTIM_SIZE="$CFLAGS_OPTIM_SIZE"
 # debug settings
-CFLAGS_OPTIM_DEBUG="-ggdb -Os"
+CFLAGS_OPTIM_DEBUG="-ggdb -Og"
 CXXFLAGS_OPTIM_DEBUG="$CFLAGS_OPTIM_DEBUG"
 LDFLAGS_OPTIM_DEBUG="-ggdb"
 # split debug settings (requires gold)
-CFLAGS_OPTIM_DEBUG_SPLIT="-gsplit-dwarf -Os"
+CFLAGS_OPTIM_DEBUG_SPLIT="-gdwarf-4 -gsplit-dwarf -Og"
 CXXFLAGS_OPTIM_DEBUG_SPLIT="$CFLAGS_OPTIM_DEBUG_SPLIT"
-LDFLAGS_OPTIM_DEBUG_SPLIT="-Wl,--gdb-index"
+LDFLAGS_OPTIM_DEBUG_SPLIT="-gdwarf-4 -Wl,--gdb-index"
 
 # position-independent code
 CFLAGS_OPTIM_PIC="-fPIC -DPIC"
@@ -66,13 +69,14 @@ if [ -z "$HOST_LIBDIR" ]; then
 
   # ubuntu/debian specific "multiarch support"
   export MACHINE_HARDWARE_NAME="$(uname -m)"
-  export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
-  FAMILY_TRIPLET=${HOST_NAME/${MACHINE_HARDWARE_NAME}/${MACHINE_HARDWARE_PLATFORM}}
-  if [ -d /lib/$FAMILY_TRIPLET ]; then
-    HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
-  fi
-  if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
-    HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
+  FAMILY_TRIPLET=$($LOCAL_CC -print-multiarch)
+  if [ -n "$FAMILY_TRIPLET" ]; then
+    if [ -d /lib/$FAMILY_TRIPLET ]; then
+      HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
+    fi
+    if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
+      HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
+    fi
   fi
 
   # default multiarch support

config/options

@@ -26,6 +26,11 @@ DISTRO="${DISTRO:-LibreELEC}"
 # determines PROJECT, if not forced by user
 export PROJECT="${PROJECT:-Generic}"
 
+# default to Generic device if building Generic project without device set
+if [ "${PROJECT}" = "Generic" -a -z "${DEVICE}" ]; then
+  export DEVICE="Generic"
+fi
+
 # determines TARGET_ARCH, if not forced by user
 export ARCH="${ARCH:-x86_64}"
 TARGET_ARCH="${ARCH}"
@@ -43,21 +48,26 @@ fi
 # read DISTRO version information
 . "${DISTRO_DIR}/${DISTRO}/version" || die "\nERROR: No distro version present\n"
 
-# read DISTRO options if available
+# read DISTRO options
 if [ -f "${DISTRO_DIR}/${DISTRO}/options" ]; then
   . "${DISTRO_DIR}/${DISTRO}/options"
 fi
 
-# read PROJECT options if available
+# read PROJECT options
 if [ -f "${PROJECT_DIR}/${PROJECT}/options" ]; then
   . "${PROJECT_DIR}/${PROJECT}/options"
 fi
 
-# read DEVICE options if available
+# read DEVICE options
 if [ -f "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" ]; then
   . "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options"
 fi
 
+# read architecture defaults
+if [ -f "config/arch.${TARGET_ARCH}" ]; then
+  . "config/arch.${TARGET_ARCH}"
+fi
+
 # projects can set KERNEL_NAME (kernel.img)
 KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
 
@@ -93,6 +103,15 @@ VERBOSE="${VERBOSE:-yes}"
 # directory.
 CCACHE_CACHE_SIZE="10G"
 
+# compression level for ccache
+# This option determines the level at which ccache will compress object files
+# using the real-time compression algorithm Zstandard. It only has effect if
+# compression is enabled (which it is by default). Zstandard is extremely fast
+# for decompression and very fast for compression for lower compression
+# levels. The default is 0. The value 0 means that ccache will choose a
+# suitable zstd level, currently 1.
+CCACHE_COMPRESSLEVEL="0"
+
 # set addon paths
 if [ -z "$ADDON_PATH" ]; then
   if [ -n "$ADDON_PROJECT" ]; then
@@ -115,6 +134,18 @@ if [ -f "${HOME}/.libreelec/options" ]; then
   . "${HOME}/.libreelec/options"
 fi
 
+if [ "${LOCAL_CCACHE_SUPPORT}" = "yes" ] && [ -z "${CCACHE_DISABLE}" ]; then
+  # like LOCAL_CC check for local ccache only on the very first
+  # call to config/options, before toolchain has been added to the path,
+  # otherwise we might pick up ccache from toolchain/bin here
+  if [ -z "${LOCAL_CCACHE}" ] && [ "${LOCAL_CCACHE_CHECKED}" != "yes" ]; then
+    export LOCAL_CCACHE="$(command -v ccache)"
+    export LOCAL_CCACHE_CHECKED="yes"
+  fi
+else
+  export LOCAL_CCACHE=""
+fi
+
 # overwrite OEM_SUPPORT via commandline
 if [ "${OEM}" = "yes" -o "${OEM}" = "no" ]; then
   OEM_SUPPORT="${OEM}"

config/path

@@ -13,11 +13,6 @@ set -e
   TARGET_IMG=${TARGET_DIR:-$ROOT/target}
   ADDONS=addons
 
-# include ARCH specific options
-  if [ -f config/arch.$TARGET_ARCH ]; then
-    . config/arch.$TARGET_ARCH
-  fi
-
 [ -z "${HOST_NAME}" ] && export HOST_NAME="$($LOCAL_CC -dumpmachine)"
 TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
 
@@ -61,18 +56,12 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
 . config/optimize
 
-# use ARM toolchain on 64/32 split builds
+# use different toolchain for 64/32 split builds
 if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  if [ "${MACHINE_HARDWARE_NAME}" = "x86_64" ]; then
-    KERNEL_TOOLCHAIN="aarch64-none-linux-gnu"
-  elif [ "${MACHINE_HARDWARE_NAME}" = "aarch64" ]; then
-    KERNEL_TOOLCHAIN="aarch64-none-elf"
-  else
-    die "No known toolchain available for ${MACHINE_HARDWARE_NAME}."
-  fi
+  KERNEL_TOOLCHAIN="aarch64"
 fi
 if [ -n "$KERNEL_TOOLCHAIN" ]; then
-  TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-arm-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN-
+  TARGET_KERNEL_PREFIX=$KERNEL_TOOLCHAIN-none-elf-
 else
   TARGET_KERNEL_PREFIX=$TARGET_PREFIX
 fi
@@ -81,6 +70,14 @@ if [ -z "$CCACHE_DIR" ]; then
   export CCACHE_DIR=$BUILD/.ccache
 fi
 
+# keep a copy of ccache dir used for toolchain ccache
+export BUILD_CCACHE_DIR="${CCACHE_DIR}"
+
+# local ccache dir in case we build early packages with local ccache
+if [ -z "${LOCAL_CCACHE_DIR}" ]; then
+  export LOCAL_CCACHE_DIR="${BUILD}/.ccache-local"
+fi
+
 if [[ -z "$PATH" || ( "$PATH" != "$TOOLCHAIN/bin:$TOOLCHAIN/sbin" && "$PATH" = "${PATH#$TOOLCHAIN/bin:$TOOLCHAIN/sbin:}" ) ]]; then
   export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin${PATH:+":$PATH"}"
 fi
@@ -106,3 +103,6 @@ unset CONFIG_SITE
 # Ignore custom python installs...
 unset PYTHONHOME PYTHONPATH PYTHONSTARTUP
 export PYTHONNOUSERSITE=yes #disable PEP 370
+
+# Fix #4737
+unset PYTHONDONTWRITEBYTECODE

config/show_config

@@ -5,101 +5,130 @@ show_config() {
   get_graphicdrivers
 
   dashes="==========================="
-  config_message="\n $dashes$dashes$dashes"
-  config_message+="\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
-  config_message+="\n $dashes$dashes$dashes"
+  config_message="\n ${dashes}${dashes}${dashes}"
+  config_message+="\n Configuration for ${DISTRONAME} "
+  if [ "${OFFICIAL}" = "yes" ]; then
+    config_message+="(official)"
+  else
+    config_message+="(community)"
+  fi
+  config_message+="\n ${dashes}${dashes}${dashes}"
 
   # Build options
 
   config_message+="\n\n Buildsystem configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)"
-  config_message+="\n - FLOAT:\t\t\t\t $TARGET_FLOAT"
-  config_message+="\n - FPU:\t\t\t\t\t $TARGET_FPU"
-  config_message+="\n - CPU features:\t\t\t $TARGET_FEATURES"
-  config_message+="\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
-  config_message+="\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
-  config_message+="\n - LLVM support:\t\t\t $LLVM_SUPPORT"
+  config_message+="\n - CPU:\t\t\t\t\t ${TARGET_CPU}"
+  config_message+="\n - Kernel Architecture:\t\t\t ${TARGET_KERNEL_ARCH}"
+  config_message+="\n - Userland Architecture:\t\t ${TARGET_ARCH}"
+  if [ -n "${TARGET_FLOAT}" ]; then
+    config_message+="\n - FLOAT:\t\t\t\t ${TARGET_FLOAT}"
+  fi
+  if [ -n "${TARGET_FPU}" ]; then
+    config_message+="\n - FPU:\t\t\t\t\t ${TARGET_FPU}"
+  fi
+  config_message+="\n - CPU features:\t\t\t ${TARGET_FEATURES}"
+  config_message+="\n - LTO (Link Time Optimization) support: ${LTO_SUPPORT}"
+  config_message+="\n - GOLD (Google Linker) Support:\t ${GOLD_SUPPORT}"
+  config_message+="\n - MOLD (Modern Linker) Support:\t ${MOLD_SUPPORT}"
+  config_message+="\n - Default Linker:\t\t\t ${DEFAULT_LINKER}"
+  config_message+="\n - LLVM support:\t\t\t ${LLVM_SUPPORT}"
   config_message+="\n - DEBUG:\t\t\t\t ${DEBUG:-no}"
-  config_message+="\n - CFLAGS:\t $TARGET_CFLAGS"
-  config_message+="\n - LDFLAGS:\t $TARGET_LDFLAGS"
+  config_message+="\n - CFLAGS:\t\t\t\t ${TARGET_CFLAGS}"
+  config_message+="\n - LDFLAGS:\t\t\t\t $(sed 's/^ *//' <<< ${TARGET_LDFLAGS})"
+  config_message+="\n - Local Ccache:\t\t\t ${LOCAL_CCACHE:-no}"
 
   # Misc. hardware configuration
 
   config_message+="\n\n Misc. hardware configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - ALSA support:\t\t\t $ALSA_SUPPORT"
-  config_message+="\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
-  config_message+="\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
+  config_message+="\n - ALSA support:\t\t\t ${ALSA_SUPPORT}"
+  config_message+="\n - Pulseaudio support:\t\t\t ${PULSEAUDIO_SUPPORT}"
+  config_message+="\n - Bluetooth support:\t\t\t ${BLUETOOTH_SUPPORT}"
 
-  for config_driver in $ADDITIONAL_DRIVERS; do
-    config_message+="\n - Include driver:\t\t\t $config_driver"
+  for config_driver in ${ADDITIONAL_DRIVERS}; do
+    config_message+="\n - Include driver:\t\t\t ${config_driver}"
   done
 
-  if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then
-    for config_driver_addons in $DRIVER_ADDONS; do
-      config_message+="\n - Include driver add-ons:\t\t $config_driver_addons"
+  if [ "${DRIVER_ADDONS_SUPPORT}" = "yes" ]; then
+    for config_driver_addons in ${DRIVER_ADDONS}; do
+      config_message+="\n - Include driver add-ons:\t\t ${config_driver_addons}"
     done
   fi
 
-  for config_firmware in $FIRMWARE; do
-    config_message+="\n - Include firmware:\t\t\t $config_firmware"
+  for config_firmware in ${FIRMWARE}; do
+    config_message+="\n - Include firmware:\t\t\t ${config_firmware}"
   done
 
   # Misc. Filesystems
 
   config_message+="\n\n Misc. Filesystems:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Swap Support:\t\t\t $SWAP_SUPPORT"
-  if [ "$SWAP_SUPPORT" = "yes" ]; then
-    config_message+="\n   - Swapfile default size:\t\t $SWAPFILESIZE"
+  config_message+="\n - Swap Support:\t\t\t ${SWAP_SUPPORT}"
+  if [ "${SWAP_SUPPORT}" = "yes" ]; then
+    config_message+="\n   - Swapfile default size:\t\t ${SWAPFILESIZE}"
   fi
-  config_message+="\n - NTFS Support (via Fuse):\t\t $NTFS3G"
-  config_message+="\n - Install HFS Tools:\t\t\t $HFSTOOLS"
+  config_message+="\n - Install HFS Tools:\t\t\t ${HFSTOOLS}"
 
   # Network service configuration
 
   config_message+="\n\n Network service configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message+="\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message+="\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
-  config_message+="\n - SAMBA server support:\t\t $SAMBA_SERVER"
-  config_message+="\n - SFTP server support:\t\t\t $SFTP_SERVER"
-  config_message+="\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
-  config_message+="\n - WireGuard support:\t\t\t $WIREGUARD_SUPPORT"
+  config_message+="\n - Avahi (Zeroconf) support:\t\t ${AVAHI_DAEMON}"
+  config_message+="\n - NFS mounting support:\t\t ${NFS_SUPPORT}"
+  config_message+="\n - SAMBA mounting support:\t\t ${SAMBA_SUPPORT}"
+  config_message+="\n - SAMBA server support:\t\t ${SAMBA_SERVER}"
+  config_message+="\n - SFTP server support:\t\t\t ${SFTP_SERVER}"
+  config_message+="\n - OpenVPN support:\t\t\t ${OPENVPN_SUPPORT}"
+  config_message+="\n - WireGuard support:\t\t\t ${WIREGUARD_SUPPORT}"
 
   # Graphic configuration
 
   config_message+="\n\n Graphic configuration:"
-  config_message+="\n $dashes$dashes"
-
-  if [ "$DISPLAYSERVER" = "x11" ] ; then
-    config_message+="\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
-    config_message+="\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
-    config_message+="\n - WindowManager:\t\t\t $WINDOWMANAGER"
+  config_message+="\n ${dashes}${dashes}"
+  config_message+="\n - Graphic Drivers:\t\t\t ${GRAPHIC_DRIVERS}"
+  config_message+="\n - Display Server:\t\t\t ${DISPLAYSERVER}"
+  if [ "${DISPLAYSERVER}" = "x11" ] ; then
+    for drv in ${XORG_DRIVERS}; do
+      XORG_DRIVERS_CONFIG+="xf86-video-${drv} "
+    done
+    config_message+="\n - X.Org Graphic Drivers:\t\t ${XORG_DRIVERS_CONFIG}"
+    config_message+="\n - X.Org Composite support:\t\t ${COMPOSITE_SUPPORT}"
   fi
-  config_message+="\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
-  config_message+="\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
-  config_message+="\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message+="\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
+  config_message+="\n - Window Manager / Compositor:\t\t ${WINDOWMANAGER}"
+  config_message+="\n - OpenGL (GLX) support (provider):\t ${OPENGL_SUPPORT}"
+    [ "${OPENGL}" != "no" ] && config_message+=" (${OPENGL})"
+  config_message+="\n - OpenGL ES support (provider):\t ${OPENGLES_SUPPORT}"
+    [ "${OPENGLES}" != "no" ] && config_message+=" (${OPENGLES})"
+  config_message+="\n - Vulkan API support (provider):\t ${VULKAN_SUPPORT}"
+    [ "${VULKAN}" != "no" ] && config_message+=" (${VULKAN})"
+  if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+    config_message+="\n - Vulkan Graphic Drivers:\t\t ${VULKAN_DRIVERS_CONFIG}"
+  fi
+
+  # Video Acceleration configuration
+
+  config_message+="\n\n Video Acceleration configuration:"
+  config_message+="\n ${dashes}${dashes}"
+  config_message+="\n - VA-API Support:\t\t\t ${VAAPI_SUPPORT}"
+  config_message+="\n - VDPAU Support:\t\t\t ${VDPAU_SUPPORT}"
 
   # OS configuration
 
   config_message+="\n\n OS configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
-  config_message+="\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
-  config_message+="\n - Bootloader:\t\t\t\t $BOOTLOADER"
-  config_message+="\n - UDevil support:\t\t\t $UDEVIL"
-  config_message+="\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
-  for config_package in $ADDITIONAL_PACKAGES; do
-    config_message+="\n - Include package:\t\t\t $config_package"
+  config_message+="\n - OEM Support:\t\t\t\t ${OEM_SUPPORT}"
+  config_message+="\n - Default ROOT Password:\t\t ${ROOT_PASSWORD}"
+  config_message+="\n - Bootloader:\t\t\t\t ${BOOTLOADER}"
+  config_message+="\n - UDevil support:\t\t\t ${UDEVIL}"
+  config_message+="\n - Installer support:\t\t\t ${INSTALLER_SUPPORT}"
+  for config_package in ${ADDITIONAL_PACKAGES}; do
+    config_message+="\n - Include package:\t\t\t ${config_package}"
   done
 
   # Distribution specific configuration
@@ -114,16 +143,10 @@ show_config() {
     show_distro_config
   fi
 
-  config_message+="\n\n $dashes$dashes$dashes"
-  config_message+="\n End Configuration for $DISTRONAME"
-  config_message+="\n $dashes$dashes$dashes"
+  config_message+="\n\n ${dashes}${dashes}${dashes}"
+  config_message+="\n End Configuration for ${DISTRONAME}"
+  config_message+="\n ${dashes}${dashes}${dashes}"
   config_message+="\n\n\n"
 
-  echo -e "$config_message"
+  echo -e "${config_message}"
 }
-
-
-if [ "${FUNCNAME[0]}" = "main" ]; then
-  . config/options ""
-  show_config
-fi

distributions/LibreELEC/kernel_options

@@ -4,6 +4,26 @@ CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_ZSTD=y
 CONFIG_VFAT_FS=y
 CONFIG_EXT4_FS=y
+CONFIG_HUGETLBFS=n
+
+# netfilter
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
 
 # packages/network/iwd
 CONFIG_CRYPTO_USER_API_HASH=y
@@ -25,10 +45,14 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
 CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_NLMON=m
+CONFIG_RFKILL=m
 
 # packages/network/wireguard
 CONFIG_NET=y
 CONFIG_INET=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_NET_UDP_TUNNEL=m
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_WIREGUARD=m
@@ -40,13 +64,13 @@ CONFIG_INOTIFY_USER=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EPOLL=y
-CONFIG_NET=y
+# CONFIG_NET=y # already set in packages/network/wireguard
 CONFIG_SYSFS=y
 CONFIG_PROC_FS=y
 CONFIG_FHANDLE=y
-CONFIG_CRYPTO_USER_API_HASH=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_SHA256=y
+# CONFIG_CRYPTO_USER_API_HASH=y # already set in packages/network/iwd
+# CONFIG_CRYPTO_HMAC=y # already set in packages/network/iwd
+# CONFIG_CRYPTO_SHA256=y # already set in packages/network/iwd
 CONFIG_SYSFS_DEPRECATED=n
 CONFIG_UEVENT_HELPER=n
 CONFIG_FW_LOADER_USER_HELPER=n
@@ -62,3 +86,87 @@ CONFIG_KCMP=y
 CONFIG_RT_GROUP_SCHED=n
 CONFIG_CGROUP_BPF=y
 CONFIG_BPF_SYSCALL=y
+
+# Native language support
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y
+
+# Human Interface Device (HID)
+CONFIG_HID_NINTENDO=m
+CONFIG_NINTENDO_FF=y
+
+# Docker
+CONFIG_NAMESPACES=y
+CONFIG_NET_NS=y
+CONFIG_PID_NS=y
+CONFIG_IPC_NS=y
+CONFIG_UTS_NS=y
+# CONFIG_CGROUPS=y # already set in packages/sysutils/systemd
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CPUSETS=y
+CONFIG_MEMCG=y
+# CONFIG_KEYS=y # already set in packages/network/iwd
+CONFIG_VETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_NETFILTER=m
+# CONFIG_IP_NF_FILTER=m # already set in netfilter
+# CONFIG_IP_NF_TARGET_MASQUERADE=m # already set in netfilter
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MARK=m
+# CONFIG_IP_NF_NAT=m # already set in netfilter
+CONFIG_NF_NAT=m
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_CGROUP_BPF=y # already set in packages/sysutils/systemd
+CONFIG_USER_NS=y
+# CONFIG_SECCOMP=y # already set in packages/sysutils/systemd
+# CONFIG_SECCOMP_FILTER=y # already set in packages/sysutils/systemd
+CONFIG_CGROUP_PIDS=y
+CONFIG_BLK_CGROUP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_CGROUP_PERF=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_RR=m
+# CONFIG_EXT4_FS=y # already set in general
+# CONFIG_EXT4_FS_POSIX_ACL=y # already set in packages/sysutils/systemd
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_VXLAN=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_GHASH=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+CONFIG_XFRM_ALGO=y
+CONFIG_INET_ESP=y
+CONFIG_IPVLAN=m
+CONFIG_MACVLAN=m
+CONFIG_DUMMY=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_OVERLAY_FS=m

distributions/LibreELEC/options

@@ -32,12 +32,21 @@
 # GOLD (Google Linker) support
   GOLD_SUPPORT="yes"
 
+# MOLD (Modern Linker) support
+  MOLD_SUPPORT="no"
+
+# default linker (bfd / gold / mold)
+  DEFAULT_LINKER="gold"
+
 # HARDENING (security relevant linker and compiler flags) support
   HARDENING_SUPPORT="no"
 
 # Default supported get handlers (archive, git, file etc.)
   GET_HANDLER_SUPPORT="archive"
 
+# use local ccache on build host, if available, for early package
+# builds before ccache has been built
+  LOCAL_CCACHE_SUPPORT="yes"
 
 ### OS CONFIGURATION ###
 
@@ -48,7 +57,7 @@
 # for a list of additional drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8192EU RTL8188EU RTL8812AU"
+  ADDITIONAL_DRIVERS="RTL8192DU RTL8812AU"
 
 # Default size of system partition, in MB, eg. 512
   SYSTEM_SIZE=512
@@ -87,6 +96,9 @@
 # build and install PulseAudio support (yes / no)
   PULSEAUDIO_SUPPORT="yes"
 
+# build and install pipewire support (yes / no)
+  PIPEWIRE_SUPPORT="no"
+
 # build and install eSpeak-NG support (yes / no)
   ESPEAK_SUPPORT="no"
 
@@ -135,6 +147,14 @@
 # build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
   KODI_SAMBA_SUPPORT="yes"
 
+# build kodi with alsa support (yes/no)
+  KODI_ALSA_SUPPORT="yes"
+
+# build kodi with pulseaudio support (yes/no)
+  KODI_PULSEAUDIO_SUPPORT="yes"
+
+# build kodi with pipewire support (yes/no)
+  KODI_PIPEWIRE_SUPPORT="no"
 
 ### KODI ADDONS ###
 
@@ -164,10 +184,10 @@
   DEBUG_GROUP_YES="kodi+"
 
 # wireless daemon to use (wpa_supplicant/iwd)
-  WIRELESS_DAEMON="wpa_supplicant"
+  WIRELESS_DAEMON="iwd"
 
 # build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
+  ISCSI_SUPPORT="no"
 
 # build with NFS support (mounting nfs shares via the OS) (yes / no)
   NFS_SUPPORT="yes"
@@ -196,9 +216,6 @@
 # This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
   INITRAMFS_PARTED_SUPPORT="no"
 
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
 # build and install hfs filesystem utilities (yes / no)
   HFSTOOLS="yes"
 
@@ -211,14 +228,6 @@
 # build with installer (yes / no)
   INSTALLER_SUPPORT="yes"
 
-# Windowmanager to use (fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia nvidia-legacy vmware virtio"
-
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
 
@@ -237,6 +246,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install ALSA Audio support (yes / no)
+  ALSA_SUPPORT="yes"
+
 # additional packages to install:
 # Space separated list is supported,
 # e.g. ADDITIONAL_PACKAGES="PACKAGE1 PACKAGE2"

distributions/LibreELEC/show_config

@@ -2,41 +2,41 @@ show_distro_config() {
   # Hardware decoder support
 
   config_message+="\n\n Kodi Hardware configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Video Acceleration provider:\t\t $KODIPLAYER_DRIVER"
+  config_message+="\n - Video Acceleration provider:\t\t ${KODIPLAYER_DRIVER}"
 
   # Input device configuration
 
-  config_message+="\n - Remote support:\t\t\t $REMOTE_SUPPORT"
-  config_message+="\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
-  config_message+="\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT"
-  config_message+="\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message+="\n - Remote support:\t\t\t ${REMOTE_SUPPORT}"
+  config_message+="\n - CEC Adapter support:\t\t\t ${CEC_SUPPORT}"
+  config_message+="\n - CEC Framework support:\t\t ${CEC_FRAMEWORK_SUPPORT}"
+  config_message+="\n - Kodi Joystick support:\t\t ${JOYSTICK_SUPPORT}"
 
   # Kodi configuration
 
   config_message+="\n\n Kodi Software configuration:"
-  config_message+="\n $dashes$dashes"
+  config_message+="\n ${dashes}${dashes}"
 
-  config_message+="\n - Kodi Blu-ray support:\t\t $KODI_BLURAY_SUPPORT"
-  if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
-    config_message+="\n   - Blu-ray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
-    config_message+="\n   - Blu-ray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+  config_message+="\n - Kodi Blu-ray support:\t\t ${KODI_BLURAY_SUPPORT}"
+  if [ "${KODI_BLURAY_SUPPORT}" = "yes" ] ; then
+    config_message+="\n   - Blu-ray BD+ support:\t\t ${BLURAY_BDPLUS_SUPPORT}"
+    config_message+="\n   - Blu-ray AACS support:\t\t ${BLURAY_AACS_SUPPORT}"
   fi
-  config_message+="\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
-  config_message+="\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
-  config_message+="\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
-  config_message+="\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
-  config_message+="\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
-  config_message+="\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
-  config_message+="\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
-  config_message+="\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-  config_message+="\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
+  config_message+="\n - Kodi DVDCSS support:\t\t\t ${KODI_DVDCSS_SUPPORT}"
+  config_message+="\n - Kodi Airplay support:\t\t ${KODI_AIRPLAY_SUPPORT}"
+  config_message+="\n - Kodi Airtunes support:\t\t ${KODI_AIRTUNES_SUPPORT}"
+  config_message+="\n - Kodi NFS support:\t\t\t ${KODI_NFS_SUPPORT}"
+  config_message+="\n - Kodi MySQL support:\t\t\t ${KODI_MYSQL_SUPPORT}"
+  config_message+="\n - Kodi Optical Drive support:\t\t ${KODI_OPTICAL_SUPPORT}"
+  config_message+="\n - Kodi SAMBA client support:\t\t ${KODI_SAMBA_SUPPORT}"
+  config_message+="\n - Kodi UPNP support:\t\t\t ${KODI_UPNP_SUPPORT}"
+  config_message+="\n - Kodi Webserver support:\t\t ${KODI_WEBSERVER_SUPPORT}"
 
-  for config_skin in $SKINS; do
-    config_message+="\n - Include Skin:\t\t\t $config_skin"
+  for config_skin in ${SKINS}; do
+    config_message+="\n - Include Skin:\t\t\t ${config_skin}"
   done
 
-  config_message+="\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message+="\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
+  config_message+="\n - Default Skin:\t\t\t ${SKIN_DEFAULT}"
+  config_message+="\n - Include extra fonts:\t\t\t ${KODI_EXTRA_FONTS}"
 }

distributions/LibreELEC/version

@@ -2,7 +2,7 @@
   LIBREELEC_VERSION="devel"
 
 # OS_VERSION: OS Version
-  OS_VERSION="10.0"
+  OS_VERSION="11.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="10.0.0"
+  ADDON_VERSION="11.0.0"

licenses/7-Zip.txt

@@ -0,0 +1,90 @@
+  7-Zip source code
+  ~~~~~~~~~~~~~~~~~
+  License for use and distribution
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  7-Zip Copyright (C) 1999-2020 Igor Pavlov.
+
+  The licenses for files are:
+
+    1) CPP/7zip/Compress/Rar* files: the "GNU LGPL" with "unRAR license restriction"
+    2) CPP/7zip/Compress/LzfseDecoder.cpp: the "BSD 3-clause License"
+    3) Some files are "public domain" files, if "public domain" status is stated in source file.
+    4) the "GNU LGPL" for all other files. If there is no license information in 
+       some source file, that file is under the "GNU LGPL".
+
+  The "GNU LGPL" with "unRAR license restriction" means that you must follow both 
+  "GNU LGPL" rules and "unRAR license restriction" rules.
+
+
+
+
+  GNU LGPL information
+  --------------------
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+
+
+  BSD 3-clause License
+  --------------------
+
+    The "BSD 3-clause License" is used for the code in LzfseDecoder.cpp that implements LZFSE data decompression.
+    That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
+    that also uses the "BSD 3-clause License":
+
+    ----
+    Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1.  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+    2.  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
+        in the documentation and/or other materials provided with the distribution.
+
+    3.  Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    ----
+
+
+
+
+  unRAR license restriction
+  -------------------------
+
+    The decompression engine for RAR archives was developed using source 
+    code of unRAR program.
+    All copyrights to original unRAR code are owned by Alexander Roshal.
+
+    The license for original unRAR code has the following restriction:
+
+    The unRAR sources cannot be used to re-create the RAR compression algorithm, 
+    which is proprietary. Distribution of modified unRAR sources in separate form 
+    or as a part of other software is permitted, provided that it is clearly
+    stated in the documentation and source comments that the code may
+    not be used to develop a RAR (WinRAR) compatible archiver.
+
+
+  --
+  Igor Pavlov

licenses/FLIRC.txt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2023 Flirc Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY FLIRC INC. \`\`AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ${AUTHOR_UPPER} OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of Flirc Inc.
+ */

licenses/HIDAPI-orig.txt

@@ -0,0 +1,9 @@
+ HIDAPI - Multi-Platform library for
+ communication with HID devices.
+
+ Copyright 2009, Alan Ott, Signal 11 Software.
+ All Rights Reserved.
+ 
+ This software may be used by anyone for any reason so
+ long as the copyright notice in the source files
+ remains intact.

packages/addons/addon-depends/ccid/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ccid"
-PKG_VERSION="1.5.1"
-PKG_SHA256="e7a78c398ec0d617a4f98bac70d5b64f78689284dd0ae87d4692e2857f117377"
+PKG_VERSION="1.5.2"
+PKG_SHA256="13934487e6f8b48f699a16d367cc7a1af7a3ca874de721ac6e9633beb86e7219"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://ccid.apdu.fr"
 PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
@@ -14,6 +14,10 @@ PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --enable-twinserial"
 
+post_configure_target() {
+  libtool_remove_rpath libtool
+}
+
 make_target() {
   make
   make -C src/ Info.plist

packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk

@@ -3,16 +3,16 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="at-spi2-core"
-PKG_VERSION="2.42.0"
-PKG_SHA256="4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386"
+PKG_VERSION="2.47.1"
+PKG_SHA256="c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.gnome.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"
+PKG_SITE="https://www.gnome.org/"
+PKG_URL="https://download.gnome.org/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst"
 PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi."
 
 PKG_MESON_OPTS_TARGET="-Ddocs=false \
-                       -Dintrospection=no \
+                       -Dintrospection=disabled \
                        -Ddbus_daemon=/usr/bin/dbus-daemon"
 
 pre_configure_target() {

packages/addons/addon-depends/chrome-depends/atk/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="atk"
-PKG_VERSION="2.36.0"
-PKG_SHA256="fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788"
+PKG_VERSION="2.38.0"
+PKG_SHA256="ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk

@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }

packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk

@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }

packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk

@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }

packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk

@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }

packages/addons/addon-depends/chrome-depends/chrome-libxshmfence/package.mk

@@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }

packages/addons/addon-depends/chrome-depends/cups/package.mk

@@ -3,21 +3,19 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cups"
-PKG_VERSION="2.3.3op2"
-PKG_SHA256="5d7dc1f05cde3d5c31d3a2b3b54d519ca74e42c1b25df1add9a1802cd13c65ad"
+PKG_VERSION="2.4.2"
+PKG_SHA256="7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
 PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain openssl zlib"
+PKG_DEPENDS_TARGET="toolchain gnutls zlib"
 PKG_LONGDESC="CUPS printing system."
 PKG_BUILD_FLAGS="+pic -sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \
                            --disable-gssapi \
-                           --disable-avahi \
-                           --disable-dnssd \
-                           --disable-systemd \
-                           --disable-launchd \
+                           --with-dnssd=no \
+                           --with-tls=gnutls
                            --disable-unit-tests"
 
 pre_configure_target() {

packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk

@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="gdk-pixbuf"
-PKG_VERSION="2.42.6"
-PKG_SHA256="c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.gtk.org/"
-PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain glib libjpeg-turbo libpng jasper shared-mime-info tiff libX11"
-PKG_DEPENDS_CONFIG="shared-mime-info"
-PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation."
-
-PKG_MESON_OPTS_TARGET="-Ddocs=false \
-                       -Dintrospection=disabled \
-                       -Dman=false \
-                       -Drelocatable=false"

packages/addons/addon-depends/chrome-depends/gtk3/package.mk

@@ -3,15 +3,14 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gtk3"
-PKG_VERSION="3.24.30"
-PKG_SHA256="ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9"
+PKG_VERSION="3.24.36"
+PKG_SHA256="27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango"
+PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango libxkbcommon"
 PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info"
 PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System."
-PKG_TOOLCHAIN="meson"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_MESON_OPTS_TARGET="-Dbroadway_backend=false \

packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk

@@ -15,7 +15,6 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \
                        -Dcairo=enabled \
                        -Ddocs=disabled \
-                       -Dfontconfig=enabled \
                        -Dfreetype=enabled \
                        -Dglib=enabled \
                        -Dgobject=disabled \

packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk

@@ -3,12 +3,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXScrnSaver"
-PKG_VERSION="1.2.3"
-PKG_SHA256="f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8"
+PKG_VERSION="1.2.4"
+PKG_SHA256="75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe"
 PKG_LICENSE="GPL"
-PKG_SITE="http://xorg.freedesktop.org/"
-PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain scrnsaverproto"
+PKG_SITE="https://xorg.freedesktop.org/"
+PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain libXext scrnsaverproto"
 PKG_LONGDESC="X11 Screen Saver extension client library."
 PKG_BUILD_FLAGS="-sysroot"
 

packages/addons/addon-depends/chrome-depends/libXcursor/package.mk

@@ -3,11 +3,15 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXcursor"
-PKG_VERSION="1.2.0"
-PKG_SHA256="3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782"
+PKG_VERSION="1.2.1"
+PKG_SHA256="46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
-PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender"
 PKG_LONGDESC="X11 Cursor management library.s"
 PKG_BUILD_FLAGS="+pic -sysroot"
+
+post_configure_target() {
+  libtool_remove_rpath libtool
+}

packages/addons/addon-depends/chrome-depends/libXft/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXft"
-PKG_VERSION="2.3.4"
-PKG_SHA256="57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd"
+PKG_VERSION="2.3.7"
+PKG_SHA256="79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
-PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-${PKG_VERSION}.tar.bz2"
+PKG_SITE="https://www.X.org"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain fontconfig freetype libXrender util-macros xorgproto"
 PKG_LONGDESC="X FreeType library."
 PKG_BUILD_FLAGS="+pic -sysroot"

packages/addons/addon-depends/chrome-depends/libxss/package.mk

@@ -2,13 +2,17 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libxss"
-PKG_VERSION="1.2.3"
-PKG_SHA256="f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8"
+PKG_VERSION="1.2.4"
+PKG_SHA256="75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe"
 PKG_LICENSE="OSS"
-PKG_SITE="http://www.X.org"
-PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.bz2"
+PKG_SITE="https://www.X.org"
+PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros libXext scrnsaverproto"
 PKG_LONGDESC="X11 Screen Saver extension library."
 PKG_BUILD_FLAGS="+pic -sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"
+
+post_configure_target() {
+  libtool_remove_rpath libtool
+}

packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk

@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="shared-mime-info"
-PKG_VERSION="2.1"
-PKG_SHA256="37df6475da31a8b5fc63a54ba0770a3eefa0a708b778cb6366dccee96393cb60"
-PKG_LICENSE="GPL2"
-PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
-PKG_URL="https://gitlab.freedesktop.org/xdg/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain glib libxml2 gettext itstool:host"
-PKG_LONGDESC="The shared-mime-info package contains the core database of common types."
-PKG_BUILD_FLAGS="-parallel -sysroot"
-
-PKG_MESON_OPTS_TARGET="-Dupdate-mimedb=false"

packages/addons/addon-depends/chrome-depends/shared-mime-info/patches/no-man-no-html.patch

@@ -1,37 +0,0 @@
-diff -Nur shared-mime-info-2.1.orig/data/meson.build shared-mime-info-2.1/data/meson.build
---- shared-mime-info-2.1.orig/data/meson.build	2021-01-01 06:12:16.000000000 +1100
-+++ shared-mime-info-2.1/data/meson.build	2021-01-14 00:25:58.299790452 +1100
-@@ -1,6 +1,4 @@
- 
--install_man('update-mime-database.1')
--
- freedesktop_org_xml = custom_target('freedesktop.org.xml',
-     input : files(
-         'freedesktop.org.xml.in',
-@@ -21,15 +19,3 @@
-   [ 'its/shared-mime-info.loc', 'its/shared-mime-info.its', ],
-   install_dir : get_option('datadir') / 'gettext/its'
- )
--
--custom_target('shared-mime-info-spec-html',
--    input : 'shared-mime-info-spec.xml',
--    output: 'shared-mime-info-spec-html',
--    command: [
--        xmlto,
--        '-o', '@OUTPUT@',
--        'html-nochunks',
--        '@INPUT@',
--    ],
--    build_by_default: true,
--)
-diff -Nur shared-mime-info-2.1.orig/meson.build shared-mime-info-2.1/meson.build
---- shared-mime-info-2.1.orig/meson.build	2021-01-01 06:12:16.000000000 +1100
-+++ shared-mime-info-2.1/meson.build	2021-01-14 00:24:18.552142696 +1100
-@@ -22,7 +22,6 @@
- 
- itstool = find_program('itstool')
- xmllint = find_program('xmllint')
--xmlto   = find_program('xmlto')
- 
- ###############################################################################
- # Find xdgmime

packages/addons/addon-depends/chrome-depends/unix_ar/package.mk

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="unix_ar"
+PKG_VERSION="0.2.1"
+PKG_SHA256="4e1c6e8fe5255b7babe93b9af51532ba09c6946eee413c5db00cab3878d7ed2f"
+PKG_LICENSE="BSD 3-Clause"
+PKG_SITE="https://github.com/getninjas/unix_ar"
+PKG_URL="https://github.com/getninjas/unix_ar/archive/refs/tags/${PKG_VERSION}.tar.gz"
+PKG_TOOLCHAIN="manual"
+PKG_LONGDESC="Python: This packages allows the reading and writing of AR archive files."

packages/addons/addon-depends/cxxtools/package.mk

@@ -3,13 +3,13 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.2.1"
-PKG_SHA256="8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342"
+PKG_VERSION="3.0"
+PKG_SHA256="07b18037fb0983f6292f5c8d53e2369e9e7a9711df2c9ad50838aacbc8c62f7c"
 PKG_LICENSE="GPL-2"
 PKG_SITE="http://www.tntnet.org/cxxtools.html"
 PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain cxxtools:host"
+PKG_DEPENDS_HOST="toolchain:host openssl:host"
+PKG_DEPENDS_TARGET="toolchain cxxtools:host openssl"
 PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes."
 PKG_BUILD_FLAGS="+pic"
 

packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-cxxtools-char-a-trivial-class-by-defining-the-default.patch

@@ -0,0 +1,25 @@
+From b773c01fc13d2ae67abc0839888e383be23562fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= <tommi@tntnet.org>
+Date: Sun, 24 Jan 2021 17:20:24 +0100
+Subject: [PATCH] make cxxtools::Char a trivial class by definining the default
+ constructor as default
+
+---
+ include/cxxtools/char.h | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h
+index 1e637317..3a4ed62a 100644
+--- a/include/cxxtools/char.h
++++ b/include/cxxtools/char.h
+@@ -68,9 +68,7 @@ namespace cxxtools
+             typedef int32_t value_type;
+ 
+             //! Constructs a character with a value of 0.
+-            Char()
+-            : _value(0)
+-            {}
++            Char() = default;
+ 
+             //! Constructs a character using the given value as base for the character value.
+             Char(value_type ch)

packages/addons/addon-depends/cxxtools/patches/cxxtools-3.0-gcc12-time.patch

@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/851837
+--- a/src/timer.cpp
++++ b/src/timer.cpp
+@@ -27,6 +27,7 @@
+ #include "cxxtools/clock.h"
+ #include "cxxtools/selector.h"
+ #include "cxxtools/datetime.h"
++#include <ctime>
+ #include <stdexcept>
+ 
+ namespace cxxtools

packages/addons/addon-depends/cxxtools/patches/cxxtools-3.0-lld-linking-openssl.patch

@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -173,7 +173,7 @@ libcxxtools_la_LIBADD = $(LIBICONV)
+ libcxxtools_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
+ 
+ if MAKE_OPENSSL
+-libcxxtools_la_LDFLAGS += -lssl
++libcxxtools_la_LIBADD += -lssl -lcrypto
+ libcxxtools_la_SOURCES += \
+ 	sslcertificateimpl.cpp
+ endif

packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch

@@ -12,9 +12,9 @@ diff -Naur cxxtools-2.2/configure cxxtools-2.2.patch/configure
  
  
  
-diff -Naur cxxtools-2.2/configure.in cxxtools-2.2.patch/configure.in
---- cxxtools-2.2/configure.in	2013-04-20 23:31:50.000000000 +0200
-+++ cxxtools-2.2.patch/configure.in	2014-01-03 20:26:32.064005192 +0100
+diff -Naur cxxtools-2.2/configure.ac cxxtools-2.2.patch/configure.ac
+--- cxxtools-2.2/configure.ac	2013-04-20 23:31:50.000000000 +0200
++++ cxxtools-2.2.patch/configure.ac	2014-01-03 20:26:32.064005192 +0100
 @@ -106,8 +106,8 @@
  
  AC_PROG_LIBTOOL

packages/addons/addon-depends/docker/cli/package.mk

@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="cli"
+PKG_VERSION="$(get_pkg_version moby)"
+PKG_SHA256="b31eb0343e8bb587e921a7630baa659896602072a77ad97720e5f2a8e48005e9"
+PKG_LICENSE="ASL"
+PKG_SITE="https://github.com/docker/cli"
+PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_LONGDESC="The Docker CLI"
+PKG_TOOLCHAIN="manual"
+
+# Git commit of the matching release https://github.com/docker/cli/releases
+export PKG_GIT_COMMIT="ef23cbc4315ae76c744e02d687c09548ede461bd"
+
+configure_target() {
+  go_configure
+
+  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC}"
+
+  # used for docker version
+  export GITCOMMIT=${PKG_GIT_COMMIT}
+  export VERSION=${PKG_VERSION}
+  export BUILDTIME="$(date --utc)"
+
+  cat > "${PKG_BUILD}/go.mod" << EOF
+module github.com/docker/cli
+
+go 1.18
+EOF
+
+  GO111MODULE=auto ${GOLANG} mod tidy -modfile 'vendor.mod' -compat 1.18
+  GO111MODULE=auto ${GOLANG} mod vendor -modfile vendor.mod
+}
+
+make_target() {
+  mkdir -p bin
+  PKG_CLI_FLAGS="-X 'github.com/docker/cli/cli/version.Version=${VERSION}'"
+  PKG_CLI_FLAGS+=" -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'"
+  PKG_CLI_FLAGS+=" -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'"
+  ${GOLANG} build -mod=mod -modfile=vendor.mod -v -o bin/docker -a -tags "${PKG_DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS} ${PKG_CLI_FLAGS}" ./cmd/docker
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/docker/cli/patches/cli-0001-path-for-cli-plugins.patch

@@ -0,0 +1,11 @@
+--- a/cli-plugins/manager/manager_unix.go	2023-02-03 11:54:16.746399916 +0000
++++ b/cli-plugins/manager/manager_unix.go	2023-02-03 11:59:04.528175595 +0000
+@@ -4,6 +4,6 @@
+ package manager
+ 
+ var defaultSystemPluginDirs = []string{
+-	"/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
+-	"/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
++	"/storage/.kodi/addons/service.system.docker/cli-plugins",
++	"/storage/.kodi/userdata/addon_data/service.system.docker/docker/cli-plugins",
+ }

packages/addons/addon-depends/docker/containerd/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
-PKG_VERSION="1.6.6"
-PKG_SHA256="27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24"
+PKG_VERSION="1.7.1"
+PKG_SHA256="fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.io"
 PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
@@ -13,15 +13,15 @@ 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() {
 
   go_configure
 
-  export CONTAINERD_VERSION=${PKG_VERSION}
-  export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
-  export CONTAINERD_PKG=github.com/containerd/containerd
+  export CONTAINERD_VERSION="${PKG_VERSION}"
+  export CONTAINERD_REVISION="${PKG_GIT_COMMIT}"
+  export CONTAINERD_PKG="github.com/containerd/containerd"
   export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}"
   export GO111MODULE=off
 
@@ -35,6 +35,7 @@ pre_make_target() {
 
 make_target() {
   mkdir -p bin
-  ${GOLANG} build -v -o bin/containerd      -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd
-  ${GOLANG} build -v -o bin/containerd-shim -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim
+  ${GOLANG} build -v -o bin/containerd              -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd
+  ${GOLANG} build -v -o bin/containerd-shim         -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim
+  ${GOLANG} build -v -o bin/containerd-shim-runc-v2 -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim-runc-v2
 }

packages/addons/addon-depends/docker/ctop/package.mk

@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="ctop"
+PKG_VERSION="0.7.7"
+PKG_SHA256="0db439f2030af73ad5345884b08a33a762c3b41b30604223dd0ebddde72d2741"
+PKG_LICENSE="MIT"
+PKG_SITE="https://ctop.sh"
+PKG_URL="https://github.com/bcicen/ctop/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_LONGDESC="Top-like interface for container metrics"
+PKG_TOOLCHAIN="manual"
+
+# Git commit of the matching release https://github.com/bcicen/ctop/releases
+PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
+
+pre_make_target() {
+  go_configure
+
+  export CTOP_VERSION="${PKG_VERSION}"
+  export CTOP_REVISION="${PKG_GIT_COMMIT}"
+  export CTOP_PKG="github.com/bcicen/ctop"
+  export LDFLAGS="-w -extldflags -static -X main.version=${CTOP_VERSION} -X main.build=${CTOP_REVISION} -extld ${CC}"
+
+  mkdir -p ${GOPATH}/src/github.com/bcicen
+  ln -fs ${PKG_BUILD} ${GOPATH}/src/${CTOP_PKG}
+}
+
+make_target() {
+  mkdir -p bin
+  ${GOLANG} build -v -o bin/ctop -a -tags "static_build release" -ldflags "${LDFLAGS}"
+}

packages/addons/addon-depends/docker/moby/package.mk

@@ -0,0 +1,54 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="moby"
+PKG_VERSION="23.0.6"
+PKG_SHA256="3bbd32f401f652cc15084d3c09bd7acd381571802beac9333fd63d803dc66c3e"
+PKG_LICENSE="ASL"
+PKG_SITE="https://mobyproject.org/"
+PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host systemd"
+PKG_LONGDESC="Moby is an open-source project created by Docker to enable and accelerate software containerization."
+PKG_TOOLCHAIN="manual"
+
+# Git commit of the matching release https://github.com/moby/moby
+export PKG_GIT_COMMIT="9dbdbd4b6d7681bd18c897a6ba0376073c2a72ff"
+
+PKG_MOBY_BUILDTAGS="daemon \
+                    autogen \
+                    exclude_graphdriver_devicemapper \
+                    exclude_graphdriver_aufs \
+                    exclude_graphdriver_btrfs \
+                    journald"
+
+configure_target() {
+  go_configure
+
+  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC}"
+
+  # used for docker version
+  export GITCOMMIT=${PKG_GIT_COMMIT}
+  export VERSION=${PKG_VERSION}
+  export BUILDTIME="$(date --utc)"
+
+  cat > "${PKG_BUILD}/go.mod" << EOF
+module github.com/docker/docker
+
+go 1.18
+EOF
+
+  GO111MODULE=auto ${GOLANG} mod tidy -modfile 'vendor.mod' -compat 1.18
+  GO111MODULE=auto ${GOLANG} mod vendor -modfile vendor.mod
+
+  bash hack/make/.go-autogen
+}
+
+make_target() {
+  mkdir -p bin
+  ${GOLANG} build -mod=mod -modfile=vendor.mod -v -o bin/docker-proxy -a -ldflags "${LDFLAGS}" ./cmd/docker-proxy
+  ${GOLANG} build -mod=mod -modfile=vendor.mod -v -o bin/dockerd -a -tags "${PKG_MOBY_BUILDTAGS}" -ldflags "${LDFLAGS}" ./cmd/dockerd
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch

@@ -0,0 +1,239 @@
+# when updating this patch just create it from scratch using this command
+#
+# find . -name "*.go" -print | xargs sed -i 's/\/etc\/docker/\/storage\/.kodi\/userdata\/addon_data\/service.system.docker\/config/g'
+#
+#
+diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
+--- a/cmd/dockerd/daemon_unix.go	2022-06-03 10:30:24.000000000 -0700
++++ b/cmd/dockerd/daemon_unix.go	2022-06-07 14:28:05.510327911 -0700
+@@ -25,7 +25,7 @@
+ 
+ func getDefaultDaemonConfigDir() (string, error) {
+ 	if !honorXDG {
+-		return "/etc/docker", nil
++		return "/storage/.kodi/userdata/addon_data/service.system.docker/config", nil
+ 	}
+ 	// NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because
+ 	// ~/.docker was not designed to store daemon configurations.
+diff -Naur a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go
+--- a/integration/plugin/authz/authz_plugin_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration/plugin/authz/authz_plugin_test.go	2022-06-07 14:28:05.570328822 -0700
+@@ -56,15 +56,15 @@
+ 	ctrl = &authorizationController{}
+ 	teardown := setupTest(t)
+ 
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
+ 	assert.NilError(t, err)
+ 
+-	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", testAuthZPlugin)
++	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", testAuthZPlugin)
+ 	err = os.WriteFile(fileName, []byte(server.URL), 0644)
+ 	assert.NilError(t, err)
+ 
+ 	return func() {
+-		err := os.RemoveAll("/etc/docker/plugins")
++		err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
+ 		assert.NilError(t, err)
+ 
+ 		teardown()
+diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugin/graphdriver/external_test.go
+--- a/integration/plugin/graphdriver/external_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration/plugin/graphdriver/external_test.go	2022-06-07 14:28:05.570328822 -0700
+@@ -80,7 +80,7 @@
+ 
+ 	sserver.Close()
+ 	jserver.Close()
+-	err := os.RemoveAll("/etc/docker/plugins")
++	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
+ 	assert.NilError(t, err)
+ }
+ 
+@@ -345,10 +345,10 @@
+ 		respond(w, &graphDriverResponse{Size: size})
+ 	})
+ 
+-	err = os.MkdirAll("/etc/docker/plugins", 0755)
++	err = os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
+ 	assert.NilError(t, err)
+ 
+-	specFile := "/etc/docker/plugins/" + name + "." + ext
++	specFile := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/" + name + "." + ext
+ 	err = os.WriteFile(specFile, b, 0644)
+ 	assert.NilError(t, err)
+ }
+diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integration-cli/docker_cli_external_volume_driver_test.go
+--- a/integration-cli/docker_cli_external_volume_driver_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration-cli/docker_cli_external_volume_driver_test.go	2022-06-07 14:28:05.556328610 -0700
+@@ -258,10 +258,10 @@
+ 		send(w, `{"Capabilities": { "Scope": "global" }}`)
+ 	})
+ 
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
+ 	assert.NilError(c, err)
+ 
+-	err = os.WriteFile("/etc/docker/plugins/"+name+".spec", []byte(s.Server.URL), 0644)
++	err = os.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/"+name+".spec", []byte(s.Server.URL), 0644)
+ 	assert.NilError(c, err)
+ 	return s
+ }
+@@ -269,7 +269,7 @@
+ func (s *DockerExternalVolumeSuite) TearDownSuite(c *testing.T) {
+ 	s.volumePlugin.Close()
+ 
+-	err := os.RemoveAll("/etc/docker/plugins")
++	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
+ 	assert.NilError(c, err)
+ }
+ 
+@@ -359,7 +359,7 @@
+ 
+ // Make sure a request to use a down driver doesn't block other requests
+ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *testing.T) {
+-	specPath := "/etc/docker/plugins/down-driver.spec"
++	specPath := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/down-driver.spec"
+ 	err := os.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0644)
+ 	assert.NilError(c, err)
+ 	defer os.RemoveAll(specPath)
+diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
+--- a/integration-cli/docker_cli_network_unix_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration-cli/docker_cli_network_unix_test.go	2022-06-07 14:28:05.558328640 -0700
+@@ -196,14 +196,14 @@
+ 		}
+ 	})
+ 
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
+ 	assert.NilError(c, err)
+ 
+-	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
++	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
+ 	err = os.WriteFile(fileName, []byte(url), 0644)
+ 	assert.NilError(c, err)
+ 
+-	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
++	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
+ 	err = os.WriteFile(ipamFileName, []byte(url), 0644)
+ 	assert.NilError(c, err)
+ }
+@@ -215,7 +215,7 @@
+ 
+ 	s.server.Close()
+ 
+-	err := os.RemoveAll("/etc/docker/plugins")
++	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
+ 	assert.NilError(c, err)
+ }
+ 
+diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go
+--- a/integration-cli/docker_cli_swarm_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/integration-cli/docker_cli_swarm_test.go	2022-06-07 14:28:05.561328685 -0700
+@@ -770,14 +770,14 @@
+ 		}
+ 	})
+ 
+-	err := os.MkdirAll("/etc/docker/plugins", 0755)
++	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
+ 	assert.NilError(c, err)
+ 
+-	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
++	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
+ 	err = os.WriteFile(fileName, []byte(url), 0644)
+ 	assert.NilError(c, err)
+ 
+-	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
++	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
+ 	err = os.WriteFile(ipamFileName, []byte(url), 0644)
+ 	assert.NilError(c, err)
+ }
+@@ -789,7 +789,7 @@
+ 	setupRemoteGlobalNetworkPlugin(c, mux, s.server.URL, globalNetworkPlugin, globalIPAMPlugin)
+ 	defer func() {
+ 		s.server.Close()
+-		err := os.RemoveAll("/etc/docker/plugins")
++		err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
+ 		assert.NilError(c, err)
+ 	}()
+ 
+diff -Naur a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remote/driver_test.go
+--- a/libnetwork/drivers/remote/driver_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/libnetwork/drivers/remote/driver_test.go	2022-06-07 14:28:05.586329065 -0700
+@@ -41,7 +41,7 @@
+ }
+ 
+ func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() {
+-	specPath := "/etc/docker/plugins"
++	specPath := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
+ 	if runtime.GOOS == "windows" {
+ 		specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
+ 	}
+diff -Naur a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/remote_test.go
+--- a/libnetwork/ipams/remote/remote_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/libnetwork/ipams/remote/remote_test.go	2022-06-07 14:28:05.591329141 -0700
+@@ -36,7 +36,7 @@
+ }
+ 
+ func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() {
+-	specPath := "/etc/docker/plugins"
++	specPath := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
+ 	if runtime.GOOS == "windows" {
+ 		specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
+ 	}
+diff -Naur a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_test.go
+--- a/libnetwork/libnetwork_unix_test.go	2022-06-03 10:30:24.000000000 -0700
++++ b/libnetwork/libnetwork_unix_test.go	2022-06-07 14:28:05.592329156 -0700
+@@ -3,4 +3,4 @@
+ 
+ package libnetwork_test
+ 
+-var specPath = "/etc/docker/plugins"
++var specPath = "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
+diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go
+--- a/pkg/plugins/discovery_unix.go	2022-06-03 10:30:24.000000000 -0700
++++ b/pkg/plugins/discovery_unix.go	2022-06-07 14:28:05.615329505 -0700
+@@ -9,7 +9,7 @@
+ 	"github.com/docker/docker/pkg/rootless"
+ )
+ 
+-const globalConfigPluginsPath = "/etc/docker/plugins"
++const globalConfigPluginsPath = "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
+ const globalLibPluginsPath = "/usr/lib/docker/plugins"
+ 
+ var globalSpecsPaths = []string{globalConfigPluginsPath, globalLibPluginsPath}
+diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
+--- a/pkg/plugins/plugins.go	2022-06-03 10:30:24.000000000 -0700
++++ b/pkg/plugins/plugins.go	2022-06-07 14:28:05.616329521 -0700
+@@ -4,7 +4,7 @@
+ // Docker discovers plugins by looking for them in the plugin directory whenever
+ // a user or container tries to use one by name. UNIX domain socket files must
+ // be located under /run/docker/plugins, whereas spec files can be located
+-// either under /etc/docker/plugins or /usr/lib/docker/plugins. This is handled
++// either under /storage/.kodi/userdata/addon_data/service.system.docker/config/plugins or /usr/lib/docker/plugins. This is handled
+ // by the Registry interface, which lets you list all plugins or get a plugin by
+ // its name if it exists.
+ //
+diff -Naur a/registry/config_unix.go b/registry/config_unix.go
+--- a/registry/config_unix.go	2022-06-03 10:30:24.000000000 -0700
++++ b/registry/config_unix.go	2022-06-07 14:28:05.626329672 -0700
+@@ -6,7 +6,7 @@
+ // defaultCertsDir is the platform-specific default directory where certificates
+ // are stored. On Linux, it may be overridden through certsDir, for example, when
+ // running in rootless mode.
+-const defaultCertsDir = "/etc/docker/certs.d"
++const defaultCertsDir = "/storage/.kodi/userdata/addon_data/service.system.docker/config/certs.d"
+ 
+ // cleanPath is used to ensure that a directory name is valid on the target
+ // platform. It will be passed in something *similar* to a URL such as
+diff -Naur a/registry/endpoint_v1.go b/registry/endpoint_v1.go
+--- a/registry/endpoint_v1.go	2022-06-03 10:30:24.000000000 -0700
++++ b/registry/endpoint_v1.go	2022-06-07 14:28:05.627329688 -0700
+@@ -63,7 +63,7 @@
+ 		if endpoint.IsSecure {
+ 			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`
+ 			// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fallback to HTTP.
+-			return invalidParamf("invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /etc/docker/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
++			return invalidParamf("invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /storage/.kodi/userdata/addon_data/service.system.docker/config/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
+ 		}
+ 
+ 		// If registry is insecure and HTTPS failed, fallback to HTTP.

packages/addons/addon-depends/docker/moby/patches/moby-002-use-unconfined-seccomp-profile-as-default.patch

@@ -0,0 +1,22 @@
+--- a/daemon/config/config.go	2022-06-03 10:30:24.000000000 -0700
++++ b/daemon/config/config.go	2022-06-07 14:29:36.755713207 -0700
+@@ -59,7 +59,7 @@
+ 	LinuxV2RuntimeName = "io.containerd.runc.v2"
+ 
+ 	// SeccompProfileDefault is the built-in default seccomp profile.
+-	SeccompProfileDefault = "builtin"
++	SeccompProfileDefault = "unconfined"
+ 	// SeccompProfileUnconfined is a special profile name for seccomp to use an
+ 	// "unconfined" seccomp profile.
+ 	SeccompProfileUnconfined = "unconfined"
+--- a/daemon/daemon_unix.go	2022-06-03 10:30:24.000000000 -0700
++++ b/daemon/daemon_unix.go	2022-06-07 14:34:55.315558083 -0700
+@@ -1711,8 +1711,6 @@
+ 
+ func (daemon *Daemon) setupSeccompProfile() error {
+ 	switch profile := daemon.configStore.SeccompProfile; profile {
+-	case "", config.SeccompProfileDefault:
+-		daemon.seccompProfilePath = config.SeccompProfileDefault
+ 	case config.SeccompProfileUnconfined:
+ 		daemon.seccompProfilePath = config.SeccompProfileUnconfined
+ 	default:

packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aspnet6-runtime"
-PKG_VERSION="6.0.12"
+PKG_VERSION="6.0.24"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"
 PKG_DEPENDS_TARGET="toolchain"
@@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual"
 
 case "${ARCH}" in
   "aarch64")
-    PKG_SHA256="0090d031615b7d49855186cff7e4cbc99636ba664880780f84ce0d5ce25e4b0b"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/8072e219-57e4-48c3-b138-2b4067844ab2/b0712ad06fd0740963bf4ba2eff7f5ea/aspnetcore-runtime-6.0.12-linux-arm64.tar.gz"
+    PKG_SHA256="ee6b660b3c8b3fb88eb64690ac78a47752dae68c21647fccdc5f810bc68829ab"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d562ba2b-8e2c-48e5-9853-f8616a9cb4e4/f4e251ba67b718083c28017e3b0c6349/aspnetcore-runtime-6.0.24-linux-arm64.tar.gz"
     ;;
   "arm")
-    PKG_SHA256="2131903c85087017ec680e44676c4eb46e7bd0a12f0683c2a7790ec75b243d75"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/57b2bdaf-8455-4b1a-b25b-5950c950bd38/471d6de036e6f367f3a4aae5252d885a/aspnetcore-runtime-6.0.12-linux-arm.tar.gz"
+    PKG_SHA256="634b0ecd7312e8a46adedcbff6e1b23e514fa153f7135a6b9f6aefb5851f9d88"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/9c00fe25-e1e0-4390-9061-77d07e95356f/09886ffeaed522c3fa8803e879ce070c/aspnetcore-runtime-6.0.24-linux-arm.tar.gz"
     ;;
   "x86_64")
-    PKG_SHA256="dd60c551d63eb66cd9bdc7ef223c00f49341e67f8ddda2e4ab412c3ee8997765"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4ba0f30d-0a77-4997-8d8d-1b113d60253b/5caeeb07572b0b6a26f2a82f7a4eb31d/aspnetcore-runtime-6.0.12-linux-x64.tar.gz"
+    PKG_SHA256="022dc914af7490bcd2d885edeb5d4c1faa4b771b503b8059d5181f130191cf2c"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/8f5a65c0-9bc8-497d-9ce2-4658c461dc55/b6c01c3cd060552d987501ba6bbde09f/aspnetcore-runtime-6.0.24-linux-x64.tar.gz"
     ;;
 esac
 PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

packages/addons/addon-depends/dvb-tools-depends/dvb-apps/patches/dvb-apps-60-dont-build-tests.patch

@@ -0,0 +1,11 @@
+diff -ru a/Makefile b/Makefile
+--- a/Makefile	2014-03-21 20:26:36.000000000 +0100
++++ b/Makefile	2022-12-04 20:52:52.827027541 +0100
+@@ -10,7 +10,6 @@
+ 
+ all clean install:
+ 	$(MAKE) -C lib $@
+-	$(MAKE) -C test $@
+ 	$(MAKE) -C util $@
+ 
+ update:

packages/addons/addon-depends/enet/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="enet"
-PKG_VERSION="d9e561938fd9360cdbbd67d78b105ccbe4af0a65" # 10 Jan 2021 # 1.3.17+vita
-PKG_SHA256="ff52ea54edb71662d5933b165c073f079c90ed9adcf98bcb7b2e74d4ddf3dc6b"
+PKG_VERSION="8d69c5abe4b699e7077395e01927bd102b3ba597" # 12 Jun 2021
+PKG_SHA256="4da28dc923828f2241f9086009c87d9679cb52bb3085305754cbcac33a06f312"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/cgutman/enet/"
 PKG_URL="https://github.com/cgutman/enet/archive/${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/ffmpegx-depends/x264/package.mk

@@ -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"
 

packages/addons/addon-depends/ffmpegx/package.mk

@@ -2,14 +2,14 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ffmpegx"
-PKG_VERSION="4.4"
-PKG_SHA256="06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909"
+PKG_VERSION="4.4.3"
+PKG_SHA256="6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls lame libvorbis opus x264 zlib"
+PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
-PKG_BUILD_FLAGS="-gold -sysroot"
+PKG_BUILD_FLAGS="-sysroot"
 
 # Dependencies
 get_graphicdrivers
@@ -17,7 +17,7 @@ get_graphicdrivers
 if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" nasm:host x265"
 
-  if listcontains "${GRAPHIC_DRIVERS}" "(iris|i915|i965)"; then
+  if listcontains "${GRAPHIC_DRIVERS}" "(crocus|i915|iris)"; then
     PKG_DEPENDS_TARGET+=" intel-vaapi-driver"
   fi
 fi
@@ -123,6 +123,7 @@ configure_target() {
     \
     `#Licensing options` \
     --enable-gpl \
+    --enable-version3 \
     \
     `#Documentation options` \
     --disable-doc \
@@ -160,8 +161,8 @@ configure_target() {
     --extra-ldflags="${LDFLAGS}" \
     --extra-libs="${PKG_FFMPEG_LIBS}" \
     --enable-pic \
-    --enable-gnutls \
-    --disable-openssl \
+    --disable-gnutls \
+    --enable-openssl \
     \
     `#Advanced options` \
     --disable-hardcoded-tables \

packages/addons/addon-depends/ffmpegx/patches/ffmpeg-openssl3.patch

@@ -0,0 +1,44 @@
+From 1d23e125b6f76e74b754560c3b6931507cacddce Mon Sep 17 00:00:00 2001
+From: Timo Rothenpieler <timo@rothenpieler.org>
+Date: Tue, 7 Sep 2021 19:35:31 +0200
+Subject: [PATCH] configure: account for openssl3 license change
+
+---
+ configure | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index c87a010387..ed7345b2c1 100755
+--- a/configure
++++ b/configure
+@@ -1765,7 +1765,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
+ EXTERNAL_LIBRARY_NONFREE_LIST="
+     decklink
+     libfdk_aac
+-    openssl
+     libtls
+ "
+ 
+@@ -1857,6 +1856,7 @@ EXTERNAL_LIBRARY_LIST="
+     mediacodec
+     openal
+     opengl
++    openssl
+     pocketsphinx
+     vapoursynth
+ "
+@@ -6572,7 +6572,10 @@ enabled omx_rpi           && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR
+                                die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
+                              enable omx
+ enabled omx               && require_headers OMX_Core.h
+-enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
++enabled openssl           && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl &&
++                                 { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
++                               { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
++                               check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
+                                check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
+                                check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+-- 
+2.34.1
+

packages/addons/addon-depends/go/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="go"
-PKG_VERSION="1.19.2"
-PKG_SHA256="8763d8e6bb595c3e2ad383e591f3009401df38ff682ef66b84efbe3ec62cf5f3"
+PKG_VERSION="1.20.3"
+PKG_SHA256="991a67cecebb7b9b1237fdbca76c4754a9f5e1669d5d49b58a9931813047e905"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/hidapi/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hidapi"
+PKG_VERSION="0.14.0"
+PKG_SHA256="a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf405bcbd"
+PKG_LICENSE="HIDAPI-orig"
+PKG_SITE="http://libusb.info/"
+PKG_URL="https://github.com/libusb/hidapi/archive/refs/tags/hidapi-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain libusb"
+PKG_LONGDESC="HIDAPI is a multi-platform library which allows an application to interface with USB and Bluetooth HID-Class devices."
+PKG_TOOLCHAIN="cmake"

packages/addons/addon-depends/icu/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="icu"
-PKG_VERSION="69.1"
-PKG_SHA256="39ce83dd5d15c7539dde261733e106a391923f82caf1ce52ecaebb72d93b4579"
+PKG_VERSION="72.1"
+PKG_SHA256="43cbad628d98f37a3f95f6c34579f9144ef4bde60248fa6004a4f006d7487e69"
 PKG_LICENSE="Custom"
-PKG_SITE="http://www.icu-project.org"
+PKG_SITE="https://icu.unicode.org"
 PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION//./-}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain icu:host"

packages/addons/addon-depends/jre-depends/apache-ant/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="apache-ant"
-PKG_VERSION="1.10.11"
-PKG_SHA256="baa049855cdecbefa62539555824058e52412e5ebe8f102e1db944cb762e06d9"
+PKG_VERSION="1.10.12"
+PKG_SHA256="6115c940367e50755cf806de5816f20a1db1321b1cb734e2c34ab20ef6682b9b"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
-PKG_URL="https://archive.apache.org/dist/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
+PKG_URL="https://downloads.apache.org/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
 PKG_DEPENDS_UNPACK="jdk-x86_64-zulu"
 PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
 PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk

@@ -13,5 +13,5 @@ PKG_CONFIGURE_OPTS_TARGET+=" --disable-static --enable-shared"
 
 unpack() {
   mkdir -p ${PKG_BUILD}
-  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:4}/${PKG_NAME:4}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:4}/${PKG_NAME:4}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
 }

packages/addons/addon-depends/libexif/package.mk

@@ -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."

packages/addons/addon-depends/libhdhomerun/package.mk

@@ -3,26 +3,20 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libhdhomerun"
-PKG_VERSION="7c54382fb681d03888b469033e50bebaf4ce6bce" # Release 20201023
-PKG_SHA256="d686f88b8dc6089e2cb3829958170d6ba02ecc4f2c5f2cfe3fd37e0dda76ce42"
+PKG_VERSION="20210624"
+PKG_SHA256="deaf463bbcc3eefa72f97199efb6213f7b0e2c8e91f1b3d2cbf52056a8715d15"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.silicondust.com"
-PKG_URL="https://github.com/Silicondust/libhdhomerun/archive/${PKG_VERSION}.tar.gz"
+PKG_URL="https://download.silicondust.com/hdhomerun/libhdhomerun_${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The library provides functionality to setup the HDHomeRun."
 
 PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=${TARGET_PREFIX}"
 
 makeinstall_target() {
-  mkdir -p ${INSTALL}/usr/bin
-    cp -PR hdhomerun_config ${INSTALL}/usr/bin
-
-  mkdir -p ${INSTALL}/usr/lib/
-    cp -PR libhdhomerun.so ${INSTALL}/usr/lib/
-
   mkdir -p ${SYSROOT_PREFIX}/usr/include/hdhomerun
     cp *.h ${SYSROOT_PREFIX}/usr/include/hdhomerun
 
   mkdir -p ${SYSROOT_PREFIX}/usr/lib
-    cp libhdhomerun.so ${SYSROOT_PREFIX}/usr/lib
+    cp libhdhomerun.a ${SYSROOT_PREFIX}/usr/lib
 }

packages/addons/addon-depends/libhdhomerun/patches/shared-to-static.patch

@@ -0,0 +1,52 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,17 @@
+ 
+-LIBSRCS += hdhomerun_channels.c
+-LIBSRCS += hdhomerun_channelscan.c
+-LIBSRCS += hdhomerun_control.c
+-LIBSRCS += hdhomerun_debug.c
+-LIBSRCS += hdhomerun_device.c
+-LIBSRCS += hdhomerun_device_selector.c
+-LIBSRCS += hdhomerun_discover.c
+-LIBSRCS += hdhomerun_os_posix.c
+-LIBSRCS += hdhomerun_pkt.c
+-LIBSRCS += hdhomerun_sock_posix.c
+-LIBSRCS += hdhomerun_video.c
++LIBSRCS += hdhomerun_channels.o
++LIBSRCS += hdhomerun_channelscan.o
++LIBSRCS += hdhomerun_control.o
++LIBSRCS += hdhomerun_debug.o
++LIBSRCS += hdhomerun_device.o
++LIBSRCS += hdhomerun_device_selector.o
++LIBSRCS += hdhomerun_discover.o
++LIBSRCS += hdhomerun_os_posix.o
++LIBSRCS += hdhomerun_pkt.o
++LIBSRCS += hdhomerun_sock_posix.o
++LIBSRCS += hdhomerun_video.o
+ 
++AR    := $(CROSS_COMPILE)ar
+ CC    := $(CROSS_COMPILE)gcc
+ STRIP := $(CROSS_COMPILE)strip
+ 
+@@ -38,14 +39,17 @@ else
+   endif
+ endif
+ 
+-all : hdhomerun_config$(BINEXT) libhdhomerun$(LIBEXT)
++all : hdhomerun_config$(BINEXT) libhdhomerun.a
++
++%.o: %.c
++	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
+ 
+ hdhomerun_config$(BINEXT) : hdhomerun_config.c $(LIBSRCS)
+ 	$(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@
+ 	$(STRIP) $@
+ 
+-libhdhomerun$(LIBEXT) : $(LIBSRCS)
+-	$(CC) $(CFLAGS) -fPIC -DDLL_EXPORT $(SHARED) $+ $(LDFLAGS) -o $@
++libhdhomerun.a : $(LIBSRCS)
++	$(AR) rcs libhdhomerun.a $(LIBSRCS)
+ 
+ clean :
+ 	-rm -f hdhomerun_config$(BINEXT)

packages/addons/addon-depends/libiconv/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libiconv"
-PKG_VERSION="1.16"
-PKG_SHA256="e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
+PKG_VERSION="1.17"
+PKG_SHA256="8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/projects/libiconv/"
-PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="https://ftp.gnu.org/pub/gnu/libiconv/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A tool that converts from one character encoding to another through Unicode conversion."
 PKG_BUILD_FLAGS="+pic"

packages/addons/addon-depends/libimobiledevice/package.mk

@@ -16,6 +16,10 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --without-cython \
                            --disable-largefile"
 
+post_configure_target() {
+  libtool_remove_rpath libtool
+}
+
 post_makeinstall_target() {
   mkdir -p "${SYSROOT_PREFIX}/usr/include/lib/libimobiledevice"
     cp ${PKG_BUILD}/common/utils.h "${SYSROOT_PREFIX}/usr/include/libimobiledevice"

packages/addons/addon-depends/libnetwork/package.mk

@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="libnetwork"
-PKG_VERSION="339b972b464ee3d401b5788b2af9e31d09d6b7da" # 2022-03-16
-PKG_SHA256="335851e924078a8e274f0c27cb80aaba32d0c1059068740496f1eb31b55a6ec4"
-PKG_LICENSE="APL"
-PKG_SITE="https://github.com/docker/libnetwork"
-PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain go:host"
-PKG_LONGDESC="A native Go implementation for connecting containers."
-PKG_TOOLCHAIN="manual"
-
-pre_make_target() {
-  go_configure
-
-  export CGO_ENABLED=0
-  export LDFLAGS="-extld ${CC}"
-  export GO111MODULE=off
-
-  mkdir -p ${GOPATH}
-  if [ -d ${PKG_BUILD}/vendor ]; then
-    mv ${PKG_BUILD}/vendor ${GOPATH}/src
-  fi
-
-  ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/docker/libnetwork
-}
-
-make_target() {
-  mkdir -p bin
-  ${GOLANG} build -v -o bin/docker-proxy -a -ldflags "${LDFLAGS}" ./cmd/proxy
-}

packages/addons/addon-depends/librespot-depends/rust/package.mk

@@ -1,63 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="rust"
-PKG_VERSION="1.54.0"
-PKG_LICENSE="MIT"
-PKG_SITE="https://www.rust-lang.org"
-PKG_DEPENDS_TARGET="toolchain rustup.rs"
-PKG_LONGDESC="A systems programming language that prevents segfaults, and guarantees thread safety."
-PKG_TOOLCHAIN="manual"
-
-make_target() {
-  export CARGO_HOME="${PKG_BUILD}/cargo"
-  export RUSTUP_HOME="${CARGO_HOME}"
-  export PATH="${CARGO_HOME}/bin:${PATH}"
-  case "${TARGET_ARCH}" in
-    aarch64)
-      RUST_TARGET_TRIPLE="aarch64-unknown-linux-gnu"
-      ;;
-    arm)
-      RUST_TARGET_TRIPLE="arm-unknown-linux-gnueabihf"
-      ;;
-    x86_64)
-      RUST_TARGET_TRIPLE="x86_64-unknown-linux-gnu"
-      ;;
-  esac
-  "$(get_build_dir rustup.rs)/rustup-init.sh" \
-    --default-toolchain none \
-    --no-modify-path \
-    --profile minimal \
-    --target "${RUST_TARGET_TRIPLE}" \
-    -y
-  cargo/bin/rustup toolchain install ${PKG_VERSION} --allow-downgrade --profile minimal --component clippy
-  cargo/bin/rustup target add ${RUST_TARGET_TRIPLE}
-
-  cat <<EOF >"${CARGO_HOME}/config"
-[build]
-target = "${RUST_TARGET_TRIPLE}"
-
-[target.${RUST_TARGET_TRIPLE}]
-ar = "${AR}"
-linker = "${CC}"
-EOF
-
-  cat <<EOF >"${CARGO_HOME}/env"
-export CARGO_HOME="${CARGO_HOME}"
-export CARGO_TARGET_DIR="\${PKG_BUILD}/.\${TARGET_NAME}"
-if [ "${HOSTTYPE}" = "${TARGET_ARCH}" ]; then
-  # Until target-applies-to-host is incorporated into stable this
-  # option is required for a matching host-target triple to be compiled
-  # by the cross compiler. Read more here.
-  # https://doc.rust-lang.org/cargo/reference/unstable.html#target-applies-to-host
-  export __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly"
-  export CARGO_TARGET_APPLIES_TO_HOST="false"
-  export CARGO_Z_TARGET_APPLIES_TO_HOST="-Z target-applies-to-host"
-fi
-export PATH="${CARGO_HOME}/bin:${PATH}"
-export PKG_CONFIG_ALLOW_CROSS="1"
-export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}"
-export RUSTUP_HOME="${CARGO_HOME}"
-unset CFLAGS
-EOF
-}

packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rustup.rs"
-PKG_VERSION="1.23.1"
-PKG_SHA256="0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f"
+PKG_VERSION="1.25.1"
+PKG_SHA256="4d062c77b08309bd212f22dd7da1957c1882509c478e57762f34ec4fb2884c9a"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/libseccomp/package.mk

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libseccomp"
+PKG_VERSION="2.5.4"
+PKG_SHA256="d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb"
+PKG_LICENSE="LGPLv2.1"
+PKG_SITE="https://github.com/seccomp/libseccomp"
+PKG_URL="https://github.com/seccomp/libseccomp/releases/download/v${PKG_VERSION}/libseccomp-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="An easy to use, platform independent, interface to the Linux Kernel syscall filtering mechanism"
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_CONFIGURE_OPTS_TARGET+=" --enable-static --enable-shared"

packages/addons/addon-depends/libusbmuxd/package.mk

@@ -14,3 +14,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
                            --enable-static \
                            --disable-shared"
+
+post_configure_target() {
+  libtool_remove_rpath libtool
+}

packages/addons/addon-depends/libvncserver/package.mk

@@ -2,16 +2,14 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libvncserver"
-PKG_VERSION="0.9.13"
-PKG_SHA256="0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a"
+PKG_VERSION="0.9.14"
+PKG_SHA256="83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libvnc.github.io/"
 PKG_URL="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libjpeg-turbo libpng openssl systemd"
 PKG_LONGDESC="A C library that allow you to easily implement VNC server or client functionality."
 
-PKG_MAINTAINER="Lukas Rusak (lrusak at irc.freenode.net)"
-
 PKG_CMAKE_OPTS_TARGET="-DWITH_GCRYPT=0 \
                        -DWITH_GNUTLS=0 \
                        -DWITH_GTK=0 \

packages/addons/addon-depends/libvpx/package.mk

@@ -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"

packages/addons/addon-depends/libzip/package.mk

@@ -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.10.1"
+PKG_SHA256="dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libzip.org/"
 PKG_URL="https://libzip.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz"
@@ -16,6 +16,7 @@ PKG_CMAKE_OPTS_TARGET="-DENABLE_COMMONCRYPTO=OFF \
                        -DENABLE_MBEDTLS=OFF \
                        -DENABLE_OPENSSL=OFF \
                        -DENABLE_WINDOWS_CRYPTO=OFF \
+                       -DENABLE_ZSTD=OFF \
                        -DBUILD_TOOLS=OFF \
                        -DBUILD_REGRESS=OFF \
                        -DBUILD_EXAMPLES=OFF \

packages/addons/addon-depends/libzip/patches/libzip-001-fix-typo-which-prevents-expansion-of-libdir-in-pkgconfig.patch

@@ -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)

packages/addons/addon-depends/mpd-mpc/package.mk

@@ -9,5 +9,4 @@ PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libiconv libmpdclient"
 PKG_LONGDESC="Command-line client for MPD."
-PKG_TOOLCHAIN="meson"
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmediainfo"
-PKG_VERSION="22.09"
-PKG_SHA256="b394d48285730cda53a41f41c82fd5ebf074c7158e1d6d4543777bfde0aa6927"
+PKG_VERSION="23.07"
+PKG_SHA256="60456c8b2ab8769a6081d96fd7be86db4fe32520e4a022397cb22cacf47ce820"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="https://mediaarea.net/download/source/libmediainfo/${PKG_VERSION}/libmediainfo_${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libzen"
-PKG_VERSION="0.4.39"
-PKG_SHA256="cded5d7774294e7d5b42768ceb285243709b6e99eec6e980a3cf7f0890dbb622"
+PKG_VERSION="0.4.41"
+PKG_SHA256="933bad3b7ecd29dc6bdc88a83645c83dfd098c15b0b90d6177a37fa1536704e8"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mediaarea.net/en/MediaInfo/"
 PKG_URL="https://mediaarea.net/download/source/libzen/${PKG_VERSION}/libzen_${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mediainfo"
-PKG_VERSION="22.09"
-PKG_SHA256="67f301276a2b82d76cb9f4bd525caa51d2dc6d4359fce774fbd5f25f1d513044"
+PKG_VERSION="23.07"
+PKG_SHA256="b6d7da9e29995fd34a22100825b843e74c32c7bc67adb01166b1beedea49f5d0"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="https://mediaarea.net/download/source/mediainfo/${PKG_VERSION}/mediainfo_${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk

@@ -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.3"
+PKG_SHA256="1ca77d3a69a5ff845b7a0536f783fee554e1041139a6b978f6afe14f5814ad1a"
 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."

packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk

@@ -2,19 +2,19 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpv-drmprime"
-PKG_VERSION="0.34.1"
-PKG_SHA256="32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746"
+PKG_VERSION="0.36.0"
+PKG_SHA256="29abc44f8ebee013bb2f9fe14d80b30db19b534c679056e4851ceadf5a5e8bf6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mpv.io/"
 PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm"
+PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm lua52"
 PKG_LONGDESC="A media player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types."
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_MANUAL_OPTS_TARGET="--prefix=/usr \
                         --disable-libarchive \
-                        --disable-lua \
+                        --enable-lua \
                         --disable-javascript \
                         --disable-uchardet \
                         --disable-rubberband \
@@ -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}
 }

packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libpcap"
-PKG_VERSION="1.10.2"
-PKG_SHA256="db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560"
+PKG_VERSION="1.10.3"
+PKG_SHA256="2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.tcpdump.org/"
 PKG_URL="https://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libstatgrab"
-PKG_VERSION="0.92"
-PKG_SHA256="5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196"
-PKG_SITE="http://www.i-scream.org/libstatgrab/"
-PKG_URL="http://ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-${PKG_VERSION}.tar.gz"
+PKG_VERSION="0.92.1"
+PKG_SHA256="5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11"
+PKG_SITE="https://libstatgrab.org"
+PKG_URL="https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_${PKG_VERSION//./_}/libstatgrab-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION=libs
 PKG_LONGDESC="A library that provides cross platform access to statistics about the system on which it's run."

packages/addons/addon-depends/network-tools-depends/iperf/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="iperf"
-PKG_VERSION="3.9"
-PKG_SHA256="c6d8076b800f2b51f92dc941b0a9b77fbf2a867f623b5cb3cbf4754dabc40899"
+PKG_VERSION="3.13"
+PKG_SHA256="a49d23fe0d3b1482047ad7f3b9e384c69657a63b486c4e3f0ce512a077d94434"
 PKG_LICENSE="BSD"
 PKG_SITE="http://software.es.net/iperf/"
 PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/network-tools-depends/lftp/package.mk

@@ -12,7 +12,12 @@ PKG_LONGDESC="A sophisticated ftp/http client, and a file transfer program suppo
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
+                           --disable-rpath \
                            --without-gnutls \
                            --with-openssl \
                            --with-readline=${SYSROOT_PREFIX}/usr \
                            --with-zlib=${SYSROOT_PREFIX}/usr"
+
+post_configure_target() {
+  libtool_remove_rpath libtool
+}

packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-Build-based-on-OpenSSL-version--not-API-level.patch

@@ -1,313 +0,0 @@
-From d6bea8dcdee36a3902cece14097993350306f1b6 Mon Sep 17 00:00:00 2001
-From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Tue, 6 Sep 2022 22:39:34 +0000
-Subject: [PATCH] Build based on OpenSSL version, not API level. Fixes #2516
-
----
- ncat/http_digest.c        |  2 +-
- ncat/ncat_connect.c       |  4 ++--
- ncat/ncat_ssl.c           |  6 +++---
- ncat/ncat_ssl.h           | 12 ------------
- ncat/test/test-wildcard.c |  4 ++--
- nse_openssl.cc            | 28 +++++++---------------------
- nse_ssl_cert.cc           | 24 ++++++------------------
- nsock/src/nsock_ssl.c     |  4 ++--
- nsock/src/nsock_ssl.h     | 15 +--------------
- 9 files changed, 24 insertions(+), 75 deletions(-)
-
-diff --git a/ncat/http_digest.c b/ncat/http_digest.c
-index b5f80a920a..e6ff99175c 100644
---- a/ncat/http_digest.c
-+++ b/ncat/http_digest.c
-@@ -133,7 +133,7 @@ int http_digest_init_secret(void)
-     return 0;
- }
- 
--#if OPENSSL_API_LEVEL < 10100
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define EVP_MD_CTX_new EVP_MD_CTX_create
- #define EVP_MD_CTX_free EVP_MD_CTX_destroy
- #endif
-diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c
-index 0e4b50761c..3dd3291fc9 100644
---- a/ncat/ncat_connect.c
-+++ b/ncat/ncat_connect.c
-@@ -82,8 +82,8 @@
- #include <openssl/err.h>
- 
- /* Deprecated in OpenSSL 3.0 */
--#if OPENSSL_API_LEVEL >= 30000
--#define SSL_get_peer_certificate SSL_get1_peer_certificate
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+# define SSL_get_peer_certificate SSL_get1_peer_certificate
- #endif
- #endif
- 
-diff --git a/ncat/ncat_ssl.c b/ncat/ncat_ssl.c
-index 9226b48116..3818bfecc5 100644
---- a/ncat/ncat_ssl.c
-+++ b/ncat/ncat_ssl.c
-@@ -80,7 +80,7 @@
- #define FUNC_ASN1_STRING_data ASN1_STRING_data
- #endif
- 
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/provider.h>
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
-@@ -117,7 +117,7 @@ SSL_CTX *setup_ssl_listen(void)
-     OpenSSL_add_all_algorithms();
-     ERR_load_crypto_strings();
-     SSL_load_error_strings();
--#elif OPENSSL_API_LEVEL >= 30000
-+#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
-   if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
-   {
-     loguser("OpenSSL legacy provider failed to load.\n");
-@@ -477,7 +477,7 @@ static int ssl_gen_cert(X509 **cert, EVP_PKEY **key)
-     const char *commonName = "localhost";
-     char dNSName[128];
-     int rc;
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     int ret = 0;
-     RSA *rsa = NULL;
-     BIGNUM *bne = NULL;
-diff --git a/ncat/ncat_ssl.h b/ncat/ncat_ssl.h
-index fca0b17716..458736e271 100644
---- a/ncat/ncat_ssl.h
-+++ b/ncat/ncat_ssl.h
-@@ -67,18 +67,6 @@
- #include <openssl/ssl.h>
- #include <openssl/err.h>
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
- #define NCAT_CA_CERTS_FILE "ca-bundle.crt"
- 
- enum {
-diff --git a/ncat/test/test-wildcard.c b/ncat/test/test-wildcard.c
-index 428ece71c7..fe55e1997e 100644
---- a/ncat/test/test-wildcard.c
-+++ b/ncat/test/test-wildcard.c
-@@ -20,7 +20,7 @@ are rejected. The SSL transactions happen over OpenSSL BIO pairs.
- 
- #include "ncat_core.h"
- #include "ncat_ssl.h"
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
- #include <openssl/bn.h>
- #endif
- 
-@@ -294,7 +294,7 @@ static int set_dNSNames(X509 *cert, const struct lstr dNSNames[])
- static int gen_cert(X509 **cert, EVP_PKEY **key,
-     const struct lstr commonNames[], const struct lstr dNSNames[])
- {
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     int rc, ret=0;
-     RSA *rsa = NULL;
-     BIGNUM *bne = NULL;
-diff --git a/nse_openssl.cc b/nse_openssl.cc
-index 3ee5d73d3f..0f5b450e0c 100644
---- a/nse_openssl.cc
-+++ b/nse_openssl.cc
-@@ -20,6 +20,9 @@
- #define FUNC_EVP_CIPHER_CTX_init EVP_CIPHER_CTX_reset
- #define FUNC_EVP_CIPHER_CTX_cleanup EVP_CIPHER_CTX_reset
- #define PASS_EVP_CTX(ctx) (ctx)
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+# include <openssl/provider.h>
-+#endif
- #else
- #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_init
- #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_cleanup
-@@ -37,23 +40,6 @@ extern NmapOps o;
- 
- #include "nse_openssl.h"
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--
--#if OPENSSL_API_LEVEL >= 30000
--#include <openssl/provider.h>
--#endif
--
- #define NSE_SSL_LUA_ERR(_L) \
-     luaL_error(_L, "OpenSSL error: %s", ERR_error_string(ERR_get_error(), NULL))
- 
-@@ -184,7 +170,7 @@ static int l_bignum_is_prime( lua_State *L ) /** bignum_is_prime( BIGNUM p ) */
-   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
-   BN_CTX * ctx = BN_CTX_new();
-   int is_prime =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
- #else
-     BN_check_prime( p->bn, ctx, NULL );
-@@ -199,7 +185,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
-   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
-   BN_CTX * ctx = BN_CTX_new();
-   int is_prime =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
- #else
-     BN_check_prime( p->bn, ctx, NULL );
-@@ -210,7 +196,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
-     BN_sub_word( n, (BN_ULONG)1 );
-     BN_div_word( n, (BN_ULONG)2 );
-     is_safe =
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       BN_is_prime_ex( n, BN_prime_checks, ctx, NULL );
- #else
-       BN_check_prime( n, ctx, NULL );
-@@ -582,7 +568,7 @@ LUALIB_API int luaopen_openssl(lua_State *L) {
- #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-   OpenSSL_add_all_algorithms();
-   ERR_load_crypto_strings();
--#elif OPENSSL_API_LEVEL >= 30000
-+#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
-   if (NULL == OSSL_PROVIDER_load(NULL, "legacy") && o.debugging > 1)
-   {
-     // Legacy provider may not be available.
-diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc
-index 5ae623a475..bc35019a1a 100644
---- a/nse_ssl_cert.cc
-+++ b/nse_ssl_cert.cc
-@@ -89,19 +89,7 @@
- #define X509_get0_notAfter X509_get_notAfter
- #endif
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/core_names.h>
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
-@@ -459,7 +447,7 @@ static const char *pkey_type_to_string(int type)
- }
- 
- int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-   char tmp[64] = {0};
-   size_t len = 0;
-   /* This structure (ecdhparams.curve_params) comes from tls.lua */
-@@ -634,7 +622,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-   else
- #endif
-   if (pkey_type == EVP_PKEY_RSA) {
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-     RSA *rsa = EVP_PKEY_get1_RSA(pubkey);
-     if (rsa) {
- #endif
-@@ -643,7 +631,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       luaL_getmetatable( L, "BIGNUM" );
-       lua_setmetatable( L, -2 );
- #if HAVE_OPAQUE_STRUCTS
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       const BIGNUM *n = NULL, *e = NULL;
-       data->should_free = false;
-       RSA_get0_key(rsa, &n, &e, NULL);
-@@ -663,7 +651,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       luaL_getmetatable( L, "BIGNUM" );
-       lua_setmetatable( L, -2 );
- #if HAVE_OPAQUE_STRUCTS
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       data->should_free = false;
- #else
-       data->should_free = true;
-@@ -673,7 +661,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
-       data->bn = rsa->n;
- #endif
-       lua_setfield(L, -2, "modulus");
--#if OPENSSL_API_LEVEL < 30000
-+#if OPENSSL_VERSION_NUMBER < 0x30000000L
-       RSA_free(rsa);
-     }
- #endif
-diff --git a/nsock/src/nsock_ssl.c b/nsock/src/nsock_ssl.c
-index 1ef7d521f0..23db5513ea 100644
---- a/nsock/src/nsock_ssl.c
-+++ b/nsock/src/nsock_ssl.c
-@@ -64,7 +64,7 @@
- #include "netutils.h"
- 
- #if HAVE_OPENSSL
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/provider.h>
- #endif
- 
-@@ -120,7 +120,7 @@ static SSL_CTX *ssl_init_helper(const SSL_METHOD *method) {
-     SSL_library_init();
- #else
-     OPENSSL_atexit(nsock_ssl_atexit);
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-     if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
-     {
-       nsock_log_error("OpenSSL legacy provider failed to load.\n");
-diff --git a/nsock/src/nsock_ssl.h b/nsock/src/nsock_ssl.h
-index bb99b1b5e1..1af473d629 100644
---- a/nsock/src/nsock_ssl.h
-+++ b/nsock/src/nsock_ssl.h
-@@ -69,20 +69,7 @@
- #include <openssl/err.h>
- #include <openssl/rand.h>
- 
--/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
--#ifndef OPENSSL_API_LEVEL
--# if OPENSSL_API_COMPAT < 0x900000L
--#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
--# else
--#  define OPENSSL_API_LEVEL \
--     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
--      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
--      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
--# endif
--#endif
--
--
--#if OPENSSL_API_LEVEL >= 30000
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- /* Deprecated in OpenSSL 3.0 */
- #define SSL_get_peer_certificate SSL_get1_peer_certificate
- #endif

packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rar2fs"
-PKG_VERSION="1.29.5"
-PKG_SHA256="a56e9f2fd3d5037087b8405cff85ce7ffb74a904176f33f55b7bd15117cff2be"
+PKG_VERSION="1.29.6"
+PKG_SHA256="ba3a0b649f2322498d54168f03d2e8bca9b1c96d70d0d97d83ea336a7525d4cb"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/hasse69/rar2fs"
 PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/network-tools-depends/sshfs/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="sshfs"
-PKG_VERSION="2.10"
-PKG_SHA256="70845dde2d70606aa207db5edfe878e266f9c193f1956dd10ba1b7e9a3c8d101"
+PKG_VERSION="3.7.3"
+PKG_SHA256="5218ce7bdd2ce0a34137a0d7798e0f6d09f0e6d21b1e98ee730a18b0699c2e99"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libfuse/sshfs"
-PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-${PKG_VERSION}/sshfs-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain fuse glib"
+PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-${PKG_VERSION}/sshfs-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain fuse3 glib"
 PKG_LONGDESC="A filesystem client based on the SSH File Transfer Protocol."
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tcpdump"
-PKG_VERSION="4.99.2"
-PKG_SHA256="f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5"
+PKG_VERSION="4.99.3"
+PKG_SHA256="ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3"
 PKG_SITE="https://www.tcpdump.org/"
 PKG_URL="https://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap libtirpc"

packages/addons/addon-depends/opus/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="opus"
-PKG_VERSION="1.3.1"
-PKG_SHA256="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d"
+PKG_VERSION="1.4"
+PKG_SHA256="c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.opus-codec.org"
-PKG_URL="https://archive.mozilla.org/pub/opus/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/xiph/opus/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Codec designed for interactive speech and audio transmission over the Internet."
 PKG_TOOLCHAIN="configure"

packages/addons/addon-depends/pcre2/package.mk

@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="pcre2"
-PKG_VERSION="10.36"
-PKG_SHA256="a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c"
-PKG_LICENSE="BSD"
-PKG_SITE="http://www.pcre.org/"
-PKG_URL="${SOURCEFORGE_SRC}/pcre/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="A set of functions that implement regular expression pattern matching using the same syntax."
-PKG_TOOLCHAIN="cmake"
-PKG_BUILD_FLAGS="+pic"
-
-PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \
-                       -DPCRE2_BUILD_PCRE2_16=ON \
-                       -DPCRE2_SUPPORT_LIBREADLINE=OFF"
-
-post_makeinstall_target() {
-  safe_remove ${INSTALL}/usr/bin
-}

packages/addons/addon-depends/pcsc-lite/package.mk

@@ -15,3 +15,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
             --disable-libudev \
             --enable-libusb \
             --enable-usbdropdir=/storage/.kodi/addons/service.pcscd/drivers"
+
+post_configure_target() {
+  libtool_remove_rpath libtool
+}

packages/addons/addon-depends/pngquant/package.mk

@@ -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.18.0"
+PKG_SHA256="e72194b52b36f040deaec49a1ddd5dcd8d4feecc3a5fe6c5e9589a9707b233d4"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://pngquant.org"
 PKG_URL="https://pngquant.org/pngquant-${PKG_VERSION}-src.tar.gz"

packages/addons/addon-depends/qtbase/patches/qtbase-0002-fix-build-with-gcc-11.patch

@@ -0,0 +1,43 @@
+From 0afad46bb71b106780dd641de768a81d9f6c6a51 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Mon, 18 Jan 2021 07:40:54 -0800
+Subject: Fix build with GCC 11: include <limits>
+
+Fixes: QTBUG-90395
+Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
+Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
+(cherry picked from commit 9c56d4da2ff631a8c1c30475bd792f6c86bda53c)
+Reviewed-by: Andy Shaw <andy.shaw@qt.io>
+---
+ src/corelib/global/qendian.h  | 4 +++-
+ src/corelib/global/qfloat16.h | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
+index 2fe29e4338..3abd6a000c 100644
+--- a/src/corelib/global/qendian.h
++++ b/src/corelib/global/qendian.h
+@@ -44,6 +44,8 @@
+ #include <QtCore/qfloat16.h>
+ #include <QtCore/qglobal.h>
+ 
++#include <limits>
++
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
+index 5b369bf3c5..6c52c94466 100644
+--- a/src/corelib/global/qfloat16.h
++++ b/src/corelib/global/qfloat16.h
+@@ -43,6 +43,7 @@
+ 
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
++#include <limits>
+ #include <string.h>
+ 
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
+-- 
+cgit v1.2.1
+

packages/addons/addon-depends/qtbase/patches/qtbase-0003-More-build-fixes-for-GCC-11.patch

@@ -0,0 +1,59 @@
+From 8bcf1828f4d75606fb8d6913dfe09e2363a06cac Mon Sep 17 00:00:00 2001
+From: Ville Voutilainen <ville.voutilainen@qt.io>
+Date: Mon, 18 Jan 2021 09:58:17 +0200
+Subject: [PATCH 002/132] Build fixes for GCC 11
+
+Task-number: QTBUG-89977
+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+(cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9)
+---
+ src/corelib/text/qbytearraymatcher.h     | 2 ++
+ src/corelib/tools/qsharedpointer_impl.h  | 3 ---
+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d20..f5f9bef7b8 100644
+--- a/src/corelib/text/qbytearraymatcher.h
++++ b/src/corelib/text/qbytearraymatcher.h
+@@ -42,6 +42,8 @@
+ 
+ #include <QtCore/qbytearray.h>
+ 
++#include <limits>
++
+ QT_BEGIN_NAMESPACE
+ 
+ 
+diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
+index 790c187cb9..4aee98af53 100644
+--- a/src/corelib/tools/qsharedpointer_impl.h
++++ b/src/corelib/tools/qsharedpointer_impl.h
+@@ -155,9 +155,6 @@ namespace QtSharedPointer {
+ #endif
+         inline void checkQObjectShared(...) { }
+         inline void setQObjectShared(...) { }
+-
+-        inline void operator delete(void *ptr) { ::operator delete(ptr); }
+-        inline void operator delete(void *, void *) { }
+     };
+     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
+ 
+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
+index 9e7e1a5572..f0866a90ac 100644
+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
+@@ -698,7 +698,7 @@ void QXcbWindow::show()
+         if (isTransient(window())) {
+             const QWindow *tp = window()->transientParent();
+             if (tp && tp->handle())
+-                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
++                transientXcbParent = tp->handle()->winId();
+             // Default to client leader if there is no transient parent, else modal dialogs can
+             // be hidden by their parents.
+             if (!transientXcbParent)
+-- 
+2.35.1
+

packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk

@@ -6,7 +6,7 @@ PKG_VERSION="1.0"
 PKG_SHA256="27d607d3c5c7b142681dcd9fd0afecb7fcb052abfaffc330b28906f782e602f3"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
-PKG_SITE="https://mockmoon-cybernetics.ch/computer/raspberry-pi/lan951x-led-ctl/"
+PKG_SITE="https://familie-radermacher.ch/dominic/computer/raspberry-pi/lan951x-led-ctl/"
 PKG_URL="https://mockmoon-cybernetics.ch/cgi/cgit/lan951x-led-ctl.git/snapshot/lan951x-led-ctl-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_LONGDESC="Control LEDs connected to LAN9512/LAN9514 ethernet USB controllers."

packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libfastjson"
-PKG_VERSION="0.99.9"
-PKG_SHA256="a330e1bdef3096b7ead53b4bad1a6158f19ba9c9ec7c36eda57de7729d84aaee"
+PKG_VERSION="1.2304.0"
+PKG_SHA256="ef30d1e57a18ec770f90056aaac77300270c6203bbe476f4181cc83a2d5dc80c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.rsyslog.com/tag/libfastjson"
 PKG_URL="https://download.rsyslog.com/libfastjson/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/rsyslog-depends/librelp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="librelp"
-PKG_VERSION="1.10.0"
-PKG_SHA256="148db4e4d1a23e8136e9ec08810929a55faf5d45e24c2e3186d5ab34355dab31"
+PKG_VERSION="1.11.0"
+PKG_SHA256="7719b5f31e07cbb9872289ad32b787c613b5355d407982a0a2c4d69938457fd6"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.rsyslog.com/category/librelp/"
 PKG_URL="https://download.rsyslog.com/librelp/${PKG_NAME}-${PKG_VERSION}.tar.gz"