diff --git a/packages/audio/flac/package.mk b/packages/audio/flac/package.mk index 856a988642..54a843115c 100644 --- a/packages/audio/flac/package.mk +++ b/packages/audio/flac/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="flac" -PKG_VERSION="1.3.2" -PKG_SHA256="91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f" +PKG_VERSION="1.3.3" +PKG_SHA256="213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748" PKG_LICENSE="GPLv2" PKG_SITE="https://xiph.org/flac/" PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/audio/libcdio/package.mk b/packages/audio/libcdio/package.mk index f637279333..9a50b688b2 100644 --- a/packages/audio/libcdio/package.mk +++ b/packages/audio/libcdio/package.mk @@ -1,12 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libcdio" -PKG_VERSION="0.94" -PKG_SHA256="96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a" +PKG_VERSION="2.1.0" +PKG_SHA256="8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" PKG_LICENSE="GPLv3" PKG_SITE="https://www.gnu.org/software/libcdio/" -PKG_URL="http://ftpmirror.gnu.org/libcdio/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://ftpmirror.gnu.org/libcdio/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A CD-ROM reading and control library." PKG_BUILD_FLAGS="+pic" diff --git a/packages/audio/libogg/package.mk b/packages/audio/libogg/package.mk index b3beb4d20f..a4352caebd 100644 --- a/packages/audio/libogg/package.mk +++ b/packages/audio/libogg/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libogg" -PKG_VERSION="1.3.3" -PKG_SHA256="4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08" +PKG_VERSION="1.3.4" +PKG_SHA256="c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe" PKG_LICENSE="BSD" PKG_SITE="https://www.xiph.org/ogg/" PKG_URL="http://downloads.xiph.org/releases/ogg/libogg-$PKG_VERSION.tar.xz" diff --git a/packages/audio/libopenmpt/package.mk b/packages/audio/libopenmpt/package.mk index ad458e64f5..3a3c6bc661 100644 --- a/packages/audio/libopenmpt/package.mk +++ b/packages/audio/libopenmpt/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libopenmpt" -PKG_VERSION="0.4.5" -PKG_SHA256="0b4cc0cc8fbbdabc6263a900ff3560dae7be43be011b6f2bc9913f7a0ed3a521" +PKG_VERSION="0.4.11" +PKG_SHA256="260e92cc2f6af37113442bff2c75a3c36a09eba4078dc593203a0502f95d26bd" PKG_LICENSE="BSD" PKG_SITE="http://lib.openmpt.org/libopenmpt/" PKG_URL="http://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz" diff --git a/packages/audio/openal-soft/package.mk b/packages/audio/openal-soft/package.mk index 4d676bada8..cb45cf60a4 100644 --- a/packages/audio/openal-soft/package.mk +++ b/packages/audio/openal-soft/package.mk @@ -2,17 +2,27 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openal-soft" -PKG_VERSION="1.18.2" -PKG_SHA256="9f8ac1e27fba15a59758a13f0c7f6540a0605b6c3a691def9d420570506d7e82" +PKG_VERSION="1.20.1" +PKG_SHA256="b6ceb051325732c23f5c8b6d37dbd89534517e6439a87e970882b447c3025d6d" PKG_LICENSE="GPL" PKG_SITE="http://www.openal.org/" PKG_URL="http://kcat.strangesoft.net/openal-releases/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="toolchain alsa-lib" +PKG_DEPENDS_HOST="toolchain:host" +PKG_DEPENDS_TARGET="toolchain openal-soft:host alsa-lib" PKG_LONGDESC="OpenAL the Open Audio Library" -PKG_CMAKE_OPTS_TARGET="-DALSOFT_BACKEND_OSS=off \ +configure_package() { + PKG_CMAKE_OPTS_HOST="-DALSOFT_BACKEND_OSS=off \ -DALSOFT_BACKEND_WAVE=off \ - -DALSOFT_BACKEND_PULSEAUDIO=off \ -DALSOFT_EXAMPLES=off \ -DALSOFT_TESTS=off \ -DALSOFT_UTILS=off" + + PKG_CMAKE_OPTS_TARGET="-DALSOFT_NATIVE_TOOLS_PATH=$PKG_BUILD/.$HOST_NAME/native-tools/ \ + -DALSOFT_BACKEND_OSS=off \ + -DALSOFT_BACKEND_WAVE=off \ + -DALSOFT_BACKEND_PULSEAUDIO=off \ + -DALSOFT_EXAMPLES=off \ + -DALSOFT_TESTS=off \ + -DALSOFT_UTILS=off" +} diff --git a/packages/compress/cpio/package.mk b/packages/compress/cpio/package.mk index 6537b938d3..099073172c 100644 --- a/packages/compress/cpio/package.mk +++ b/packages/compress/cpio/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cpio" -PKG_VERSION="2.12" -PKG_SHA256="08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73" +PKG_VERSION="2.13" +PKG_SHA256="e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/cpio/" PKG_URL="http://ftpmirror.gnu.org/cpio/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/compress/libarchive/package.mk b/packages/compress/libarchive/package.mk index ed1ff230c8..f4f6f563ad 100644 --- a/packages/compress/libarchive/package.mk +++ b/packages/compress/libarchive/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libarchive" -PKG_VERSION="3.3.3" -PKG_SHA256="ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e" +PKG_VERSION="3.4.2" +PKG_SHA256="b60d58d12632ecf1e8fad7316dc82c6b9738a35625746b47ecdcaf4aed176176" PKG_LICENSE="GPL" PKG_SITE="https://www.libarchive.org" PKG_URL="https://www.libarchive.org/downloads/$PKG_NAME-$PKG_VERSION.tar.gz" @@ -11,7 +11,14 @@ PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_SHORTDESC="A multi-format archive and compression library." -PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 -DENABLE_EXPAT=0 -DENABLE_ICONV=0 -DENABLE_LIBXML2=0 -DENABLE_LZO=1 -DENABLE_TEST=0 -DENABLE_COVERAGE=0" +PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 \ + -DENABLE_EXPAT=0 \ + -DENABLE_ICONV=0 \ + -DENABLE_LIBXML2=0 \ + -DENABLE_LZO=1 \ + -DENABLE_TEST=0 \ + -DENABLE_COVERAGE=0 \ + -DENABLE_WERROR=0" post_makeinstall_target() { rm -rf $INSTALL diff --git a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch b/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch deleted file mode 100644 index d3410e234f..0000000000 --- a/packages/compress/libarchive/patches/libarchive-01-die-Werror.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cd88d92aa23f6f32aedd54f9a83c118ede4ee799 Mon Sep 17 00:00:00 2001 -From: Arne Morten Kvarving -Date: Sat, 11 Nov 2017 23:42:40 +0100 -Subject: [PATCH] die Werror - ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 80871bc..9bd5165 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$") - ################################################################# - # Set compile flags for debug build. - # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" -- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") -+ #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow") -@@ -112,7 +112,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$") - # Set compile flags for debug build. - # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g") -- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") -+ #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow") -@@ -133,7 +133,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use") - ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$") --IF (MSVC) -+IF (0) - ################################################################# - # Set compile flags for debug build. - # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" -@@ -172,7 +172,7 @@ IF (MSVC) - ################################################################# - # Set compile flags for release build. - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Oi") --ENDIF (MSVC) -+ENDIF (0) - - # Enable CTest/CDash support - include(CTest) --- -2.7.4 - diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk index 5002eb5706..fe78dad6b7 100644 --- a/packages/compress/lz4/package.mk +++ b/packages/compress/lz4/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lz4" -PKG_VERSION="1.9.1" -PKG_SHA256="f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052dc4" +PKG_VERSION="1.9.2" +PKG_SHA256="658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lz4/lz4" PKG_URL="https://github.com/lz4/lz4/archive/v$PKG_VERSION.tar.gz" diff --git a/packages/compress/minizip/package.mk b/packages/compress/minizip/package.mk index e9e6a4c307..d0f81579a8 100644 --- a/packages/compress/minizip/package.mk +++ b/packages/compress/minizip/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="minizip" -PKG_VERSION="2.8.8" -PKG_SHA256="a551063636ae4f989baefc6a20870f5b28246052a372a2ce124ebf3f66018db0" +PKG_VERSION="2.9.2" +PKG_SHA256="8425399277d9d5e39454e655cfd3eb004607960c8358a3e732f5e741a6b5df0a" PKG_LICENSE="zlib" PKG_SITE="https://github.com/nmoinvaz/minizip" PKG_URL="https://github.com/nmoinvaz/minizip/archive/$PKG_VERSION.tar.gz" diff --git a/packages/databases/mariadb-connector-c/package.mk b/packages/databases/mariadb-connector-c/package.mk index 2f0c31bd3a..7e14d01653 100644 --- a/packages/databases/mariadb-connector-c/package.mk +++ b/packages/databases/mariadb-connector-c/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mariadb-connector-c" -PKG_VERSION="3.1.1" -PKG_SHA256="63a0ecfa3c87ba0361aef3b2c849abe280f7371030e84f41ce0dc4466db85637" +PKG_VERSION="3.1.7" +PKG_SHA256="c6bda309fd71aa01e5d32c48768cb4fb5abcb760b1272e270901f4e47cd759d6" PKG_LICENSE="LGPL" PKG_SITE="https://mariadb.org/" PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz" diff --git a/packages/debug/libunwind/package.mk b/packages/debug/libunwind/package.mk index 790131dffd..a54f72cb9f 100644 --- a/packages/debug/libunwind/package.mk +++ b/packages/debug/libunwind/package.mk @@ -2,16 +2,20 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libunwind" -PKG_VERSION="1.2.1" -PKG_SHA256="3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb" +PKG_VERSION="1.3.1" +PKG_SHA256="43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8" PKG_LICENSE="GPL" PKG_SITE="http://www.nongnu.org/libunwind/" PKG_URL="http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="library to determine the call-chain of a program" +PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="--enable-static \ - --disable-shared" + --disable-shared \ + --disable-minidebuginfo \ + --disable-documentation \ + --disable-tests" makeinstall_target() { make DESTDIR=$SYSROOT_PREFIX install diff --git a/packages/debug/libunwind/patches/libunwind-0001-fix-multiple-definition.patch b/packages/debug/libunwind/patches/libunwind-0001-fix-multiple-definition.patch new file mode 100644 index 0000000000..68eb5f70a0 --- /dev/null +++ b/packages/debug/libunwind/patches/libunwind-0001-fix-multiple-definition.patch @@ -0,0 +1,26 @@ +From f40db1e2562934fd21485ba7f62e4521945f17e4 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 17 Feb 2020 05:52:10 +0000 +Subject: [PATCH] fix multiple definition + +https://lists.nongnu.org/archive/html/libunwind-devel/2017-08/msg00039.html +https://github.com/libunwind/libunwind/commit/0e74e583ae18d6852835f327921ee130a5fa3e6f +--- + include/tdep-arm/ex_tables.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/tdep-arm/ex_tables.h b/include/tdep-arm/ex_tables.h +index 9df5e0a..0b5388a 100644 +--- a/include/tdep-arm/ex_tables.h ++++ b/include/tdep-arm/ex_tables.h +@@ -47,6 +47,7 @@ struct arm_exbuf_data + #define arm_exidx_extract UNW_OBJ(arm_exidx_extract) + #define arm_exidx_decode UNW_OBJ(arm_exidx_decode) + #define arm_exidx_apply_cmd UNW_OBJ(arm_exidx_apply_cmd) ++#define arm_search_unwind_table UNW_OBJ(arm_search_unwind_table) + + int arm_exidx_extract (struct dwarf_cursor *c, uint8_t *buf); + int arm_exidx_decode (const uint8_t *buf, uint8_t len, struct dwarf_cursor *c); +-- +2.7.4 + diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk index 5737caf216..137f4c4d58 100644 --- a/packages/debug/xorg-intel-gpu-tools/package.mk +++ b/packages/debug/xorg-intel-gpu-tools/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xorg-intel-gpu-tools" -PKG_VERSION="504367d33b787de2ba8e007a5b620cfd6f0b3074" -PKG_SHA256="3e118ce6ab58b506de88ab158e9e630b3db9ab75b14cd0c4a8019548d2d0c320" +PKG_VERSION="1.24" +PKG_SHA256="d8db92f1151e46b74b149bb9efa745f73c080c12841bb2b9de22d65403dc601f" PKG_LICENSE="GPL" PKG_DEPENDS_TARGET="toolchain cairo procps-ng" PKG_SITE="https://github.com/freedesktop/xorg-intel-gpu-tools" -PKG_URL="https://github.com/freedesktop/xorg-intel-gpu-tools/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/freedesktop/xorg-intel-gpu-tools/archive/igt-gpu-tools-$PKG_VERSION.tar.gz" PKG_LONGDESC="Test suite and tools for DRM/KMS drivers" PKG_TOOLCHAIN="meson" diff --git a/packages/graphics/glm/config/glm.pc b/packages/graphics/glm/config/glm.pc new file mode 100644 index 0000000000..337af88dad --- /dev/null +++ b/packages/graphics/glm/config/glm.pc @@ -0,0 +1,7 @@ +prefix=/usr +includedir=${prefix}/include + +Name: GLM +Description: OpenGL Mathematics +Version: @@VERSION@@ +Cflags: -I${includedir} diff --git a/packages/graphics/glm/config/glmConfig.cmake b/packages/graphics/glm/config/glmConfig.cmake new file mode 100644 index 0000000000..cc25e3a129 --- /dev/null +++ b/packages/graphics/glm/config/glmConfig.cmake @@ -0,0 +1,20 @@ +set(GLM_VERSION "@@VERSION@@") + + +####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### +get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) + +macro(set_and_check _var _file) + set(${_var} "${_file}") + if(NOT EXISTS "${_file}") + message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") + endif() +endmacro() + +#################################################################################### + +set_and_check(GLM_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include") + +if (NOT CMAKE_VERSION VERSION_LESS "3.0") + include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake") +endif() diff --git a/packages/graphics/glm/config/glmConfigVersion.cmake b/packages/graphics/glm/config/glmConfigVersion.cmake new file mode 100644 index 0000000000..3673ca6273 --- /dev/null +++ b/packages/graphics/glm/config/glmConfigVersion.cmake @@ -0,0 +1,31 @@ +# This is a basic version file for the Config-mode of find_package(). +# It is used by write_basic_package_version_file() as input file for configure_file() +# to create a version-file which can be installed along a config.cmake file. +# +# The created file sets PACKAGE_VERSION_EXACT if the current version string and +# the requested version string are exactly the same and it sets +# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. +# The variable CVF_VERSION must be set before calling configure_file(). + +set(PACKAGE_VERSION "@@VERSION@@") + +if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + +# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: +if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@@VOID_SIZE@@" STREQUAL "") + return() +endif() + +# check that the installed version has the same 32/64bit-ness as the one which is currently searching: +if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@@VOID_SIZE@@") + math(EXPR installedBits "@@VOID_SIZE@@ * 8") + set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") + set(PACKAGE_VERSION_UNSUITABLE FALSE) +endif() diff --git a/packages/graphics/glm/config/glmTargets.cmake b/packages/graphics/glm/config/glmTargets.cmake new file mode 100644 index 0000000000..905b67731b --- /dev/null +++ b/packages/graphics/glm/config/glmTargets.cmake @@ -0,0 +1,107 @@ +# Generated by CMake + +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + message(FATAL_ERROR "CMake >= 2.6.0 required") +endif() +cmake_policy(PUSH) +cmake_policy(VERSION 2.6) +#---------------------------------------------------------------- +# Generated CMake target import file. +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Protect against multiple inclusion, which would fail when already imported targets are added once more. +set(_targetsDefined) +set(_targetsNotDefined) +set(_expectedTargets) +foreach(_expectedTarget glm) + list(APPEND _expectedTargets ${_expectedTarget}) + if(NOT TARGET ${_expectedTarget}) + list(APPEND _targetsNotDefined ${_expectedTarget}) + endif() + if(TARGET ${_expectedTarget}) + list(APPEND _targetsDefined ${_expectedTarget}) + endif() +endforeach() +if("${_targetsDefined}" STREQUAL "${_expectedTargets}") + unset(_targetsDefined) + unset(_targetsNotDefined) + unset(_expectedTargets) + set(CMAKE_IMPORT_FILE_VERSION) + cmake_policy(POP) + return() +endif() +if(NOT "${_targetsDefined}" STREQUAL "") + message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") +endif() +unset(_targetsDefined) +unset(_targetsNotDefined) +unset(_expectedTargets) + + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +# Use original install prefix when loaded through a +# cross-prefix symbolic link such as /lib -> /usr/lib. +get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH) +get_filename_component(_realOrig "/usr/lib/cmake/glm" REALPATH) +if(_realCurr STREQUAL _realOrig) + set(_IMPORT_PREFIX "/usr/lib/cmake/glm") +endif() +unset(_realOrig) +unset(_realCurr) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +# Create imported target glm +add_library(glm INTERFACE IMPORTED) + +set_target_properties(glm PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +) + +if(CMAKE_VERSION VERSION_LESS 3.0.0) + message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.") +endif() + +# Load information for each installed configuration. +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/glmTargets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() + +# Cleanup temporary variables. +set(_IMPORT_PREFIX) + +# Loop over all imported files and verify that they actually exist +foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) + if(NOT EXISTS "${file}" ) + message(FATAL_ERROR "The imported target \"${target}\" references the file + \"${file}\" +but this file does not exist. Possible reasons include: +* The file was deleted, renamed, or moved to another location. +* An install or uninstall procedure did not complete successfully. +* The installation package was faulty and contained + \"${CMAKE_CURRENT_LIST_FILE}\" +but not all the files it references. +") + endif() + endforeach() + unset(_IMPORT_CHECK_FILES_FOR_${target}) +endforeach() +unset(_IMPORT_CHECK_TARGETS) + +# This file does not depend on other imported targets which have +# been exported from the same project but in a separate export set. + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) +cmake_policy(POP) diff --git a/packages/graphics/glm/package.mk b/packages/graphics/glm/package.mk index 11a95d2c0a..2666c22fbd 100644 --- a/packages/graphics/glm/package.mk +++ b/packages/graphics/glm/package.mk @@ -2,11 +2,27 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glm" -PKG_VERSION="0.9.9.5" -PKG_SHA256="4fe34860ce69156f63eea6c3d84c91cadfc330353cf275ff394aef4e163cafee" +PKG_VERSION="0.9.9.7" +PKG_SHA256="6b79c3d06d9745d1cce3f38c0c15666596f9aefff25ddb74df3af0a02f011ee1" PKG_LICENSE="MIT" PKG_SITE="https://glm.g-truc.net/" PKG_URL="https://github.com/g-truc/glm/releases/download/$PKG_VERSION/glm-$PKG_VERSION.zip" PKG_SOURCE_DIR="glm" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="OpenGL Mathematics (GLM)" + +# Hack install solution until cmake install restored in upstream package +makeinstall_target() { + target_has_feature 32bit && PKG_VOID_SIZE=4 || PKG_VOID_SIZE=8 + + for _dir in ${SYSROOT_PREFIX} ${INSTALL}; do + mkdir -p ${_dir}/usr/include ${_dir}/usr/lib/pkgconfig ${_dir}/usr/lib/cmake/glm + cp -r ${PKG_BUILD}/glm ${_dir}/usr/include + cp ${PKG_DIR}/config/glm.pc ${_dir}/usr/lib/pkgconfig + cp ${PKG_DIR}/config/*.cmake ${_dir}/usr/lib/cmake/glm + + sed -e "s/@@VERSION@@/${PKG_VERSION}/g" \ + -e "s/@@VOID_SIZE@@/${PKG_VOID_SIZE}/g" \ + -i ${_dir}/usr/lib/pkgconfig/glm.pc ${_dir}/usr/lib/cmake/glm/*.cmake + done +} diff --git a/packages/graphics/libepoxy/package.mk b/packages/graphics/libepoxy/package.mk index 0c4ad61989..876981e899 100644 --- a/packages/graphics/libepoxy/package.mk +++ b/packages/graphics/libepoxy/package.mk @@ -8,8 +8,8 @@ # in Xorg.log PKG_NAME="libepoxy" -PKG_VERSION="1.5.3" -PKG_SHA256="002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d" +PKG_VERSION="1.5.4" +PKG_SHA256="0bd2cc681dfeffdef739cb29913f8c3caa47a88a451fd2bc6e606c02997289d2" PKG_LICENSE="GPL" PKG_SITE="https://github.com/anholt/libepoxy" PKG_URL="https://github.com/anholt/libepoxy/releases/download/${PKG_VERSION}/libepoxy-${PKG_VERSION}.tar.xz" diff --git a/packages/graphics/libglvnd/package.mk b/packages/graphics/libglvnd/package.mk index dc2e1f8606..1a6bd69db2 100644 --- a/packages/graphics/libglvnd/package.mk +++ b/packages/graphics/libglvnd/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libglvnd" -PKG_VERSION="1.2.0" -PKG_SHA256="37981bd3320261f14140b8aef6e2e6c08c7e75b6a98dcea034670017f3f1312a" +PKG_VERSION="1.3.0" +PKG_SHA256="fabf98e72e172a1402617f5daade4dd79c752a77ab1688e0c1a0ffc49605040f" PKG_LICENSE="GPL" PKG_SITE="https://github.com/NVIDIA/libglvnd" PKG_URL="https://github.com/NVIDIA/libglvnd/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/graphics/libglvnd/patches/libglvnd-999.01-install-GL-headers-when-GL-is-enabled.patch b/packages/graphics/libglvnd/patches/libglvnd-999.01-install-GL-headers-when-GL-is-enabled.patch deleted file mode 100644 index a11f7742c7..0000000000 --- a/packages/graphics/libglvnd/patches/libglvnd-999.01-install-GL-headers-when-GL-is-enabled.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6f52473dac08c44b081b792874b4ce73122096da Mon Sep 17 00:00:00 2001 -From: Eric Engestrom -Date: Mon, 30 Sep 2019 16:06:42 +0100 -Subject: [PATCH] include: install GL headers when GL is enabled - -A typo made it depend on EGL instead. - -Fixes: ab9b5fcc3bf90064418f ("Install the GL/GLES/GLX/EGL header files.") ---- - include/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/Makefile.am b/include/Makefile.am -index 1e33d2d..3d81d17 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -39,7 +39,7 @@ EGL_HEADER_FILES = \ - EGL/eglext.h \ - EGL/eglplatform.h - --if ENABLE_EGL_HEADERS -+if ENABLE_GL_HEADERS - nobase_include_HEADERS += $(GL_HEADER_FILES) - else - noinst_HEADERS += $(GL_HEADER_FILES) --- -2.22.0 - diff --git a/packages/graphics/libglvnd/patches/libglvnd-999.02-egl-Sync-with-Khronos.patch b/packages/graphics/libglvnd/patches/libglvnd-999.02-egl-Sync-with-Khronos.patch deleted file mode 100644 index 4d8f2bbae2..0000000000 --- a/packages/graphics/libglvnd/patches/libglvnd-999.02-egl-Sync-with-Khronos.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 51233cc52cbcbe25f8461830913c06f5b5bc9508 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 17 Oct 2019 11:51:37 -0400 -Subject: [PATCH] egl: Sync with Khronos - - commit de3a5e867d906a04a5c37ee0d89e7f01d3598eb9 - Author: Ken Russell - Date: Sat Oct 12 05:44:43 2019 -0700 - - Reserve enums 0x34A0..0x34AF for ANGLE project. (#93) - -Closes: https://gitlab.freedesktop.org/glvnd/libglvnd/issues/193 ---- - include/EGL/eglplatform.h | 6 ++++++ - src/generate/xml/egl.xml | 7 +++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h -index 29ab288..5ab49c1 100644 ---- a/include/EGL/eglplatform.h -+++ b/include/EGL/eglplatform.h -@@ -116,6 +116,12 @@ typedef intptr_t EGLNativeDisplayType; - typedef intptr_t EGLNativePixmapType; - typedef intptr_t EGLNativeWindowType; - -+#elif defined(__unix__) && defined(EGL_NO_X11) -+ -+typedef void *EGLNativeDisplayType; -+typedef khronos_uintptr_t EGLNativePixmapType; -+typedef khronos_uintptr_t EGLNativeWindowType; -+ - #elif defined(__unix__) || defined(USE_X11) - - /* X11 (tentative) */ -diff --git a/src/generate/xml/egl.xml b/src/generate/xml/egl.xml -index c27f172..6bc2ea2 100644 ---- a/src/generate/xml/egl.xml -+++ b/src/generate/xml/egl.xml -@@ -1002,6 +1002,9 @@ - - - -+ -+ -+ - - -- -- -+ -+ - - - --- -2.22.0 - diff --git a/packages/graphics/libglvnd/patches/libglvnd-999.03-EGL-Set-EGL_NO_X11-macro-if--disable-x11-is-used.patch b/packages/graphics/libglvnd/patches/libglvnd-999.03-EGL-Set-EGL_NO_X11-macro-if--disable-x11-is-used.patch deleted file mode 100644 index 51b8fd7b40..0000000000 --- a/packages/graphics/libglvnd/patches/libglvnd-999.03-EGL-Set-EGL_NO_X11-macro-if--disable-x11-is-used.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 158cd95a086398b60310227f2feca31838576750 Mon Sep 17 00:00:00 2001 -From: Kyle Brenneman -Date: Fri, 18 Oct 2019 09:30:30 -0600 -Subject: [PATCH 1/2] EGL: Set EGL_NO_X11 macro if --disable-x11 is used. - -Change the configure script so that it will set the macro EGL_NO_X11 if X11 is -disabled instead of setting USE_X11 if X11 is enabled. - -Using EGL_NO_X11 means that EGL/eglplatform.h won't try to include the Xlib -headers. ---- - configure.ac | 6 +++--- - src/EGL/libegl.c | 8 ++++---- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eb68d3b..ebe497c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -174,10 +174,10 @@ dnl - dnl Checks for libraries. - AX_PTHREAD() - --if test "x$enable_x11" = "xyes" ; then -+if test "x$enable_x11" != "xyes" ; then - PKG_CHECK_MODULES([X11], [x11]) -- AC_DEFINE([USE_X11], 1, -- [Define to 1 if X11 support is enabled.]) -+ AC_DEFINE([EGL_NO_X11], 1, -+ [Define to 1 if X11 support is disabled.]) - fi - if test "x$enable_glx" = "xyes" ; then - PKG_CHECK_MODULES([XEXT], [xext]) -diff --git a/src/EGL/libegl.c b/src/EGL/libegl.c -index 5f742cb..c0e4dd8 100644 ---- a/src/EGL/libegl.c -+++ b/src/EGL/libegl.c -@@ -36,7 +36,7 @@ - #include - #include - --#if defined(USE_X11) -+#if !defined(EGL_NO_X11) - #include - #endif - -@@ -180,7 +180,7 @@ static EGLBoolean IsGbmDisplay(void *native_display) - - static EGLBoolean IsX11Display(void *dpy) - { --#if defined(USE_X11) -+#if !defined(EGL_NO_X11) - void *alloc; - void *handle; - void *XAllocID = NULL; -@@ -197,9 +197,9 @@ static EGLBoolean IsX11Display(void *dpy) - } - - return (XAllocID != NULL && XAllocID == alloc); --#else // defined(USE_X11) -+#else // !defined(EGL_NO_X11) - return EGL_FALSE; --#endif // defined(USE_X11) -+#endif // !defined(EGL_NO_X11) - } - - static EGLBoolean IsWaylandDisplay(void *native_display) --- -2.22.0 - - -From 0b09d6222265be115d3102348b5da68ae0e92f77 Mon Sep 17 00:00:00 2001 -From: Kyle Brenneman -Date: Sat, 19 Oct 2019 08:38:25 -0600 -Subject: [PATCH 2/2] configure: Fix the pkg-config check for Xlib. - -Fix an error in the previous commit so that the configure script runs -pkg-config for x11 when it's enabled, not when it's disabled. ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ebe497c..31188b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -174,8 +174,9 @@ dnl - dnl Checks for libraries. - AX_PTHREAD() - --if test "x$enable_x11" != "xyes" ; then -+if test "x$enable_x11" = "xyes" ; then - PKG_CHECK_MODULES([X11], [x11]) -+else - AC_DEFINE([EGL_NO_X11], 1, - [Define to 1 if X11 support is disabled.]) - fi --- -2.22.0 - diff --git a/packages/graphics/libglvnd/patches/libglvnd-999.04-update-gl.h-to-match-Mesa..patch b/packages/graphics/libglvnd/patches/libglvnd-999.04-update-gl.h-to-match-Mesa..patch deleted file mode 100644 index 9e1f26a620..0000000000 --- a/packages/graphics/libglvnd/patches/libglvnd-999.04-update-gl.h-to-match-Mesa..patch +++ /dev/null @@ -1,245 +0,0 @@ -From 5dfdc5a6dc60a3bdc63cd4510dabacba388da13a Mon Sep 17 00:00:00 2001 -From: Kyle Brenneman -Date: Tue, 22 Oct 2019 16:46:09 -0600 -Subject: [PATCH] Update GL/gl.h to match Mesa. - -Updated GL/gl.h to match the copy from Mesa at commit -a0829cf23b307ca44ab8c4505974fb7c8d71a35a. ---- - include/GL/gl.h | 147 ++++++------------------------------------------ - 1 file changed, 17 insertions(+), 130 deletions(-) - -diff --git a/include/GL/gl.h b/include/GL/gl.h -index 3f8cb62..2518dfb 100644 ---- a/include/GL/gl.h -+++ b/include/GL/gl.h -@@ -27,40 +27,24 @@ - #ifndef __gl_h_ - #define __gl_h_ - --#if defined(USE_MGL_NAMESPACE) --#include "gl_mangle.h" --#endif -- -- - /********************************************************************** -- * Begin system-specific stuff. Do not do any of this when building -- * for SciTech SNAP, as this is all done before this header file is -- * included. -+ * Begin system-specific stuff. - */ --#if !defined(__SCITECH_SNAP__) -- --#if defined(__BEOS__) --#include /* to get some BeOS-isms */ --#endif -- --#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO)) --#define OPENSTEP --#endif - - #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) - #define __WIN32__ - #endif - --#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) -+#if defined(__WIN32__) && !defined(__CYGWIN__) - # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ - # define GLAPI __declspec(dllexport) - # elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ - # define GLAPI __declspec(dllimport) - # else /* for use with static link lib build of Win32 edition only */ - # define GLAPI extern --# endif /* _STATIC_MESA support */ -+# endif - # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ --# define GLAPIENTRY -+# define GLAPIENTRY - # else - # define GLAPIENTRY __stdcall - # endif -@@ -72,10 +56,6 @@ - # define GLAPIENTRY - #endif /* WIN32 && !CYGWIN */ - --#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) --# define PRAGMA_EXPORT_SUPPORTED 1 --#endif -- - /* - * WINDOWS: Include windows.h here to define APIENTRY. - * It is also useful when applications include this file by -@@ -91,10 +71,6 @@ - #include - #endif - --#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED --#pragma import on --#endif -- - #ifndef GLAPI - #define GLAPI extern - #endif -@@ -116,15 +92,6 @@ - #define GLAPIENTRYP GLAPIENTRY * - #endif - --#ifdef CENTERLINE_CLPP --#define signed --#endif -- --#if defined(PRAGMA_EXPORT_SUPPORTED) --#pragma export on --#endif -- --#endif /* !__SCITECH_SNAP__ */ - /* - * End system-specific stuff. - **********************************************************************/ -@@ -718,7 +685,7 @@ typedef double GLclampd; /* double precision float in [0,1] */ - #define GL_LIST_BIT 0x00020000 - #define GL_TEXTURE_BIT 0x00040000 - #define GL_SCISSOR_BIT 0x00080000 --#define GL_ALL_ATTRIB_BITS 0x000FFFFF -+#define GL_ALL_ATTRIB_BITS 0xFFFFFFFF - - - /* OpenGL 1.1 */ -@@ -1738,6 +1705,7 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, - - - -+ - /* - * OpenGL 1.3 - */ -@@ -2085,26 +2053,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh - - - --#if GL_ARB_shader_objects -- --#ifndef GL_MESA_shader_debug --#define GL_MESA_shader_debug 1 -- --#define GL_DEBUG_OBJECT_MESA 0x8759 --#define GL_DEBUG_PRINT_MESA 0x875A --#define GL_DEBUG_ASSERT_MESA 0x875B -- --GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void); --GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType); --GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength, -- GLsizei *length, GLcharARB *debugLog); --GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType); -- --#endif /* GL_MESA_shader_debug */ -- --#endif /* GL_ARB_shader_objects */ -- -- - /* - * ???. GL_MESA_packed_depth_stencil - * XXX obsolete -@@ -2121,60 +2069,6 @@ GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logTyp - #endif /* GL_MESA_packed_depth_stencil */ - - --#ifndef GL_MESA_program_debug --#define GL_MESA_program_debug 1 -- --#define GL_FRAGMENT_PROGRAM_POSITION_MESA 0x8bb0 --#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA 0x8bb1 --#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA 0x8bb2 --#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA 0x8bb3 --#define GL_VERTEX_PROGRAM_POSITION_MESA 0x8bb4 --#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8bb5 --#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8bb6 --#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8bb7 -- --typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data); -- --GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data); -- --GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v); -- --#endif /* GL_MESA_program_debug */ -- -- --#ifndef GL_MESA_texture_array --#define GL_MESA_texture_array 1 -- --/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array. -- */ --#ifndef GL_EXT_texture_array -- --#ifdef GL_GLEXT_PROTOTYPES --GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target, -- GLenum attachment, GLuint texture, GLint level, GLint layer); --#endif /* GL_GLEXT_PROTOTYPES */ -- --#if 0 --/* (temporarily) disabled because of collision with typedef in glext.h -- * that happens if apps include both gl.h and glext.h -- */ --typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, -- GLenum attachment, GLuint texture, GLint level, GLint layer); --#endif -- --#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 --#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 --#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A --#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B --#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C --#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D --#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF --#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 --#endif -- --#endif -- -- - #ifndef GL_ATI_blend_equation_separate - #define GL_ATI_blend_equation_separate 1 - -@@ -2186,27 +2080,20 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen - #endif /* GL_ATI_blend_equation_separate */ - - --/** -- ** NOTE!!!!! If you add new functions to this file, or update -- ** glext.h be sure to regenerate the gl_mangle.h file. See comments -- ** in that file for details. -- **/ -- -- -- --/********************************************************************** -- * Begin system-specific stuff -- */ --#if defined(PRAGMA_EXPORT_SUPPORTED) --#pragma export off -+/* GL_OES_EGL_image */ -+#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage) -+typedef void* GLeglImageOES; - #endif - --#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED --#pragma import off -+#ifndef GL_OES_EGL_image -+#define GL_OES_EGL_image 1 -+#ifdef GL_GLEXT_PROTOTYPES -+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); -+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); -+#endif -+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); -+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); - #endif --/* -- * End system-specific stuff -- **********************************************************************/ - - - #ifdef __cplusplus --- -2.22.0 - diff --git a/packages/graphics/libheif/package.mk b/packages/graphics/libheif/package.mk index a9634bc26a..8673725fbd 100644 --- a/packages/graphics/libheif/package.mk +++ b/packages/graphics/libheif/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libheif" -PKG_VERSION="1.5.1" -PKG_SHA256="b134d0219dd2639cc13b8a8bcb8f264834593dd0417da1973fbe96e810918a8b" +PKG_VERSION="1.6.2" +PKG_SHA256="bb229e855621deb374f61bee95c4642f60c2a2496bded35df3d3c42cc6d8eefc" PKG_LICENSE="LGPLv3" PKG_SITE="http://www.libde265.org" PKG_URL="https://github.com/strukturag/libheif/releases/download/v$PKG_VERSION/libheif-$PKG_VERSION.tar.gz" diff --git a/packages/graphics/libjpeg-turbo/package.mk b/packages/graphics/libjpeg-turbo/package.mk index 827a1581f0..6717e5e2a7 100644 --- a/packages/graphics/libjpeg-turbo/package.mk +++ b/packages/graphics/libjpeg-turbo/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libjpeg-turbo" -PKG_VERSION="2.0.3" -PKG_SHA256="a69598bf079463b34d45ca7268462a18b6507fdaa62bb1dfd212f02041499b5d" +PKG_VERSION="2.0.4" +PKG_SHA256="7777c3c19762940cff42b3ba4d7cd5c52d1671b39a79532050c85efb99079064" PKG_LICENSE="GPL" PKG_SITE="https://libjpeg-turbo.org/" PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/$PKG_VERSION.tar.gz" diff --git a/packages/graphics/libraw/package.mk b/packages/graphics/libraw/package.mk index 5aab45ec02..593b0a2f53 100644 --- a/packages/graphics/libraw/package.mk +++ b/packages/graphics/libraw/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libraw" -PKG_VERSION="0.19.2" -PKG_SHA256="400d47969292291d297873a06fb0535ccce70728117463927ddd9452aa849644" +PKG_VERSION="0.19.5" +PKG_SHA256="40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5" PKG_LICENSE="LGPL" PKG_SITE="http://www.libraw.org/" PKG_URL="http://www.libraw.org/data/LibRaw-$PKG_VERSION.tar.gz" diff --git a/packages/graphics/tiff/package.mk b/packages/graphics/tiff/package.mk index 61aee38443..e7176225bb 100644 --- a/packages/graphics/tiff/package.mk +++ b/packages/graphics/tiff/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tiff" -PKG_VERSION="4.0.10" -PKG_SHA256="2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4" +PKG_VERSION="4.1.0" +PKG_SHA256="5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634" PKG_LICENSE="OSS" PKG_SITE="http://www.remotesensing.org/libtiff/" PKG_URL="http://download.osgeo.org/libtiff/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 8afda7c339..d3e1d68f70 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bluez" -PKG_VERSION="5.52" -PKG_SHA256="f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a" +PKG_VERSION="5.53" +PKG_SHA256="38aa2da8302fefad53116bb281a11968732a42eeb19c5fb3668342f39b7938bc" PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/network/ethtool/package.mk b/packages/network/ethtool/package.mk index 2414126d41..1d11250ea0 100644 --- a/packages/network/ethtool/package.mk +++ b/packages/network/ethtool/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ethtool" -PKG_VERSION="5.1" -PKG_SHA256="65feac1fec6565290b7784b2efc925dee900a9b11202ce7c6c30a967c3da3387" +PKG_VERSION="5.4" +PKG_SHA256="22f81e4927d6eb6a13a259d705248a96005fce2005e15257f639f5a1c8c52b6b" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/" PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/network/iw/package.mk b/packages/network/iw/package.mk index e1245e97f6..f5463b3082 100644 --- a/packages/network/iw/package.mk +++ b/packages/network/iw/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iw" -PKG_VERSION="4.14" -PKG_SHA256="f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89" +PKG_VERSION="5.4" +PKG_SHA256="a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc27a395f" PKG_LICENSE="PUBLIC_DOMAIN" PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw" PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/network/iwd/package.mk b/packages/network/iwd/package.mk index 5b9e798471..816aa4fc49 100644 --- a/packages/network/iwd/package.mk +++ b/packages/network/iwd/package.mk @@ -2,7 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iwd" -PKG_VERSION="0.18" +PKG_VERSION="1.5" +PKG_SHA256="13d36dcec625ae8ef54e4be5fb0b65db598c68ab0b4d70ff6c557f7954d259aa" PKG_LICENSE="GPL" PKG_SITE="https://git.kernel.org/cgit/network/wireless/iwd.git/about/" PKG_URL="https://www.kernel.org/pub/linux/network/wireless/iwd-${PKG_VERSION}.tar.xz" diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index 5400b57843..7d0f88ec4d 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -3,18 +3,19 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libssh" -PKG_VERSION="0.8.7" -PKG_SHA256="43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592" +PKG_VERSION="0.9.3" +PKG_SHA256="2c8b5f894dced58b3d629f16f3afa6562c20b4bdc894639163cf657833688f0c" PKG_LICENSE="LGPL" PKG_SITE="http://www.libssh.org/" PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="Library for accessing ssh client services through C libraries." -PKG_CMAKE_OPTS_TARGET="-DWITH_STATIC_LIB=1 \ +PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \ -DWITH_SERVER=OFF \ -DWITH_GCRYPT=OFF \ -DWITH_GSSAPI=OFF \ + -DWITH_GEX=OFF \ -DWITH_INTERNAL_DOC=OFF" makeinstall_target() { diff --git a/packages/network/netbase/package.mk b/packages/network/netbase/package.mk index 3aaf84829e..e5cc616868 100644 --- a/packages/network/netbase/package.mk +++ b/packages/network/netbase/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="netbase" -PKG_VERSION="5.4" -PKG_SHA256="66ff73d2d162e2d49db43988d8b8cd328cf7fffca042db73397f14c71825e80d" +PKG_VERSION="6.0" +PKG_SHA256="692baeb7b76eba5580c7edbc97ce1784a06b5aa4b367c5ed0b39e0ce7a97d594" PKG_LICENSE="GPL" PKG_SITE="https://anonscm.debian.org/cgit/users/md/netbase.git/" PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_$PKG_VERSION.tar.xz" @@ -13,6 +13,6 @@ PKG_TOOLCHAIN="manual" makeinstall_target() { mkdir -p $INSTALL/etc - cp etc-protocols $INSTALL/etc/protocols - cp etc-services $INSTALL/etc/services + cp etc/protocols $INSTALL/etc + cp etc/services $INSTALL/etc } diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk index b8eb8b3b7b..97bd17bd33 100644 --- a/packages/network/openssh/package.mk +++ b/packages/network/openssh/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openssh" -PKG_VERSION="8.0p1" -PKG_SHA256="bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68" +PKG_VERSION="8.2p1" +PKG_SHA256="43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671" PKG_LICENSE="OSS" PKG_SITE="https://www.openssh.com/" PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch b/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch index 25749b6fa2..bd02a2634b 100644 --- a/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch +++ b/packages/network/openssh/patches/openssh-silence-missing-identity-error.patch @@ -5,10 +5,10 @@ index d6af0b9..22c0aa6 100644 @@ -1320,8 +1320,7 @@ load_identity_file(char *filename, int userprovided) struct stat st; - if (stat(id->filename, &st) < 0) { + if (stat(id->filename, &st) == -1) { - (id->userprovided ? logit : debug3)("no such identity: %s: %s", - id->filename, strerror(errno)); + debug3("no such identity: %s", id->filename); return NULL; } - private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok); + snprintf(prompt, sizeof prompt, diff --git a/packages/network/openvpn/package.mk b/packages/network/openvpn/package.mk index 574153108b..cc64259069 100644 --- a/packages/network/openvpn/package.mk +++ b/packages/network/openvpn/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openvpn" -PKG_VERSION="2.4.7" -PKG_SHA256="a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648" +PKG_VERSION="2.4.8" +PKG_SHA256="fb8ca66bb7807fff595fbdf2a0afd085c02a6aa47715c9aa3171002f9f1a3f91" PKG_LICENSE="GPL" PKG_SITE="https://openvpn.net" PKG_URL="https://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/network/wpa_supplicant/package.mk b/packages/network/wpa_supplicant/package.mk index d29c5c1a18..09bdbd4b3f 100644 --- a/packages/network/wpa_supplicant/package.mk +++ b/packages/network/wpa_supplicant/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wpa_supplicant" -PKG_VERSION="2.8" -PKG_SHA256="a689336a12a99151b9de5e25bfccadb88438f4f4438eb8db331cd94346fd3d96" +PKG_VERSION="2.9" +PKG_SHA256="fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17" PKG_LICENSE="GPL" PKG_SITE="https://w1.fi/wpa_supplicant/" PKG_URL="https://w1.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/python/devel/Mako/package.mk b/packages/python/devel/Mako/package.mk index e103ea5caa..1e11a7a8f3 100644 --- a/packages/python/devel/Mako/package.mk +++ b/packages/python/devel/Mako/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="Mako" -PKG_VERSION="1.0.12" -PKG_SHA256="0cfa65de3a835e87eeca6ac856b3013aade55f49e32515f65d999f91a2324162" +PKG_VERSION="1.1.1" +PKG_SHA256="2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4" PKG_LICENSE="GPL" PKG_SITE="https://pypi.org/project/Mako" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/python/devel/ninja/package.mk b/packages/python/devel/ninja/package.mk index 3e4f9c6415..e6834744f7 100644 --- a/packages/python/devel/ninja/package.mk +++ b/packages/python/devel/ninja/package.mk @@ -3,19 +3,16 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ninja" -PKG_VERSION="1.9.0" -PKG_SHA256="5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9" +PKG_VERSION="1.10.0" +PKG_SHA256="3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f" PKG_LICENSE="Apache" PKG_SITE="http://martine.github.io/ninja/" PKG_URL="https://github.com/ninja-build/ninja/archive/v$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="Python3:host" PKG_LONGDESC="Small build system with a focus on speed" -PKG_TOOLCHAIN="manual" - -make_host() { - python3 configure.py --bootstrap -} +PKG_TOOLCHAIN="cmake-make" makeinstall_host() { - cp ninja $TOOLCHAIN/bin/ + mkdir -p $TOOLCHAIN/bin + cp ninja $TOOLCHAIN/bin } diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk index fdc850a8b8..5db5cc9105 100644 --- a/packages/python/devel/setuptools/package.mk +++ b/packages/python/devel/setuptools/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="setuptools" -PKG_VERSION="45.1.0" -PKG_SHA256="e545c3d8390a7a664c0243910341c06fc3239b6b3be69a64e7f4ad2fdac1cb24" +PKG_VERSION="45.2.0" +PKG_SHA256="1cee9d515859e83a409056189bb9f512881bf0fb3334609beed0cf8d384948fc" PKG_LICENSE="OSS" PKG_SITE="https://pypi.org/project/setuptools" PKG_URL="https://github.com/pypa/setuptools/archive/v$PKG_VERSION.tar.gz" diff --git a/packages/python/devel/waf/package.mk b/packages/python/devel/waf/package.mk index de13cf08e4..d6d1200ca0 100644 --- a/packages/python/devel/waf/package.mk +++ b/packages/python/devel/waf/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="waf" -PKG_VERSION="2.0.15" -PKG_SHA256="34b8156ea375089e1bed5a31acfaff4024f6f3e96f3bee98f801f0c281ad3d2c" +PKG_VERSION="2.0.19" +PKG_SHA256="ba63c90a865a9bcf46926c4e6776f9a3f73d29f33d49b7f61f96bc37b7397cef" PKG_LICENSE="MIT" PKG_SITE="https://waf.io" PKG_URL="https://waf.io/$PKG_NAME-$PKG_VERSION" diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk index 58257afcf1..0a1146002f 100644 --- a/packages/security/libgpg-error/package.mk +++ b/packages/security/libgpg-error/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libgpg-error" -PKG_VERSION="1.36" -PKG_SHA256="babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" +PKG_VERSION="1.37" +PKG_SHA256="b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763" PKG_LICENSE="GPLv2" PKG_SITE="https://www.gnupg.org" PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/security/libgpg-error/patches/0001-gawk50.patch b/packages/security/libgpg-error/patches/0001-gawk50.patch deleted file mode 100644 index 7e1c3f19a0..0000000000 --- a/packages/security/libgpg-error/patches/0001-gawk50.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 15 Apr 2019 15:10:44 +0900 -Subject: [PATCH] awk: Prepare for Gawk 5.0. - -* src/Makefile.am: Use pkg_namespace (instead of namespace). -* src/mkerrnos.awk: Likewise. -* lang/cl/mkerrcodes.awk: Don't escape # in regexp. -* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. - --- - -In Gawk 5.0, regexp routines are replaced by Gnulib implementation, -which only allows escaping specific characters. - -GnuPG-bug-id: 4459 -Reported-by: Marius Schamschula -Signed-off-by: NIIBE Yutaka ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 7 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk -index ae29043..9a1fc18 100644 ---- a/lang/cl/mkerrcodes.awk -+++ b/lang/cl/mkerrcodes.awk -@@ -122,7 +122,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/Makefile.am b/src/Makefile.am -index ce1b882..f2590cb 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - -diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk -index 46d436c..e9c857c 100644 ---- a/src/mkerrcodes.awk -+++ b/src/mkerrcodes.awk -@@ -85,7 +85,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk -index a771a73..4578e29 100644 ---- a/src/mkerrcodes1.awk -+++ b/src/mkerrcodes1.awk -@@ -81,7 +81,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..188f7a4 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -91,7 +91,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk -index f79df66..15b1aad 100644 ---- a/src/mkerrnos.awk -+++ b/src/mkerrnos.awk -@@ -83,7 +83,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk -index c9de9c1..285e45f 100644 ---- a/src/mkstrtable.awk -+++ b/src/mkstrtable.awk -@@ -77,7 +77,7 @@ - # - # The variable prefix can be used to prepend a string to each message. - # --# The variable namespace can be used to prepend a string to each -+# The variable pkg_namespace can be used to prepend a string to each - # variable and macro name. - - BEGIN { -@@ -102,7 +102,7 @@ header { - print "/* The purpose of this complex string table is to produce"; - print " optimal code with a minimum of relocations. */"; - print ""; -- print "static const char " namespace "msgstr[] = "; -+ print "static const char " pkg_namespace "msgstr[] = "; - header = 0; - } - else -@@ -110,7 +110,7 @@ header { - } - - !header { -- sub (/\#.+/, ""); -+ sub (/#.+/, ""); - sub (/[ ]+$/, ""); # Strip trailing space and tab characters. - - if (/^$/) -@@ -150,7 +150,7 @@ END { - else - print " gettext_noop (\"" last_msgstr "\");"; - print ""; -- print "static const int " namespace "msgidx[] ="; -+ print "static const int " pkg_namespace "msgidx[] ="; - print " {"; - for (i = 0; i < coded_msgs; i++) - print " " pos[i] ","; -@@ -158,7 +158,7 @@ END { - print " };"; - print ""; - print "static GPG_ERR_INLINE int"; -- print namespace "msgidxof (int code)"; -+ print pkg_namespace "msgidxof (int code)"; - print "{"; - print " return (0 ? 0"; - -diff a/src/Makefile.in b/src/Makefile.in ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -1615,7 +1615,7 @@ - - errnos-sym.h: Makefile mkstrtable.awk errnos.in - $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ -- -v prefix=GPG_ERR_ -v namespace=errnos_ \ -+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ - $(srcdir)/errnos.in >$@ - - mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile - diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index ce7f67c237..61d6e3abcb 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="e2fsprogs" -PKG_VERSION="1.45.3" -PKG_SHA256="90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595" +PKG_VERSION="1.45.5" +PKG_SHA256="f9faccc0d90f73556e797dc7cc5979b582bd50d3f8609c0f2ad48c736d44aede" PKG_LICENSE="GPL" PKG_SITE="http://e2fsprogs.sourceforge.net/" PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk index 34a56e673f..f4ac40be3e 100644 --- a/packages/sysutils/libevdev/package.mk +++ b/packages/sysutils/libevdev/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libevdev" -PKG_VERSION="1.7.0" -PKG_SHA256="11dbe1f2b1d03a51f3e9a196757a75c3a999042ce34cf1fdc00a2363e5a2e369" +PKG_VERSION="1.8.0" +PKG_SHA256="20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/" PKG_URL="http://www.freedesktop.org/software/libevdev/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/sysutils/parted/package.mk b/packages/sysutils/parted/package.mk index b71a52a95e..6b7193d956 100644 --- a/packages/sysutils/parted/package.mk +++ b/packages/sysutils/parted/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="parted" -PKG_VERSION="3.2" -PKG_SHA256="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4" +PKG_VERSION="3.3" +PKG_SHA256="57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/parted/" PKG_URL="http://ftpmirror.gnu.org/parted/$PKG_NAME-$PKG_VERSION.tar.xz" @@ -20,6 +21,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-device-mapper \ PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET" +pre_configure_init() { + : # reuse pre_configure_target() +} + configure_init() { : # reuse configure_target() } @@ -33,3 +38,7 @@ makeinstall_init() { cp ../.$TARGET_NAME/parted/parted $INSTALL/sbin cp ../.$TARGET_NAME/partprobe/partprobe $INSTALL/sbin } + +pre_configure_target() { + export CFLAGS+=" -I$PKG_BUILD/lib" +} diff --git a/packages/sysutils/parted/patches/parted-0001-buildfix.patch b/packages/sysutils/parted/patches/parted-0001-buildfix.patch deleted file mode 100644 index 88b2ada7ea..0000000000 --- a/packages/sysutils/parted/patches/parted-0001-buildfix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur parted-3.2/libparted/arch/linux.c parted-3.2.patch/libparted/arch/linux.c ---- parted-3.2/libparted/arch/linux.c 2014-06-15 21:15:54.000000000 +0200 -+++ parted-3.2.patch/libparted/arch/linux.c 2014-08-04 01:57:47.626611437 +0200 -@@ -2307,6 +2307,7 @@ - static char * - dm_canonical_path (PedDevice const *dev) - { -+#ifdef ENABLE_DEVICE_MAPPER - LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev); - - /* Get map name from devicemapper */ -@@ -2324,6 +2325,7 @@ - dm_task_destroy (task); - return dev_name; - err: -+#endif - return NULL; - } - -@@ -2944,13 +2946,14 @@ - unsigned long long *start, - unsigned long long *length); - -- -+#ifdef ENABLE_DEVICE_MAPPER - if (disk->dev->type == PED_DEVICE_DM) { - add_partition = _dm_add_partition; - remove_partition = _dm_remove_partition; - resize_partition = _dm_resize_partition; - get_partition_start_and_length = _dm_get_partition_start_and_length; - } else { -+#endif - add_partition = _blkpg_add_partition; - remove_partition = _blkpg_remove_partition; - #ifdef BLKPG_RESIZE_PARTITION -@@ -2959,7 +2962,9 @@ - resize_partition = NULL; - #endif - get_partition_start_and_length = _kernel_get_partition_start_and_length; -+#ifdef ENABLE_DEVICE_MAPPER - } -+#endif - - /* lpn = largest partition number. - * for remove pass, use greater of device or label limit */ diff --git a/packages/sysutils/parted/patches/parted-0002-buildfix-glibc-2.28.patch b/packages/sysutils/parted/patches/parted-0002-buildfix-glibc-2.28.patch deleted file mode 100644 index 8e77a9600e..0000000000 --- a/packages/sysutils/parted/patches/parted-0002-buildfix-glibc-2.28.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b79bdebf285575ec2c3e8944d951655ef8c97a23 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 21 Jun 2016 15:01:08 -0400 -Subject: [PATCH] include sysmacros.h for major/minor/makedev - -Linux C libs are moving away from including this header implicitly via -sys/types.h, so include it explicitly. - -Upstream-Status: Pending -Signed-off-by: Martin Jansa ---- - libparted/arch/linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 0f18904..b302d63 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include /* for uname() */ - #include --- -2.14.1 - diff --git a/packages/sysutils/pciutils/package.mk b/packages/sysutils/pciutils/package.mk index 019fd8cd3c..1607da1289 100644 --- a/packages/sysutils/pciutils/package.mk +++ b/packages/sysutils/pciutils/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pciutils" -PKG_VERSION="3.6.2" -PKG_SHA256="db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" +PKG_VERSION="3.6.4" +PKG_SHA256="f67ff732976e2db2a5ccdf3960020796526ba6b05f6b1cdd24b7b206af706055" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="http://mj.ucw.cz/pciutils.shtml" diff --git a/packages/sysutils/sed/package.mk b/packages/sysutils/sed/package.mk index 714a262501..16508b249e 100644 --- a/packages/sysutils/sed/package.mk +++ b/packages/sysutils/sed/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="sed" -PKG_VERSION="4.7" -PKG_SHA256="2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a" +PKG_VERSION="4.8" +PKG_SHA256="f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/sed/" PKG_URL="http://ftpmirror.gnu.org/sed/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk index 5bf39aadc0..b590d1fa31 100644 --- a/packages/textproc/jsoncpp/package.mk +++ b/packages/textproc/jsoncpp/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="jsoncpp" -PKG_VERSION="1.8.4" -PKG_SHA256="c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6" +PKG_VERSION="1.9.2" +PKG_SHA256="77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0" PKG_LICENSE="GPL" PKG_SITE="https://github.com/open-source-parsers/jsoncpp/" PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/$PKG_VERSION.tar.gz" diff --git a/packages/textproc/jsoncpp/patches/jsoncpp-0001-disable-examples.patch b/packages/textproc/jsoncpp/patches/jsoncpp-0001-disable-examples.patch new file mode 100644 index 0000000000..663e6395a2 --- /dev/null +++ b/packages/textproc/jsoncpp/patches/jsoncpp-0001-disable-examples.patch @@ -0,0 +1,22 @@ +From 2d8dab16808ab6ceda83c33e2f662ca07271c288 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Sun, 16 Feb 2020 10:33:04 +0000 +Subject: [PATCH] Disable building examples, fails due to deprecated methods + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a7d3ef..24f518d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -228,4 +228,4 @@ add_subdirectory( src ) + add_subdirectory( include ) + + #install the example +-add_subdirectory( example ) ++#add_subdirectory( example ) +-- +2.7.4 + diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk index 7f2385e7c1..a3177ca063 100644 --- a/packages/textproc/libxml2/package.mk +++ b/packages/textproc/libxml2/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxml2" -PKG_VERSION="2.9.9" -PKG_SHA256="94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871" +PKG_VERSION="2.9.10" +PKG_SHA256="aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk index 8794609151..fb2e89ef88 100644 --- a/packages/textproc/libxslt/package.mk +++ b/packages/textproc/libxslt/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxslt" -PKG_VERSION="1.1.33" -PKG_SHA256="8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8" +PKG_VERSION="1.1.34" +PKG_SHA256="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org/xslt/" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/textproc/nlohmann-json/package.mk b/packages/textproc/nlohmann-json/package.mk index 1811435f60..57148cb6ba 100644 --- a/packages/textproc/nlohmann-json/package.mk +++ b/packages/textproc/nlohmann-json/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nlohmann-json" -PKG_VERSION="3.6.1" -PKG_SHA256="80c45b090e40bf3d7a7f2a6e9f36206d3ff710acfa8d8cc1f8c763bb3075e22e" +PKG_VERSION="3.7.3" +PKG_SHA256="249548f4867417d66ae46b338dfe0a2805f3323e81c9e9b83c89f3adbfde6f31" PKG_LICENSE="MIT" PKG_SITE="https://nlohmann.github.io/json/" PKG_URL="https://github.com/nlohmann/json/archive/v$PKG_VERSION.tar.gz" diff --git a/packages/textproc/pugixml/package.mk b/packages/textproc/pugixml/package.mk index 96ed84667a..6e2e02acef 100644 --- a/packages/textproc/pugixml/package.mk +++ b/packages/textproc/pugixml/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pugixml" -PKG_VERSION="1.9" -PKG_SHA256="7ac060048bf00da4b3902cf411f0ba9f048cdc5580eed1f5a27ff51be4a38243" +PKG_VERSION="1.10" +PKG_SHA256="10f1f0a32b559ca8435d95855928d990cfbb9796e339efb638080c897728174c" PKG_LICENSE="MIT" PKG_SITE="https://pugixml.org/" PKG_URL="https://github.com/zeux/pugixml/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/textproc/pugixml/patches/pugixml-100.01-always-install-the-pkg-config-file.patch b/packages/textproc/pugixml/patches/pugixml-100.01-always-install-the-pkg-config-file.patch deleted file mode 100644 index da442ed28e..0000000000 --- a/packages/textproc/pugixml/patches/pugixml-100.01-always-install-the-pkg-config-file.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 314dc6a95baaca90294a8ea957d9810e3bee0f62 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Mon, 9 Apr 2018 01:46:30 -0400 -Subject: [PATCH] cmake: always install the pkg-config file - -There's really never a reason to *not* want this installed. If an option -is needed to specify installing in a versioned subdirectory, this option -should be explicitly described rather than hidden in something else. - -As an added bonus, this makes the CMake install code slightly *less* -complicated. ---- - CMakeLists.txt | 10 ++++------ - scripts/pugixml.pc.in | 6 +++--- - 2 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90fa6793..d7bc1b20 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -4,7 +4,7 @@ project(pugixml) - - option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) - option(BUILD_TESTS "Build tests" OFF) --option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF) -+option(USE_VERSIONED_LIBDIR "Use a private subdirectory to install the headers and libs" OFF) - - set(BUILD_DEFINES "" CACHE STRING "Build defines") - -@@ -55,7 +55,7 @@ endif() - set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1) - get_target_property(PUGIXML_VERSION_STRING pugixml VERSION) - --if(BUILD_PKGCONFIG) -+if(USE_VERSIONED_LIBDIR) - # Install library into its own directory under LIBDIR - set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING}) - endif() -@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-config - install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}) - install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) - --if(BUILD_PKGCONFIG) -- configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) -- install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) --endif() -+configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY) -+install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) - - if(BUILD_TESTS) - file(GLOB TEST_SOURCES tests/*.cpp) -diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in -index 3c97c28d..804c4d38 100644 ---- a/scripts/pugixml.pc.in -+++ b/scripts/pugixml.pc.in -@@ -1,11 +1,11 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@ --libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@ -+includedir=${prefix}/include@INSTALL_SUFFIX@ -+libdir=${exec_prefix}/lib@INSTALL_SUFFIX@ - - Name: pugixml - Description: Light-weight, simple and fast XML parser for C++ with XPath support. - URL: http://pugixml.org/ - Version: @PUGIXML_VERSION_STRING@ - Cflags: -I${includedir} --Libs: -L${libdir} -lpugixml -\ No newline at end of file -+Libs: -L${libdir} -lpugixml diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk index e540df0ad6..2b84cc7fcd 100644 --- a/packages/tools/dtc/package.mk +++ b/packages/tools/dtc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dtc" -PKG_VERSION="1.5.0" -PKG_SHA256="14343cb204aaff386206ea27e39e93d6e35d9a797222e8426f95e57828ca6b94" +PKG_VERSION="1.5.1" +PKG_SHA256="c7a565ea4ea6d2b1fc866698940ee33a303bb6b59076167b0374f125ae2a8420" PKG_LICENSE="GPL" PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/" PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz" diff --git a/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch b/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch index c070ddddc5..a95e51eba2 100644 --- a/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch +++ b/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch @@ -1,13 +1,13 @@ -diff --git a/Makefile b/Makefile -index e6b32cf..c50789d 100644 ---- a/Makefile -+++ b/Makefile -@@ -184,7 +184,7 @@ endif - # - LIBFDT_dir = libfdt - LIBFDT_archive = $(LIBFDT_dir)/libfdt.a --LIBFDT_lib = $(LIBFDT_dir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) -+LIBFDT_lib = $(LIBFDT_dir)/libfdt.$(SHAREDLIB_EXT) - LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES)) - LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION)) +diff --git a/libfdt/Makefile.libfdt b/libfdt/Makefile.libfdt +index e546397..dd71746 100644 +--- a/libfdt/Makefile.libfdt ++++ b/libfdt/Makefile.libfdt +@@ -10,7 +10,7 @@ LIBFDT_VERSION = version.lds + LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \ + fdt_addresses.c fdt_overlay.c + LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) +-LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) ++LIBFDT_LIB = libfdt.$(SHAREDLIB_EXT) + libfdt_clean: + @$(VECHO) CLEAN "(libfdt)" diff --git a/packages/tools/flashrom/package.mk b/packages/tools/flashrom/package.mk index 828a281ede..aa5c962cdd 100644 --- a/packages/tools/flashrom/package.mk +++ b/packages/tools/flashrom/package.mk @@ -1,22 +1,21 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2019 Team LibreELEC (https://libreelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="flashrom" -PKG_VERSION="1.1" -PKG_SHA256="aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19" +PKG_VERSION="1.2" +PKG_SHA256="e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" PKG_LICENSE="GPL" PKG_SITE="https://www.flashrom.org/Flashrom" PKG_URL="https://download.flashrom.org/releases/${PKG_NAME}-v${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libusb-compat" PKG_LONGDESC="flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash BIOS/EFI/coreboot/firmware/optionROM images on mainboards, network/graphics/storage controller cards, and various other programmer devices." -PKG_MAKE_OPTS_TARGET="PREFIX=/usr \ - CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no \ - CONFIG_FT2232_SPI=no \ - CONFIG_USBBLASTER_SPI=no \ - CONFIG_JLINK_SPI=no" -PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}" +PKG_MESON_OPTS_TARGET="-Dpciutils=false \ + -Dusb=false \ + -Dconfig_ft2232_spi=false \ + -Dconfig_usbblaster_spi=false" -post_makeinstall_target() { - rm -fr ${INSTALL}/usr/share/man +makeinstall_target() { + mkdir -p ${INSTALL}/usr/sbin + cp flashrom ${INSTALL}/usr/sbin } diff --git a/packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch b/packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch new file mode 100644 index 0000000000..ac5438deda --- /dev/null +++ b/packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch @@ -0,0 +1,21 @@ +From 689d136c2806188d4a8bdaf9b5a7a57c2d889050 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Fri, 21 Feb 2020 03:02:31 +0000 +Subject: [PATCH] meson build: fails to build stlinkv3 when usb is disabled + +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 375089c30..3c5296c5f 100644 +--- a/meson.build ++++ b/meson.build +@@ -91,6 +91,7 @@ else + config_digilent_spi = false + config_developerbox_spi = false + config_pickit2_spi = false ++ config_stlinkv3_spi = false + endif + + # some programmers require libpci diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk index fccbdcf497..901ceaa6b8 100644 --- a/packages/tools/nano/package.mk +++ b/packages/tools/nano/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nano" -PKG_VERSION="4.4" -PKG_SHA256="2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7" +PKG_VERSION="4.8" +PKG_SHA256="c348f61c68ab1d573b308398212a09cd68c60fbee20f01a5bd4b50071a258e63" PKG_LICENSE="GPL" PKG_SITE="http://www.nano-editor.org/" PKG_URL="http://ftpmirror.gnu.org/nano/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index 3b91e9ff6b..2a6c522b07 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="procps-ng" -PKG_VERSION="3.3.15" -PKG_SHA256="191391fde24a1d3b9b0030d26f8dfdcbf641d36297aab7ecf2f941c5ca927e21" +PKG_VERSION="3.3.16" +PKG_SHA256="720caf307ab5dfe6d1cf4fc3e6ce786d749c69baa088627dbe1b01828f2528b1" PKG_LICENSE="GPL" PKG_SITE="https://gitlab.com/procps-ng/procps" PKG_URL="https://gitlab.com/procps-ng/procps/-/archive/v${PKG_VERSION}/procps-v${PKG_VERSION}.tar.bz2" diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk index b75d299dfe..0999c68810 100644 --- a/packages/web/libmicrohttpd/package.mk +++ b/packages/web/libmicrohttpd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmicrohttpd" -PKG_VERSION="0.9.64" -PKG_SHA256="e792d8ed5990823a0baadea0adf94365999e702f6f1314ef9c555018dafc350e" +PKG_VERSION="0.9.70" +PKG_SHA256="90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307" PKG_LICENSE="LGPLv2.1" PKG_SITE="http://www.gnu.org/software/libmicrohttpd/" PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/web/nghttp2/package.mk b/packages/web/nghttp2/package.mk index 0ff720eb1c..8b5ced7d43 100644 --- a/packages/web/nghttp2/package.mk +++ b/packages/web/nghttp2/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nghttp2" -PKG_VERSION="1.39.1" -PKG_SHA256="679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448" +PKG_VERSION="1.40.0" +PKG_SHA256="09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073" PKG_LICENSE="MIT" PKG_SITE="http://www.linuxfromscratch.org/blfs/view/cvs/basicnet/nghttp2.html" PKG_URL="https://github.com/nghttp2/nghttp2/releases/download/v$PKG_VERSION/nghttp2-$PKG_VERSION.tar.xz" diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index da05e2ffb9..11855a065d 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xkeyboard-config" -PKG_VERSION="2.27" -PKG_SHA256="690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f" +PKG_VERSION="2.29" +PKG_SHA256="1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" PKG_LICENSE="MIT" PKG_SITE="http://www.X.org" PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch index 7cbb8fc69c..cdcbf5cd2c 100644 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0002-revert-commits-depending-on-unreleased-packages.patch @@ -1,23 +1,26 @@ -commit a77adbe8d56dcaf4a138aa4026134e2869aa61cb -Author: Andreas Boll -Date: Mon Feb 11 14:00:49 2019 +0100 +From 02d24ce4001d2ef9c821566867599f41fbc3d1d1 Mon Sep 17 00:00:00 2001 +From: Andreas Boll +Date: Sun, 16 Feb 2020 02:34:56 +0000 +Subject: [PATCH 1/3] Revert "Map evdev keycode KEY_BRIGHTNESS_CYCLE to + XF86MonBrightnessCycle" - Revert "Map evdev keycode KEY_BRIGHTNESS_CYCLE to XF86MonBrightnessCycle" - - This reverts commit ed67b29ecc639f1bafa9530cb9307fee57241458. - - XF86MonBrightnessCycle currently depends on an unreleased xorgproto. - - See also - https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/123 - https://gitlab.freedesktop.org/xorg/proto/xorgproto/commit/4e9f4e6136a7c35b0b3d341424eb4e0585f2f0a7 - - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 +This reverts commit ed67b29ecc639f1bafa9530cb9307fee57241458. + +XF86MonBrightnessCycle currently depends on an unreleased xorgproto. + +See also +https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/123 +https://gitlab.freedesktop.org/xorg/proto/xorgproto/commit/4e9f4e6136a7c35b0b3d341424eb4e0585f2f0a7 + +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 +--- + symbols/inet | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/symbols/inet b/symbols/inet -index 8e65c5e5..4d774fac 100644 +index 049ac18..5ab6feb 100644 --- a/symbols/inet +++ b/symbols/inet @@ -212,7 +212,7 @@ xkb_symbols "evdev" { @@ -29,28 +32,35 @@ index 8e65c5e5..4d774fac 100644 // key { [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off // key { [ ] }; // KEY_DISPLAY_OFF -- turn off display key { [ XF86WWAN ] }; // KEY_WWAN -commit 0ea1d601ee56e1eb81be5f0a740e1380735e11ac -Author: Andreas Boll -Date: Mon Feb 11 14:48:08 2019 +0100 +-- +2.7.4 - Revert "Map evdev keycode KEY_KEYBOARD to XF86Keyboard" - - This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d. - - This patch breaks keyboard layouts in XWayland applications when having several - keyboard layouts enabled. - - See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998 - - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 - - Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump - dependency on x11-xkb-utils. + +From 5bb6d783f40d8aa61da2095c08a6933bb1ee7bf3 Mon Sep 17 00:00:00 2001 +From: Andreas Boll +Date: Sun, 16 Feb 2020 02:35:03 +0000 +Subject: [PATCH 2/3] Revert "Map evdev keycode KEY_KEYBOARD to XF86Keyboard" + +This reverts commit d0e5e63cf59be444bec0e5b11838a9abce45226d. + +This patch breaks keyboard layouts in XWayland applications when having several +keyboard layouts enabled. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998 + +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 + +Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump +dependency on x11-xkb-utils. +--- + keycodes/evdev | 1 - + symbols/inet | 1 - + 2 files changed, 2 deletions(-) diff --git a/keycodes/evdev b/keycodes/evdev -index 90b8278d..f2630ffe 100644 +index d41799d..e08ea0a 100644 --- a/keycodes/evdev +++ b/keycodes/evdev @@ -285,7 +285,6 @@ default xkb_keycodes "evdev" { @@ -59,10 +69,10 @@ index 90b8278d..f2630ffe 100644 = 372; // #define KEY_FAVORITES 364 - = 382; // #define KEY_KEYBOARD 374 = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 + = 380; // #define KEY_FULL_SCREEN 372 - // Fake keycodes for virtual keys diff --git a/symbols/inet b/symbols/inet -index 4d774fac..469a7d65 100644 +index 5ab6feb..72cc45d 100644 --- a/symbols/inet +++ b/symbols/inet @@ -219,7 +219,6 @@ xkb_symbols "evdev" { @@ -71,51 +81,59 @@ index 4d774fac..469a7d65 100644 key { [ XF86Favorites ] }; - key { [ XF86Keyboard ] }; key { [ XF86RotationLockToggle ] }; + key { [ XF86FullScreen ] }; - key { [ XF86Tools ] }; -commit 3dd87655fd92a375ada3fc6d8cfe90d431baecaa -Author: Andreas Boll -Date: Mon Feb 11 14:55:34 2019 +0100 +-- +2.7.4 - Revert "Map evdev keycode KEY_FAVORITES to XF86Favorites" - - This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd. - - This patch breaks keyboard layouts in XWayland applications when having - several keyboard layouts enabled. - - See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998 - - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 - Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 - - Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump - dependency on x11-xkb-utils. + +From 9415d810808061cbb38832c4abf636606f3ed2ad Mon Sep 17 00:00:00 2001 +From: Andreas Boll +Date: Sun, 16 Feb 2020 02:35:56 +0000 +Subject: [PATCH 3/3] Revert "Map evdev keycode KEY_FAVORITES to XF86Favorites" + +This reverts commit e6103610a2ddae633e2715c9f1da86e79b5256dd. + +This patch breaks keyboard layouts in XWayland applications when having +several keyboard layouts enabled. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1587998 + +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921867 +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921940 +Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922020 + +Drop this revert once we have a newer xkbcomp (>> 1.4.2) and bump +dependency on x11-xkb-utils. +--- + keycodes/evdev | 1 - + symbols/inet | 1 - + 2 files changed, 2 deletions(-) diff --git a/keycodes/evdev b/keycodes/evdev -index f2630ffe..51a6e26d 100644 +index e08ea0a..8ed0fa9 100644 --- a/keycodes/evdev +++ b/keycodes/evdev -@@ -284,8 +284,7 @@ default xkb_keycodes "evdev" { +@@ -284,7 +284,6 @@ default xkb_keycodes "evdev" { = 254; // #define KEY_WWAN 246 = 255; // #define KEY_RFKILL 247 - = 372; // #define KEY_FAVORITES 364 = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 - - // Fake keycodes for virtual keys - = 92; + = 380; // #define KEY_FULL_SCREEN 372 + diff --git a/symbols/inet b/symbols/inet -index 469a7d65..ef0635a7 100644 +index 72cc45d..2a5ab74 100644 --- a/symbols/inet +++ b/symbols/inet -@@ -218,8 +218,7 @@ xkb_symbols "evdev" { +@@ -218,7 +218,6 @@ xkb_symbols "evdev" { key { [ XF86WWAN ] }; // KEY_WWAN key { [ XF86RFKill ] }; // KEY_RFKILL - key { [ XF86Favorites ] }; key { [ XF86RotationLockToggle ] }; + key { [ XF86FullScreen ] }; + +-- +2.7.4 - key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch index 3815c0bf78..d7153fbdb2 100644 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0003-drop-unsupported-keycode.patch @@ -1,6 +1,6 @@ -From 86c0e56796658a8a3ba1246252e88a997f48a359 Mon Sep 17 00:00:00 2001 +From 9d3629f7a6edce20990ca75d879097abe62bc8a7 Mon Sep 17 00:00:00 2001 From: MilhouseVH -Date: Fri, 14 Jun 2019 01:00:37 +0100 +Date: Sun, 16 Feb 2020 02:51:52 +0000 Subject: [PATCH] drop unsupported keycodes Jun 14 00:55:54 NUC xorg-launch[722]: The XKEYBOARD keymap compiler (xkbcomp) reports: @@ -10,36 +10,38 @@ Jun 14 00:55:54 NUC xorg-launch[722]: > This warning only show Jun 14 00:55:54 NUC xorg-launch[722]: > Internal error: Could not resolve keysym XF86RotationLockToggle Jun 14 00:55:54 NUC xorg-launch[722]: Errors from xkbcomp are not fatal to the X server --- - keycodes/evdev | 2 -- - symbols/inet | 2 -- - 2 files changed, 4 deletions(-) + keycodes/evdev | 3 --- + symbols/inet | 3 --- + 2 files changed, 6 deletions(-) diff --git a/keycodes/evdev b/keycodes/evdev -index bac7e36..51a6e26 100644 +index 8ed0fa9..f7d5c7b 100644 --- a/keycodes/evdev +++ b/keycodes/evdev -@@ -284,8 +284,6 @@ default xkb_keycodes "evdev" { +@@ -284,9 +284,6 @@ default xkb_keycodes "evdev" { = 254; // #define KEY_WWAN 246 = 255; // #define KEY_RFKILL 247 - = 569; // #define KEY_ROTATE_LOCK_TOGGLE 561 +- = 380; // #define KEY_FULL_SCREEN 372 - // Fake keycodes for virtual keys = 92; = 203; diff --git a/symbols/inet b/symbols/inet -index 1229617..39cf9dc 100644 +index 2a5ab74..0fb78cd 100644 --- a/symbols/inet +++ b/symbols/inet -@@ -218,8 +218,6 @@ xkb_symbols "evdev" { +@@ -218,9 +218,6 @@ xkb_symbols "evdev" { key { [ XF86WWAN ] }; // KEY_WWAN key { [ XF86RFKill ] }; // KEY_RFKILL - key { [ XF86RotationLockToggle ] }; +- key { [ XF86FullScreen ] }; - key { [ XF86Tools ] }; key { [ XF86Launch5 ] }; key { [ XF86Launch6 ] }; -- -2.14.1 +2.7.4 diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0004-fix-python3-support.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0004-fix-python3-support.patch new file mode 100644 index 0000000000..6f15ec983d --- /dev/null +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0004-fix-python3-support.patch @@ -0,0 +1,34 @@ +From bb68466121aa7a4fd5e5af0ef781235b8dbc4ce7 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Sun, 16 Feb 2020 09:41:43 +0000 +Subject: [PATCH] fix python3 support + +https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197 +--- + rules/compat/map-variants.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py +index ebbfec9..979ba43 100755 +--- a/rules/compat/map-variants.py ++++ b/rules/compat/map-variants.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + + import argparse + import re +@@ -12,8 +12,8 @@ class Layout(object): + assert variant is None + # parse a layout(variant) string + match = re.match(r'([^(]+)\(([^)]+)\)', layout) +- self.layout = match[1] +- self.variant = match[2] ++ self.layout = match.groups()[0] ++ self.variant = match.groups()[1] + + def __str__(self): + if self.variant: +-- +2.7.4 + diff --git a/packages/x11/driver/xf86-input-libinput/package.mk b/packages/x11/driver/xf86-input-libinput/package.mk index a3b155dc34..4c02be401b 100644 --- a/packages/x11/driver/xf86-input-libinput/package.mk +++ b/packages/x11/driver/xf86-input-libinput/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xf86-input-libinput" -PKG_VERSION="0.28.2" -PKG_SHA256="b8b346962c6b62b8069928c29c0db83b6f544863bf2fc6830f324de841de2820" +PKG_VERSION="0.29.0" +PKG_SHA256="c28b56a21754b972db31798e6a4cf4dc9d69208d08f8fe41701a94def5e94bee" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/libinput/" PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/font/encodings/package.mk b/packages/x11/font/encodings/package.mk index 1269a1580c..bca211007d 100644 --- a/packages/x11/font/encodings/package.mk +++ b/packages/x11/font/encodings/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="encodings" -PKG_VERSION="1.0.4" -PKG_SHA256="ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" +PKG_VERSION="1.0.5" +PKG_SHA256="bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2"