From 682a2e75b0cf5ea95a7da26ba77525678a1e4051 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 12 Feb 2021 19:49:51 +0100 Subject: [PATCH 001/162] configs/mx6cubox: bump Linux and U-Boot versions Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/mx6cubox_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index 5ed28e53c0..30a64f05f5 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -6,8 +6,8 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y # Toolchain -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System configuration BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.6" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" @@ -32,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 31a21958633bac220471faafb801547511f9c312 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 12 Feb 2021 20:47:50 +0100 Subject: [PATCH 002/162] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot versions Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 8 ++++---- configs/olimex_a20_olinuxino_lime_defconfig | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index ca8a319e68..8b10502de8 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Toolchain # glibc is needed for sunxi-mali-mainline-package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.6" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -43,7 +43,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 9de6de77f3..9ae713569b 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Toolchain # glibc is needed for sunxi-mali-mainline-package. @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.69" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.6" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -43,7 +43,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 516ce1f134e6ee866e20bc2a087bec689844b586 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 12 Feb 2021 18:39:26 +0100 Subject: [PATCH 003/162] package/eudev: bump version to 3.2.10 Removed patch which was applied upstream: https://github.com/gentoo/eudev/commit/799591c57368bbe47667f5b696050247a766b117 Reformatted hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...dev-monitor.c-do-not-check-if-dev-is.patch | 33 ------------------- package/eudev/eudev.hash | 6 ++-- package/eudev/eudev.mk | 2 +- 3 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch diff --git a/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch b/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch deleted file mode 100644 index 3027ad7f17..0000000000 --- a/package/eudev/0001-src-libudev-libudev-monitor.c-do-not-check-if-dev-is.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 799591c57368bbe47667f5b696050247a766b117 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Mon, 6 Jan 2020 11:14:47 -0500 -Subject: [PATCH] src/libudev/libudev-monitor.c: do not check if /dev is tmpfs - -This check fails for buildroot systems where /dev is not mounted -as a tmpfs filesystem. Dropping this check should be safe even -on regular systems. - -This solves issue #172. - -Signed-off-by: Anthony G. Basile -Signed-off-by: Joel Stanley ---- - src/libudev/libudev-monitor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c -index 614149c6243c..060ba733f33b 100644 ---- a/src/libudev/libudev-monitor.c -+++ b/src/libudev/libudev-monitor.c -@@ -186,7 +186,7 @@ struct udev_monitor *udev_monitor_new_from_netlink_fd(struct udev *udev, const c - * We do not set a netlink multicast group here, so the socket - * will not receive any messages. - */ -- if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0 || !udev_has_devtmpfs(udev)) { -+ if (access(UDEV_ROOT_RUN "/udev/control", F_OK) < 0) { - log_debug("the udev service seems not to be active, disable the monitor"); - group = UDEV_MONITOR_NONE; - } else --- -2.25.0 - diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index e6a319ac44..fda0481351 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,5 +1,5 @@ # From http://dev.gentoo.org/~blueness/eudev/ -md5 dedfb1964f6098fe9320de827957331f eudev-3.2.9.tar.gz +md5 60b135a189523f333cea5f71a3345c8d eudev-3.2.10.tar.gz # Locally calculated -sha256 89618619084a19e1451d373c43f141b469c9fd09767973d73dd268b92074d4fc eudev-3.2.9.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index d4133a5ace..5d18b388c7 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -EUDEV_VERSION = 3.2.9 +EUDEV_VERSION = 3.2.10 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING From 1276a1bd78b461f0d5c204a1d971fdec6c886423 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 10 Feb 2021 19:50:15 +0100 Subject: [PATCH 004/162] package/wpa_supplicant: Fix options to actually disable features. Since wpa_supplicant 2.8, most features are now enabled by default, instead of being disabled by default. Remove setting of options that are already enabled by default, and turn ENABLE into DISABLE where appropriate. This also makes the existing options disable more features, otherwise, it would still include dead code or even fail to compile. Als correct/update some help texts. Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wpa_supplicant/Config.in | 4 ++-- package/wpa_supplicant/wpa_supplicant.mk | 30 ++++++++++-------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index cba7fa07e1..8057c0b7be 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -38,7 +38,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT set. This links in parts of hostapd functionality into wpa_supplicant, making it bigger but dispensing the need for a separate hostapd binary in some applications hence being - smaller overall. + smaller overall. It also enables support for Wi-Fi Direct. config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY bool "Enable Wi-Fi Display" @@ -63,7 +63,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN config BR2_PACKAGE_WPA_SUPPLICANT_EAP bool "Enable EAP" help - Enable support for EAP. + Enable support for EAP, 802.1x/WPA-Enterprise and FILS. config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT bool "Enable HS20" diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 940a821746..295f368d78 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -27,15 +27,8 @@ WPA_SUPPLICANT_INSTALL_STAGING = YES WPA_SUPPLICANT_CONFIG_EDITS = -# Add support for simple background scan -WPA_SUPPLICANT_CONFIG_SET = CONFIG_BGSCAN_SIMPLE - WPA_SUPPLICANT_CONFIG_ENABLE = \ - CONFIG_IEEE80211AC \ - CONFIG_IEEE80211N \ - CONFIG_IEEE80211R \ CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_DEBUG_FILE \ CONFIG_MATCH_IFACE WPA_SUPPLICANT_CONFIG_DISABLE = \ @@ -62,11 +55,15 @@ ifeq ($(BR2_STATIC_LIBS),y) WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_TNC endif else -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_EAP \ + CONFIG_IEEE8021X_EAPOL \ + CONFIG_FILS endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_HS20 \ +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),) +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_HS20 \ CONFIG_INTERWORKING endif @@ -86,9 +83,8 @@ else WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_WIFI_DISPLAY endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_MESH -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_IEEE80211W +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_MESH endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN),y) @@ -97,8 +93,8 @@ WPA_SUPPLICANT_CONFIG_ENABLE += \ CONFIG_AUTOSCAN_PERIODIC endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WPS +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_WPS endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA3),y) @@ -143,8 +139,8 @@ else WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE_DBUS_NEW endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_DEBUG_SYSLOG +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DEBUG_SYSLOG endif ifeq ($(BR2_PACKAGE_READLINE),y) From 1f24dcf4801dd5a345978b26dabdf103970cbf17 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 10 Feb 2021 19:50:16 +0100 Subject: [PATCH 005/162] package/wpa_supplicant: Add options to disable more features. Together, they increase the size of the binary by a bit less than a megabyte. As a result, make the wpa_supplicant option a menuconfig. Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wpa_supplicant/Config.in | 35 +++++++++++++++++++++++- package/wpa_supplicant/wpa_supplicant.mk | 19 +++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 8057c0b7be..9553dcf7df 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_WPA_SUPPLICANT +menuconfig BR2_PACKAGE_WPA_SUPPLICANT bool "wpa_supplicant" depends on BR2_USE_MMU # fork() help @@ -29,6 +29,33 @@ config BR2_PACKAGE_WPA_SUPPLICANT_NL80211 comment "nl80211 support needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_WPA_SUPPLICANT_WEXT + bool "Enable wext (deprecated)" + default y if !BR2_TOOLCHAIN_HAS_THREADS + help + Enable support for wext. This is the historic wireless API + for Linux, which is now deprecated and in maintenance-only in + the kernel. It may still be required by out-of-tree drivers. + +config BR2_PACKAGE_WPA_SUPPLICANT_WIRED + bool "Enable wired support" + select BR2_PACKAGE_WPA_SUPPLICANT_EAP + help + Include the "wired" driver, so the internal IEEE 802.1x + supplicant can be used with Ethernet. This also enables + support for MACSEC. + +comment "wpa_supplicant will be useless without at least one driver" + depends on !BR2_PACKAGE_WPA_SUPPLICANT_NL80211 && \ + !BR2_PACKAGE_WPA_SUPPLICANT_WEXT && \ + !BR2_PACKAGE_WPA_SUPPLICANT_WIRED + +config BR2_PACKAGE_WPA_SUPPLICANT_IBSS_RSN + bool "Enable IBSS RSN" + depends on BR2_PACKAGE_WPA_SUPPLICANT_NL80211 + help + Enable support for RSN/WPA2 in Ad-Hoc mode. + config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT bool "Enable AP mode" depends on BR2_PACKAGE_WPA_SUPPLICANT_NL80211 @@ -90,6 +117,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WPA3 config BR2_PACKAGE_WPA_SUPPLICANT_CLI bool "Install wpa_cli binary" + select BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE help Install wpa_cli command line utility @@ -107,6 +135,11 @@ config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE help Install wpa_passphrase command line utility. +config BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE + bool "Enable the Unix-socket control interface" + help + Enable support for the Unix-socket-based API. + config BR2_PACKAGE_WPA_SUPPLICANT_DBUS bool "Enable support for the DBus control interface" depends on BR2_TOOLCHAIN_HAS_THREADS # dbus diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 295f368d78..f4ed74abc3 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -47,6 +47,14 @@ else WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DRIVER_NL80211 endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WEXT),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DRIVER_WEXT +endif + +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_IBSS_RSN), ) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_IBSS_RSN +endif + # Trailing underscore on purpose to not enable CONFIG_EAPOL_TEST ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_EAP_ @@ -61,6 +69,13 @@ WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_FILS endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIRED),) +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_DRIVER_WIRED \ + CONFIG_MACSEC \ + CONFIG_DRIVER_MACSEC +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),) WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_HS20 \ @@ -119,6 +134,10 @@ WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD CONFIG_EAP_TEAP WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE),) +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus WPA_SUPPLICANT_MAKE_ENV = \ From f3dcb2012522505b1dba0f39da6987b8882252d9 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 10 Feb 2021 19:50:17 +0100 Subject: [PATCH 006/162] package/wpa_supplicant: Simplify D-Bus support. wpa_supplicant 2.8 dropped support for the old D-Bus interface, so remove mentions of it and rename DBUS_NEW variables to just DBUS. Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wpa_supplicant/Config.in | 2 +- package/wpa_supplicant/wpa_supplicant.mk | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 9553dcf7df..3c986ff4ba 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -154,6 +154,6 @@ config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION bool "Introspection support" depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS help - Add introspection support for new DBus control interface. + Add introspection support for the DBus control interface. endif diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index f4ed74abc3..b7bdc4e0af 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,8 +13,7 @@ WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CPE_ID_VENDOR = w1.fi WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant -WPA_SUPPLICANT_DBUS_OLD_SERVICE = fi.epitest.hostap.WPASupplicant -WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1 +WPA_SUPPLICANT_DBUS_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) WPA_SUPPLICANT_SELINUX_MODULES = networkmanager @@ -146,8 +145,8 @@ WPA_SUPPLICANT_MAKE_ENV = \ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ - $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service \ - $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service + $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_SERVICE).service \ + $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service endef ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y) @@ -220,7 +219,6 @@ define WPA_SUPPLICANT_INSTALL_DBUS $(INSTALL) -m 0644 -D \ $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf - $(WPA_SUPPLICANT_INSTALL_DBUS_OLD) $(WPA_SUPPLICANT_INSTALL_DBUS_NEW) endef endif From 4feb7c37f214aa833baa7d8ade271ff3cc0f195d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 13 Feb 2021 14:53:13 +0100 Subject: [PATCH 007/162] package/util-linux: bump version to 2.36.2 For details see [1]. [1] http://lkml.iu.edu/hypermail/linux/kernel/2102.1/07236.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index c5f5c69a4d..3f9fe39818 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.36/sha256sums.asc -sha256 09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed util-linux-2.36.1.tar.xz +sha256 f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f util-linux-2.36.2.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 0178c52bac..95fd7ec82b 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.36 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From 7851f5a1279e918e38ee531b8e77b21aef0848c1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Feb 2021 00:16:34 +0100 Subject: [PATCH 008/162] package/libubox: bump version to 5bc0146a - change download url to https - update homepage url (the old one returns 404 - No projects found) - add hash file - delete 0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch (from upstream [1]) [1] https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...x-array-out-of-bounds-GCC-10-warning.patch | 47 ------------------- package/libubox/Config.in | 2 +- package/libubox/libubox.hash | 2 + package/libubox/libubox.mk | 5 +- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch create mode 100644 package/libubox/libubox.hash diff --git a/package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch b/package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch deleted file mode 100644 index 09128db9e2..0000000000 --- a/package/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch +++ /dev/null @@ -1,47 +0,0 @@ -From eb7eb6393d47a918c420f5b287946dbd6c0d5f57 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Petr=20=C5=A0tetiar?= -Date: Wed, 25 Dec 2019 10:27:59 +0100 -Subject: [PATCH] blobmsg: fix array out of bounds GCC 10 warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes following warning reported by GCC 10.0.0 20191203: - - blobmsg.c:234:2: error: 'strcpy' offset 6 from the object at 'attr' is out of the bounds of referenced subobject 'name' with type 'uint8_t[0]' {aka 'unsigned char[0]'} at offset 6 [-Werror=array-bounds] - 234 | strcpy((char *) hdr->name, (const char *)name); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - In file included from blobmsg.c:16: - blobmsg.h:42:10: note: subobject 'name' declared here - 42 | uint8_t name[]; - | ^~~~ - -Reported-by: Khem Raj -Signed-off-by: Petr Å tetiar -[Retrieved from: -https://git.openwrt.org/?p=project/libubox.git;a=commit;h=eb7eb6393d47a918c420f5b287946dbd6c0d5f57] -Signed-off-by: Fabrice Fontaine ---- - blobmsg.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/blobmsg.c b/blobmsg.c -index 48dba81..37821c3 100644 ---- a/blobmsg.c -+++ b/blobmsg.c -@@ -240,7 +240,10 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v - attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED); - hdr = blob_data(attr); - hdr->namelen = cpu_to_be16(namelen); -- strcpy((char *) hdr->name, (const char *)name); -+ -+ memcpy(hdr->name, name, namelen); -+ hdr->name[namelen] = '\0'; -+ - pad_end = *data = blobmsg_data(attr); - pad_start = (char *) &hdr->name[namelen]; - if (pad_start < pad_end) --- -2.20.1 - diff --git a/package/libubox/Config.in b/package/libubox/Config.in index 25ef4bb89a..1f0b691e13 100644 --- a/package/libubox/Config.in +++ b/package/libubox/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBUBOX also be used for the same purposes in projects other than OpenWrt. - http://nbd.name/gitweb.cgi?p=luci2/libubox.git;a=summary + https://openwrt.org/docs/techref/libubox comment "libubox needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libubox/libubox.hash b/package/libubox/libubox.hash new file mode 100644 index 0000000000..fd4c5a4a39 --- /dev/null +++ b/package/libubox/libubox.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 e383caf80a241e9711ab0c58a5e8f4d16479693be1e44ffb6cc716a185e7e303 libubox-5bc0146a1d6474d339c4ade9a227f32cc27a8b93-br1.tar.gz diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index d3e3b709dc..4626659158 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBUBOX_VERSION = 723730214732862de7e892bae2f7a7889e66bf1b -LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git +LIBUBOX_VERSION = 5bc0146a1d6474d339c4ade9a227f32cc27a8b93 +LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git +LIBUBOX_SITE_METHOD = git LIBUBOX_LICENSE = ISC, BSD-3-Clause LIBUBOX_INSTALL_STAGING = YES LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) From 1510a61f69757823b6c314b6ea957c897d446f86 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Feb 2021 00:16:35 +0100 Subject: [PATCH 009/162] package/ubus: bump version to d1d9ddf - change download url to https - update homepage url (the old one redirects to legacy read only OpenWrt wiki system) - update license file hash (ubusd_acl.h - license unrelated source code changes only) Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/ubus/Config.in | 2 +- package/ubus/ubus.hash | 4 ++-- package/ubus/ubus.mk | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/ubus/Config.in b/package/ubus/Config.in index 28bf8e9ae4..391893e808 100644 --- a/package/ubus/Config.in +++ b/package/ubus/Config.in @@ -19,7 +19,7 @@ config BR2_PACKAGE_UBUS * Select BR2_PACKAGE_LUA_5_1 if you want to have Lua support. - https://wiki.openwrt.org/doc/techref/ubus + https://openwrt.org/docs/techref/ubus if BR2_PACKAGE_UBUS diff --git a/package/ubus/ubus.hash b/package/ubus/ubus.hash index 1fcea36851..15e67b53ed 100644 --- a/package/ubus/ubus.hash +++ b/package/ubus/ubus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 011566b2be426f572d397b44a7c12baa50a9b949232e5a6075eba613e1c3f7ae ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692-br1.tar.gz -sha256 f53187f011575f6ec6c529136fd4658d67e674227c80b7b72c99b3654454ae7f ubusd_acl.h +sha256 0d2abb7212ad1ac0ac641d52f62e212bb090a1bbaeae975a78f44ab08d3e3c23 ubus-d1d9ddf98d39b0bdc055060fb962335439445690-br1.tar.gz +sha256 a3caa6c0e90c87b7c97c2ac3d0c0d416082ef777215faec2e9b24ea6e68f6988 ubusd_acl.h diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk index 5fb57ead01..09668f7dd2 100644 --- a/package/ubus/ubus.mk +++ b/package/ubus/ubus.mk @@ -4,8 +4,9 @@ # ################################################################################ -UBUS_VERSION = 34c6e818e431cc53478a0f7c7c1eca07d194d692 -UBUS_SITE = git://git.openwrt.org/project/ubus.git +UBUS_VERSION = d1d9ddf98d39b0bdc055060fb962335439445690 +UBUS_SITE = https://git.openwrt.org/project/ubus.git +UBUS_SITE_METHOD = git UBUS_LICENSE = LGPL-2.1 UBUS_LICENSE_FILES = ubusd_acl.h From 351e6a9bce11ced9e75a5aca0ada6dcf9de2e113 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Feb 2021 00:16:36 +0100 Subject: [PATCH 010/162] package/libuci: bump version to 52bbc99 - change download url to https - update homepage url (the old one redirects to legacy read only OpenWrt wiki system) Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/libuci/Config.in | 2 +- package/libuci/libuci.hash | 2 +- package/libuci/libuci.mk | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libuci/Config.in b/package/libuci/Config.in index 2f4ad40487..f94d7dc391 100644 --- a/package/libuci/Config.in +++ b/package/libuci/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_LIBUCI This package will also install CLI tool uci. - http://wiki.openwrt.org/doc/techref/uci + https://openwrt.org/docs/techref/uci comment "libuci needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/libuci/libuci.hash b/package/libuci/libuci.hash index b808810ccf..b6962c2541 100644 --- a/package/libuci/libuci.hash +++ b/package/libuci/libuci.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 1ee875910bdf751807f10d44f6b6b7f9ec71c12d4c407a80bae5cb654d2ba4cc libuci-49ec6efbdac4819033d34f08927d795f83a3932d-br1.tar.gz +sha256 76ef826df2961420cd7a4f1702bef06c37563d9807a2d8e84557963aab21ac80 libuci-52bbc99f69ea6f67b6fe264f424dac91bde5016c-br1.tar.gz diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk index 55afd53c10..fcfda95b3a 100644 --- a/package/libuci/libuci.mk +++ b/package/libuci/libuci.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBUCI_VERSION = 49ec6efbdac4819033d34f08927d795f83a3932d -LIBUCI_SITE = git://git.openwrt.org/project/uci.git +LIBUCI_VERSION = 52bbc99f69ea6f67b6fe264f424dac91bde5016c +LIBUCI_SITE = https://git.openwrt.org/project/uci.git +LIBUCI_SITE_METHOD = git LIBUCI_LICENSE = LGPL-2.1, GPL-2.0 (tools) LIBUCI_INSTALL_STAGING = YES LIBUCI_DEPENDENCIES = libubox From 74515d8e582bcff88ff28cb30f49aa9fe5adc2ac Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Feb 2021 00:16:37 +0100 Subject: [PATCH 011/162] package/odhcp6c: bump version to 53f07e9 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/odhcp6c/odhcp6c.hash | 2 +- package/odhcp6c/odhcp6c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/odhcp6c/odhcp6c.hash b/package/odhcp6c/odhcp6c.hash index 26ee711684..84d1fc4527 100644 --- a/package/odhcp6c/odhcp6c.hash +++ b/package/odhcp6c/odhcp6c.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c3622120b5209d1c14d5ac92884240bf0e4f652633562355e70dbf482f6c37b4 odhcp6c-f575351cbb3defc0bf52680c9082912a6c264374-br1.tar.gz +sha256 7274a304016838483e2da48193309e5f84ca0a8a407647033283d1249eebe986 odhcp6c-53f07e90b7f1da6977143a488dd5cb73a33b233b-br1.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/odhcp6c/odhcp6c.mk b/package/odhcp6c/odhcp6c.mk index c7f214ff7a..dd3a9d3e28 100644 --- a/package/odhcp6c/odhcp6c.mk +++ b/package/odhcp6c/odhcp6c.mk @@ -4,7 +4,7 @@ # ################################################################################ -ODHCP6C_VERSION = f575351cbb3defc0bf52680c9082912a6c264374 +ODHCP6C_VERSION = 53f07e90b7f1da6977143a488dd5cb73a33b233b ODHCP6C_SITE = https://git.openwrt.org/project/odhcp6c.git ODHCP6C_SITE_METHOD = git ODHCP6C_LICENSE = GPL-2.0 From 2766ac8d577074b478ff8f65bbea9ccea3cdb5ad Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Feb 2021 00:16:38 +0100 Subject: [PATCH 012/162] package/ustream-ssl: bump version to 68d0924 - change download url to https - change hash of ustream-ssl.h, which is used as license file. There are no changes to the license text, only changes in the code. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/ustream-ssl/ustream-ssl.hash | 4 ++-- package/ustream-ssl/ustream-ssl.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/ustream-ssl/ustream-ssl.hash b/package/ustream-ssl/ustream-ssl.hash index 60672b38b3..0c51a977cc 100644 --- a/package/ustream-ssl/ustream-ssl.hash +++ b/package/ustream-ssl/ustream-ssl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f09474dbe4680b51cc0c6a088807102d64954764ef58c2a1e3231e3a77c4b01f ustream-ssl-23a3f2830341acd1db149175baf7315a33bd0edb-br1.tar.gz -sha256 90dd1590cf400a548438e2575e1ff46d8fb8cebae7d09f544aae7e059e30b6c5 ustream-ssl.h +sha256 e77e579b718085c1447339e0fcd5385b85a783d5c92544e48a6b37b1695a7f39 ustream-ssl-68d09243b6fd4473004b27ff6483352e76e6af1a-br1.tar.gz +sha256 cf28f0f01a57423983fa062eb0f04bb1a78891863cb58c53059c3d8cb52c1dd4 ustream-ssl.h diff --git a/package/ustream-ssl/ustream-ssl.mk b/package/ustream-ssl/ustream-ssl.mk index 7804eb5d38..bee8d7de15 100644 --- a/package/ustream-ssl/ustream-ssl.mk +++ b/package/ustream-ssl/ustream-ssl.mk @@ -4,8 +4,9 @@ # ################################################################################ -USTREAM_SSL_VERSION = 23a3f2830341acd1db149175baf7315a33bd0edb -USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git +USTREAM_SSL_VERSION = 68d09243b6fd4473004b27ff6483352e76e6af1a +USTREAM_SSL_SITE = https://git.openwrt.org/project/ustream-ssl.git +USTREAM_SSL_SITE_METHOD = git USTREAM_SSL_LICENSE = ISC USTREAM_SSL_LICENSE_FILES = ustream-ssl.h USTREAM_SSL_INSTALL_STAGING = YES From 2854c31aceac89f8b397fd456229802e3837d3e7 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Feb 2021 00:16:39 +0100 Subject: [PATCH 013/162] package/uhttpd: bump version to f53a639 - change download url to https - update license file hash (uhttpd.h - license unrelated source code changes only) Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/uhttpd/uhttpd.hash | 4 ++-- package/uhttpd/uhttpd.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/uhttpd/uhttpd.hash b/package/uhttpd/uhttpd.hash index 389a0ef636..6f8b4a60f8 100644 --- a/package/uhttpd/uhttpd.hash +++ b/package/uhttpd/uhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5b81ebf9e419c668de4181cce7b9f5fa358cabb2a4a0d1f1a3a24190eeb21f25 uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82-br1.tar.gz -sha256 2a61a8a690e7646a4bfe4261bf77c49f47588db5fc234b3cc66809dcc0cb3985 uhttpd.h +sha256 8a537a377c8dc1abda147a1e3feb3fe3e3633a9d30e4e37d378cc6309dace2f0 uhttpd-f53a63999784bcb7dc513e221f3f25dd3de2f35e-br1.tar.gz +sha256 ce1803f83f776cc88661e303fede0e5ff52faf1d9f74508fadbecf7705b4c84d uhttpd.h diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk index cc7649d0ec..355a266d6b 100644 --- a/package/uhttpd/uhttpd.mk +++ b/package/uhttpd/uhttpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -UHTTPD_VERSION = a8bf9c00842224edb394e79909053f7628ee6a82 -UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git +UHTTPD_VERSION = f53a63999784bcb7dc513e221f3f25dd3de2f35e +UHTTPD_SITE = https://git.openwrt.org/project/uhttpd.git UHTTPD_SITE_METHOD = git UHTTPD_LICENSE = ISC UHTTPD_LICENSE_FILES = uhttpd.h From 8fcdd2023ee6bc2efd96a3b43fec103f2afa0e2f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Feb 2021 00:16:40 +0100 Subject: [PATCH 014/162] package/dnsmasq: bump version to 2.84 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/dnsmasq/dnsmasq.hash | 2 +- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 6c19dad791..d141fb0c83 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature # https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.83.tar.xz.asc -sha256 ffc1f7e8b05e22d910b9a71d09f1128197292766dc7c54cb7018a1b2c3af4aea dnsmasq-2.83.tar.xz +sha256 603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c dnsmasq-2.84.tar.xz # Locally calculated sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index fb21dc7ad0..76b48f952a 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.83 +DNSMASQ_VERSION = 2.84 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" From 797d63e6039de83bb2b466886fafefb17f41d52c Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Thu, 11 Feb 2021 17:20:39 +0200 Subject: [PATCH 015/162] package/python-uvloop: bump to version 0.15.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-uvloop/python-uvloop.hash | 4 ++-- package/python-uvloop/python-uvloop.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvloop/python-uvloop.hash b/package/python-uvloop/python-uvloop.hash index 436babf915..baed0b3e58 100644 --- a/package/python-uvloop/python-uvloop.hash +++ b/package/python-uvloop/python-uvloop.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/uvloop/json -md5 a2f82abb676756f11f544c6b51caf171 uvloop-0.14.0.tar.gz -sha256 123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e uvloop-0.14.0.tar.gz +md5 c97447b8b386971be5e6f4328563be42 uvloop-0.15.0.tar.gz +sha256 1a503d5b49da6e3dd5607d6e533a5315b1caedbf629901807c65a23a09cad065 uvloop-0.15.0.tar.gz # Locally computed sha256 checksums sha256 2fdc436a67077941295c58647f521fbef8f50e46db0970552fa1a4dd8ae261c6 LICENSE-APACHE sha256 9185f3c77e9f6ef8859a6ba4c94128ac1329876be3e813aad32d7645e51ae409 LICENSE-MIT diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 3ee8d299a3..ff98d747b2 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVLOOP_VERSION = 0.14.0 +PYTHON_UVLOOP_VERSION = 0.15.0 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz -PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/84/2e/462e7a25b787d2b40cf6c9864a9e702f358349fc9cfb77e83c38acb73048 +PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/df/fb/0e1b479ac5502f3d4531a2fc3f046312616f1ad020c686da353c2ff3bbc6 PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT From f81b0998eadc8aa8a4f8f205f5fa4d68438fb68d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Feb 2021 23:19:48 +0100 Subject: [PATCH 016/162] support/scripts/cpedb.py: drop CPE XML database caching Currently, the CPE XML database is parsed into a Python dict, which is then pickled into a local file, to speed up the processing of further invocations. However, it turns out that since the initial implementation, we have switched the XML parsing from the out of tree xmltodict module to the standard ElementTree one, which has made the parsing much faster. The pickle caching only saves 6 seconds, on something that takes more than 13 minutes total. In addition, this pickle caching consumes a significant amount of RAM, causing the Python process to be OOM-killed on a server with 4 GB of RAM. So let's just drop this caching entirely. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- support/scripts/cpedb.py | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/support/scripts/cpedb.py b/support/scripts/cpedb.py index 825ed6cb1e..b1e7e7012c 100644 --- a/support/scripts/cpedb.py +++ b/support/scripts/cpedb.py @@ -94,22 +94,6 @@ class CPEDB: self.all_cpes_no_version = dict() self.nvd_path = nvd_path - def gen_cached_cpedb(self, cpedb, cache_all_cpes, cache_all_cpes_no_version): - print("CPE: Unzipping xml manifest...") - nist_cpe_file = gzip.GzipFile(fileobj=open(cpedb, 'rb')) - print("CPE: Converting xml manifest to dict...") - tree = ET.parse(nist_cpe_file) - all_cpedb = tree.getroot() - self.parse_dict(all_cpedb) - - print("CPE: Caching dictionary") - cpes_file = open(cache_all_cpes, 'wb') - pickle.dump(self.all_cpes, cpes_file) - cpes_file.close() - cpes_file = open(cache_all_cpes_no_version, 'wb') - pickle.dump(self.all_cpes_no_version, cpes_file) - cpes_file.close() - def get_xml_dict(self): print("CPE: Setting up NIST dictionary") if not os.path.exists(os.path.join(self.nvd_path, "cpe")): @@ -121,24 +105,12 @@ class CPEDB: cpe_dict = requests.get(CPEDB_URL) open(cpe_dict_local, "wb").write(cpe_dict.content) - cache_all_cpes = os.path.join(self.nvd_path, "cpe", "all_cpes.pkl") - cache_all_cpes_no_version = os.path.join(self.nvd_path, "cpe", "all_cpes_no_version.pkl") - - if not os.path.exists(cache_all_cpes) or \ - not os.path.exists(cache_all_cpes_no_version) or \ - os.stat(cache_all_cpes).st_mtime < os.stat(cpe_dict_local).st_mtime or \ - os.stat(cache_all_cpes_no_version).st_mtime < os.stat(cpe_dict_local).st_mtime: - self.gen_cached_cpedb(cpe_dict_local, - cache_all_cpes, - cache_all_cpes_no_version) - - print("CPE: Loading CACHED dictionary") - cpe_file = open(cache_all_cpes, 'rb') - self.all_cpes = pickle.load(cpe_file) - cpe_file.close() - cpe_file = open(cache_all_cpes_no_version, 'rb') - self.all_cpes_no_version = pickle.load(cpe_file) - cpe_file.close() + print("CPE: Unzipping xml manifest...") + nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) + print("CPE: Converting xml manifest to dict...") + tree = ET.parse(nist_cpe_file) + all_cpedb = tree.getroot() + self.parse_dict(all_cpedb) def parse_dict(self, all_cpedb): # Cycle through the dict and build two dict to be used for custom From f0b41307a336b4d3eee383e913019e39067459d0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 14 Feb 2021 09:31:03 +0100 Subject: [PATCH 017/162] package/x11r7/xdriver_xf86-video-nouveau: bump version to 1.0.17 Release notes: https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html Reformatted hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-nouveau.hash | 11 +++++------ .../xdriver_xf86-video-nouveau.mk | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash index b70728f9b7..336f29be46 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash +++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash @@ -1,7 +1,6 @@ -# From https://lists.freedesktop.org/archives/nouveau/2019-January/032053.html -md5 ecd9be89d853301167e3d564c49f7a8e xf86-video-nouveau-1.0.16.tar.bz2 -sha1 a2d19439ceed315079207a62c6888a12e8489995 xf86-video-nouveau-1.0.16.tar.bz2 -sha256 304060806415579cdb5c1f71f1c54d11cacb431b5552b170decbc883ed43bf06 xf86-video-nouveau-1.0.16.tar.bz2 -sha512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0 xf86-video-nouveau-1.0.16.tar.bz2 +# From https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html +sha256 499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b xf86-video-nouveau-1.0.17.tar.bz2 +sha512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2 xf86-video-nouveau-1.0.17.tar.bz2 + # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk index d85cbfe4a4..e63bc611bf 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk +++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.16 +XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.17 XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT From cf77733dbb616731857e238b6ae11f808499a69b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 16 Feb 2021 09:30:21 +0100 Subject: [PATCH 018/162] DEVELOPERS: drop Guillaume Gardet, domain no longer exists The oliseo.fr domain no longer responds to SMTP requests: smtplib.SMTPRecipientsRefused: {'Guillaume Gardet ': (550, b'5.1.2 : Recipient address rejected: Domain not found')} Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 361ee2f35a..7ab3587315 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1052,11 +1052,6 @@ F: package/python-redis/ F: package/python-rpi-ws281x/ F: package/python-wtforms/ -N: Guillaume Gardet -F: package/c-icap/ -F: package/c-icap-modules/ -F: package/sdl2/ - N: Guillaume William Brs F: package/libnids/ F: package/liquid-dsp/ From e792b4d22d318173619a02ebc515a422bfc133ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 16 Feb 2021 09:44:16 +0100 Subject: [PATCH 019/162] DEVELOPERS: drop Rahul Jain, user no longer exists : host mxa-00376f01.gslb.pphosted.com[185.132.180.163] said: 550 5.1.1 User Unknown (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7ab3587315..7666493ddc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2200,10 +2200,6 @@ F: package/gupnp-av/ F: package/let-me-create/ F: package/nanomsg/ -N: Rahul Jain -F: package/uhttpd/ -F: package/ustream-ssl/ - N: Ramon Fried F: package/bitwise/ From 6b41a0e91e57e9c46404fe7b103a48d9325e7845 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 16 Feb 2021 14:54:28 +0100 Subject: [PATCH 020/162] package/collectd: add 'infiniband' option The infiniband plugin is new since 5.12.0 and enabled by default in collectd. Add an option in Buildroot, disabled by default. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index f02cedda49..ae69482608 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -285,6 +285,11 @@ config BR2_PACKAGE_COLLECTD_HUGEPAGES help Reports the number of used and free hugepages on Linux. +config BR2_PACKAGE_COLLECTD_INFINIBAND + bool "infiniband" + help + Attributes and counters for each port on each IB device. + config BR2_PACKAGE_COLLECTD_INTERFACE bool "interface" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 3fcca12a45..4a4e313224 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -83,6 +83,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_GRPC),--enable-grpc,--disable-grpc) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ + $(if $(BR2_PACKAGE_COLLECTD_INFINIBAND),--enable-infiniband,--disable-infiniband) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ From e77ab581208682e0bc2b8e03ab3fe6604e5b803d Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 16 Feb 2021 14:54:30 +0100 Subject: [PATCH 021/162] package/collectd: add 'mdevents' option The mdevents plugin is new since 5.12.0 and enabled by default in collectd. Add an option in Buildroot, disabled by default. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index ae69482608..11136f98ef 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -331,6 +331,11 @@ config BR2_PACKAGE_COLLECTD_MD help Collects software-RAID device information. +config BR2_PACKAGE_COLLECTD_MDEVENTS + bool "mdevents" + help + Events from md (Linux Software RAID) devices. + config BR2_PACKAGE_COLLECTD_MEMCACHEC bool "memcachec" depends on BR2_INSTALL_LIBSTDCPP diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 4a4e313224..792eb9c355 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -94,6 +94,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ + $(if $(BR2_PACKAGE_COLLECTD_MDEVENTS),--enable-mdevents,--disable-mdevents) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ $(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \ From fe74c2b846ec19c7964a24ce81ee28a37aba5366 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 16 Feb 2021 14:54:31 +0100 Subject: [PATCH 022/162] package/collectd: add 'logparser' option The logparser plugin is new since 5.11.0 and enabled by default in collectd. Add an option in Buildroot, disabled by default. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 11136f98ef..679285d997 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -326,6 +326,11 @@ config BR2_PACKAGE_COLLECTD_LOAD help Collects the system load. +config BR2_PACKAGE_COLLECTD_LOGPARSER + bool "logparser" + help + Plugin for filtering and parsing log messages. + config BR2_PACKAGE_COLLECTD_MD bool "md" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 792eb9c355..d57e6b8c1d 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -91,6 +91,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ $(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \ $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ + $(if $(BR2_PACKAGE_COLLECTD_LOGPARSER),--enable-logparser,--disable-logparser) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ $(if $(BR2_PACKAGE_COLLECTD_LUA),--enable-lua,--disable-lua) \ $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ From 312cf8e1206aa991f55e16648c0bd813cf43f283 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 16 Feb 2021 14:54:32 +0100 Subject: [PATCH 023/162] package/collectd: add 'synproxy' option The synproxy plugin exists since 5.8.0 and is enabled by default in collectd. Add an option in Buildroot, disabled by default. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 679285d997..82c24fdbc3 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -513,6 +513,11 @@ config BR2_PACKAGE_COLLECTD_SWAP help Collects the amount of memory currently written to disk. +config BR2_PACKAGE_COLLECTD_SYNPROXY + bool "synproxy" + help + Synproxy stats plugin. + config BR2_PACKAGE_COLLECTD_TABLE bool "table" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index d57e6b8c1d..7db753b342 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -132,6 +132,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_SMART),--enable-smart,--disable-smart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \ $(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \ + $(if $(BR2_PACKAGE_COLLECTD_SYNPROXY),--enable-synproxy,--disable-synproxy) \ $(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \ $(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \ $(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \ From fed835768aac18f2457544ff40f3b59b387117ed Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sat, 13 Feb 2021 13:33:53 +0100 Subject: [PATCH 024/162] package/{wlroots,cage}: change mesa3d dependency to virtual libegl/libgles Since commits: https://github.com/swaywm/wlroots/commit/c2288a7b88240e4377bfc1c67b44efb58f704a42 https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab Mesa dependency is no longer required. Wlroots is able to run on drivers that provide EGL and GLES2.0 support, and with specific EGL wayland extensions. (thus the BR2_PACKAGE_HAS_LIBEGL_WAYLAND dependency) This was verified on NXP's i.MX8MMini using imx-gpu-viv driver. Signed-off-by: Julien Olivain Signed-off-by: Gilles Talis Signed-off-by: Thomas Petazzoni --- package/cage/Config.in | 12 +++++++----- package/wlroots/Config.in | 15 +++++++-------- package/wlroots/wlroots.mk | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/package/cage/Config.in b/package/cage/Config.in index 3bef08f037..0844d6ff62 100644 --- a/package/cage/Config.in +++ b/package/cage/Config.in @@ -1,6 +1,7 @@ -comment "cage needs udev, mesa3d w/ EGL and GLES support" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_OPENGL_ES || \ +comment "cage needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES || \ !BR2_PACKAGE_HAS_UDEV comment "cage needs a toolchain w/ threads, dynamic library" @@ -11,9 +12,10 @@ config BR2_PACKAGE_CAGE bool "cage" depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots depends on BR2_PACKAGE_HAS_UDEV # wlroots - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # wlroots - depends on BR2_PACKAGE_MESA3D_OPENGL_ES # wlroots select BR2_PACKAGE_WLROOTS help Kiosk compositor for Wayland, which displays a single diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 2f72fd4945..694aa79de4 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -1,6 +1,7 @@ -comment "wlroots needs udev, mesa3d w/ EGL and GLES support" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_OPENGL_ES || \ +comment "wlroots needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES || \ !BR2_PACKAGE_HAS_UDEV comment "wlroots needs a toolchain w/ threads, dynamic library" @@ -12,11 +13,9 @@ config BR2_PACKAGE_WLROOTS depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland depends on BR2_PACKAGE_HAS_UDEV # libinput - # Technically wlroots should work with any OpenGL implementation - # which provides EGL, GLES2, and libgbm; but in practice only - # Mesa ships an usable libgbm. - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - depends on BR2_PACKAGE_MESA3D_OPENGL_ES + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 5665d5a956..0160b1aedb 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -15,7 +15,8 @@ WLROOTS_DEPENDENCIES = \ host-wayland \ libinput \ libxkbcommon \ - mesa3d \ + libegl \ + libgles \ pixman \ udev \ wayland \ From c92d1c58cb2871f5475eee57a331fe86d0ba2954 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 16 Feb 2021 21:12:33 +0100 Subject: [PATCH 025/162] support/scripts/cpedb.py: remove import pickle pickle is no longer used since 09a71e6a75636 Fixes: support/scripts/cpedb.py:7:1: F401 'pickle' imported but unused Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 74cfd3aeb7350a7be39f2d43b35273beba57f9c7) --- support/scripts/cpedb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/scripts/cpedb.py b/support/scripts/cpedb.py index b1e7e7012c..f4daf56124 100644 --- a/support/scripts/cpedb.py +++ b/support/scripts/cpedb.py @@ -4,7 +4,6 @@ import xml.etree.ElementTree as ET from xml.etree.ElementTree import Element, SubElement import gzip import os -import pickle import requests import time from xml.dom import minidom From d2fe9c64154d675da116b1390eedfe77806d92d6 Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Tue, 16 Feb 2021 11:47:22 +0100 Subject: [PATCH 026/162] {linux, linux-headers}: add version 5.11 Signed-off-by: Michael Walle Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f0515632e5..3370162faa 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,7 +28,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.10)" + bool "Latest version (5.11)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (4.19.152-cip37)" @@ -125,7 +125,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.10.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.11" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 5200c53a35..58b8c1171a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4 linux-5.11.tar.xz sha256 06698c0ce35ceefa9b79ceb108ec7fb86de05f51fe615f3ae5cc82e293dfe1f2 linux-5.10.13.tar.xz sha256 030ae544f346bfa2ce619dd9e17e93d10ec393632d3b6d6cf5d1fc84b914d449 linux-5.4.95.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8da119cfa9..f50a9d0ff4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_10 + default BR2_KERNEL_HEADERS_5_11 help Select the kernel version to get headers from. @@ -57,6 +57,10 @@ config BR2_KERNEL_HEADERS_5_4 config BR2_KERNEL_HEADERS_5_10 bool "Linux 5.10.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 + +config BR2_KERNEL_HEADERS_5_11 + bool "Linux 5.11.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -131,8 +135,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11 + bool "5.11.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10 - bool "5.10.x or later" + bool "5.10.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9 @@ -352,6 +360,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.173" if BR2_KERNEL_HEADERS_4_19 default "5.4.95" if BR2_KERNEL_HEADERS_5_4 default "5.10.13" if BR2_KERNEL_HEADERS_5_10 + default "5.11" if BR2_KERNEL_HEADERS_5_11 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 553612c4aa..ce7e7f6cc4 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -492,6 +492,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -505,6 +509,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 default "5.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 default "5.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9 default "5.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 992fd2c150..4331c2528a 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -119,8 +119,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_11 + bool "5.11.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_11 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10 - bool "5.10.x or later" + bool "5.10.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_9 From b1a9d3af0288ac27c4987550343b36835767de6d Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Tue, 16 Feb 2021 11:47:23 +0100 Subject: [PATCH 027/162] configs/kontron_smarc_sal28: use kernel 5.11 Signed-off-by: Michael Walle Signed-off-by: Peter Korsgaard --- configs/kontron_smarc_sal28_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index 4a72bf3ec1..d09ba0a2fc 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -1,6 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-ls1028a-kontron-sl28 freescale/fsl-ls1028a-kontron-sl28-var2 freescale/fsl-ls1028a-kontron-sl28-var3-ads2 freescale/fsl-ls1028a-kontron-sl28-var4 freescale/fsl-ls1028a-kontron-kbox-a-230-ls" From 10f785f9d2c2bb92da52514f9f49e11149408e32 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 12 Feb 2021 18:27:24 +0100 Subject: [PATCH 028/162] package/kodi-pvr-iptvsimple: bump version to 3.10.0-Leia Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 2de9a4a15b..f90ff8b737 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0812e359a943f4ffb763b47fc0440768a8aa09f12172ef8dff4440b0a48f9c96 kodi-pvr-iptvsimple-3.9.8-Leia.tar.gz +sha256 906d023b4713be558445902ff703ae65e03733d47dd7d0e1b16d02c05679c7ed kodi-pvr-iptvsimple-3.10.0-Leia.tar.gz sha256 50e33ec3cddb75e6c5c5eb1b3d38cc0adee7dec71d7244925106d4a2c4d5e31d debian/copyright diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index f1a087100c..0b31024556 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 3.9.8-Leia +KODI_PVR_IPTVSIMPLE_VERSION = 3.10.0-Leia KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = debian/copyright From 5f5ed4159831708168244c09c32f67cea0443f3c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 12 Feb 2021 18:27:25 +0100 Subject: [PATCH 029/162] package/kodi-pvr-zattoo: bump version to 18.1.23-Leia Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 2 +- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index 13201a4292..a9e2cd996c 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 19de7bc58bcf37bbcff5ad2cb2f095cb15a4217f9abec5c9ff30d0489dab89d2 kodi-pvr-zattoo-18.1.21-Leia.tar.gz +sha256 9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e kodi-pvr-zattoo-18.1.23-Leia.tar.gz sha256 d3670aef89085fd6b97665967a8422c89324afbc4720daa0975696a2ee92e236 debian/copyright diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 78fc01f195..cb995c9c78 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 18.1.21-Leia +KODI_PVR_ZATTOO_VERSION = 18.1.23-Leia KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_LICENSE_FILES = debian/copyright From 7636bdaf1fcc1793abad34b74be67f8b50f7ec3f Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Mon, 15 Feb 2021 09:40:23 +0100 Subject: [PATCH 030/162] package/wpa_supplicant: need EAP when HOTSPOT is enabled. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make WPA_SUPPLICANT_HOTSPOT depend on WPA_SUPPLICANT_EAP, Otherwise, compilation fails with errors like: interworking.c:1439:15: error: ‘struct wpa_ssid’ has no member named ‘eap’ Signed-off-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wpa_supplicant/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 3c986ff4ba..27ad22430a 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -94,6 +94,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_EAP config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT bool "Enable HS20" + select BR2_PACKAGE_WPA_SUPPLICANT_EAP help Enable Hotspot 2.0 and IEEE 802.11u interworking functionality. From 9a5c9c058cbb250cfb9519347507a030e157ed16 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 13 Feb 2021 12:39:28 +0100 Subject: [PATCH 031/162] package/janet: new package Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/janet/Config.in | 10 ++++++++++ package/janet/janet.hash | 5 +++++ package/janet/janet.mk | 22 ++++++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 package/janet/Config.in create mode 100644 package/janet/janet.hash create mode 100644 package/janet/janet.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7666493ddc..cee62ddca8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -920,6 +920,7 @@ F: package/copas/ F: package/coxpcall/ F: package/dado/ F: package/ficl/ +F: package/janet/ F: package/libtomcrypt/ F: package/libtommath/ F: package/libwpe/ diff --git a/package/Config.in b/package/Config.in index 5304ab141c..8fb173540f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -624,6 +624,7 @@ endif source "package/gauche/Config.in" source "package/guile/Config.in" source "package/haserl/Config.in" + source "package/janet/Config.in" source "package/jimtcl/Config.in" source "package/lua/Config.in" source "package/luainterpreter/Config.in" diff --git a/package/janet/Config.in b/package/janet/Config.in new file mode 100644 index 0000000000..0e25ce34e3 --- /dev/null +++ b/package/janet/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_JANET + bool "janet" + help + Janet is a functional and imperative programming language. + The entire language (core library, interpreter, compiler, + assembler, PEG) is less than 1MB. You can also add Janet + scripting to an application by embedding a single C file + and two headers. + + https://janet-lang.org/ diff --git a/package/janet/janet.hash b/package/janet/janet.hash new file mode 100644 index 0000000000..4a1167f8e7 --- /dev/null +++ b/package/janet/janet.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 e2cf16b330e47c858a675ac79b5a0af83727ff041efcb133a80f36bedfae57c4 janet-1.15.0.tar.gz + +# Locally calculated +sha256 1114e280d850605ae71b656dfc88115ab06081e8157720a2497f50edf50b110e LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk new file mode 100644 index 0000000000..7243d60c01 --- /dev/null +++ b/package/janet/janet.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# janet +# +################################################################################ + +JANET_VERSION = 1.15.0 +JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) +JANET_LICENSE = MIT +JANET_LICENSE_FILES = LICENSE + +JANET_INSTALL_STAGING = YES + +ifeq ($(BR2_STATIC_LIBS),y) +JANET_CONF_OPTS += -Ddynamic_modules=false +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +JANET_CONF_OPTS += -Dsingle_threaded=true +endif + +$(eval $(meson-package)) From 464bbe26ff5fb9e5bfe26a26ea65c700b90598f5 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Thu, 11 Feb 2021 22:37:29 +0100 Subject: [PATCH 032/162] package/libxcrypt: new package libxcrypt is a modern library for one-way hashing of passwords. It supports a wide variety of both modern and historical hashing methods: yescrypt, gost-yescrypt, scrypt, bcrypt, sha512crypt, sha256crypt, md5crypt, SunMD5, sha1crypt, NT. Signed-off-by: Guillaume W. Bres Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/libxcrypt/Config.in | 11 +++++++++++ package/libxcrypt/libxcrypt.hash | 4 ++++ package/libxcrypt/libxcrypt.mk | 13 +++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/libxcrypt/Config.in create mode 100644 package/libxcrypt/libxcrypt.hash create mode 100644 package/libxcrypt/libxcrypt.mk diff --git a/DEVELOPERS b/DEVELOPERS index cee62ddca8..42f3c66274 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1055,6 +1055,7 @@ F: package/python-wtforms/ N: Guillaume William Brs F: package/libnids/ +F: package/libxcrypt/ F: package/liquid-dsp/ F: package/pixiewps/ F: package/python-pybind/ diff --git a/package/Config.in b/package/Config.in index 8fb173540f..1cfbabeb86 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1372,6 +1372,7 @@ menu "Crypto" source "package/libssh2/Config.in" source "package/libtomcrypt/Config.in" source "package/libuecc/Config.in" + source "package/libxcrypt/Config.in" source "package/mbedtls/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" diff --git a/package/libxcrypt/Config.in b/package/libxcrypt/Config.in new file mode 100644 index 0000000000..57ae8f67a3 --- /dev/null +++ b/package/libxcrypt/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBXCRYPT + bool "libxcrypt" + help + libxcrypt is a modern library for one-way hashing + of passwords. It supports a wide variety of both + modern and historical hashing methods: + yescrypt, gost-yescrypt, scrypt, bcrypt, sha512crypt, + sha256crypt, md5crypt, SunMD5, sha1crypt, NT, + bsdicrypt, bigcrypt, and descrypt. + + https://github.com/besser82/libxcrypt diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash new file mode 100644 index 0000000000..b56ab6beaf --- /dev/null +++ b/package/libxcrypt/libxcrypt.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 7665168d0409574a03f7b484682e68334764c29c21ca5df438955a381384ca07 libxcrypt-4.4.17.tar.gz +sha256 f8198fcc4f002bf54512bac2e68e1e3f04af7d105f4f4f98d7d22cb110e04715 LICENSING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk new file mode 100644 index 0000000000..f9799ac006 --- /dev/null +++ b/package/libxcrypt/libxcrypt.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libxcrypt +# +################################################################################ + +LIBXCRYPT_VERSION = 4.4.17 +LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) +LIBXCRYPT_LICENSE = LGPL-2.1+ +LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB +LIBXCRYPT_AUTORECONF = YES + +$(eval $(autotools-package)) From 63de6a68aaf45aeb395bfcbbcd7c47a1cdb38775 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Sat, 20 Feb 2021 17:32:15 +0100 Subject: [PATCH 033/162] package/libxcrypt: also install to staging Signed-off-by: Guillaume W. Bres Signed-off-by: Yann E. MORIN --- package/libxcrypt/libxcrypt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index f9799ac006..63132edd9d 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -8,6 +8,7 @@ LIBXCRYPT_VERSION = 4.4.17 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB +LIBXCRYPT_INSTALL_STAGING = YES LIBXCRYPT_AUTORECONF = YES $(eval $(autotools-package)) From 65487297554e181218e872e858d558e1a21d2341 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Sat, 20 Feb 2021 18:38:15 +0100 Subject: [PATCH 034/162] package/libxcrypt: --disable-werror to fix problem with sensitive compilers Fixes: http://autobuild.buildroot.net/results/e9a058a8c98daf197cd9d7ac632e0cb5707d524f Some sensitive compilers may raise warnings that turn into errors. Signed-off-by: Guillaume W. Bres Signed-off-by: Yann E. MORIN --- package/libxcrypt/libxcrypt.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 63132edd9d..ccbb1a282c 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -11,4 +11,7 @@ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB LIBXCRYPT_INSTALL_STAGING = YES LIBXCRYPT_AUTORECONF = YES +# Some warnings turn into errors with some sensitive compilers +LIBXCRYPT_CONF_OPTS = --disable-werror + $(eval $(autotools-package)) From 04f0ed0a444292075dfcd6abf0f8e1b10e492e28 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Sat, 20 Feb 2021 17:29:16 +0100 Subject: [PATCH 035/162] package/libxcrypt: fix conversion error Fixes: http://autobuild.buildroot.net/results/e9a058a8c98daf197cd9d7ac632e0cb5707d524f Some sensitive compilers may raise a warning that turns into an error on this line. Signed-off-by: Guillaume W. Bres [yann.morin.1998@free.fr: backport the actual commit] Signed-off-by: Yann E. MORIN --- ...gost3411-core.c-fix-conversion-error.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch diff --git a/package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch b/package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch new file mode 100644 index 0000000000..1245216aad --- /dev/null +++ b/package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch @@ -0,0 +1,30 @@ +From c7bf2cf8e610bb26bece7f3a2bc5b47d7c659c7d Mon Sep 17 00:00:00 2001 +From: "Guillaume W. Bres" +Date: Sat, 20 Feb 2021 16:51:04 +0100 +Subject: [PATCH] lib/alg-gost3411-core.c: fix conversion error seen by + sensitive compilers + +Some compiler might be sensitive and raise an Warning/error on this line. + +Signed-off-by: Guillaume W. Bres +[backported from upstream] +--- + lib/alg-gost3411-2012-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/alg-gost3411-2012-core.c b/lib/alg-gost3411-2012-core.c +index 13bb493..af3a36e 100644 +--- a/lib/alg-gost3411-2012-core.c ++++ b/lib/alg-gost3411-2012-core.c +@@ -92,7 +92,7 @@ add512(const uint512_u *x, const uint512_u *y, uint512_u *r) + for (i = 0; i < 64; i++) + { + buf = xp[i] + yp[i] + (buf >> 8); +- rp[i] = (unsigned char) buf & 0xFF; ++ rp[i] = (unsigned char) (buf & 0xFF); + } + #endif + } +-- +2.20.1 + From 4c488c7385b4f5d7f536cf03a12c0b72356ebbab Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Thu, 18 Feb 2021 19:51:35 +0100 Subject: [PATCH 036/162] boot/barebox: bump version to 2021.01.0 Signed-off-by: Bartosz Bilas Signed-off-by: Peter Korsgaard --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 239c95bf90..03d9a272d0 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2020.11.0" + bool "2021.01.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2020.11.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2021.01.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 3644601bbc..e6f8234a4d 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2020.11.0.tar.bz2.md5 -md5 1fc2c1a03d7b44dc12fbf4cf1fc6ffe0 barebox-2020.11.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2021.01.0.tar.bz2.md5 +md5 e81e7cd6bc2629e7fcdeaddf59c324c3 barebox-2021.01.0.tar.bz2 # Locally calculated -sha256 049d2b1b887d0397f4b5390255459fb0240200b06a3276ffaefdeab7fb243554 barebox-2020.11.0.tar.bz2 +sha256 b39501db1c701b05f862973d8aed628cab0e611421cbaadae8b5262311551ff9 barebox-2021.01.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From 795fe88cf89ba61a4c8ad2003f993be65a62fcdb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 18 Feb 2021 22:35:08 +0100 Subject: [PATCH 037/162] package/tor: bump version to 0.4.5.6 Rebased patch, part of it was committed upstream: https://gitweb.torproject.org/tor.git/commit/?id=c5817a0dafc67882f15730ee818fbcdba1b7b915 Release notes: https://blog.torproject.org/node/2000 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...0001-Fix-static-linking-with-OpenSSL.patch | 49 +++++++------------ package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch index 128b6ed0ce..8385c28972 100644 --- a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch +++ b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch @@ -9,45 +9,31 @@ and remove host paths when looking for openssl. [Vincent: - Adapt the patch to make it apply on the new version.] [Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10, - 0.3.4.8, 0.3.5.7 & 0.4.4.5] + 0.3.4.8, 0.3.5.7, 0.4.4.5 & 0.4.5.6] [Fabrice: fix detection of openssl functions in 0.3.5.8] Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls Signed-off-by: Fabrice Fontaine --- - acinclude.m4 | 2 +- configure.ac | 4 ++-- src/test/include.am | 8 ++++---- src/tools/include.am | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index 5ecdf1d5c..be5633f4f 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -166,7 +166,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ - - for tor_trydir in "$try$1dir" "(system)" "$prefix" /usr/local /usr/pkg $8; do - LDFLAGS="$tor_saved_LDFLAGS" -- LIBS="$tor_saved_LIBS $3" -+ LIBS="$3 $tor_saved_LIBS" - CPPFLAGS="$tor_saved_CPPFLAGS" - - if test -z "$tor_trydir" ; then diff --git a/configure.ac b/configure.ac index 05e1392cf..580befa6b 100644 --- a/configure.ac +++ b/configure.ac -@@ -973,7 +973,7 @@ AC_ARG_WITH(ssl-dir, +@@ -1056,7 +1056,7 @@ AC_ARG_WITH(ssl-dir, ]) AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) --TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32], -+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32], +-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], ++TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], [#include char *getenv(const char *);], [struct ssl_cipher_st; -@@ -1005,7 +1005,7 @@ dnl Now check for particular openssl functions. +@@ -1086,7 +1086,7 @@ dnl Now check for particular openssl functions. save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" save_CPPFLAGS="$CPPFLAGS" @@ -60,28 +46,28 @@ diff --git a/src/test/include.am b/src/test/include.am index ecb768957..39a622e88 100644 --- a/src/test/include.am +++ b/src/test/include.am -@@ -400,8 +400,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) +@@ -404,8 +404,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_ntor_cl_LDADD = \ - $(TOR_INTERNAL_LIBS) \ + libtor.a \ $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ +- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @TOR_LIB_MATH@ \ -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ ++ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ @TOR_TRACE_LIBS@ src_test_test_ntor_cl_AM_CPPFLAGS = \ $(AM_CPPFLAGS) -@@ -410,8 +410,8 @@ src_test_test_hs_ntor_cl_SOURCES = src/test/test_hs_ntor_cl.c +@@ -414,8 +414,8 @@ src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) src_test_test_hs_ntor_cl_LDADD = \ - $(TOR_INTERNAL_LIBS) \ + libtor.a \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ + @TOR_LIB_MATH@ \ -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ ++ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ + @CURVE25519_LIBS@ @TOR_TRACE_LIBS@ src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ $(AM_CPPFLAGS) - diff --git a/src/tools/include.am b/src/tools/include.am index f7aa7e0d1..4c4e8aa7a 100644 --- a/src/tools/include.am @@ -92,7 +78,7 @@ index f7aa7e0d1..4c4e8aa7a 100644 $(rust_ldadd) \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \ + @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ + @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ endif @@ -45,7 +45,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ @@ -101,9 +87,8 @@ index f7aa7e0d1..4c4e8aa7a 100644 $(TOR_UTIL_LIBS) \ - @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ + @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@ + @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ if USE_NSS -- 2.20.1 - diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 4dd86e51f5..ecbe738574 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 326d2926177f0c7838cac213456d0056817d57f3f2e46714a2911c7d7a9b05ee tor-0.4.4.7.tar.gz +sha256 22cba3794fedd5fa87afc1e512c6ce2c21bc20b4e1c6f8079d832dc1e545e733 tor-0.4.5.6.tar.gz sha256 ae2afe6cd3fd9d512afbaa1ef218757eb00aa6b6aa5e2dfc2774b6837e373fa1 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 8ad4a7a825..1c9d2f2367 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.4.7 +TOR_VERSION = 0.4.5.6 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 947f982ded32e1dfb54b6e701d4c56ef9c8a1829 Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Fri, 19 Feb 2021 11:03:44 +0100 Subject: [PATCH 038/162] package/micropython: bump to v1.14 Micropython 1.4 brings many changes, see the release notes: https://github.com/micropython/micropython/releases/tag/v1.14 Amongst these changes, Micropython can now produce reproducible builds, using the standard SOURCE_DATE_EPOCH. The LICENSE hash changed because the copyright year range was extended to 2021. Signed-off-by: Titouan Christophe Signed-off-by: Peter Korsgaard --- package/micropython/micropython.hash | 4 ++-- package/micropython/micropython.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index 5dfbb74522..fe47ee09c4 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 31466dacebeb3af60dc80a071a07c3e15b657219a826e0b6ac741f9f22472f23 micropython-1.13.tar.gz -sha256 4b8a8884a60cd72749f9ef40328b85b40d13c22594c01352e0a55392141e0f89 LICENSE +sha256 542eb120df8d9eb6f200bcd856294e143813adea9dda0d7189405c218d4b16f7 micropython-1.14.tar.gz +sha256 9c6089e26c8638a0645bcb0db2c85051f82de8022dcd07fb22baa0c5f9362085 LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index a126b3eeae..80d086f3c8 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.13 +MICROPYTHON_VERSION = 1.14 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE From e92ec5945043506d79e3b4f74a9d2f61b32a78a5 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 10 Feb 2021 15:25:46 -0800 Subject: [PATCH 039/162] package/go: bump to version 1.15.8 go1.15.8 (released 2021/02/04) includes fixes to the compiler, linker, runtime, the go command, and the net/http package. https://golang.org/doc/go1.15 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 1bd7ab7ca9..cbc82a9b64 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 8631b3aafd8ecb9244ec2ffb8a2a8b4983cf4ad15572b9801f7c5b167c1a2abc go1.15.7.src.tar.gz +sha256 540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2 go1.15.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 21a33d215c..7b7f173706 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.15.7 +GO_VERSION = 1.15.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 9c035502bf2f44dd7ce5c0dca2e03cdcd4ef3f88 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 19 Feb 2021 16:50:39 -0800 Subject: [PATCH 040/162] package/go: bump version to 1.16 Release notes: https://golang.org/doc/go1.16 The latest Go release, version 1.16, arrives six months after Go 1.15. Most of its changes are in the implementation of the toolchain, runtime, and libraries. The linker changes in 1.16 extend the 1.15 improvements to all supported architecture/OS combinations (the 1.15 performance improvements were primarily focused on ELF-based OSes and amd64 architectures). For a representative set of large Go programs, linking is 20-25% faster than 1.15 and requires 5-15% less memory on average for linux/amd64, with larger improvements for other architectures and OSes. Most binaries are also smaller as a result of more aggressive symbol pruning. According to the release notes, Go 1.16 drops support for x87 mode compilation (GO386=387). Support for non-SSE2 processors is now available using soft float mode. Buildroot will automatically set GO386=softfloat on non-SSE2 processors. Signed-off-by: Christian Stewart v1 -> v2: - added 386=softfloat handling re: Peter's review Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index cbc82a9b64..4181fb52c5 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2 go1.15.8.src.tar.gz +sha256 7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a go1.16.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 7b7f173706..f6cb2469a8 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.15.8 +GO_VERSION = 1.16 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -49,6 +49,10 @@ else ifeq ($(BR2_aarch64),y) GO_GOARCH = arm64 else ifeq ($(BR2_i386),y) GO_GOARCH = 386 +# i386: use softfloat if no SSE2: https://golang.org/doc/go1.16#386 +ifneq ($(BR2_X86_CPU_HAS_SSE2),y) +GO_GO386 = softfloat +endif else ifeq ($(BR2_x86_64),y) GO_GOARCH = amd64 else ifeq ($(BR2_powerpc64),y) @@ -90,6 +94,7 @@ HOST_GO_CROSS_ENV = \ CC_FOR_TARGET="$(TARGET_CC)" \ CXX_FOR_TARGET="$(TARGET_CXX)" \ GOARCH=$(GO_GOARCH) \ + $(if $(GO_GO386),GO386=$(GO_GO386)) \ $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ GO_ASSUME_CROSSCOMPILING=1 From f1c9c07b54dba2f2ffe9915207aca7cfedd5d10a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 15 Feb 2021 17:05:54 +0100 Subject: [PATCH 041/162] package/linux-firmware: rationalise install step The logic we have for the installation of the firmware files is, to say the least, non conventional. It is split in two parts: - one that copies files via an intermediate tarball: the tarball creation is used to detect if firmware files are missing (i.e. on a version bump) and fail the build if so, while the tarball extraction is the actual firmware installation; - one that copies directories one by one in a loop, removing the destination before the copy, to maintain a proper layout. Needless to say, this is not very clean. First, there is no reason why the directories can not be copied with the same mechanism as the files themselves; not sure what I had in mind with b55bd5a9e25e... Second, we're soon going to need the same installation step to copy the firmware files in the images/ directory, to ease embedding in the kernel image. Rationalise this installation procedure. Cherry-picking files and directories with cp, while still maintaining the directory layout, is not trivial; rsync is not one of our pre-requisites. So we're left with tar, which makes it easy. So we keep using an intermediate tarball, but we use it for both files and directories, and we generate it at build time, not install time. That archive is then extracted during the installation. Now the installation complexity is mostly located in the creation of the symlinks, so we merge all of that directly into the _INSTALL_TARGET_CMDS and drop the intermediate macros that have no longer any reason to exist. This will also make it pretty simple to later install in the images/ directory. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 29 +++++------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index f23da171c6..9bc59435ef 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -638,22 +638,10 @@ LINUX_FIRMWARE_FILES += ti_3410.fw ti_5052.fw \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.moxa endif -ifneq ($(LINUX_FIRMWARE_FILES),) -define LINUX_FIRMWARE_INSTALL_FILES +ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) +define LINUX_FIRMWARE_BUILD_CMDS cd $(@D) && \ - $(TAR) cf install.tar $(sort $(LINUX_FIRMWARE_FILES)) && \ - $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware -endef -endif - -ifneq ($(LINUX_FIRMWARE_DIRS),) -# We need to rm-rf the destination directory to avoid copying -# into it in itself, should we re-install the package. -define LINUX_FIRMWARE_INSTALL_DIRS - $(foreach d,$(LINUX_FIRMWARE_DIRS), \ - rm -rf $(TARGET_DIR)/lib/firmware/$(d); \ - mkdir -p $(dir $(TARGET_DIR)/lib/firmware/$(d)); \ - cp -a $(@D)/$(d) $(TARGET_DIR)/lib/firmware/$(d)$(sep)) + $(TAR) cf br-firmware.tar $(sort $(LINUX_FIRMWARE_FILES) $(LINUX_FIRMWARE_DIRS)) endef endif @@ -686,7 +674,9 @@ endif # sure we canonicalize the pointed-to file, to cover the symlinks of the form # a/foo -> ../b/foo where a/ (the directory where to put the symlink) does # not yet exist. -define LINUX_FIRMWARE_CREATE_SYMLINKS +define LINUX_FIRMWARE_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/lib/firmware + $(TAR) xf $(@D)/br-firmware.tar -C $(TARGET_DIR)/lib/firmware/ cd $(TARGET_DIR)/lib/firmware/ ; \ sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \ while read f d; do \ @@ -697,11 +687,4 @@ define LINUX_FIRMWARE_CREATE_SYMLINKS done endef -define LINUX_FIRMWARE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware - $(LINUX_FIRMWARE_INSTALL_FILES) - $(LINUX_FIRMWARE_INSTALL_DIRS) - $(LINUX_FIRMWARE_CREATE_SYMLINKS) -endef - $(eval $(generic-package)) From 4cadbbfdb136f54b098d6c83128bf4c0191f80d1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 Feb 2021 17:05:55 +0100 Subject: [PATCH 042/162] package/linux-firmware: make install logic macro accept a destination parameter So it can be reused for also installing into the images directory. Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9bc59435ef..8defedd309 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -674,10 +674,10 @@ endif # sure we canonicalize the pointed-to file, to cover the symlinks of the form # a/foo -> ../b/foo where a/ (the directory where to put the symlink) does # not yet exist. -define LINUX_FIRMWARE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware - $(TAR) xf $(@D)/br-firmware.tar -C $(TARGET_DIR)/lib/firmware/ - cd $(TARGET_DIR)/lib/firmware/ ; \ +define LINUX_FIRMWARE_INSTALL_FW + mkdir -p $(1) + $(TAR) xf $(@D)/br-firmware.tar -C $(1) + cd $(1) ; \ sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \ while read f d; do \ if test -f $$(readlink -m $$(dirname $$f)/$$d); then \ @@ -687,4 +687,8 @@ define LINUX_FIRMWARE_INSTALL_TARGET_CMDS done endef +define LINUX_FIRMWARE_INSTALL_TARGET_CMDS + $(call LINUX_FIRMWARE_INSTALL_FW, $(TARGET_DIR)/lib/firmware) +endef + $(eval $(generic-package)) From af49734349ca06f88ed4c17e456fc385ebee2012 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 Feb 2021 17:05:56 +0100 Subject: [PATCH 043/162] package/linux-firmware: also install into images for early loading support Some drivers request their firmware very early when built into the kernel, even before the initramfs is mounted - So the only way to provide firmware for those drivers is to include them directly in the kernel with the CONFIG_EXTRA_FIRMWARE option. An example of this is the uC firmware for modern Intel GPUs. Conceptually you can point CONFIG_EXTRA_FIRMWARE to ${TARGET_DIR}/lib/firmware, but then you cannot remove the firmware from the initramfs and pay the size cost twice (inside the kernel + in initramfs), so instead also install linux-firmware to the images dir, similar to how we do it for intel-microcode. Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 8defedd309..5e92b0446e 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -7,6 +7,7 @@ LINUX_FIRMWARE_VERSION = 20201022 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git +LINUX_FIRMWARE_INSTALL_IMAGES = YES LINUX_FIRMWARE_CPE_ID_VENDOR = kernel @@ -691,4 +692,8 @@ define LINUX_FIRMWARE_INSTALL_TARGET_CMDS $(call LINUX_FIRMWARE_INSTALL_FW, $(TARGET_DIR)/lib/firmware) endef +define LINUX_FIRMWARE_INSTALL_IMAGES_CMDS + $(call LINUX_FIRMWARE_INSTALL_FW, $(BINARIES_DIR)) +endef + $(eval $(generic-package)) From dacf9d78f2244694d4a20d82b66180460e75d391 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 Feb 2021 17:05:57 +0100 Subject: [PATCH 044/162] linux: build after linux-firmware if enabled for early loading support To support building in (a subset of) the linux-firmware files into the kernel using the CONFIG_EXTRA_FIRMWARE option, we need to ensure that the firmware files are installed before the Linux kernel is built, similar to how it is done for intel-microcode. Signed-off-by: Peter Korsgaard --- linux/linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index a212f42c28..5e4b319cf1 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -78,7 +78,8 @@ LINUX_MAKE_ENV = \ LINUX_INSTALL_IMAGES = YES LINUX_DEPENDENCIES = host-kmod \ - $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) + $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ + $(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) # Starting with 4.16, the generated kconfig paser code is no longer # shipped with the kernel sources, so we need flex and bison, but From 49bb8ebd81a295a34511073739f50a235b931a3a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 22 Feb 2021 20:46:40 +0100 Subject: [PATCH 045/162] package/iptables: bump to version 1.8.7 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/iptables/iptables.hash | 2 +- package/iptables/iptables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index 120e7e4a89..7f14413931 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767 iptables-1.8.6.tar.bz2 +sha256 c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0 iptables-1.8.7.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index dc01466607..ca8178425e 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.6 +IPTABLES_VERSION = 1.8.7 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES From 24575ad614fecc50bfa2c3d586104f7134a46770 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 22 Feb 2021 23:08:01 +0100 Subject: [PATCH 046/162] package/ell: bump version to 0.38 - remove 0001-build-Add-rawmemchr-to-missing.h.patch (upstream [1]) - remove 0002-ell-add-missing-include-in-dhcp-server.patch (upstream [2]) [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81 [2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=6dfff19d4716ba216de1a3298ed0f667d7782810 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...001-build-Add-rawmemchr-to-missing.h.patch | 47 ------------------- ...l-add-missing-include-in-dhcp-server.patch | 26 ---------- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 4 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 package/ell/0001-build-Add-rawmemchr-to-missing.h.patch delete mode 100644 package/ell/0002-ell-add-missing-include-in-dhcp-server.patch diff --git a/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch b/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch deleted file mode 100644 index 3e00023001..0000000000 --- a/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001 -From: Denis Kenzior -Date: Mon, 30 Nov 2020 13:00:11 -0600 -Subject: [PATCH] build: Add rawmemchr to missing.h - -For those systems (i.e. musl) that do not support this - -[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81] -Signed-off-by: Peter Seiderer ---- - configure.ac | 1 + - ell/missing.h | 10 ++++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 1e5ead9..f34add1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan], - ]) - - AC_CHECK_FUNCS(explicit_bzero) -+AC_CHECK_FUNCS(rawmemchr) - - AC_CHECK_FUNC(signalfd, dummy=yes, - AC_MSG_ERROR(signalfd support is required)) -diff --git a/ell/missing.h b/ell/missing.h -index 6b9b0fd..2a3e647 100644 ---- a/ell/missing.h -+++ b/ell/missing.h -@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n) - #ifndef SO_BINDTOIFINDEX - #define SO_BINDTOIFINDEX 62 - #endif -+ -+#ifndef HAVE_RAWMEMCHR -+static inline void *rawmemchr(const void *s, int c) -+{ -+_Pragma("GCC diagnostic push") -+_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") -+ return memchr(s, c, (size_t) -1); -+_Pragma("GCC diagnostic pop") -+} -+#endif --- -2.29.2 - diff --git a/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch b/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch deleted file mode 100644 index a2ac7b0965..0000000000 --- a/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=89rico=20Nogueira?= -Date: Mon, 30 Nov 2020 18:40:33 -0300 -Subject: [PATCH] ell: add missing include in dhcp-server. - -[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=6dfff19d4716ba216de1a3298ed0f667d7782810] -Signed-off-by: Peter Seiderer ---- - ell/dhcp-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c -index c983ed4..144e83e 100644 ---- a/ell/dhcp-server.c -+++ b/ell/dhcp-server.c -@@ -24,6 +24,7 @@ - #include - #endif - -+#include - #include - #include - #include --- -2.29.2 - diff --git a/package/ell/ell.hash b/package/ell/ell.hash index efd39b31db..cbefd79bb8 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 c2b3848568c75bcf5a0e7d1f2efce4fdb2733d28226ed21c6a6542f0be05d784 ell-0.35-br1.tar.gz +sha256 7767306f20db41c28b3138b5323bca05fef92238b6b61f81f66c2af684a13886 ell-0.38-br1.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 8aec067bc0..18f1cf2aac 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.35 +ELL_VERSION = 0.38 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git ELL_SITE_METHOD = git ELL_LICENSE = LGPL-2.1+ From 542097b11a4a98a279079ac93f4e549cf8a3f991 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 22 Feb 2021 23:08:02 +0100 Subject: [PATCH 047/162] package/iwd: bump version to 1.12 - remove 0001-configure.ac-fix-static-build-with-readline.patch (upstream [1]) [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=62d31539d6e31a40d7d33c73637e37b50c59ef40 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...re.ac-fix-static-build-with-readline.patch | 61 ------------------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 package/iwd/0001-configure.ac-fix-static-build-with-readline.patch diff --git a/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch b/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch deleted file mode 100644 index 37dbdb18e5..0000000000 --- a/package/iwd/0001-configure.ac-fix-static-build-with-readline.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 358e0755c3a434d7a815519b8c10ae5d347caad0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 16 Dec 2020 07:51:04 +0100 -Subject: [PATCH] configure.ac: fix static build with readline - -Retrieve the dependencies of readline through pkg-config (and fallback -to -lreadline) to avoid the following build failure: - -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libreadline.a(display.o): in function `cr': -display.c:(.text+0x1ab): undefined reference to `tputs' - -Fixes: - - http://autobuild.buildroot.org/results/8fb1341f2f5094c346456b43b4fc04996c2e1485 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://lists.01.org/hyperkitty/list/iwd@lists.01.org/thread/NFI4P52Y65T6XX7S7DGIVDMZISNQWUUC/] ---- - Makefile.am | 4 ++-- - configure.ac | 3 +++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 3cd7eaa6..493d06cc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -288,7 +288,7 @@ client_iwctl_SOURCES = client/main.c \ - client/network.h client/network.c \ - client/properties.h client/properties.c \ - client/wsc.c client/station.c --client_iwctl_LDADD = $(ell_ldadd) -lreadline -+client_iwctl_LDADD = $(ell_ldadd) $(READLINE_LIBS) - - if MANUAL_PAGES - man_MANS += client/iwctl.1 -@@ -504,7 +504,7 @@ unit_test_client_SOURCES = unit/test-client.c \ - client/display.h client/display.c \ - client/network.h client/network.c \ - client/properties.h client/properties.c --unit_test_client_LDADD = $(ell_ldadd) -lreadline -+unit_test_client_LDADD = $(ell_ldadd) $(READLINE_LIBS) - endif - - unit_test_sae_SOURCES = unit/test-sae.c \ -diff --git a/configure.ac b/configure.ac -index 7bd917a4..52f27ed9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -154,6 +154,9 @@ AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client], - if (test "${enable_client}" != "no"); then - AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes, - AC_MSG_ERROR(readline header files are required)) -+ PKG_CHECK_MODULES(READLINE, readline, dummy=yes, READLINE_LIBS=-lreadline) -+ AC_SUBST(READLINE_CFLAGS) -+ AC_SUBST(READLINE_LIBS) - fi - AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") - --- -2.29.2 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index f1ee23dc5d..b043af745d 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 c3ea43eccf27bb92d4e4482ff407cdabd2d1a1e4647d646241de87f2774e9a20 iwd-1.10-br1.tar.gz +sha256 c0d827f446012cd14e63d174d52b69b0806ae23f0708933d50c57fea64af9c8a iwd-1.12-br1.tar.gz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 652beb838f..f38552de99 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.10 +IWD_VERSION = 1.12 IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git IWD_SITE_METHOD = git IWD_LICENSE = LGPL-2.1+ From 7a3a47cc7462d33698a4b5ccf9d413129078e716 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 22 Feb 2021 23:23:08 +0100 Subject: [PATCH 048/162] package/libuev: bump version to 2.3.2 - update license hash (copyright year, maintainer surname, see [1]) [1] https://github.com/troglobit/libuev/commit/86e01be26ebe51824e6574ef186a532823bc085c#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/libuev/libuev.hash | 6 +++--- package/libuev/libuev.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libuev/libuev.hash b/package/libuev/libuev.hash index fece0e9b65..d52d210d10 100644 --- a/package/libuev/libuev.hash +++ b/package/libuev/libuev.hash @@ -1,4 +1,4 @@ -# From https://github.com/troglobit/libuev/releases/download/v2.3.1/libuev-2.3.1.tar.xz.md5 -md5 ec601f69f69477858fa023a75da23793 libuev-2.3.1.tar.xz +# From https://github.com/troglobit/libuev/releases/download/v2.3.2/libuev-2.3.2.tar.xz.sha256 +sha256 af31ffe1058a2ff6c56fee26ec8749688704d297189b6a898380a601efefbec9 libuev-2.3.2.tar.xz # License files -sha256 3c2bf3fdd85687242ba6f2b02b6ce5176aba15b5e1a2ccb8b608439197ec4641 LICENSE +sha256 694a734d9c1b46ae203314ed1c744a1acebd4fe5fc964b761703772546f0d3ab LICENSE diff --git a/package/libuev/libuev.mk b/package/libuev/libuev.mk index c7b73b4221..8a6759a2d7 100644 --- a/package/libuev/libuev.mk +++ b/package/libuev/libuev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUEV_VERSION = 2.3.1 +LIBUEV_VERSION = 2.3.2 LIBUEV_SOURCE = libuev-$(LIBUEV_VERSION).tar.xz LIBUEV_SITE = https://github.com/troglobit/libuev/releases/download/v$(LIBUEV_VERSION) LIBUEV_LICENSE = MIT From e648dfa6f7078a6fbbc5feb83292c6a98300fe8f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 23 Feb 2021 06:44:57 +0100 Subject: [PATCH 049/162] package/mc: bump to version 4.8.26 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/mc/mc.hash | 4 ++-- package/mc/mc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 208d0beda4..63fbfa3213 100644 --- a/package/mc/mc.hash +++ b/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.25.sha256 -sha256 ffc19617f20ebb23330acd3998b7fd559a042d172fa55746d53d246697b2548a mc-4.8.25.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.26.sha256 +sha256 c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27 mc-4.8.26.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 00f34f81cc..50dc50f65e 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.25 +MC_VERSION = 4.8.26 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ From 8939392424efb86bff02dd77994f748eac25c223 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 Feb 2021 07:09:07 +0100 Subject: [PATCH 050/162] package/dav1d: bump version to 0.8.2 Release notes: https://code.videolan.org/videolan/dav1d/-/releases Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 2 +- package/dav1d/dav1d.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 45152f7a80..520e42fe90 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 842da2945afcf54e651d17112bf2823a238e6c935a6c8dff3a8e96a2eb740269 dav1d-0.8.1.tar.bz2 +sha256 78ec7a1714d98a8f4ecbc4255e83e6c4c944cdd881871ea234ce40153fd3df04 dav1d-0.8.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 68f6fc8805..377bd63419 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 0.8.1 +DAV1D_VERSION = 0.8.2 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From f3f64705b9e609266f181850cfa190e43042b342 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 22 Feb 2021 15:58:43 +0100 Subject: [PATCH 051/162] package/python-dialog3: bump to version 3.5.1 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-dialog3/python-dialog3.hash | 4 ++-- package/python-dialog3/python-dialog3.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-dialog3/python-dialog3.hash b/package/python-dialog3/python-dialog3.hash index 83e26c5727..42a7512e4f 100644 --- a/package/python-dialog3/python-dialog3.hash +++ b/package/python-dialog3/python-dialog3.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/pythondialog/json -md5 3d5ebc33e85f6313964f5eef720dab19 pythondialog-3.4.0.tar.bz2 +md5 07e257d91099b804e040c6ea5ec56041 pythondialog-3.5.1.tar.gz # Locally computed -sha256 019cdbffe3f61d32d6fb158ce48a767478af2aac2f31fb40460b39aefae604fe pythondialog-3.4.0.tar.bz2 +sha256 34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8 pythondialog-3.5.1.tar.gz sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog3/python-dialog3.mk b/package/python-dialog3/python-dialog3.mk index 4048447e1f..e2147507bf 100644 --- a/package/python-dialog3/python-dialog3.mk +++ b/package/python-dialog3/python-dialog3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DIALOG3_VERSION = 3.4.0 -PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.bz2 -PYTHON_DIALOG3_SITE = https://pypi.python.org/packages/fa/f4/686742f01ebb5863d4c5e1acab620acfed0fe97280a26b4ed25917f4f333 +PYTHON_DIALOG3_VERSION = 3.5.1 +PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.gz +PYTHON_DIALOG3_SITE = https://files.pythonhosted.org/packages/72/3c/26ed0db035f97196704d0197d8b2254b8a6ca93a2d132430b0b0d597aa79 PYTHON_DIALOG3_LICENSE = LGPL-2.1+ PYTHON_DIALOG3_LICENSE_FILES = COPYING PYTHON_DIALOG3_SETUP_TYPE = distutils From af3a264b3bc2584039e58afb9a6bf3b4f06f836e Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 22 Feb 2021 16:00:23 +0100 Subject: [PATCH 052/162] package/python-pyusb: bump to version 1.1.1 Along with the version bump the following changes were needed to get the package built: - since 1.1.1 PyUSB supports only Python3 - change download file name to lowercase - the package now requires setuptools and setuptools_scm - change LICENSE checksum as the copyright year changed to 2021 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-pyusb/Config.in | 1 + package/python-pyusb/python-pyusb.hash | 6 +++--- package/python-pyusb/python-pyusb.mk | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package/python-pyusb/Config.in b/package/python-pyusb/Config.in index bba3480a1b..13080a9fde 100644 --- a/package/python-pyusb/Config.in +++ b/package/python-pyusb/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PYUSB bool "python-pyusb" + depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index c5006c8184..9c634ef722 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/pyusb/json -md5 c8a571bfdba778555156af3facaea6fc PyUSB-1.0.0.tar.gz +md5 a9db479f1fb914e91d3106e67a13ae09 pyusb-1.1.1.tar.gz # Locally computed -sha256 5b34ffa74ac34f330bff949c94ee00ec4a9d147234db17ee2eed2a67c0275368 PyUSB-1.0.0.tar.gz -sha256 de177fb928a0eed8d209fddbfa3861379e08b3b41f34ad17a329c2f78199371d LICENSE +sha256 7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38 pyusb-1.1.1.tar.gz +sha256 03e39fdcee9c18f2f9d0c3500a993ddeac050695eb81070ea41347587c76a7fe LICENSE diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index 0afcbe8b8f..dc81efde9e 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.0.0 -PYTHON_PYUSB_SOURCE = PyUSB-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d +PYTHON_PYUSB_VERSION = 1.1.1 +PYTHON_PYUSB_SOURCE = pyusb-$(PYTHON_PYUSB_VERSION).tar.gz +PYTHON_PYUSB_SITE = https://files.pythonhosted.org/packages/b9/8d/25c4e446a07e918eb39b5af25c4a83a89db95ae44e4ed5a46c3c53b0a4d6 PYTHON_PYUSB_LICENSE = BSD-3-Clause PYTHON_PYUSB_LICENSE_FILES = LICENSE -PYTHON_PYUSB_SETUP_TYPE = distutils -PYTHON_PYUSB_DEPENDENCIES = libusb +PYTHON_PYUSB_SETUP_TYPE = setuptools +PYTHON_PYUSB_DEPENDENCIES = host-python-setuptools-scm libusb $(eval $(python-package)) From 564371c1f39283e27126908b3babc5eae37d0684 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Feb 2021 19:28:42 +0100 Subject: [PATCH 053/162] package/bwm-ng: bump to version 0.6.3 https://github.com/vgropp/bwm-ng/releases/tag/v0.6.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/bwm-ng/bwm-ng.hash | 2 +- package/bwm-ng/bwm-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bwm-ng/bwm-ng.hash b/package/bwm-ng/bwm-ng.hash index 4b66227676..d447673f5d 100644 --- a/package/bwm-ng/bwm-ng.hash +++ b/package/bwm-ng/bwm-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70 bwm-ng-0.6.2.tar.gz +sha256 c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46 bwm-ng-0.6.3.tar.gz sha256 8556cc15ba3c0a411bf7d94bac5870829fb725f294b450c724c1e0856a601556 COPYING diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index 4a34559e3c..de09eafae5 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -BWM_NG_VERSION = 0.6.2 +BWM_NG_VERSION = 0.6.3 BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION)) BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_LICENSE = GPL-2.0+ From 81efd0da9ab7d391ba18b4663679cfd17cc6dd24 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Feb 2021 19:31:22 +0100 Subject: [PATCH 054/162] package/faketime: bump to version 0.9.9 Update indentation in hash file (two spaces) https://github.com/wolfcw/libfaketime/releases/tag/v0.9.9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/faketime/faketime.hash | 4 ++-- package/faketime/faketime.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index bdb003aa69..0628ff9ae6 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3 faketime-0.9.8.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c faketime-0.9.9.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 85ce9a90d8..355477ba3b 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.8 +FAKETIME_VERSION = 0.9.9 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING From 50cfedc86d205f2ac7145deadb1c94474374acff Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Tue, 23 Feb 2021 19:19:10 +0100 Subject: [PATCH 055/162] package/genimage: bump to version 14 Signed-off-by: Pierre-Jean Texier Signed-off-by: Peter Korsgaard --- package/genimage/genimage.hash | 2 +- package/genimage/genimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index fbec5ce57b..9f60261b53 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4206e253226a384386c01591251f2ed1ea3485ef63f1e696db03600e1213db79 genimage-13.tar.xz +sha256 9d1d53b33309fe24ea367ea057eb689bdb8ea33cb99d796de31127ca44ccf44c genimage-14.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index dde8f8b9e0..1934223b23 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 13 +GENIMAGE_VERSION = 14 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION) HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse From 38b58a0d65b3dd28f1585036d83a5257b8479d8b Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Tue, 23 Feb 2021 19:19:00 +0100 Subject: [PATCH 056/162] package/stunnel: bump to version 5.58 Update COPYING hash; copyright year update: -_Copyright (C) 1998-2020 Michal Trojnara_ +_Copyright (C) 1998-2021 Michal Trojnara_ See full changelog https://www.stunnel.org/NEWS.html Signed-off-by: Pierre-Jean Texier Signed-off-by: Peter Korsgaard --- package/stunnel/stunnel.hash | 6 +++--- package/stunnel/stunnel.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/stunnel/stunnel.hash b/package/stunnel/stunnel.hash index 67d06a4d7c..a62fa07607 100644 --- a/package/stunnel/stunnel.hash +++ b/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.57.tar.gz.sha256 -sha256 af5ab973dde11807c38735b87bdd87563a47d2fa1c72a07929fcfce80a600fe1 stunnel-5.57.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.58.tar.gz.sha256 +sha256 d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79 stunnel-5.58.tar.gz # Locally calculated -sha256 d3055d327fd4daa5895fcf8fc4ebe993d06f40f2841ac995c6a69988d19bac4b COPYING.md +sha256 28b55d0157efd5ceb63640faeebb50fda13b1f49aec0b9c1240b9a3ea9f0eb4c COPYING.md sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index e0cc5630e4..f163b2bc1a 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).57 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).58 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ From 7328b08c564778485f27d633b714a41b8b937427 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 25 Feb 2021 07:55:59 +0200 Subject: [PATCH 057/162] package/uhubctl: bump to version 2.4.0 Add COPYING license text to _LICENSE_FILES. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/uhubctl/uhubctl.hash | 3 ++- package/uhubctl/uhubctl.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/uhubctl/uhubctl.hash b/package/uhubctl/uhubctl.hash index c137088772..c696d70f6c 100644 --- a/package/uhubctl/uhubctl.hash +++ b/package/uhubctl/uhubctl.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 714f733592d3cb6ba8efc84fbc03b1beed2323918ff33aef01cdb956755be7b7 uhubctl-2.3.0.tar.gz +sha256 391f24fd1f89cacce801df38ecc289b34c3627bc08ee69eec515af7e1a283d97 uhubctl-2.4.0.tar.gz sha256 2d3aa0737e8db9dfd710f9a282b446cb7b15b2b3eecac383f0c45c64d736eea0 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/uhubctl/uhubctl.mk b/package/uhubctl/uhubctl.mk index 08efca092c..3429d7d151 100644 --- a/package/uhubctl/uhubctl.mk +++ b/package/uhubctl/uhubctl.mk @@ -4,10 +4,10 @@ # ################################################################################ -UHUBCTL_VERSION = 2.3.0 +UHUBCTL_VERSION = 2.4.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 -UHUBCTL_LICENSE_FILES = LICENSE +UHUBCTL_LICENSE_FILES = LICENSE COPYING UHUBCTL_DEPENDENCIES = libusb define UHUBCTL_BUILD_CMDS From 8b2934e0aeea5e071d54e7b88c971690ef737f80 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 25 Feb 2021 08:48:48 +0200 Subject: [PATCH 058/162] package/daemon: bump to version 0.7.1 Add COPYING to _LICENSE_FILES. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/daemon/daemon.hash | 4 +++- package/daemon/daemon.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/daemon/daemon.hash b/package/daemon/daemon.hash index b1c1dcdc2c..ec7451a81e 100644 --- a/package/daemon/daemon.hash +++ b/package/daemon/daemon.hash @@ -1,3 +1,5 @@ # From http://www.libslack.org/daemon/ -sha256 f66af2ece784c16dcb5219de1f4fa3ae5787bb3374e44bd4b1d3e275e8ff272c daemon-0.7.tar.gz +sha256 ba1f6dc87532c852bfb8f436179cd661c3458ff898f67767c414123198626dfd daemon-0.7.1.tar.gz +# Locally calculated sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +sha256 cbac6eb0e1f7f95826966c7903939d591092a7f7d7726862946cb49096e8497d COPYING diff --git a/package/daemon/daemon.mk b/package/daemon/daemon.mk index f3a1917fad..91f77dd24a 100644 --- a/package/daemon/daemon.mk +++ b/package/daemon/daemon.mk @@ -4,10 +4,10 @@ # ################################################################################ -DAEMON_VERSION = 0.7 +DAEMON_VERSION = 0.7.1 DAEMON_SITE = http://libslack.org/daemon/download DAEMON_LICENSE = GPL-2.0+ -DAEMON_LICENSE_FILES = LICENSE +DAEMON_LICENSE_FILES = LICENSE COPYING define DAEMON_CONFIGURE_CMDS (cd $(@D); ./configure) From 5211e7489490620f9512e0ff2c2034af286e95b0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 23 Feb 2021 22:36:57 +0100 Subject: [PATCH 059/162] package/wireguard-linux-compat: bump version to 1.0.20210219 Includes various compat fixes and lowers memory requirements. For details, see the announcement: https://lists.zx2c4.com/pipermail/wireguard/2021-February/006404.html Signed-off-by: Peter Korsgaard --- package/wireguard-linux-compat/wireguard-linux-compat.hash | 4 ++-- package/wireguard-linux-compat/wireguard-linux-compat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash index f4f94cfd2e..c164a9e48e 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.hash +++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2021-January/006349.html -sha256 dac6e68cd4c3db441499850dfa8a70706384a3295f37fda1b839a50b79faef54 wireguard-linux-compat-1.0.20210124.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2021-February/006404.html +sha256 99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00 wireguard-linux-compat-1.0.20210219.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk index 2f36ec8bfb..eba5686683 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20210124 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20210219 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 From f3b292d907ace616b621748a35e22349b3286ee0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 23 Feb 2021 22:40:32 +0100 Subject: [PATCH 060/162] package/wireguard-tools: bump version to 1.0.20210223 For details, see the announcement: https://lists.zx2c4.com/pipermail/wireguard/2021-February/006407.html Signed-off-by: Peter Korsgaard --- package/wireguard-tools/wireguard-tools.hash | 4 ++-- package/wireguard-tools/wireguard-tools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireguard-tools/wireguard-tools.hash b/package/wireguard-tools/wireguard-tools.hash index 3bff364e06..dab7f72ca8 100644 --- a/package/wireguard-tools/wireguard-tools.hash +++ b/package/wireguard-tools/wireguard-tools.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-August/005790.html -sha256 51bc85e33a5b3cf353786ae64b0f1216d7a871447f058b6137f793eb0f53b7fd wireguard-tools-1.0.20200827.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2021-February/006407.html +sha256 1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c wireguard-tools-1.0.20210223.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-tools/wireguard-tools.mk b/package/wireguard-tools/wireguard-tools.mk index d360c81208..d3d2069846 100644 --- a/package/wireguard-tools/wireguard-tools.mk +++ b/package/wireguard-tools/wireguard-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_TOOLS_VERSION = 1.0.20200827 +WIREGUARD_TOOLS_VERSION = 1.0.20210223 WIREGUARD_TOOLS_SITE = https://git.zx2c4.com/wireguard-tools/snapshot WIREGUARD_TOOLS_SOURCE = wireguard-tools-$(WIREGUARD_TOOLS_VERSION).tar.xz WIREGUARD_TOOLS_LICENSE = GPL-2.0 From 2a3cfb2381d0254ee57debb7bd520f0e89843345 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 21 Feb 2021 10:02:25 +0100 Subject: [PATCH 061/162] package/ffmpeg: bump version to 4.3.2 Removed patch which was applied upstream. Changelog: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;h=28d79ea1aed0a59f43ee922f5b6efa82dc7e2b18;hb=refs/heads/release/4.3 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...-make-sure-mpegts-read-header-always.patch | 38 ------------------- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch diff --git a/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch b/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch deleted file mode 100644 index 75a39d16fa..0000000000 --- a/package/ffmpeg/0004-avformat-mpegts-make-sure-mpegts-read-header-always.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3136f41e6db8189994a8e4f72eacc92b669776d1 Mon Sep 17 00:00:00 2001 -From: Marton Balint -Date: Sun, 15 Nov 2020 00:39:41 +0100 -Subject: [PATCH] avformat/mpegts: make sure mpegts_read_header always stops at - the first pmt - -mpegts_read_header stops parsing the file at the first PMT. However the check -that ensured this was wrong because streams can also be added before the first -PMT is received (e.g. EIT). - -So let's make sure we are in the header reading phase by checking if ts->pkt is -unset instead of checking if the number of streams found so far is 0. - -Downloaded from Kodi ffmpeg repo: -https://github.com/xbmc/FFmpeg/commit/3136f41e6db8189994a8e4f72eacc92b669776d1 - -Patch was committed upstream: -http://git.videolan.org/?p=ffmpeg.git;a=patch;h=ca55240b8c1fd4cfdb61f88fd2cb378d475d910a - -Signed-off-by: Marton Balint -Signed-off-by: Bernd Kuhls ---- - libavformat/mpegts.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index c6fd3e1cef63..1da81a0fe62a 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -2352,7 +2352,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len - goto out; - - // stop parsing after pmt, we found header -- if (!ts->stream->nb_streams) -+ if (!ts->pkt) - ts->stop_parse = 2; - - set_pmt_found(ts, h->id); diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 959a562b8d..81dc0d3e6b 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb ffmpeg-4.3.1.tar.xz +sha256 46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb ffmpeg-4.3.2.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 6d28bfbed7..9b79dff48e 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 4.3.1 +FFMPEG_VERSION = 4.3.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From d1d5c1c9141ab4e510938715d1a397a817f078e9 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Mon, 22 Feb 2021 13:47:58 +0100 Subject: [PATCH 062/162] package/refpolicy: bump to 2.20210203 Changelog: https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20210203 Signed-off-by: Antoine Tenart Signed-off-by: Peter Korsgaard --- package/refpolicy/refpolicy.hash | 2 +- package/refpolicy/refpolicy.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/refpolicy/refpolicy.hash b/package/refpolicy/refpolicy.hash index 7e258c4e04..6c33a4d974 100644 --- a/package/refpolicy/refpolicy.hash +++ b/package/refpolicy/refpolicy.hash @@ -1,5 +1,5 @@ # From https://github.com/SELinuxProject/refpolicy/releases -sha256 1488f9b94060de28addbcb29fb8437ee0d75cba15e11280dd9dfa3e09986f57b refpolicy-2.20200818.tar.bz2 +sha256 48cbf2c63ff9003bef05e03c8d3cdddb4e8f63fef2a072ae51c987301f0b874d refpolicy-2.20210203.tar.bz2 # Locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 0194708b37..0e7dfd86f8 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -22,9 +22,9 @@ REFPOLICY_SITE = $(call qstrip,$(BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL)) REFPOLICY_SITE_METHOD = git BR_NO_CHECK_HASH_FOR += $(REFPOLICY_SOURCE) else -REFPOLICY_VERSION = 2.20200818 +REFPOLICY_VERSION = 2.20210203 REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2 -REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20200818 +REFPOLICY_SITE = https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20210203 endif # Cannot use multiple threads to build the reference policy From f50c212218a8521bc66be22cc14581f5449ff84e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 22 Feb 2021 15:33:25 +0100 Subject: [PATCH 063/162] package/nfs-utils: bump version to 2.5.3 Signed-off-by: Giulio Benetti Reviewed-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/nfs-utils/nfs-utils.hash | 4 ++-- package/nfs-utils/nfs-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 6268552ca1..25c11cb686 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.2/sha256sums.asc -sha256 d493b81c9d3ffce5d10af701a63ed2b8a21768c23da4a2eceb4d708aea65d9de nfs-utils-2.5.2.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.3/sha256sums.asc +sha256 b54d6d8ea2ee62d64111278301ba4631b7bb19174e7f717a724fe5d463900c80 nfs-utils-2.5.3.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index df581b381f..c384e939d8 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.5.2 +NFS_UTILS_VERSION = 2.5.3 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ From 8a854214bdd822720a57cab1694519391fa24ff1 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Fri, 26 Feb 2021 09:59:35 +0100 Subject: [PATCH 064/162] package/libxcrypt: fix legal info When the initial package has been submitted, the hashes for the license files were computed against the files from the repository, not the release tarball, but the files had changed in the repo since the version was cut. Fix that hash. Fixes: http://autobuild.buildroot.net/results/206aac81799074ef45c0cc7b9979cbf02c3935d5 http://autobuild.buildroot.net/results/8db5df1286673fdedb854bad2b9e5757d5218950 Signed-off-by: Guillaume W. Bres [yann.morin.1998@free.fr: expand commit log with root cause] Signed-off-by: Yann E. MORIN --- package/libxcrypt/libxcrypt.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index b56ab6beaf..d5d3710b71 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated sha256 7665168d0409574a03f7b484682e68334764c29c21ca5df438955a381384ca07 libxcrypt-4.4.17.tar.gz -sha256 f8198fcc4f002bf54512bac2e68e1e3f04af7d105f4f4f98d7d22cb110e04715 LICENSING +sha256 9178c76310a1136274d485e606ad92b6f8df265fc736642f5421d628214acc76 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB From 4e827d930f033994fc1e27978d5d5a01a760b8b3 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Fri, 26 Feb 2021 09:29:17 +0100 Subject: [PATCH 065/162] package/libxcrypt: bump version to 4.4.18 Drop patch which has been merged into mainline. LICENSING file identifies individual files in the tree, and some have moved between 4.4.17 and 4.4.18 (upstream commit 3436c6a94b8d). Fix two -spaces in hash file as well. Signed-off-by: Guillaume W. Bres [yann.morin.1998@free.fr: - explain license hash change - two-spaces in hash file ] Signed-off-by: Yann E. MORIN --- ...gost3411-core.c-fix-conversion-error.patch | 30 ------------------- package/libxcrypt/libxcrypt.hash | 6 ++-- package/libxcrypt/libxcrypt.mk | 2 +- 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch diff --git a/package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch b/package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch deleted file mode 100644 index 1245216aad..0000000000 --- a/package/libxcrypt/0001-lib-alg-gost3411-core.c-fix-conversion-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c7bf2cf8e610bb26bece7f3a2bc5b47d7c659c7d Mon Sep 17 00:00:00 2001 -From: "Guillaume W. Bres" -Date: Sat, 20 Feb 2021 16:51:04 +0100 -Subject: [PATCH] lib/alg-gost3411-core.c: fix conversion error seen by - sensitive compilers - -Some compiler might be sensitive and raise an Warning/error on this line. - -Signed-off-by: Guillaume W. Bres -[backported from upstream] ---- - lib/alg-gost3411-2012-core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/alg-gost3411-2012-core.c b/lib/alg-gost3411-2012-core.c -index 13bb493..af3a36e 100644 ---- a/lib/alg-gost3411-2012-core.c -+++ b/lib/alg-gost3411-2012-core.c -@@ -92,7 +92,7 @@ add512(const uint512_u *x, const uint512_u *y, uint512_u *r) - for (i = 0; i < 64; i++) - { - buf = xp[i] + yp[i] + (buf >> 8); -- rp[i] = (unsigned char) buf & 0xFF; -+ rp[i] = (unsigned char) (buf & 0xFF); - } - #endif - } --- -2.20.1 - diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index d5d3710b71..bf187413e5 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7665168d0409574a03f7b484682e68334764c29c21ca5df438955a381384ca07 libxcrypt-4.4.17.tar.gz -sha256 9178c76310a1136274d485e606ad92b6f8df265fc736642f5421d628214acc76 LICENSING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 3801f0263a8596b15ec466343fc1fdc4ad4ec7416c51e038a3528fd47f3be01a libxcrypt-4.4.18.tar.gz +sha256 f8198fcc4f002bf54512bac2e68e1e3f04af7d105f4f4f98d7d22cb110e04715 LICENSING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index ccbb1a282c..fd33fb7ab5 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.17 +LIBXCRYPT_VERSION = 4.4.18 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB From 27fffea6db7358af20f5a3a8faa174d3b782d61f Mon Sep 17 00:00:00 2001 From: Markus Mayer Date: Wed, 17 Feb 2021 13:57:38 -0800 Subject: [PATCH 066/162] package/tar: bump version to 1.34 Bump the version of tar to 1.34 for host and target. Signed-off-by: Markus Mayer Signed-off-by: Yann E. MORIN --- package/tar/tar.hash | 4 ++-- package/tar/tar.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tar/tar.hash b/package/tar/tar.hash index 72f0cd6fcb..1914a9f3b4 100644 --- a/package/tar/tar.hash +++ b/package/tar/tar.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -sha256 d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 tar-1.32.tar.xz -sha256 9fbfba0cba05233421dd619b8825e1ceb7c144e433c15ae48b68f17ede8d404a tar-1.32.cpio.gz +sha256 63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28 tar-1.34.tar.xz +sha256 51337b19c71df92cd4f51c50efe4dc6ddc267d31fd54679be9e9bc2e6ce8132b tar-1.34.cpio.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 2da731f80a..690a5952ba 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAR_VERSION = 1.32 +TAR_VERSION = 1.34 TAR_SOURCE = tar-$(TAR_VERSION).tar.xz TAR_SITE = $(BR2_GNU_MIRROR)/tar # busybox installs in /bin, so we need tar to install as well in /bin From 1fd8baac1d716916eb27f80a66de6aff26c3be08 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 26 Feb 2021 20:19:09 +0100 Subject: [PATCH 067/162] package/libinput: bump version to 1.16.5 For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2021-February/041734.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/libinput/libinput.hash | 6 +++--- package/libinput/libinput.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index f2cea28ee3..1664afbac8 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-November/041664.html -sha256 65923a06d5a8970e4a999c4668797b9b689614b62b1d44432ab1c87b65e39e29 libinput-1.16.4.tar.xz -sha512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee libinput-1.16.4.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2021-February/041734.html +sha256 42d404af037a0dcc9dee7a1ab0a8e53cec0b62902fc4a262e5be9d2b7452c214 libinput-1.16.5.tar.xz +sha512 b2fdd87375cbd5b212f76cefedfaa146966dde1d5e5d566beadd3167749dc3667214946178b157fa4b44360dc6b86a25ffb0356049cdf5a57d0fa2b8e3fcb1e9 libinput-1.16.5.tar.xz # License files sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 3b459d6fb5..cbe4bb124f 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.16.4 +LIBINPUT_VERSION = 1.16.5 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From a66614dddda1c2143ddbb2111f7e0ccee96be6ea Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Feb 2021 10:39:01 +0100 Subject: [PATCH 068/162] package/pcsc-lite: bump to version 1.9.1 https://github.com/LudovicRousseau/PCSC/releases/tag/1.9.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/pcsc-lite/pcsc-lite.hash | 2 +- package/pcsc-lite/pcsc-lite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pcsc-lite/pcsc-lite.hash b/package/pcsc-lite/pcsc-lite.hash index 08bc85b154..4d31b25aaa 100644 --- a/package/pcsc-lite/pcsc-lite.hash +++ b/package/pcsc-lite/pcsc-lite.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9 pcsc-lite-1.9.0.tar.bz2 +sha256 73c4789b7876a833a70f493cda21655dfe85689d9b7e29701c243276e55e683a pcsc-lite-1.9.1.tar.bz2 sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk index c411e9c7ee..3091da41a4 100644 --- a/package/pcsc-lite/pcsc-lite.mk +++ b/package/pcsc-lite/pcsc-lite.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCSC_LITE_VERSION = 1.9.0 +PCSC_LITE_VERSION = 1.9.1 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files PCSC_LITE_INSTALL_STAGING = YES From c95486059827d65c5e4761879e848ee070d47b81 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Feb 2021 10:47:42 +0100 Subject: [PATCH 069/162] package/log4cplus: bump to version 2.0.6 Drop patch (already in version) and so autoreconf https://github.com/log4cplus/log4cplus/releases/tag/REL_2_0_6 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ure-ac-check-for-libraries-in-C-mode.patch | 62 ------------------- package/log4cplus/log4cplus.hash | 2 +- package/log4cplus/log4cplus.mk | 4 +- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch diff --git a/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch b/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch deleted file mode 100644 index 6226a6210d..0000000000 --- a/package/log4cplus/0001-configure-ac-check-for-libraries-in-C-mode.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4446516eb4fc8613d26669f5683f9d5d7c36ee67 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Wed, 18 Dec 2019 21:26:58 +0100 -Subject: [PATCH] configure.ac: check for libraries in C mode - -Fixes check for libraries failures, e.g. (from config.log): - - arc-buildroot-linux-uclibc-g++ -o conftest -Os -Wall -fdiagnostics-show-caret -ftrack-macro-expansion -fdiagnostics-color=auto -Wextra -pedantic -Wstrict-aliasing -Wstrict-overflow -Woverloaded-virtual -Wold-style-cast -Wc++14-compat -Wundef -Wshadow -Wformat -Wnoexcept -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wno-variadic-macros -fvisibility=hidden conftest.cpp -latomic - conftest.cpp:28:6: error: new declaration 'char __atomic_fetch_and_4()' ambiguates built-in declaration 'unsigned int __atomic_fetch_and_4(volatile void*, unsigned int, int)' [-fpermissive] - 28 | char __atomic_fetch_and_4 (); - | ^~~~~~~~~~~~~~~~~~~~ - conftest.cpp: In function 'int main()': - conftest.cpp:32:30: error: too few arguments to function 'unsigned int __atomic_fetch_and_4(volatile void*, unsigned int, int)' - 32 | return __atomic_fetch_and_4 (); - | ^ - -Resulting in: - - checking for library containing __atomic_fetch_and_4... no - -instead (after the fix applied): - - checking for library containing __atomic_fetch_and_4... -latomic - -Signed-off-by: Peter Seiderer -[Retrieved from: -https://github.com/log4cplus/log4cplus/commit/4446516eb4fc8613d26669f5683f9d5d7c36ee67] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 72fbd870a..64eff1936 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -412,6 +412,7 @@ LOG4CPLUS_DEFINE_MACRO_IF([LOG4CPLUS_HAVE_VAR_ATTRIBUTE_INIT_PRIORITY], - - dnl Checks for libraries. - -+AC_LANG_PUSH([C]) - AC_SEARCH_LIBS([__atomic_fetch_and_4], [atomic]) - AC_SEARCH_LIBS([strerror], [cposix]) - dnl On some systems libcompat exists only as a static library which -@@ -422,6 +423,7 @@ AC_SEARCH_LIBS([setsockopt], [socket network net]) - AS_IF([test "x$with_iconv" = "xyes"], - [AC_SEARCH_LIBS([iconv_open], [iconv], [], - [AC_SEARCH_LIBS([libiconv_open], [iconv])])]) -+AC_LANG_POP([C]) - - dnl Windows/MinGW specific. - -@@ -497,7 +499,9 @@ dnl Multi threaded library. - AS_VAR_APPEND([LIBS], [" $PTHREAD_LIBS"]) - - dnl required on HP-UX -+ AC_LANG_PUSH([C]) - AC_SEARCH_LIBS([sem_init], [rt]) -+ AC_LANG_POP([C]) - - AS_CASE([$ax_cv_cxx_compiler_vendor], - [gnu|clang], diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index 43ff401da6..28e5b204c7 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6046f0867ce4734f298418c7b7db0d35c27403090bb751d98e6e76aa4935f1af log4cplus-2.0.5.tar.xz +sha256 73519a5e47c40cf375aa6cd28a703b01908b5dcd3f4cb4290db2fef237c8180c log4cplus-2.0.6.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 8a613efaee..8b62fb8f92 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,14 +4,12 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.5 +LOG4CPLUS_VERSION = 2.0.6 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) LOG4CPLUS_LICENSE_FILES = LICENSE LOG4CPLUS_INSTALL_STAGING = YES -# We're patching configure.ac -LOG4CPLUS_AUTORECONF = YES ifeq ($(BR2_GCC_ENABLE_LTO),y) LOG4CPLUS_CONF_OPTS += --enable-lto From 970b2ca3cc3f927f679c871eeadb22ec110b0ed5 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 1 Mar 2021 18:50:56 +0100 Subject: [PATCH 070/162] package/gd: bump to version 2.3.1 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/gd/gd.hash | 2 +- package/gd/gd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gd/gd.hash b/package/gd/gd.hash index 5aec317f2d..3fd4ca0eb5 100644 --- a/package/gd/gd.hash +++ b/package/gd/gd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58 libgd-2.3.0.tar.xz +sha256 9767917d9f818faec4ddd763fe4a4ad9f6322c3d25da290ab2ea3e2ce4b52a7b libgd-2.3.1.tar.xz sha256 4d80b4af6c38d7a65128c881623dee2a5daee6b3a6ccab74a5cdfa0dfda96da7 COPYING diff --git a/package/gd/gd.mk b/package/gd/gd.mk index f54c2b37a2..53bf62dabd 100644 --- a/package/gd/gd.mk +++ b/package/gd/gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GD_VERSION = 2.3.0 +GD_VERSION = 2.3.1 GD_SOURCE = libgd-$(GD_VERSION).tar.xz GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION) GD_INSTALL_STAGING = YES From 722918d818ee103175cf5663ca46d9685abe86b4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 1 Mar 2021 19:43:16 +0100 Subject: [PATCH 071/162] package/nano: bump to version 5.6 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 4498414fd0..152766aa3b 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v5/nano-5.5.tar.xz.asc +# https://www.nano-editor.org/dist/v5/nano-5.6.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 390b81bf9b41ff736db997aede4d1f60b4453fbd75a519a4ddb645f6fd687e4a nano-5.5.tar.xz +sha256 fce183e4a7034d07d219c79aa2f579005d1fd49f156db6e50f53543a87637a32 nano-5.6.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index d47c749ef5..43f5f5f0b2 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 5 -NANO_VERSION = $(NANO_VERSION_MAJOR).5 +NANO_VERSION = $(NANO_VERSION_MAJOR).6 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From 59f35fe78e60f7288b41bdc2b4c46d8259c33bac Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 1 Mar 2021 19:51:24 +0100 Subject: [PATCH 072/162] package/lighttpd: bump to version 1.4.59 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/lighttpd/lighttpd.hash | 4 ++-- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 0a7cdfe3bc..cc192f1a9e 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.sha256sum -sha256 267feffda13a190ebdce7b15172d8be16da98008457f30fddecd72832d126d0e lighttpd-1.4.58.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.59.sha256sum +sha256 fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5 lighttpd-1.4.59.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 028ff17aa6..fbbca00b0c 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).58 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).59 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause From 8c017f37773079d83acf147e0517af538bd3514b Mon Sep 17 00:00:00 2001 From: Gustavo Heinz Date: Wed, 24 Feb 2021 20:28:50 -0300 Subject: [PATCH 073/162] package/python-m2crypto: bump to version 0.37.1 Also, removed 0001 patch since it's already merged upstream. https://gitlab.com/m2crypto/m2crypto/-/merge_requests/248 Signed-off-by: Gustavo Heinz Signed-off-by: Peter Korsgaard --- ...swig-default-includes-before-openssl.patch | 63 ------------------- package/python-m2crypto/python-m2crypto.hash | 4 +- package/python-m2crypto/python-m2crypto.mk | 4 +- 3 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch diff --git a/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch b/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch deleted file mode 100644 index f4d7e428f1..0000000000 --- a/package/python-m2crypto/0001-setup.py-move-swig-default-includes-before-openssl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 1aab31787a8d1ef9436d9cf81832691f729b6282 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 7 Nov 2020 23:26:30 +0100 -Subject: [PATCH] setup.py: move swig default includes before openssl - -Move swig default includes before openssl to avoid the following build -failure when cross-compiling for some architectures (e.g. arm, mips): - -swig -python -py3 -D__x86_64__ \ - -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/python3.9 \ - -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include \ - -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/openssl \ - -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include \ - -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/include-fixed \ - -I/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-gnu/8.3.0/../../../../mipsel-buildroot-linux-gnu/include \ - -I/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include \ - -includeall -modern -builtin -outdir \ - /srv/storage/autobuild/run/instance-0/output-1/build/python-m2crypto-0.36.0/M2Crypto -o SWIG/_m2crypto_wrap.c SWIG/_m2crypto.i -Deprecated command line option: -modern. This option is now always on. -/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/bits/types.h:139: -Error: CPP #error "". Use the -cpperraswarn option to continue swig processing. - -This build failure is probably raised because swig includes a wrong types.h file -from the openssl directory (e.g. -/srv/storage/autobuild/run/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include) - -Fixes: - - http://autobuild.buildroot.org/results/7f63e6a2d8681cc3408f344556afd5dd16eb7368 - - http://autobuild.buildroot.org/results/d115a082418321e7dc4715c635f94b30b3cad387 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/m2crypto/m2crypto/-/merge_requests/248] ---- - setup.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 89d03bb..0045fda 100644 ---- a/setup.py -+++ b/setup.py -@@ -154,6 +154,9 @@ class _M2CryptoBuildExt(build_ext.build_ext): - if sys.version_info[:1] >= (3,): - self.swig_opts.append('-py3') - -+ # swig seems to need the default header file directories -+ self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) -+ - log.debug('self.include_dirs = %s', self.include_dirs) - log.debug('self.library_dirs = %s', self.library_dirs) - -@@ -204,8 +207,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): - self.swig_opts.append( - '-I' + os.path.join(openssl_include_dir, 'openssl')) - -- # swig seems to need the default header file directories -- self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) - self.swig_opts.append('-includeall') - self.swig_opts.append('-modern') - self.swig_opts.append('-builtin') --- -2.28.0 - diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python-m2crypto/python-m2crypto.hash index 148cdd8317..1ccc786f51 100644 --- a/package/python-m2crypto/python-m2crypto.hash +++ b/package/python-m2crypto/python-m2crypto.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/m2crypto/json -md5 b8b34c5b83892096a8676b6f2e8f4e7e M2Crypto-0.36.0.tar.gz -sha256 1542c18e3ee5c01db5031d0b594677536963e3f54ecdf5315aeecb3a595b4dc1 M2Crypto-0.36.0.tar.gz +md5 1f3095440092ca5e54007d1f3fa2562a M2Crypto-0.37.1.tar.gz +sha256 e4e42f068b78ccbf113e5d0a72ae5f480f6c3ace4940b91e4fff5598cfff6fb3 M2Crypto-0.37.1.tar.gz # Locally computed sha256 checksums sha256 4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0 LICENCE diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index ccc63058ce..557985eb0e 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_M2CRYPTO_VERSION = 0.36.0 +PYTHON_M2CRYPTO_VERSION = 0.37.1 PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz -PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/ff/df/84609ed874b5e6fcd3061a517bf4b6e4d0301f553baf9fa37bef2b509797 +PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/aa/36/9fef97358e378c1d3bd567c4e8f8ca0428a8d7e869852cef445ee6da91fd PYTHON_M2CRYPTO_SETUP_TYPE = setuptools PYTHON_M2CRYPTO_LICENSE = MIT PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE From 3a80e190092fe08da816c4adcf0802651eb0c274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 25 Feb 2021 11:53:55 +0100 Subject: [PATCH 074/162] package/gerbera: add optional duktape dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Duktape allows the user to enable JavaScript scripting support. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/gerbera/Config.in | 3 +++ package/gerbera/gerbera.mk | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/gerbera/Config.in b/package/gerbera/Config.in index b734de95de..33a9705bea 100644 --- a/package/gerbera/Config.in +++ b/package/gerbera/Config.in @@ -20,6 +20,9 @@ config BR2_PACKAGE_GERBERA A free media server. Stream your media to devices on your home network. + Select BR2_PACKAGE_DUKTAPE if you want to enable JavaScript + for scripting. + https://gerbera.io comment "gerbera needs a toolchain w/ C++, threads, wchar, gcc >= 8" diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index 6e36377798..ccb3b2eeb5 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -16,15 +16,20 @@ GERBERA_DEPENDENCIES = \ sqlite \ util-linux \ zlib -GERBERA_CONF_OPTS = \ - -DWITH_DEBUG=OFF \ - -DWITH_JS=OFF +GERBERA_CONF_OPTS = -DWITH_DEBUG=OFF # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GERBERA_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" endif +ifeq ($(BR2_PACKAGE_DUKTAPE),y) +GERBERA_DEPENDENCIES += duktape +GERBERA_CONF_OPTS += -DWITH_JS=ON +else +GERBERA_CONF_OPTS += -DWITH_JS=OFF +endif + ifeq ($(BR2_PACKAGE_EXIV2),y) GERBERA_DEPENDENCIES += exiv2 GERBERA_CONF_OPTS += -DWITH_EXIV2=ON From b82b58a8ddc3d079aa2976b3dafbc965b6107648 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Tue, 23 Feb 2021 17:12:23 +0100 Subject: [PATCH 075/162] package/s390-tools: bump to version 2.16.0 - Remove patch 0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch which has been merged. - Also update the GitHub URL because the project has been renamed. Signed-off-by: Alexander Egorenkov [Peter: also update Config.in URL] Signed-off-by: Peter Korsgaard --- ...nmpd-Makefile-fix-cross-compilation.patch} | 0 ...ey-ekmfweb-fix-linking-of-libekmfweb.patch | 53 ------------------- package/s390-tools/Config.in | 2 +- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 4 +- 5 files changed, 4 insertions(+), 57 deletions(-) rename package/s390-tools/{0002-osasnmpd-Makefile-fix-cross-compilation.patch => 0001-osasnmpd-Makefile-fix-cross-compilation.patch} (100%) delete mode 100644 package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch diff --git a/package/s390-tools/0002-osasnmpd-Makefile-fix-cross-compilation.patch b/package/s390-tools/0001-osasnmpd-Makefile-fix-cross-compilation.patch similarity index 100% rename from package/s390-tools/0002-osasnmpd-Makefile-fix-cross-compilation.patch rename to package/s390-tools/0001-osasnmpd-Makefile-fix-cross-compilation.patch diff --git a/package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch b/package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch deleted file mode 100644 index 76a642af70..0000000000 --- a/package/s390-tools/0001-zkey-ekmfweb-fix-linking-of-libekmfweb.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a4e6f7239d8cee37e58eac974482d6deefa8a137 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov -Date: Thu, 5 Nov 2020 17:42:58 +0100 -Subject: [PATCH 1/1] zkey/ekmfweb: fix linking of libekmfweb - -Use -L compiler's parameter instead of the environment variable -LIBRARY_PATH. - -Fixes the following problem on buildroot: - -buildroot/qemu-s390x/host/bin/s390x-linux-gcc -shared -Wl,--version-script=zkey-ekmfweb.map -Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-ekmfweb.so.1 zkey-ekmfweb.o properties.o pkey.o cca.o ep11.o utils.o ../..//libutil/libutil.a -lekmfweb -ldl -lcrypto -o zkey-ekmfweb.so -buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c udev_ccwgroup.c -o udev_ccwgroup.o -buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c iscsi.c -o iscsi.o -buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c dasd.c -o dasd.o -buildroot/qemu-s390x/host/opt/ext-toolchain/bin/../lib/gcc/s390x-buildroot-linux-gnu/9.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: cannot find -lekmfweb -collect2: error: ld returned 1 exit status -make[4]: *** [Makefile:36: zkey-ekmfweb.so] Error 1 -make[3]: *** [Makefile:128: ekmfweb] Error 2 -buildroot/qemu-s390x/host/bin/s390x-linux-gcc -I ../../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I ../include -std=gnu99 -Wno-unused-parameter -Wno-missing-field-initializers -DS390_TOOLS_RELEASE=2.15.1-build-20201105 -DS390_TOOLS_LIBDIR=/lib/s390-tools -DS390_TOOLS_DATADIR=/usr/share/s390-tools -DS390_TOOLS_SYSCONFDIR=/etc -DS390_TOOLS_BINDIR=/sbin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_GNU_SOURCE -c zfcp.c -o zfcp.o -make[2]: *** [Makefile:43: zkey] Error 2 -make[2]: *** Waiting for unfinished jobs.... - -Signed-off-by: Alexander Egorenkov -Acked-by: Ingo Franzki ---- - zkey/ekmfweb/Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/zkey/ekmfweb/Makefile b/zkey/ekmfweb/Makefile -index 79a16cb5..1a3a4977 100644 ---- a/zkey/ekmfweb/Makefile -+++ b/zkey/ekmfweb/Makefile -@@ -7,8 +7,6 @@ all: zkey-ekmfweb.so - - libs = $(rootdir)/libutil/libutil.a - --export LIBRARY_PATH = $(rootdir)/libekmfweb:$LIBRARY_PATH -- - zkey-ekmfweb.o: zkey-ekmfweb.c zkey-ekmfweb.h ../kms-plugin.h \ - ../cca.h ../utils.h ../pkey.h ../properties.h \ - $(rootdir)include/ekmfweb/ekmfweb.h libekmfweb.dep -@@ -29,7 +27,7 @@ utils.o: ../utils.c ../utils.h ../pkey.h ../cca.h ../ep11.h - $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@ - - zkey-ekmfweb.so: ALL_CFLAGS += -fPIC --zkey-ekmfweb.so: LDLIBS = -lekmfweb -ldl -lcrypto -+zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto - zkey-ekmfweb.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-ekmfweb.map \ - -Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-ekmfweb.so.$(VERM) - zkey-ekmfweb.so: zkey-ekmfweb.o properties.o pkey.o cca.o ep11.o utils.o $(libs) --- -2.26.2 - diff --git a/package/s390-tools/Config.in b/package/s390-tools/Config.in index 4aede4e265..23b7d31db6 100644 --- a/package/s390-tools/Config.in +++ b/package/s390-tools/Config.in @@ -11,4 +11,4 @@ config BR2_PACKAGE_S390_TOOLS help Tools for use with the s390 Linux kernel and device drivers. - https://github.com/ibm-s390-tools/s390-tools + https://github.com/ibm-s390-linux/s390-tools diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 1de2399e03..bf007286b4 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8dc1180031018756ccd5acf6c26c4175bcac79e512e8a2ea8569fdf5d3f9bd6c s390-tools-2.15.1.tar.gz +sha256 b789d5c9d8587b288e1fd9b1c1c4512bb3439e1f389519cb257f1c7c302da58f s390-tools-2.16.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 535caf208e..326262b475 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.15.1 -S390_TOOLS_SITE = $(call github,ibm-s390-tools,s390-tools,v$(S390_TOOLS_VERSION)) +S390_TOOLS_VERSION = 2.16.0 +S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE S390_TOOLS_DEPENDENCIES = zlib From af5226f2fd1292a26f2dfda32f41cbbad7aa4cc6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Feb 2021 19:06:18 +0100 Subject: [PATCH 076/162] package/ruby: update to 3.0.0 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...0001-fix-default-coroutine-selection.patch | 30 +++++-------------- package/ruby/ruby.hash | 4 +-- package/ruby/ruby.mk | 6 ++-- 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/package/ruby/0001-fix-default-coroutine-selection.patch b/package/ruby/0001-fix-default-coroutine-selection.patch index 79dbd692e5..ea84aa9bc6 100644 --- a/package/ruby/0001-fix-default-coroutine-selection.patch +++ b/package/ruby/0001-fix-default-coroutine-selection.patch @@ -2,34 +2,20 @@ fixed default coroutine selection for musl/uclibc https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 -Signed-off-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb -diff -Nur ruby-2.7.1.orig/configure.ac ruby-2.7.1/configure.ac ---- ruby-2.7.1.orig/configure.ac 2020-03-31 12:44:55.000000000 +0200 -+++ ruby-2.7.1/configure.ac 2020-10-01 00:03:53.130462286 +0200 -@@ -2344,8 +2344,12 @@ +diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac +--- ruby-3.0.0.orig/configure.ac 2020-12-25 04:33:01.000000000 +0100 ++++ ruby-3.0.0/configure.ac 2021-02-22 13:00:53.990314464 +0100 +@@ -2441,7 +2441,10 @@ rb_cv_coroutine=copy ], - [*], [ + [ - rb_cv_coroutine=ucontext -+ AC_CHECK_FUNCS([getcontext swapcontext makecontext], ++ AC_CHECK_FUNCS([getcontext swapcontext makecontext], + [rb_cv_coroutine=ucontext], + [rb_cv_coroutine=copy; break] -+ ) ++ ) ] -+ ) AC_MSG_RESULT(${rb_cv_coroutine}) - ]) -diff -Nur ruby-2.7.1.orig/coroutine/copy/Context.c ruby-2.7.1/coroutine/copy/Context.c ---- ruby-2.7.1.orig/coroutine/copy/Context.c 2020-03-31 12:44:55.000000000 +0200 -+++ ruby-2.7.1/coroutine/copy/Context.c 2020-10-01 00:04:59.414670705 +0200 -@@ -5,6 +5,8 @@ - * Copyright, 2019, by Samuel Williams. All rights reserved. - */ - -+#include -+ - #include "Context.h" - - // http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 80ffb00c0f..b4594fcaba 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/ -sha256 1b95ab193cc8f5b5e59d2686cb3d5dcf1ddf2a86cb6950e0b4bdaae5040ec0d6 ruby-2.7.2.tar.xz +# https://www.ruby-lang.org/en/news/2020/12/25/ruby-3-0-0-released/ +sha256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 ruby-3.0.0.tar.xz # License files, Locally calculated sha256 b09ca195d2de08f0aacfa8793d0af62d7681c304b3ef714b75813721823295a6 LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 341943c4a5..a754ba8451 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 2.7 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 -RUBY_VERSION_EXT = 2.7.0 +RUBY_VERSION_MAJOR = 3.0 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION_EXT = 3.0.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz RUBY_DEPENDENCIES = host-pkgconf host-ruby From a7953bfa0f72a2971cdd35b93df10f530d0a3794 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Feb 2021 20:36:25 +0100 Subject: [PATCH 077/162] package/udftools: bump to version 2.3 Update indentation in hash file (two spaces) https://github.com/pali/udftools/releases/tag/2.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/udftools/udftools.hash | 4 ++-- package/udftools/udftools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/udftools/udftools.hash b/package/udftools/udftools.hash index 630a3427eb..5b3f10d37d 100644 --- a/package/udftools/udftools.hash +++ b/package/udftools/udftools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d67ce203d71d828619d6d3791ab33eefab4bc506e0ee73355ab6c2f91d52448e udftools-2.2.tar.gz -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 750dcf5c797765eb42265e0a56d1a99f97f94b7f6f4534263a5410503f0caf59 udftools-2.3.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/udftools/udftools.mk b/package/udftools/udftools.mk index db7c13cc77..7dc1c57eb2 100644 --- a/package/udftools/udftools.mk +++ b/package/udftools/udftools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UDFTOOLS_VERSION = 2.2 +UDFTOOLS_VERSION = 2.3 UDFTOOLS_SITE = https://github.com/pali/udftools/releases/download/$(UDFTOOLS_VERSION) UDFTOOLS_LICENSE = GPL-2.0+ UDFTOOLS_LICENSE_FILES = COPYING From 29f38b4c603ef0900ed241de52cd5b5077ceea28 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Feb 2021 20:56:08 +0100 Subject: [PATCH 078/162] package/dfu-util: bump to version 0.10 Update indentation in hash file (two spaces) https://sourceforge.net/p/dfu-util/dfu-util/ci/v0.10/tree/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/dfu-util/dfu-util.hash | 8 ++++---- package/dfu-util/dfu-util.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/dfu-util/dfu-util.hash b/package/dfu-util/dfu-util.hash index 7c66a93376..a99e67565d 100644 --- a/package/dfu-util/dfu-util.hash +++ b/package/dfu-util/dfu-util.hash @@ -1,6 +1,6 @@ -# From http://dfu-util.sourceforge.net/releases/dfu-util-0.9.tar.gz.md5 -md5 233bb1e08ef4b405062445d84e28fde6 dfu-util-0.9.tar.gz +# From http://dfu-util.sourceforge.net/releases/dfu-util-0.10.tar.gz.md5 +md5 8cf55663703cdc6b40f377f999eb8d3d dfu-util-0.10.tar.gz # Locally computed -sha256 36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833 dfu-util-0.9.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 a03dc58dfc79c056819c0544b2a5970537566460102b3d82cfb038c60e619b42 dfu-util-0.10.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk index 5e8ba5a8f2..9f26948a1a 100644 --- a/package/dfu-util/dfu-util.mk +++ b/package/dfu-util/dfu-util.mk @@ -4,7 +4,7 @@ # ################################################################################ -DFU_UTIL_VERSION = 0.9 +DFU_UTIL_VERSION = 0.10 DFU_UTIL_SITE = http://dfu-util.sourceforge.net/releases DFU_UTIL_LICENSE = GPL-2.0+ DFU_UTIL_LICENSE_FILES = COPYING From 17ee49fe2599a0b229d3723a15a9dd775a0a9dd1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Feb 2021 21:03:49 +0100 Subject: [PATCH 079/162] package/python-colorlog: bump to version 4.7.2 Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-colorlog/python-colorlog.hash | 6 +++--- package/python-colorlog/python-colorlog.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-colorlog/python-colorlog.hash b/package/python-colorlog/python-colorlog.hash index b7b27b59d9..4613cf0d3c 100644 --- a/package/python-colorlog/python-colorlog.hash +++ b/package/python-colorlog/python-colorlog.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorlog/json -md5 25f79b76421132e2a9e08da15e4e0a73 colorlog-4.1.0.tar.gz -sha256 30aaef5ab2a1873dec5da38fd6ba568fa761c9fa10b40241027fa3edea47f3d2 colorlog-4.1.0.tar.gz +md5 28500337c5bffc2a90dd19551479c992 colorlog-4.7.2.tar.gz +sha256 18d05b616438a75762d7d214b9ec3b05d274466c9f3ddd92807e755840c88251 colorlog-4.7.2.tar.gz # Locally computed sha256 checksums -sha256 915d2c0c578d5015fb561f69ce2970a0d0ed566f0b99bdb6a4ebb439e9c81b0d LICENSE +sha256 915d2c0c578d5015fb561f69ce2970a0d0ed566f0b99bdb6a4ebb439e9c81b0d LICENSE diff --git a/package/python-colorlog/python-colorlog.mk b/package/python-colorlog/python-colorlog.mk index 18c077e4ab..ba1ef7247b 100644 --- a/package/python-colorlog/python-colorlog.mk +++ b/package/python-colorlog/python-colorlog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORLOG_VERSION = 4.1.0 +PYTHON_COLORLOG_VERSION = 4.7.2 PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz -PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/a5/51/c6e1f2c7e6d7524b580d5a8d7691fd4530f894ae8a23ba66a065291ceba2 +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/b2/d8/7bd0e6aa6b7dc93611f90a847eefcd048d3cae66dc8867c72486362bdfbd PYTHON_COLORLOG_SETUP_TYPE = setuptools PYTHON_COLORLOG_LICENSE = MIT PYTHON_COLORLOG_LICENSE_FILES = LICENSE From 90442682475d550cdcae439a608793a2c1688fce Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Sat, 27 Feb 2021 01:12:33 +0800 Subject: [PATCH 080/162] package/libuhttpd: bump version to 3.10.0 Signed-off-by: Jianhui Zhao Signed-off-by: Peter Korsgaard --- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index 68f1f21733..e772cc84ee 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9939cd5f9aaad2c118bc04417fb2d21994fb1cdca7fff475a0930a1374635af0 libuhttpd-3.9.0.tar.gz +sha256 78b1c670e4f259346a1e49e57d158c619eace23f0b72821b0ff2ba991f7dcc51 libuhttpd-3.10.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index a90fe666a8..06d7bc7d5e 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.9.0 +LIBUHTTPD_VERSION = 3.10.0 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE From 88c1cb10b66b8690aed29447cbedfa6d7657db00 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sun, 28 Feb 2021 15:45:17 +0800 Subject: [PATCH 081/162] board/qemu: Add ppc-e500mc configuration This adds a 32-bit equivalent configuration of ppc64-e5500 board. Signed-off-by: Bin Meng Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- board/qemu/ppc-e500mc/linux.fragment | 10 ++++++++++ board/qemu/ppc-e500mc/readme.txt | 5 +++++ configs/qemu_ppc_e500mc_defconfig | 29 ++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 board/qemu/ppc-e500mc/linux.fragment create mode 100644 board/qemu/ppc-e500mc/readme.txt create mode 100644 configs/qemu_ppc_e500mc_defconfig diff --git a/board/qemu/ppc-e500mc/linux.fragment b/board/qemu/ppc-e500mc/linux.fragment new file mode 100644 index 0000000000..35a8dccf89 --- /dev/null +++ b/board/qemu/ppc-e500mc/linux.fragment @@ -0,0 +1,10 @@ +# Enables generic PPC e500 base arch support for QEMU. +# The e500mc is a variant of the e500 arch. +CONFIG_PPC_QEMU_E500=y + +# Enable virtio (blk, rng and net devices) +CONFIG_VIRTIO=y +CONFIG_VIRTIO_PCI=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_VIRTIO_BLK=y +CONFIG_VIRTIO_NET=y diff --git a/board/qemu/ppc-e500mc/readme.txt b/board/qemu/ppc-e500mc/readme.txt new file mode 100644 index 0000000000..77a864ed2b --- /dev/null +++ b/board/qemu/ppc-e500mc/readme.txt @@ -0,0 +1,5 @@ +Run the emulation with: + + qemu-system-ppc -M ppce500 -cpu e500mc -m 256 -kernel output/images/uImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "console=ttyS0 rootwait root=/dev/vda" -serial mon:stdio -nographic # qemu_ppc_e500mc_defconfig + +The login prompt will appear in the terminal that started Qemu. diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig new file mode 100644 index 0000000000..69fc8dbc06 --- /dev/null +++ b/configs/qemu_ppc_e500mc_defconfig @@ -0,0 +1,29 @@ +# Architecture +BR2_powerpc=y +BR2_powerpc_e500mc=y + +# Serial port config +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Linux headers same as the kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.7" +BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_TAR is not set + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y From 1e07dc4ed2ccd791c607fa2fae3547b45227cc54 Mon Sep 17 00:00:00 2001 From: David GOUARIN Date: Mon, 1 Mar 2021 10:39:28 +0100 Subject: [PATCH 082/162] package/librelp: bump to version 1.10.0 Signed-off-by: David GOUARIN Signed-off-by: Peter Korsgaard --- package/librelp/librelp.hash | 2 +- package/librelp/librelp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/librelp/librelp.hash b/package/librelp/librelp.hash index 88665bcf2a..23ce8c15f8 100644 --- a/package/librelp/librelp.hash +++ b/package/librelp/librelp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 24ee9e843960d1400a44ffaedb0b1ec91463df8f8acca869cc027ed25ee6bf33 librelp-1.9.0.tar.gz +sha256 148db4e4d1a23e8136e9ec08810929a55faf5d45e24c2e3186d5ab34355dab31 librelp-1.10.0.tar.gz sha256 1ed76f935566e93e3c3c0d9f8fad22eb6d8bbe406e2eb8470a4a2764d9fd9685 COPYING diff --git a/package/librelp/librelp.mk b/package/librelp/librelp.mk index 2b8a53e833..0b2f5a20c9 100644 --- a/package/librelp/librelp.mk +++ b/package/librelp/librelp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRELP_VERSION = 1.9.0 +LIBRELP_VERSION = 1.10.0 LIBRELP_SITE = http://download.rsyslog.com/librelp LIBRELP_LICENSE = GPL-3.0+ LIBRELP_LICENSE_FILES = COPYING From b5e8f1c1475b46c8d9b7159aafe983e72d329d29 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Thu, 4 Mar 2021 18:54:28 +0100 Subject: [PATCH 083/162] package/janet: add -std=c99 to CFLAGS As upstream says Janet should be compiled with -std=c99 so pass this in order to fix the failures below. Fixes: http://autobuild.buildroot.net/results/192/1922ec115b9dc9e879760a6868969d9677093510/build-end.log ... http://autobuild.buildroot.net/results/355/355e0992338a8d132050517f83a3884606b00529/build-end.log Signed-off-by: Bartosz Bilas Signed-off-by: Peter Korsgaard --- package/janet/janet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/janet/janet.mk b/package/janet/janet.mk index 7243d60c01..ea042221d8 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -8,8 +8,8 @@ JANET_VERSION = 1.15.0 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE - JANET_INSTALL_STAGING = YES +JANET_CFLAGS = $(TARGET_CFLAGS) -std=c99 ifeq ($(BR2_STATIC_LIBS),y) JANET_CONF_OPTS += -Ddynamic_modules=false From 88df5192a8859fab7d74945151411561cfba24f7 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 3 Mar 2021 14:39:39 -0600 Subject: [PATCH 084/162] package/libubootenv: bump to version e663439 Include the following changes: e663439 Always fsync file writes 80b7f31 Treat '=' as an illegal character in variable names 950f541 libuboot_env: fix calculation of usable envsize fb88032 Correct initialisations in libuboot_configure 20d1ec7 Force writing of environment if default is used 5ca11bd libuboot_env: correct length to usable env size length cd4a8f1 libuboot_env_store: fix env double-null termination 9510164 uboot_env: fix infinite loop on short read (EOF) Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- package/libubootenv/libubootenv.hash | 2 +- package/libubootenv/libubootenv.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash index a655ed2349..0b5320b36f 100644 --- a/package/libubootenv/libubootenv.hash +++ b/package/libubootenv/libubootenv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4c52dd908b69f18cdd5721b3f24573fb276e61115f66edb74906d766ca60399f libubootenv-0.3.1.tar.gz +sha256 e25adf81dd2d4a083cb2cf032843a1ee2bb1fab54aa7a0202bd2295186bfe1b7 libubootenv-e663439e3d39a4cdbddb7e818245a99c485fa965.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk index 61516710a7..7a98f5324b 100644 --- a/package/libubootenv/libubootenv.mk +++ b/package/libubootenv/libubootenv.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUBOOTENV_VERSION = 0.3.1 -LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,v$(LIBUBOOTENV_VERSION)) +LIBUBOOTENV_VERSION = e663439e3d39a4cdbddb7e818245a99c485fa965 +LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION)) LIBUBOOTENV_LICENSE = LGPL-2.1 LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt LIBUBOOTENV_INSTALL_STAGING = YES From 46979791ba200180a6cccfb0794696936f16fa20 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 3 Mar 2021 16:59:47 +0100 Subject: [PATCH 085/162] package/grpc: bump to version 1.36.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 52d25fc5ed..2e6bd71cb3 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958 grpc-1.35.0.tar.gz +sha256 1a5127c81487f4e3e57973bb332f04b9159f94d860c207e096d8a587d371edbd grpc-1.36.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 27b28deff3..8426ff5736 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.35.0 +GRPC_VERSION = 1.36.0 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE From aed4eaa04035566b2e9d93f439f04f09882bfc58 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 3 Mar 2021 16:57:40 +0100 Subject: [PATCH 086/162] package/{protobuf, python-protobuf}: bump to version 3.15.3 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- package/python-protobuf/python-protobuf.hash | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 001b41be9a..084f8ce0f2 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 50ec5a07c0c55d4ec536dd49021f2e194a26bfdbc531d03d1e9d4d3e27175659 protobuf-cpp-3.14.0.tar.gz +sha256 984a65bcc3522b40b7aa493e392dc7ff710c2e4254fdd3ca0594a16f32391199 protobuf-cpp-3.15.3.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 661b7a6b81..99174841ea 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,7 +7,7 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 3.14.0 +PROTOBUF_VERSION = 3.15.3 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index c8762b5416..f74625bd2f 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 969019c5fd9c1345f0b34afa06ab2664c1441d159d5ae87ded5fa01d79f028c1 protobuf-python-3.14.0.tar.gz +sha256 f777d95da5b870b8d5e06765bec3596a9ad5aa1f1595279a4836db562e82e281 protobuf-python-3.15.3.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From 49eb73cac119d96822e8b758de18aec840b98d61 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:06:58 +0100 Subject: [PATCH 087/162] package/kodi-screensaver-crystalmorph: remove package The package received its last updates in 2017, is not part of the official Kodi github repo and its build is broken with Kodi 19.x. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 10 ++++++++++ package/kodi-screensaver-crystalmorph/Config.in | 10 ---------- .../kodi-screensaver-crystalmorph.hash | 3 --- .../kodi-screensaver-crystalmorph.mk | 13 ------------- package/kodi/Config.in | 1 - 5 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 package/kodi-screensaver-crystalmorph/Config.in delete mode 100644 package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash delete mode 100644 package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk diff --git a/Config.in.legacy b/Config.in.legacy index 9deb67b31f..8ebbc4c295 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,16 @@ endif ############################################################################### +comment "Legacy options removed in 2021.05" + +config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH + bool "kodi-screensaver-crystalmorph removed" + select BR2_LEGACY + help + The package received its last updates in 2017, is not part + of the official Kodi github repo and its build is broken + with Kodi 19.x, so it was removed. + comment "Legacy options removed in 2021.02" config BR2_PACKAGE_MPD_AUDIOFILE diff --git a/package/kodi-screensaver-crystalmorph/Config.in b/package/kodi-screensaver-crystalmorph/Config.in deleted file mode 100644 index 1303d229fd..0000000000 --- a/package/kodi-screensaver-crystalmorph/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH - bool "kodi-screensaver-crystalmorph" - depends on BR2_PACKAGE_HAS_LIBGL # libglu - help - CrystalMorph screensaver for Kodi - - https://github.com/notspiff/screensaver.crystalmorph - -comment "kodi-screensaver-crystalmorph needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash deleted file mode 100644 index 59e0703255..0000000000 --- a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 d8ed548222f1118964104fefc8ac3056dfe6c9d2ee35cd7c8355c9ea9fcaffc5 kodi-screensaver-crystalmorph-4439c84c38abf889e19a1863e745942c0d7f8203.tar.gz -sha256 febce1924ed772f22ec3fabec646b1401aad4f4a81a7f1baeb858f27ae4f5241 src/Fractal.cpp diff --git a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk deleted file mode 100644 index 35642d5580..0000000000 --- a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-crystalmorph -# -################################################################################ - -KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 4439c84c38abf889e19a1863e745942c0d7f8203 -KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION)) -KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp -KODI_SCREENSAVER_CRYSTALMORPH_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 8453ba0e07..e805aa9d31 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -357,7 +357,6 @@ menu "Screensavers" source "package/kodi-screensaver-asterwave/Config.in" source "package/kodi-screensaver-biogenesis/Config.in" source "package/kodi-screensaver-cpblobs/Config.in" - source "package/kodi-screensaver-crystalmorph/Config.in" source "package/kodi-screensaver-greynetic/Config.in" source "package/kodi-screensaver-matrixtrails/Config.in" source "package/kodi-screensaver-pingpong/Config.in" From 639fe21d5b36409dd7698b9805f91b5673c820b8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:06:59 +0100 Subject: [PATCH 088/162] package/libcec: bump version to 6.0.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libcec/libcec.hash | 2 +- package/libcec/libcec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash index 36b6bad861..3e5a443057 100644 --- a/package/libcec/libcec.hash +++ b/package/libcec/libcec.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bcd92c376993a5721d346edcc09eb17289451f9156b1d1d113c9663c2046315a libcec-4.0.7.tar.gz +sha256 090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 libcec-6.0.2.tar.gz sha256 0137261d24ce001fc5237aacddd267533e0f150ac23cf21acffea599f7358f7a COPYING diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 7c37d05c7f..6591bc009a 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCEC_VERSION = 4.0.7 +LIBCEC_VERSION = 6.0.2 LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPL-2.0+ LIBCEC_LICENSE_FILES = COPYING From 977f5fd13480699d94e0ba63d9afae94b71906e6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:00 +0100 Subject: [PATCH 089/162] package/libplatform: bump version Add -std=c++11 to CXXFLAGS to fix build with gcc < 5.x: buildroot/output/build/libplatform-a7cd0d5780ed80a4e70480d1650749f29e8a1fb2/src/util/StringUtils.cpp: In static member function 'static std::string& StringUtils::TrimLeft(std::string&)': buildroot/output/build/libplatform-a7cd0d5780ed80a4e70480d1650749f29e8a1fb2/src/util/StringUtils.cpp:456:99: warning: lambda expressions only available with -std=c++11 or -std=gnu++11 [enabled by default] str.erase(str.begin(), ::find_if(str.begin(), str.end(), [](char s) { return isspace_c(s) == 0; })); ^ buildroot/output/build/libplatform-a7cd0d5780ed80a4e70480d1650749f29e8a1fb2/src/util/StringUtils.cpp:456:100: error: no matching function for call to 'find_if(std::basic_string::iterator, std::basic_string::iterator, StringUtils::TrimLeft(std::string&)::__lambda0)' str.erase(str.begin(), ::find_if(str.begin(), str.end(), [](char s) { return isspace_c(s) == 0; })); ^ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libplatform/libplatform.hash | 2 +- package/libplatform/libplatform.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/libplatform/libplatform.hash b/package/libplatform/libplatform.hash index f08435da12..283b435b7c 100644 --- a/package/libplatform/libplatform.hash +++ b/package/libplatform/libplatform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 209daeb87af4ca92199887eb151b2a459bb81566cdaa092644e0889afb64bf6a libplatform-1c9d14fa996af33760a2c700caebd2bd9ae527c9.tar.gz +sha256 ebee46c76b86b40b703fa913465f5004fa3166eeb6a4794c58fc8a5c25702931 libplatform-a7cd0d5780ed80a4e70480d1650749f29e8a1fb2.tar.gz sha256 80fc66febbb2393c9d518e3eefa4ad9aae15a9b6a84174c0e443ea79eeea5131 src/os.h diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk index ca57a07d15..5d909f784c 100644 --- a/package/libplatform/libplatform.mk +++ b/package/libplatform/libplatform.mk @@ -4,10 +4,14 @@ # ################################################################################ -LIBPLATFORM_VERSION = 1c9d14fa996af33760a2c700caebd2bd9ae527c9 +LIBPLATFORM_VERSION = a7cd0d5780ed80a4e70480d1650749f29e8a1fb2 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) LIBPLATFORM_LICENSE = GPL-2.0+ LIBPLATFORM_LICENSE_FILES = src/os.h LIBPLATFORM_INSTALL_STAGING = YES +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) +LIBPLATFORM_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -std=c++11" +endif + $(eval $(cmake-package)) From 8c476e1bb7d592af542c62e268b2f9927b9649ea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 10 Feb 2021 18:40:23 +0100 Subject: [PATCH 090/162] package/kodi: remove dependency to libsamplerate This package is not needed anymore since 2014: https://github.com/xbmc/xbmc/commit/e36e4f0e2a46764d0c4341a5caf50cae6f772504 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 1 - package/kodi/kodi.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index e805aa9d31..745df41e20 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -88,7 +88,6 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST - select BR2_PACKAGE_LIBSAMPLERATE select BR2_PACKAGE_LZO select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 80a8d4e6bf..3f22db48a3 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -37,7 +37,6 @@ KODI_DEPENDENCIES = \ libcurl \ libfribidi \ libplist \ - libsamplerate \ lzo \ ncurses \ openssl \ From 148e695e37561fe45d4726cb68f6454464d17797 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:01 +0100 Subject: [PATCH 091/162] package/kodi: bump version to 19.0-Matrix Rebased patch 0001. Removed patch 0002, not needed anymore due to use of system ffmpeg package. Added patch 0002 to fix build with gcc-4.9, gcc-4.8 stays broken. Switch from python2 to python3, reworked dependencies. Rework platform handling following upstream changes, only the choice of a render system (OpenGL vs. OpenGLES) is needed now, for details see upstream PR 18534. Add configure options to force detection of the host version of wayland-scanner. Use system ffmpeg instead of internal build. Added dependency to spdlog, for reference see upstream PR 17498. cpluff was removed upstream. Add configure option to use host version of flatc. Add configure option to disable tests, for reference see upstream PR 17489. Added optional dependency to libudfread, for reference see upstream PR 17612. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-jsonschemabuilder.mk | 2 +- .../kodi-texturepacker/kodi-texturepacker.mk | 2 +- ...e-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | 17 ++- .../kodi/0002-Fix-crosscompiling-issues.patch | 76 ---------- ...ux-fix-drm-object-build-with-gcc-4.9.patch | 34 +++++ package/kodi/Config.in | 135 ++++++++---------- package/kodi/kodi.hash | 3 +- package/kodi/kodi.mk | 96 +++++++------ 8 files changed, 152 insertions(+), 213 deletions(-) delete mode 100644 package/kodi/0002-Fix-crosscompiling-issues.patch create mode 100644 package/kodi/0002-linux-fix-drm-object-build-with-gcc-4.9.patch diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 2c7f77d050..57062c3c8c 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 18.9-Leia +KODI_JSONSCHEMABUILDER_VERSION = 19.0-Matrix KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 7b13904ef4..fd43566379 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 18.9-Leia +KODI_TEXTUREPACKER_VERSION = 19.0-Matrix KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch index 5abb77e777..057d2254bc 100644 --- a/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ b/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch @@ -8,18 +8,21 @@ When cross-compiling, the location at build time of the libraries is not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable is here to handle this difference, so use it in kodi-config.cmake. +Upstream status: Reverted (PR 17616) + Signed-off-by: Thomas Petazzoni (rebased and simplified for Kodi 17.0-Krypton) Signed-off-by: Bernd Kuhls +(rebased for Kodi 19.0-Matrix) --- - project/cmake/KodiConfig.cmake.in | 4 ++-- + cmake/KodiConfig.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in -index 76626ec..ffb8e1d 100644 +diff --git a/cmake/KodiConfig.cmake.in b/cmake/KodiConfig.cmake.in +index a06d889fca9d..ff299807ea44 100644 --- a/cmake/KodiConfig.cmake.in +++ b/cmake/KodiConfig.cmake.in -@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC@_PREFIX) +@@ -9,7 +9,7 @@ if(NOT @APP_NAME_UC@_PREFIX) set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) endif() if(NOT @APP_NAME_UC@_INCLUDE_DIR) @@ -28,10 +31,10 @@ index 76626ec..ffb8e1d 100644 endif() if(NOT @APP_NAME_UC@_LIB_DIR) set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -@@ -20,7 +20,7 @@ endif() - if(NOT WIN32) - set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") +@@ -18,7 +18,7 @@ if(NOT @APP_NAME_UC@_DATA_DIR) + set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@) endif() + set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM@) -list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) diff --git a/package/kodi/0002-Fix-crosscompiling-issues.patch b/package/kodi/0002-Fix-crosscompiling-issues.patch deleted file mode 100644 index 12bb66dde0..0000000000 --- a/package/kodi/0002-Fix-crosscompiling-issues.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d2c343a20bb61098d0450b15ea2d1dacd28d954a Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 12 Aug 2018 15:13:24 +0200 -Subject: [PATCH] Fix crosscompiling issues - -The codepath for KODI_DEPENDSBUILD needs to be used in order to provide -the correct crosscompiling options to ffmpeg. The CMake option -KODI_DEPENDSBUILD itself can not be enabled because it disables the -internal build of libdvd*. - -To link kodi.bin with the statically built ffmpeg libraries kodi uses -a wrapper script which calls pkgconfig. Our pkgconfig is patched to -alter paths which breaks the link command in this case, to fix this -PKG_CONFIG_SYSROOT_DIR was added. - -Also remove configure option --cpu from ffmpeg_conf to fix build -errors. - -Signed-off-by: Bernd Kuhls ---- - project/cmake/modules/FindFFMPEG.cmake | 16 +++++++--------- - tools/depends/target/ffmpeg/CMakeLists.txt | 2 +- - 2 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake -index 28cc80710e..1ac8793149 100644 ---- a/cmake/modules/FindFFMPEG.cmake -+++ b/cmake/modules/FindFFMPEG.cmake -@@ -234,14 +234,12 @@ - -DENABLE_VAAPI=${ENABLE_VAAPI} - -DENABLE_VDPAU=${ENABLE_VDPAU}) - -- if(KODI_DEPENDSBUILD) - set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH} - -DPKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE} - -DCROSSCOMPILING=${CMAKE_CROSSCOMPILING} - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -- -DOS=${OS} -+ -DOS=linux - -DCMAKE_AR=${CMAKE_AR}) -- endif() - set(LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) - list(APPEND LINKER_FLAGS ${SYSTEM_LDFLAGS}) - -@@ -280,12 +278,12 @@ - "#!${BASH_COMMAND} - if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}${APP_BINARY_SUFFIX}* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]] - then -- avformat=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec` -- avcodec=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat` -- avfilter=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter` -- avutil=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil` -- swscale=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale` -- swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` -+ avformat=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec` -+ avcodec=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavformat` -+ avfilter=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavfilter` -+ avutil=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavutil` -+ swscale=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswscale` -+ swresample=`PKG_CONFIG_SYSROOT_DIR=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` - gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` - $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls - else -diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt -index fda6b0cac4..af3afa6b60 100644 ---- a/tools/depends/target/ffmpeg/CMakeLists.txt -+++ b/tools/depends/target/ffmpeg/CMakeLists.txt -@@ -13,7 +13,7 @@ - if(CROSSCOMPILING) - set(pkgconf "PKG_CONFIG_LIBDIR=${DEPENDS_PATH}/lib/pkgconfig") - list(APPEND ffmpeg_conf --pkg-config=${PKG_CONFIG_EXECUTABLE} --pkg-config-flags=--static) -- list(APPEND ffmpeg_conf --enable-cross-compile --cpu=${CPU} --arch=${CPU} --target-os=${OS}) -+ list(APPEND ffmpeg_conf --enable-cross-compile --arch=${CPU} --target-os=${OS}) - list(APPEND ffmpeg_conf --ar=${CMAKE_AR} --strip=${CMAKE_STRIP}) - message(STATUS "CROSS: ${ffmpeg_conf}") - endif() diff --git a/package/kodi/0002-linux-fix-drm-object-build-with-gcc-4.9.patch b/package/kodi/0002-linux-fix-drm-object-build-with-gcc-4.9.patch new file mode 100644 index 0000000000..b9a0efd336 --- /dev/null +++ b/package/kodi/0002-linux-fix-drm-object-build-with-gcc-4.9.patch @@ -0,0 +1,34 @@ +From 4f3b35c58ffb755cd7371faa44e2914fd7be3f0a Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 4 Jan 2021 22:32:28 +0100 +Subject: [PATCH] [linux] fix drm object build with gcc-4.9 + +Fixes build error introduced by PR18858: + +kodi/xbmc/windowing/gbm/drm/DRMObject.cpp: In member function 'std::tuple KODI::WINDOWING::GBM::CDRMObject::GetPropertyValue(const string&, const string&) const': +kodi/xbmc/windowing/gbm/drm/DRMObject.cpp:103:39: error: converting to 'std::tuple' from initializer list would use explicit constructor 'constexpr std::tuple<_T1, _T2>::tuple(_U1&&, _U2&&) [with _U1 = bool; _U2 = long long unsigned int&; = void; _T1 = bool; _T2 = long unsigned int]' + return {true, prop->enums[j].value}; + +Patch sent upstream: https://github.com/xbmc/xbmc/pull/19020 + +Signed-off-by: Bernd Kuhls +--- + xbmc/windowing/gbm/drm/DRMObject.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xbmc/windowing/gbm/drm/DRMObject.cpp b/xbmc/windowing/gbm/drm/DRMObject.cpp +index 7d27c6f059..f93f014f7d 100644 +--- a/xbmc/windowing/gbm/drm/DRMObject.cpp ++++ b/xbmc/windowing/gbm/drm/DRMObject.cpp +@@ -100,7 +100,7 @@ std::tuple CDRMObject::GetPropertyValue(const std::string& name, + if (prop->enums[j].name != valueName) + continue; + +- return {true, prop->enums[j].value}; ++ return std::make_tuple(true, prop->enums[j].value); + } + + return std::make_tuple(false, 0); +-- +2.29.2 + diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 745df41e20..4fc2f832ac 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -5,103 +5,97 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE) depends on BR2_USE_MMU # libcdio, and others -comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.8" +comment "kodi needs python3 w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.9" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || BR2_TOOLCHAIN_USES_MUSL \ - || !BR2_PACKAGE_PYTHON \ - || BR2_PACKAGE_PYTHON_PYC_ONLY + || !BR2_PACKAGE_PYTHON3 \ + || BR2_PACKAGE_PYTHON3_PYC_ONLY config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS bool -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM bool default y - # List of valid CPUs can be found here: - # https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L12 - depends on BR2_arm1176jzf_s || BR2_cortex_a7 || BR2_cortex_a53 - depends on BR2_PACKAGE_RPI_USERLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_MESA3D_GBM depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND bool default y - depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp depends on BR2_PACKAGE_WAYLAND # waylandpp select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLANDPP -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 bool default y - depends on BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp - depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp - depends on BR2_PACKAGE_WAYLAND # waylandpp - select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS - -config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL - bool - default y - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + select BR2_PACKAGE_XLIB_LIBXRANDR -comment "kodi needs an OpenGL EGL backend with OpenGL support" +comment "kodi needs an OpenGL EGL backend with OpenGL or GLES support" depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS menuconfig BR2_PACKAGE_KODI bool "kodi" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # gnutls, python and others + depends on !BR2_STATIC_LIBS # gnutls, python3 and others + depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS - depends on BR2_PACKAGE_PYTHON - depends on !BR2_PACKAGE_PYTHON_PYC_ONLY + depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_PACKAGE_PYTHON3_PYC_ONLY select BR2_NEEDS_HOST_JAVA - select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_FFMPEG_GPL + select BR2_PACKAGE_FFMPEG_POSTPROC + select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FLATBUFFERS select BR2_PACKAGE_FMT - select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP - select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST select BR2_PACKAGE_LZO - select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_PYTHON_2TO3 - select BR2_PACKAGE_PYTHON_BSDDB - select BR2_PACKAGE_PYTHON_CURSES - select BR2_PACKAGE_PYTHON_PYEXPAT - select BR2_PACKAGE_PYTHON_SQLITE - select BR2_PACKAGE_PYTHON_SSL - select BR2_PACKAGE_PYTHON_UNICODEDATA - select BR2_PACKAGE_PYTHON_ZLIB + select BR2_PACKAGE_PYTHON3_2TO3 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_SQLITE + select BR2_PACKAGE_PYTHON3_SSL + select BR2_PACKAGE_PYTHON3_UNICODEDATA + select BR2_PACKAGE_PYTHON3_ZLIB select BR2_PACKAGE_RAPIDJSON + select BR2_PACKAGE_SPDLOG select BR2_PACKAGE_SQLITE select BR2_PACKAGE_TAGLIB select BR2_PACKAGE_TINYXML @@ -196,34 +190,17 @@ config BR2_PACKAGE_KODI_MYSQL Enable MySQL support choice - prompt "platform" - default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + prompt "render system" + default BR2_PACKAGE_KODI_RENDER_SYSTEM_GL -config BR2_PACKAGE_KODI_PLATFORM_RBPI - bool "Raspberry Pi" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_LIBXKBCOMMON - -config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL - bool "Wayland/OpenGL" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL +config BR2_PACKAGE_KODI_RENDER_SYSTEM_GL + bool "OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_WAYLANDPP -config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES - bool "Wayland/GLES" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_WAYLANDPP - -config BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL - bool "X11/OpenGL" - depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_XLIB_LIBXRANDR +config BR2_PACKAGE_KODI_RENDER_SYSTEM_GLES + bool "GLES" + depends on BR2_PACKAGE_HAS_LIBGLES endchoice @@ -257,40 +234,40 @@ config BR2_PACKAGE_KODI_LIBUSB # https://github.com/xbmc/xbmc/blob/Jarvis/configure.ac#L1554 # "if libudev is available, we don't need libusb" depends on !BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help Enable libusb support. -comment "usb support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_KODI_LIBVA bool "va" depends on \ - BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL || \ - BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES || \ - BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM || \ + BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND || \ + (BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 && \ + BR2_PACKAGE_KODI_RENDER_SYSTEM_GL) select BR2_PACKAGE_LIBVA help Enable libva support. -comment "libva support needs platform 'Wayland' or 'X11/OpenGL'" +comment "libva support needs platform 'gbm', 'Wayland' or 'X11/OpenGL'" depends on \ - !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL && \ - !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES && \ - !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM && \ + !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND && \ + (!BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 || \ + !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL) config BR2_PACKAGE_KODI_LIBVDPAU bool "vdpau" - depends on BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + depends on BR2_PACKAGE_KODI_PLATFORM_X11 && \ + BR2_PACKAGE_KODI_RENDER_SYSTEM_GL select BR2_PACKAGE_LIBVDPAU help Enable libvdpau support. comment "libvdpau support needs platform 'X11/OpenGL'" - depends on !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 || \ + !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL config BR2_PACKAGE_KODI_UPNP bool "upnp" diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 545f87909f..17bbc33714 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,6 +1,5 @@ # Locally computed -sha256 bdf8afa9356b1f815de9984801d3e0d2b46a719e747895b75528f20995c59d2b kodi-18.9-Leia.tar.gz -sha256 e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2 kodi-ffmpeg-4.0.4-Leia-18.4.tar.gz +sha256 f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2 kodi-19.0-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 3f22db48a3..bf5822eb61 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION = 18.9-Leia +KODI_VERSION = 19.0-Matrix KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.md @@ -15,13 +15,12 @@ KODI_INSTALL_STAGING = YES # kodi recommends building out-of-source KODI_SUPPORTS_IN_SOURCE_BUILD = NO KODI_DEPENDENCIES = \ - expat \ + ffmpeg \ flatbuffers \ fmt \ fontconfig \ freetype \ fstrcmp \ - gnutls \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -35,36 +34,30 @@ KODI_DEPENDENCIES = \ libcdio \ libcrossguid \ libcurl \ + libdrm \ + libegl \ libfribidi \ libplist \ lzo \ - ncurses \ openssl \ pcre \ - python \ + python3 \ rapidjson \ + spdlog \ sqlite \ taglib \ tinyxml \ zlib # taken from tools/depends/target/*/*-VERSION -KODI_FFMPEG_VERSION = 4.0.4-Leia-18.4 KODI_LIBDVDCSS_VERSION = 1.4.2-Leia-Beta-5 KODI_LIBDVDNAV_VERSION = 6.0.0-Leia-Alpha-3 KODI_LIBDVDREAD_VERSION = 6.0.0-Leia-Alpha-3 KODI_EXTRA_DOWNLOADS += \ - $(call github,xbmc,FFmpeg,$(KODI_FFMPEG_VERSION))/kodi-ffmpeg-$(KODI_FFMPEG_VERSION).tar.gz \ $(call github,xbmc,libdvdcss,$(KODI_LIBDVDCSS_VERSION))/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ $(call github,xbmc,libdvdnav,$(KODI_LIBDVDNAV_VERSION))/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ $(call github,xbmc,libdvdread,$(KODI_LIBDVDREAD_VERSION))/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz -define KODI_CPLUFF_AUTOCONF - cd $(KODI_SRCDIR)/lib/cpluff && ./autogen.sh -endef -KODI_PRE_CONFIGURE_HOOKS += KODI_CPLUFF_AUTOCONF -KODI_DEPENDENCIES += host-automake host-autoconf host-libtool - KODI_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(KODI_C_FLAGS)" \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(KODI_CXX_FLAGS)" \ @@ -72,30 +65,56 @@ KODI_CONF_OPTS += \ -DENABLE_CCACHE=OFF \ -DENABLE_DVDCSS=ON \ -DENABLE_INTERNAL_CROSSGUID=OFF \ - -DENABLE_INTERNAL_FFMPEG=ON \ + -DWITH_FFMPEG=$(STAGING_DIR)/usr \ -DENABLE_INTERNAL_FLATBUFFERS=OFF \ - -DFFMPEG_URL=$(KODI_DL_DIR)/kodi-ffmpeg-$(KODI_FFMPEG_VERSION).tar.gz \ + -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc \ -DKODI_DEPENDSBUILD=OFF \ -DENABLE_LDGOLD=OFF \ -DNATIVEPREFIX=$(HOST_DIR) \ -DDEPENDS_PATH=$(STAGING_DIR)/usr \ + -DENABLE_TESTING=OFF \ -DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \ -DLIBDVDNAV_URL=$(KODI_DL_DIR)/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \ -DLIBDVDREAD_URL=$(KODI_DL_DIR)/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz +ifeq ($(BR2_PACKAGE_KODI_RENDER_SYSTEM_GL),y) +KODI_CONF_OPTS += -DAPP_RENDER_SYSTEM=gl +KODI_DEPENDENCIES += libgl libglu +else ifeq ($(BR2_PACKAGE_KODI_RENDER_SYSTEM_GLES),y) +KODI_CONF_OPTS += -DAPP_RENDER_SYSTEM=gles +KODI_DEPENDENCIES += libgles +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM),y) +KODI_CORE_PLATFORM_NAME += gbm +KODI_DEPENDENCIES += libinput libxkbcommon mesa3d +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND),y) +KODI_CONF_OPTS += \ + -DPC_WAYLANDPP_SCANNER=$(HOST_DIR)/bin/wayland-scanner \ + -DPC_WAYLANDPP_SCANNER_FOUND=ON +KODI_CORE_PLATFORM_NAME += wayland +KODI_DEPENDENCIES += libxkbcommon waylandpp +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11),y) +KODI_CORE_PLATFORM_NAME += x11 +KODI_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXrandr +endif + +KODI_CONF_OPTS += -DCORE_PLATFORM_NAME="$(KODI_CORE_PLATFORM_NAME)" + ifeq ($(BR2_ENABLE_LOCALE),) KODI_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) -# These CPU-specific options are only used on rbpi: -# https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L13 -ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y) -KODI_CONF_OPTS += -DWITH_CPU="$(GCC_TARGET_CPU)" -endif -else ifeq ($(BR2_arceb)$(BR2_arcle),y) +ifeq ($(BR2_arceb)$(BR2_arcle),y) KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc else ifeq ($(BR2_armeb),y) KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm @@ -168,31 +187,8 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) KODI_CXX_FLAGS += -latomic endif -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) -KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi -KODI_DEPENDENCIES += libinput libxkbcommon rpi-userland -endif - -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL),y) -KODI_CONF_OPTS += \ - -DCORE_PLATFORM_NAME=wayland \ - -DWAYLAND_RENDER_SYSTEM=gl -KODI_DEPENDENCIES += libegl libgl libglu libxkbcommon waylandpp -endif - -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES),y) -KODI_CONF_OPTS += \ - -DCORE_PLATFORM_NAME=wayland \ - -DWAYLAND_RENDER_SYSTEM=gles -KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` -KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` -KODI_DEPENDENCIES += libegl libgles libxkbcommon waylandpp -endif - -ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y) -KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=x11 -KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \ - xlib_libXrandr libdrm +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) +KODI_C_FLAGS += -std=gnu99 endif ifeq ($(BR2_PACKAGE_KODI_MYSQL),y) @@ -348,6 +344,12 @@ else KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF endif +ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) +KODI_DEPENDENCIES += libudfread +else +KODI_CONF_OPTS += -DENABLE_INTERNAL_UDFREAD=OFF +endif + # Remove versioncheck addon, updating Kodi is done by building a new # buildroot image. KODI_ADDON_MANIFEST = $(TARGET_DIR)/usr/share/kodi/system/addon-manifest.xml From c11db7e86f4141324a2fb722c275b26d7d00c132 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:02 +0100 Subject: [PATCH 092/162] package/kodi-audiodecoder-*: mass version bump Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 4 ++-- .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 4 ++-- .../kodi-audiodecoder-nosefart.hash | 4 ++-- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 4 ++-- .../kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash | 4 ++-- .../kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk | 4 ++-- .../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 4 ++-- .../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 4 ++-- .../kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash | 4 ++-- .../kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk | 4 ++-- .../kodi-audiodecoder-timidity.hash | 2 +- .../kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk | 2 +- .../kodi-audiodecoder-vgmstream.hash | 4 ++-- .../kodi-audiodecoder-vgmstream.mk | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index ecc6f2b778..fcb5884807 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6827f1ebefa5f281ace52bdf83b5ab95789c77b88a344524ead1b346668d57e7 kodi-audiodecoder-modplug-2.0.3-Leia.tar.gz -sha256 317f732723eb58745a9b22c234861dbd2d98972039543f6b549c7cb26eb2cb08 debian/copyright +sha256 629a9f83a2663ab8f2ea1ae747782d1ce6df870f42d6d9b84c858bc9b607ae9c kodi-audiodecoder-modplug-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk index 8e1031053e..e4bee48f98 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 2.0.3-Leia +KODI_AUDIODECODER_MODPLUG_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_MODPLUG_SITE = $(call github,xbmc,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi libmodplug $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 8f04dc5302..9f929d9f82 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 66305c9d654aed0b9efcf44b90acac0ab8db321dff57523d13faf67606cd78ce kodi-audiodecoder-nosefart-2.0.2-Leia.tar.gz -sha256 01a3f135925df23a5d8679ff633fe3d5021125224c9349acd2c35dd0cf3ea762 debian/copyright +sha256 a4be5f6efc46841c9b1689c91b06f69cd695220b583e62ed2948768fa93d09a2 kodi-audiodecoder-nosefart-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk index 8f437a7378..377f6b7ef1 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_NOSEFART_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_NOSEFART_SITE = $(call github,xbmc,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index 308f2b6fe1..cb66e0a00e 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 271e513a3094b163f986eb5bb5cbc70c7a602f5764cef255cc161cc5094e5648 kodi-audiodecoder-sidplay-1.2.2-Leia.tar.gz -sha256 dc915100daec3589f59b47f3438e8ec5ccc11ec25ccb3d0e7e66639764f31584 debian/copyright +sha256 4919d71e76889df1c1e3c5abe60641cc266afdbbcf3976a5509ae3fda142d2c4 kodi-audiodecoder-sidplay-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk index 079ae0b202..d0ab98418f 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = 1.2.2-Leia +KODI_AUDIODECODER_SIDPLAY_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,xbmc,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi libsidplay2 $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index c1c2eee2bc..b82c5b36a1 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e059f84b04b8e92e5ecc2989303f6a736f37d6e3bda939ac765499e616c91580 kodi-audiodecoder-snesapu-2.0.2-Leia.tar.gz -sha256 b7e8b234fc40687d647d929fc554b91cdaa4011e5e656e68c5c6ee8c4cdf81d2 debian/copyright +sha256 3537b735acfbbacaada2aa1d2035acbc698f37cc7626375f408e967ca612b2d0 kodi-audiodecoder-snesapu-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk index 57504a17bb..7cd2fe588c 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_SNESAPU_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_SNESAPU_SITE = $(call github,xbmc,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index 24b764061b..ae6a5aa528 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3e14a7da3822002a90bf7d31a9f98541ae9ec2137c764dc94ca5b4de4ac8de82 kodi-audiodecoder-stsound-2.0.2-Leia.tar.gz -sha256 417ded3464139990f7898ac17c9eacde85dc0fafd3b3ca0c497d945b1bd93af5 debian/copyright +sha256 65b452cd3bdf8b21929084ca0dc238147784defdfb25351c857fa459230e2f3f kodi-audiodecoder-stsound-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk index 679be5a7ff..6a5bb721bc 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = 2.0.2-Leia +KODI_AUDIODECODER_STSOUND_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_STSOUND_SITE = $(call github,xbmc,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_STSOUND_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_STSOUND_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi $(eval $(cmake-package)) diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index ea56c38f6c..dcb835664d 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b20a3a23056aaf76c216c755f36dff03e943d7c086d3e3fca4c920b93113e073 kodi-audiodecoder-timidity-2.0.5-Leia.tar.gz +sha256 0e049f25a12d8cfc9965d189de573d87aa3e7e6549e99a7ddcaf9d8cddc111db kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk index a4f0126c43..a79622cfd9 100644 --- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_TIMIDITY_VERSION = 2.0.5-Leia +KODI_AUDIODECODER_TIMIDITY_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,xbmc,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+ KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash index 3ee9ebbfcb..02df50cc7b 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 28876be1e1317b3ec5c3a4fe415f20d92a4c5868912656c5e8ab9cdd7e3f32d8 kodi-audiodecoder-vgmstream-1.1.5-Leia.tar.gz -sha256 fc7c7ab8774d94fb2eccdf47e3b8052a3906e4b5ec8554191da321020c965d8e debian/copyright +sha256 81f4577c2ec53bfa7ab04d3da374b1cc639ef5f5fe9c2837f9e85916b50d9d5d kodi-audiodecoder-vgmstream-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk index 4e3cdab584..1c3e96bb1d 100644 --- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIODECODER_VGMSTREAM_VERSION = 1.1.5-Leia +KODI_AUDIODECODER_VGMSTREAM_VERSION = 3.0.0-Matrix KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,xbmc,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+ -KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = debian/copyright +KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = LICENSE.md KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi $(eval $(cmake-package)) From d5b747467cad7da4bc9ce945dcdabb16d9afae50 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:03 +0100 Subject: [PATCH 093/162] package/kodi-audioencoder-*: mass version bump Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash | 4 ++-- package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk | 4 ++-- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 4 ++-- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 4 ++-- .../kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash | 4 ++-- package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk | 4 ++-- package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash | 4 ++-- package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index 9f33d6c63a..162d21e39c 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 42e18fc2477ce5abc3efd89851a4bacc6b9436889a607a15f8232ef68b297f93 kodi-audioencoder-flac-2.0.6-Leia.tar.gz -sha256 21dc3eb9c75f1ed6367a4cf3f3999b299bc6c172da3730184edd2a5dd4d090aa debian/copyright +sha256 e9001f1789970178b551f01d9242a897523af4f2d34f70bfd7bbbe598bce2e6c kodi-audioencoder-flac-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk index 53c1f3debc..3987fa107d 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = 2.0.6-Leia +KODI_AUDIOENCODER_FLAC_VERSION = 3.0.0-Matrix KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION)) KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_FLAC_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_FLAC_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf $(eval $(cmake-package)) diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index cd3351e2b7..9c12a58e55 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9df54cf5c5ae3882a2d89d745c1d1f8b749e71a7f9305a1b059ecfd356995a36 kodi-audioencoder-lame-2.0.4-Leia.tar.gz -sha256 68a06632cc80eea941b07e27777788dcd4f7c5ba9c006e24f467a9d4bf4d3582 debian/copyright +sha256 ad47d8c4dffe6690bd1ff32bb5fd44f11b691706ff9a1e5b6152efee92976a75 kodi-audioencoder-lame-3.0.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk index 5d93e83ed6..2316473829 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 2.0.4-Leia +KODI_AUDIOENCODER_LAME_VERSION = 3.0.2-Matrix KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_LAME_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_LAME_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame KODI_AUDIOENCODER_LAME_CONF_OPTS += \ -DLAME_INCLUDE_DIRS=$(STAGING_DIR)/usr/include diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index 0b9463feb8..f415624db0 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b4b2b1b7ae8bda35514f20ad0275b434f2b60fc93b1e17ca6e654ae145852b1f kodi-audioencoder-vorbis-2.0.4-Leia.tar.gz -sha256 706e890fc5c0496b72d3c36284abcc85f9c83b3f2b21db53a68439c538122a59 debian/copyright +sha256 ba4e6bf402e31096c1fd791db8db26d0eea575998ae414a74c797e868fd08000 kodi-audioencoder-vorbis-3.0.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk index b789d239bd..e79dd433db 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_VORBIS_VERSION = 2.0.4-Leia +KODI_AUDIOENCODER_VORBIS_VERSION = 3.0.1-Matrix KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_VORBIS_DEPENDENCIES = kodi libogg libvorbis host-pkgconf $(eval $(cmake-package)) diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index 9b9add2161..345fd1aa03 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 03cb2810b2aa335fd308a5e2b6580d21ac840334c55fc891acc310633c3c49b4 kodi-audioencoder-wav-2.0.3-Leia.tar.gz -sha256 341a6317428fbc7c9d5b971d1c6162ea34be64649caa650ee0a05c06ae53a872 debian/copyright +sha256 9c4c834717060c5ca643a8f9758c8d784b00382ee6ce20e55ab8f2fe0b5f44dd kodi-audioencoder-wav-3.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk index b597b1b13d..b47c2bce84 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = 2.0.3-Leia +KODI_AUDIOENCODER_WAV_VERSION = 3.0.0-Matrix KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION)) KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+ -KODI_AUDIOENCODER_WAV_LICENSE_FILES = debian/copyright +KODI_AUDIOENCODER_WAV_LICENSE_FILES = LICENSE.md KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi $(eval $(cmake-package)) From 8e78c80467c99b6aa094416959e0f18992bf30e4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:04 +0100 Subject: [PATCH 094/162] package/kodi-inputstream-adaptive: bump version to 2.6.7-Matrix Add expat as dependency after it was removed from the kodi package: https://github.com/xbmc/inputstream.adaptive/blob/Matrix/CMakeLists.txt#L61 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-inputstream-adaptive/Config.in | 1 + .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/kodi-inputstream-adaptive/Config.in b/package/kodi-inputstream-adaptive/Config.in index f9ba20adcf..90e9a85dd8 100644 --- a/package/kodi-inputstream-adaptive/Config.in +++ b/package/kodi-inputstream-adaptive/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE # wvdecrypter/cdm/build/build_config.h depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \ || BR2_mips64el || BR2_x86_64 + select BR2_PACKAGE_EXPAT help Kodi inputstream addon for several manifest types diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index b12c93ac11..6c9b79b881 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 222b7ad879146c62a1fc6016fc70ca1ca57b3b882882ebc54e0b772bf96482e7 kodi-inputstream-adaptive-2.4.6-Leia.tar.gz +sha256 353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe kodi-inputstream-adaptive-2.6.7-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 30fbaf5251..6b085e49ce 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.6-Leia +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.7-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL -KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = kodi +KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = expat kodi $(eval $(cmake-package)) From d0c70351a5a878ffd03ba7e27d0851bb40b1be89 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:05 +0100 Subject: [PATCH 095/162] package/kodi-inputstream-ffmpegdirect: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-inputstream-ffmpegdirect/Config.in | 13 +++++++++++++ .../kodi-inputstream-ffmpegdirect.hash | 3 +++ .../kodi-inputstream-ffmpegdirect.mk | 15 +++++++++++++++ package/kodi/Config.in | 1 + 4 files changed, 32 insertions(+) create mode 100644 package/kodi-inputstream-ffmpegdirect/Config.in create mode 100644 package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash create mode 100644 package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk diff --git a/package/kodi-inputstream-ffmpegdirect/Config.in b/package/kodi-inputstream-ffmpegdirect/Config.in new file mode 100644 index 0000000000..4f246e1733 --- /dev/null +++ b/package/kodi-inputstream-ffmpegdirect/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_KODI_INPUTSTREAM_FFMPEGDIRECT + bool "kodi-inputstream-ffmpegdirect" + depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_FFMPEG_GPL + select BR2_PACKAGE_FFMPEG_POSTPROC + help + This is a Kodi input stream addon for streams that can be + opened by FFmpeg's libavformat, such as plain TS, HLS and + DASH streams. + + https://github.com/xbmc/inputstream.ffmpegdirect diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash new file mode 100644 index 0000000000..ccb7291bb8 --- /dev/null +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 952eeaa7af717dd954c940feb2902b51e497cde8822222c1bfa98804ec8665c7 kodi-inputstream-ffmpegdirect-1.19.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk new file mode 100644 index 0000000000..80891858cf --- /dev/null +++ b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# kodi-inputstream-ffmpegdirect +# +################################################################################ + +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 1.19.2-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_SITE = $(call github,xbmc,inputstream.ffmpegdirect,$(KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION)) +KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE = GPL-2.0+ +KODI_INPUTSTREAM_FFMPEGDIRECT_LICENSE_FILES = LICENSE.md +KODI_INPUTSTREAM_FFMPEGDIRECT_DEPENDENCIES = bzip2 ffmpeg kodi +KODI_INPUTSTREAM_FFMPEGDIRECT_CONF_OPTS = \ + -DFFMPEG_PATH=$(STAGING_DIR)/usr + +$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 4fc2f832ac..eefdd54990 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -303,6 +303,7 @@ endmenu menu "Inputstream addons" source "package/kodi-inputstream-adaptive/Config.in" + source "package/kodi-inputstream-ffmpegdirect/Config.in" source "package/kodi-inputstream-rtmp/Config.in" endmenu From d8a582f140695711d940b2d5611daf62a302b08d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:06 +0100 Subject: [PATCH 096/162] package/kodi-inputstream-rtmp: bump version to 3.4.0-Matrix Openssl and zlib are built as hard-dependencies of Kodi already. For the case that Kodi drops these dependencies we need to make sure that this package still finds its dependencies: https://github.com/xbmc/inputstream.rtmp/blob/Matrix/CMakeLists.txt#L8 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-inputstream-rtmp/Config.in | 2 ++ package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash | 4 ++-- package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/kodi-inputstream-rtmp/Config.in b/package/kodi-inputstream-rtmp/Config.in index fa83926301..c4bd2e1380 100644 --- a/package/kodi-inputstream-rtmp/Config.in +++ b/package/kodi-inputstream-rtmp/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_KODI_INPUTSTREAM_RTMP bool "kodi-inputstream-rtmp" + select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_RTMPDUMP + select BR2_PACKAGE_ZLIB help RTMP input stream add-on for Kodi diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash index d472b89ba9..e645fb14bb 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 56dac63262fa736620863900d903616d4827d735992e6d8beda84e377a5599e5 kodi-inputstream-rtmp-2.0.9-Leia.tar.gz -sha256 ddba7d22c2586f13de40786c21f3b87c6913c9937f4862dc828d33cfff0395eb debian/copyright +sha256 efaaa9b07c18810582a3826df476fc36a2aac82be7512271545073c3f6cc0212 kodi-inputstream-rtmp-3.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk index e850be40ff..6029b7d35c 100644 --- a/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk +++ b/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_INPUTSTREAM_RTMP_VERSION = 2.0.9-Leia +KODI_INPUTSTREAM_RTMP_VERSION = 3.4.0-Matrix KODI_INPUTSTREAM_RTMP_SITE = $(call github,xbmc,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION)) KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+ -KODI_INPUTSTREAM_RTMP_LICENSE_FILES = debian/copyright -KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi rtmpdump +KODI_INPUTSTREAM_RTMP_LICENSE_FILES = LICENSE.md +KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi openssl rtmpdump zlib $(eval $(cmake-package)) From 36c3a64ad8faac06eb29637edfa7342103f60798 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:07 +0100 Subject: [PATCH 097/162] package/kodi-peripheral-joystick: bump version to 1.7.1-Matrix Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 4 ++-- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index d0cac8e4bb..650cab0f2d 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e83c32380a51ea74bd5f0af74afc747ff5de99167934e2644bc2b3438cd998d0 kodi-peripheral-joystick-1.4.9-Leia.tar.gz -sha256 2bb807179053b1a7795f9952539a394664847f561a9ffa4ccc36d7bb3cddadf9 debian/copyright +sha256 4dc63c6c5bdad25881eeba800765d97c53b2583addf28e71bbcd67775452ecdb kodi-peripheral-joystick-1.7.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 9cce174da1..0fdd4851cf 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 1.4.9-Leia +KODI_PERIPHERAL_JOYSTICK_VERSION = 1.7.1-Matrix KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = debian/copyright +KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi tinyxml udev $(eval $(cmake-package)) From 7591fc0176124b25583dd4ee687f3606f9921545 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:08 +0100 Subject: [PATCH 098/162] package/kodi-peripheral-xarcade: bump version to 1.2.0-Matrix Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash | 4 ++-- package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash index 7443ac65d8..a971493c02 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c1d755230b0f2fe943cf7297a6d187371088f39391944d422d2bf5969c8863c1 kodi-peripheral-xarcade-51e1a4550a6c7d7feeb01760a731af17bea6c524.tar.gz -sha256 848ad4f3a480c953b556467fb9a315dd352ec1d267e012144c46adc571e39efb debian/copyright +sha256 6fa8e1d0e6ebb6c385a7aef6e6c7629d2f1f52601ade7839093c1c3abb844894 kodi-peripheral-xarcade-1.2.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk index 42d7af8a02..fe5a9e41a0 100644 --- a/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk +++ b/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PERIPHERAL_XARCADE_VERSION = 51e1a4550a6c7d7feeb01760a731af17bea6c524 +KODI_PERIPHERAL_XARCADE_VERSION = 1.2.0-Matrix KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION)) KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+ -KODI_PERIPHERAL_XARCADE_LICENSE_FILES = debian/copyright +KODI_PERIPHERAL_XARCADE_LICENSE_FILES = LICENSE.md KODI_PERIPHERAL_XARCADE_DEPENDENCIES = kodi $(eval $(cmake-package)) From 2fe5c6bf5704ed62c7dd0e4cc18404308fe6cd6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:09 +0100 Subject: [PATCH 099/162] package/kodi-pvr-argustv: bump version to 7.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.argustv/commit/44d9c5a20579a2f505f26a072096911d68855a4a https://github.com/kodi-pvr/pvr.argustv/commit/6a6968892d468d02ca0d380e3fff54e607346024 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-argustv/Config.in | 1 - package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 4 ++-- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-argustv/Config.in b/package/kodi-pvr-argustv/Config.in index 216000aefd..7cca2661c7 100644 --- a/package/kodi-pvr-argustv/Config.in +++ b/package/kodi-pvr-argustv/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_ARGUSTV bool "kodi-pvr-argustv" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM help Kodi's ARGUS TV client addon diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index 5c47dd30b2..3024d8e65f 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7bfedb27b2aec4015b2594df18b76fe42e97ec10f4b5cb9c6987b1a7a264c844 kodi-pvr-argustv-3.5.6-Leia.tar.gz -sha256 17bc5450fff10fc46484886690adbf20c369f5baff021435feab1187b9943834 debian/copyright +sha256 d91f195c4a91af893231d03a887a340900c4e515597ea059ee6b9e6444717fc9 kodi-pvr-argustv-7.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index 73a9f1c764..2d5d62a539 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 3.5.6-Leia +KODI_PVR_ARGUSTV_VERSION = 7.1.0-Matrix KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ -KODI_PVR_ARGUSTV_LICENSE_FILES = debian/copyright -KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi-platform +KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md +KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi $(eval $(cmake-package)) From 6b99569d8d74e130c3607b1b853647c68015b70e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:10 +0100 Subject: [PATCH 100/162] package/kodi-pvr-dvblink: bump version to 9.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.dvblink/commit/a07c82f1591b0231e66b3ae14fabffa88259b8ec Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-dvblink/Config.in | 1 - package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash | 4 ++-- package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-dvblink/Config.in b/package/kodi-pvr-dvblink/Config.in index 57f11271ec..3358750376 100644 --- a/package/kodi-pvr-dvblink/Config.in +++ b/package/kodi-pvr-dvblink/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_DVBLINK bool "kodi-pvr-dvblink" - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_TINYXML2 help Kodi's DVBLink client addon diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash index c2121df025..ce4a42acac 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ad7586abfe7b3f9dd67b3a2225c442fc8d2a442e48bd7df75b11652286392c2f kodi-pvr-dvblink-4.7.2-Leia.tar.gz -sha256 4200fb35edb052f04dc43d267a1ad59468cb899e7b4931756b5830039b82716d debian/copyright +sha256 4b216871a16c7d9d9ab29f2788dfd0abdc828d1a2cb8203e84aee60ded75c9f6 kodi-pvr-dvblink-9.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk index 95bc7bbb4b..b691be6f5b 100644 --- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_DVBLINK_VERSION = 4.7.2-Leia +KODI_PVR_DVBLINK_VERSION = 9.1.0-Matrix KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) KODI_PVR_DVBLINK_LICENSE = GPL-2.0+ -KODI_PVR_DVBLINK_LICENSE_FILES = debian/copyright -KODI_PVR_DVBLINK_DEPENDENCIES = kodi-platform tinyxml2 +KODI_PVR_DVBLINK_LICENSE_FILES = LICENSE.md +KODI_PVR_DVBLINK_DEPENDENCIES = kodi tinyxml2 $(eval $(cmake-package)) From 1784f47c8530fcc05e2c92b4f1992969b3f0e9fb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:11 +0100 Subject: [PATCH 101/162] package/kodi-pvr-dvbviewer: bump version to 7.2.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.dvbviewer/commit/838efac4e46ad249d066437b96633c2e0b9dda1a https://github.com/kodi-pvr/pvr.dvbviewer/commit/7ca7ca3ab05f67606d7cdae15fcfab292ad00b37 Add missing dependency to tinyxml. Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-dvbviewer/Config.in | 2 +- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash | 4 ++-- package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-dvbviewer/Config.in b/package/kodi-pvr-dvbviewer/Config.in index e7dd7b3eb6..6a47d154fc 100644 --- a/package/kodi-pvr-dvbviewer/Config.in +++ b/package/kodi-pvr-dvbviewer/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_DVBVIEWER bool "kodi-pvr-dvbviewer" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help Kodi's DVBViewer client addon diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index ec2013412f..a2aac32bf3 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a3d167e652574caf30ba0ce9c22d278715e0237774b817e37826f1b2d647bff kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz -sha256 5757dbd6a8731e9395508cd7ab9ca0ea0c2863a7aac7136299d40549c88c9c2c debian/copyright +sha256 aa81c0a59c00aa13bc1ea3adc078e2910fde42bc86ad3a78ecefc6e4c3d5de59 kodi-pvr-dvbviewer-7.2.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk index b88d3d86cd..cbc12ed9e5 100644 --- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_DVBVIEWER_VERSION = 3.7.11-Leia +KODI_PVR_DVBVIEWER_VERSION = 7.2.0-Matrix KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+ -KODI_PVR_DVBVIEWER_LICENSE_FILES = debian/copyright -KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi-platform +KODI_PVR_DVBVIEWER_LICENSE_FILES = LICENSE.md +KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi tinyxml $(eval $(cmake-package)) From 5d7b098e146acac0184d6bdf8c35a8d164b0f85b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:12 +0100 Subject: [PATCH 102/162] package/kodi-pvr-filmon: bump version to 6.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.filmon/commit/b0ea8036274480245b5a7aa48d2ba18cc37b6b88 https://github.com/kodi-pvr/pvr.filmon/commit/b8f249fcb50a27168f8b96ca9b4b8075d8c42b4a Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-filmon/Config.in | 1 - package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 4 ++-- package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-filmon/Config.in b/package/kodi-pvr-filmon/Config.in index 0b662df176..d10002912a 100644 --- a/package/kodi-pvr-filmon/Config.in +++ b/package/kodi-pvr-filmon/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_FILMON bool "kodi-pvr-filmon" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM help Filmon PVR client addon for Kodi diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index e89ce6359b..277adb4087 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 90988e4833c0f84ab08e08be3cd08b84e4ba2baf2ebc1545c62e5dbd6708d749 kodi-pvr-filmon-2.4.6-Leia.tar.gz -sha256 081907693b03f27cb1b17e0a440ae05fd8c8b4631be6fe6fdba4e18a5d40fdc5 debian/copyright +sha256 7c2998bdde04acee5c147cb9f82939cfb13af57e5ecf46a4343dcfee15eb02e2 kodi-pvr-filmon-6.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index 078eae176a..2612f9aead 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 2.4.6-Leia +KODI_PVR_FILMON_VERSION = 6.1.0-Matrix KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ -KODI_PVR_FILMON_LICENSE_FILES = debian/copyright -KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi-platform +KODI_PVR_FILMON_LICENSE_FILES = LICENSE.md +KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi $(eval $(cmake-package)) From 1c93827df5934ea3fa1610e2220907b67b1eb487 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:13 +0100 Subject: [PATCH 103/162] package/kodi-pvr-hdhomerun: bump version to 7.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.hdhomerun/commit/f87f811e5d9462cb80370aa72f38d3dbd2e02ba9 https://github.com/kodi-pvr/pvr.hdhomerun/commit/999c7ac4a7f5e6d44d6f35cddfaa27ecb29d1dce Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-hdhomerun/Config.in | 1 - package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash | 4 ++-- package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-hdhomerun/Config.in b/package/kodi-pvr-hdhomerun/Config.in index ed5b914cb3..5a05a85c9c 100644 --- a/package/kodi-pvr-hdhomerun/Config.in +++ b/package/kodi-pvr-hdhomerun/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_HDHOMERUN bool "kodi-pvr-hdhomerun" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_LIBHDHOMERUN help Kodi's HDHomeRun client addon diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 1762289f0c..c506502874 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 815ba3dfbe6e1318226d41879057f0b8a4f0ac960d12ebc5d69f0a1ac28cfa09 kodi-pvr-hdhomerun-3.5.0-Leia.tar.gz -sha256 9e76c8ce9e201f75c50c755982b9e2f15821280dedc5e953f685086912e1e39d debian/copyright +sha256 a31587e00d58efb72aadba3ad1bd67c08332feef0d558e0eeb6fda7c81bf93e8 kodi-pvr-hdhomerun-7.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk index ae42f5c33d..110576120f 100644 --- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_HDHOMERUN_VERSION = 3.5.0-Leia +KODI_PVR_HDHOMERUN_VERSION = 7.1.0-Matrix KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+ -KODI_PVR_HDHOMERUN_LICENSE_FILES = debian/copyright -KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi-platform libhdhomerun +KODI_PVR_HDHOMERUN_LICENSE_FILES = LICENSE.md +KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi libhdhomerun $(eval $(cmake-package)) From b193fb07b041b957cc6e86e93bfae4c673031582 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:14 +0100 Subject: [PATCH 104/162] package/kodi-pvr-hts: bump version to 8.2.1-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.hts/commit/9943d05ce52b6ddcd63a3faa094f7ee9b2671c86 https://github.com/kodi-pvr/pvr.hts/commit/d6b71de38b1c522a6f2716a7e4a90528ae06e992 Added dependency to gcc >= 7 due to c++17 code added by https://github.com/kodi-pvr/pvr.hts/commit/954f25d39652098b5fb1a55d44e2d410de78902b Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-hts/Config.in | 5 ++++- package/kodi-pvr-hts/kodi-pvr-hts.hash | 4 ++-- package/kodi-pvr-hts/kodi-pvr-hts.mk | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-hts/Config.in b/package/kodi-pvr-hts/Config.in index c4c4497bd3..a352457f31 100644 --- a/package/kodi-pvr-hts/Config.in +++ b/package/kodi-pvr-hts/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_KODI_PVR_HTS bool "kodi-pvr-hts" - select BR2_PACKAGE_KODI_PLATFORM + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 help Tvheadend HTSP PVR client addon for Kodi https://github.com/kodi-pvr/pvr.hts + +comment "kodi-pvr-hts needs a toolchain w/ gcc >= 7" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index c9724404b5..275712df49 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6958b91ca616554e4c068bc303c66388e9a2c3a68b5979d8918b4e0d7b6bb95c kodi-pvr-hts-4.4.21-Leia.tar.gz -sha256 6d97c3d608a5d59565b567313bd3e53a1d0066ed59f4ae8e474c895d0c20e746 debian/copyright +sha256 ec291b5717c19dfd639131d195c64043746043d4f85189accaf29e9b1547fbba kodi-pvr-hts-8.2.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 6a25cda003..a4a14cdd6e 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 4.4.21-Leia +KODI_PVR_HTS_VERSION = 8.2.2-Matrix KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ -KODI_PVR_HTS_LICENSE_FILES = debian/copyright -KODI_PVR_HTS_DEPENDENCIES = kodi-platform +KODI_PVR_HTS_LICENSE_FILES = LICENSE.md +KODI_PVR_HTS_DEPENDENCIES = kodi $(eval $(cmake-package)) From 8890d168c45d3f084ee14404d34541d4439b0e5d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:15 +0100 Subject: [PATCH 105/162] package/kodi-pvr-iptvsimple: bump version to 7.4.3-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.iptvsimple/commit/61fa5d222bc5633d7b1e1c231c089b61fbb0a8c5 https://github.com/kodi-pvr/pvr.iptvsimple/commit/2d9c01439301292992b6e32c578c222b9eddea69 Switch from rapidxml to pugixml: https://github.com/kodi-pvr/pvr.iptvsimple/commit/b4e292f11c7c3f40b8c7ff18f28f7b2e149c6bee https://github.com/kodi-pvr/pvr.iptvsimple/commit/6325b2a958888e88809d7d6036610198cb2d3b09 Add missing dependency to zlib. Added runtime dependencies to inputstream addons: https://github.com/kodi-pvr/pvr.iptvsimple/commit/af9a1b6933664ef24d407051f20985682881544d https://github.com/kodi-pvr/pvr.iptvsimple/commit/46bd18fe84227e59b2d3378b17fafb87bcd87f33 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/Config.in | 10 ++++++++-- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 4 ++-- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/Config.in b/package/kodi-pvr-iptvsimple/Config.in index 94fc1f0602..00f4d115bf 100644 --- a/package/kodi-pvr-iptvsimple/Config.in +++ b/package/kodi-pvr-iptvsimple/Config.in @@ -1,7 +1,13 @@ config BR2_PACKAGE_KODI_PVR_IPTVSIMPLE bool "kodi-pvr-iptvsimple" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_RAPIDXML + # kodi-inputstream-adaptive + depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \ + || BR2_mips64el || BR2_x86_64 + select BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE # runtime + select BR2_PACKAGE_KODI_INPUTSTREAM_FFMPEGDIRECT # runtime + select BR2_PACKAGE_KODI_INPUTSTREAM_RTMP # runtime + select BR2_PACKAGE_PUGIXML + select BR2_PACKAGE_ZLIB help IPTV Live TV and Radio PVR client addon for Kodi diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index f90ff8b737..24f8f377f7 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 906d023b4713be558445902ff703ae65e03733d47dd7d0e1b16d02c05679c7ed kodi-pvr-iptvsimple-3.10.0-Leia.tar.gz -sha256 50e33ec3cddb75e6c5c5eb1b3d38cc0adee7dec71d7244925106d4a2c4d5e31d debian/copyright +sha256 70afe4e0c8df6c00c155cff0cc1e6bcf2d2a2de07a3f77367b4ad76ba7442b22 kodi-pvr-iptvsimple-7.4.3-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 0b31024556..ca4b2ff604 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 3.10.0-Leia +KODI_PVR_IPTVSIMPLE_VERSION = 7.4.3-Matrix KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ -KODI_PVR_IPTVSIMPLE_LICENSE_FILES = debian/copyright -KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform rapidxml +KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md +KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi pugixml zlib $(eval $(cmake-package)) From da3a5b45cbb38b59560b272a2e97ec39ccf480fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:16 +0100 Subject: [PATCH 106/162] package/kodi-pvr-mediaportal-tvserver: bump version to 8.1.0-Matrix Added patch series from upstream PR 127 to remove the dependency to kodi-platform, switch dependency to kodi. Added missing dependency to tinyxml. Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...o-more-supported-C-17-declaration-ke.patch | 29 + .../0002-Remove-p8-os-includes.patch | 157 ++++ .../0003-Use-kodi-StringUtils.patch | 124 ++++ .../0004-Remove-SAFE_DELETE.patch | 289 ++++++++ ...d-sleep_for-instead-of-p8-time-utils.patch | 308 ++++++++ ...td-mutex-condition_variable-instead-.patch | 673 ++++++++++++++++++ ...-Remove-charset-converter-dependency.patch | 55 ++ .../0008-Remove-p8-platform-dependency.patch | 74 ++ .../0009-Travis-changes-for-cpp17.patch | 28 + ...-keyword-as-no-longer-valid-in-CPP17.patch | 23 + .../0011-changelog-and-version-v8.1.1.patch | 42 ++ .../kodi-pvr-mediaportal-tvserver/Config.in | 2 +- .../kodi-pvr-mediaportal-tvserver.hash | 4 +- .../kodi-pvr-mediaportal-tvserver.mk | 6 +- 14 files changed, 1808 insertions(+), 6 deletions(-) create mode 100644 package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch create mode 100644 package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch diff --git a/package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch b/package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch new file mode 100644 index 0000000000..c09bbc14de --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0001-Revert-Removed-no-more-supported-C-17-declaration-ke.patch @@ -0,0 +1,29 @@ +From 8696d5408d6ec14b1ff4395ed538b7a48528fe68 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Thu, 8 Oct 2020 16:12:18 +0100 +Subject: [PATCH] Revert "Removed no more supported (C++17) declaration keyword + (register)" + +This reverts commit a8edcafe6cc7a424615319995f4f7bdfab3856b1. + +Signed-off-by: Bernd Kuhls +--- + src/lib/tsreader/DvbUtil.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/tsreader/DvbUtil.cpp b/src/lib/tsreader/DvbUtil.cpp +index c973062..8c4798a 100644 +--- a/src/lib/tsreader/DvbUtil.cpp ++++ b/src/lib/tsreader/DvbUtil.cpp +@@ -77,7 +77,7 @@ namespace MPTV + //******************************************************************* + uint32_t crc32(char *data, int len) + { +- int i; ++ register int i; + uint32_t crc = 0xffffffff; + + for (i = 0; i < len; i++) +-- +2.29.2 + diff --git a/package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch b/package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch new file mode 100644 index 0000000000..b18d1ff82c --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0002-Remove-p8-os-includes.patch @@ -0,0 +1,157 @@ +From be13de0679d1707eadaf5349ab904a07fa83bb13 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Wed, 7 Oct 2020 17:34:56 +0100 +Subject: [PATCH] Remove p8 os includes + +Signed-off-by: Bernd Kuhls +--- + src/Socket.cpp | 1 - + src/lib/tsreader/FileReader.h | 1 - + src/lib/tsreader/MemorySink.cpp | 1 - + src/lib/tsreader/Section.cpp | 2 ++ + src/os-dependent.h | 40 ++++++++++++++++++--------------- + src/timers.cpp | 1 - + src/windows/FileUtils.cpp | 6 ++++- + 7 files changed, 29 insertions(+), 23 deletions(-) + +diff --git a/src/Socket.cpp b/src/Socket.cpp +index 12f7e80..b7dd250 100644 +--- a/src/Socket.cpp ++++ b/src/Socket.cpp +@@ -7,7 +7,6 @@ + + #include "utils.h" + #include +-#include "p8-platform/os.h" + #include "Socket.h" + + #include +diff --git a/src/lib/tsreader/FileReader.h b/src/lib/tsreader/FileReader.h +index 986bbc4..edb01f2 100644 +--- a/src/lib/tsreader/FileReader.h ++++ b/src/lib/tsreader/FileReader.h +@@ -33,7 +33,6 @@ + * http://forums.dvbowners.com/ + */ + +-#include "p8-platform/os.h" // for __stat + #include + #include + +diff --git a/src/lib/tsreader/MemorySink.cpp b/src/lib/tsreader/MemorySink.cpp +index 2d60696..dafef56 100644 +--- a/src/lib/tsreader/MemorySink.cpp ++++ b/src/lib/tsreader/MemorySink.cpp +@@ -29,7 +29,6 @@ + + #if defined LIVE555 + +-#include "p8-platform/os.h" + #include "MemorySink.h" + #include "GroupsockHelper.hh" + #include //for kodi::Log +diff --git a/src/lib/tsreader/Section.cpp b/src/lib/tsreader/Section.cpp +index 258c6a9..aac6b53 100644 +--- a/src/lib/tsreader/Section.cpp ++++ b/src/lib/tsreader/Section.cpp +@@ -22,6 +22,8 @@ + #include "os-dependent.h" + #include "Section.h" + ++#include ++ + namespace MPTV + { + CSection::CSection(void) +diff --git a/src/os-dependent.h b/src/os-dependent.h +index 1f368ea..cdc6980 100644 +--- a/src/os-dependent.h ++++ b/src/os-dependent.h +@@ -7,29 +7,33 @@ + + #pragma once + +-#include "p8-platform/os.h" ++#include + +-#ifdef TARGET_LINUX +-// Retrieve the number of milliseconds that have elapsed since the system was started +-#include +-inline unsigned long long GetTickCount64(void) +-{ +- struct timespec ts; +- if(clock_gettime(CLOCK_MONOTONIC, &ts) != 0) +- { +- return 0; +- } +- return (unsigned long long)( (ts.tv_sec * 1000) + (ts.tv_nsec / 1000000) ); +-}; +-#elif defined(TARGET_DARWIN) +-#include ++#if (defined(_WIN32) || defined(_WIN64)) ++ ++#ifndef _SSIZE_T_DEFINED ++#ifdef _WIN64 ++typedef __int64 ssize_t; ++#else ++typedef _W64 int ssize_t; ++#endif ++#define _SSIZE_T_DEFINED ++#endif ++ ++#else ++ ++#if (defined(TARGET_LINUX) || defined(TARGET_DARWIN)) ++#include ++#include ++#include + inline unsigned long long GetTickCount64(void) + { +- struct timeval tv; +- gettimeofday(&tv, NULL); +- return (unsigned long long)( (tv.tv_sec * 1000) + (tv.tv_usec / 1000) ); ++ auto now = std::chrono::steady_clock::now(); ++ return std::chrono::duration_cast(now.time_since_epoch()).count(); + }; + #endif /* TARGET_LINUX || TARGET_DARWIN */ + ++#endif ++ + // Additional typedefs + typedef uint8_t byte; +diff --git a/src/timers.cpp b/src/timers.cpp +index a8760e4..a60b4c2 100644 +--- a/src/timers.cpp ++++ b/src/timers.cpp +@@ -11,7 +11,6 @@ + + using namespace std; + +-#include "p8-platform/os.h" //needed for snprintf + #include "timers.h" + #include "settings.h" + #include "utils.h" +diff --git a/src/windows/FileUtils.cpp b/src/windows/FileUtils.cpp +index 0d26bc6..0c8a03e 100644 +--- a/src/windows/FileUtils.cpp ++++ b/src/windows/FileUtils.cpp +@@ -6,7 +6,6 @@ + */ + + #include "../FileUtils.h" +-#include "p8-platform/os.h" + #include "p8-platform/windows/CharsetConverter.h" + #include + #include "../utils.h" +@@ -14,6 +13,11 @@ + #include + #endif + ++#ifdef TARGET_WINDOWS ++#include ++#include ++#endif ++ + namespace OS + { + bool CFile::Exists(const std::string& strFileName, long* errCode) diff --git a/package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch b/package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch new file mode 100644 index 0000000000..597e76af28 --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0003-Use-kodi-StringUtils.patch @@ -0,0 +1,124 @@ +From 621a98436875f8b4ceea18218a23025e0b59aeb3 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Wed, 7 Oct 2020 17:46:14 +0100 +Subject: [PATCH] Use kodi StringUtils + +Signed-off-by: Bernd Kuhls +--- + src/GUIDialogRecordSettings.cpp | 6 +++--- + src/lib/tsreader/TSReader.cpp | 10 +++++----- + src/pvrclient-mediaportal.cpp | 3 ++- + src/utils.cpp | 3 ++- + 4 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/src/GUIDialogRecordSettings.cpp b/src/GUIDialogRecordSettings.cpp +index cf36d82..8e942d2 100644 +--- a/src/GUIDialogRecordSettings.cpp ++++ b/src/GUIDialogRecordSettings.cpp +@@ -9,9 +9,9 @@ + #include "timers.h" + #include "utils.h" + #include "DateTime.h" +-#include "p8-platform/util/StringUtils.h" + + #include ++#include + + /* Dialog item identifiers */ + #define BUTTON_OK 1 +@@ -106,7 +106,7 @@ bool CGUIDialogRecordSettings::OnInit() + + // Populate PreRecord spin control + std::string marginStart; +- marginStart = StringUtils::Format("%d (%s)", m_timerinfo.GetMarginStart(), kodi::GetLocalizedString(30136).c_str()); ++ marginStart = kodi::tools::StringUtils::Format("%d (%s)", m_timerinfo.GetMarginStart(), kodi::GetLocalizedString(30136).c_str()); + m_spinPreRecord->SetType(kodi::gui::controls::ADDON_SPIN_CONTROL_TYPE_TEXT); + m_spinPreRecord->AddLabel(kodi::GetLocalizedString(30135), -1); + m_spinPreRecord->AddLabel(marginStart, m_timerinfo.GetMarginStart()); //value from XBMC +@@ -120,7 +120,7 @@ bool CGUIDialogRecordSettings::OnInit() + + // Populate PostRecord spin control + std::string marginEnd; +- marginEnd = StringUtils::Format("%d (%s)", m_timerinfo.GetMarginEnd(), kodi::GetLocalizedString(30136).c_str()); ++ marginEnd = kodi::tools::StringUtils::Format("%d (%s)", m_timerinfo.GetMarginEnd(), kodi::GetLocalizedString(30136).c_str()); + m_spinPostRecord->SetType(kodi::gui::controls::ADDON_SPIN_CONTROL_TYPE_TEXT); + m_spinPostRecord->AddLabel(kodi::GetLocalizedString(30135), -1); + m_spinPostRecord->AddLabel(marginEnd, m_timerinfo.GetMarginEnd()); //value from XBMC +diff --git a/src/lib/tsreader/TSReader.cpp b/src/lib/tsreader/TSReader.cpp +index 1129c8e..3f9725b 100644 +--- a/src/lib/tsreader/TSReader.cpp ++++ b/src/lib/tsreader/TSReader.cpp +@@ -34,7 +34,7 @@ + #include "utils.h" + #include "TSDebug.h" + #include "p8-platform/util/timeutils.h" +-#include "p8-platform/util/StringUtils.h" ++#include + #ifdef LIVE555 + #include "MemoryReader.h" + #include "MepoRTSPClient.h" +@@ -104,7 +104,7 @@ namespace MPTV + { + if (!tscard.TimeshiftFolderUNC.empty()) + { +- StringUtils::Replace(sFileName, tscard.TimeshiftFolder.c_str(), tscard.TimeshiftFolderUNC.c_str()); ++ kodi::tools::StringUtils::Replace(sFileName, tscard.TimeshiftFolder.c_str(), tscard.TimeshiftFolderUNC.c_str()); + bFound = true; + } + else +@@ -129,7 +129,7 @@ namespace MPTV + if (!it->RecordingFolderUNC.empty()) + { + // Remove the original base path and replace it with the given path +- StringUtils::Replace(sFileName, it->RecordingFolder.c_str(), it->RecordingFolderUNC.c_str()); ++ kodi::tools::StringUtils::Replace(sFileName, it->RecordingFolder.c_str(), it->RecordingFolderUNC.c_str()); + bFound = true; + break; + } +@@ -412,8 +412,8 @@ namespace MPTV + if (tmp.find("smb://") != string::npos) + { + // Convert XBMC smb share name back to a real windows network share... +- StringUtils::Replace(tmp, "smb://", "\\\\"); +- StringUtils::Replace(tmp, "/", "\\"); ++ kodi::tools::StringUtils::Replace(tmp, "smb://", "\\\\"); ++ kodi::tools::StringUtils::Replace(tmp, "/", "\\"); + } + #else + //TODO: do something useful... +diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp +index 93ca1bc..fdb31e7 100644 +--- a/src/pvrclient-mediaportal.cpp ++++ b/src/pvrclient-mediaportal.cpp +@@ -11,7 +11,7 @@ + #include + + #include "p8-platform/util/timeutils.h" +-#include "p8-platform/util/StringUtils.h" ++#include + + #include "timers.h" + #include "channels.h" +@@ -29,6 +29,7 @@ + #include + #include + ++using namespace kodi::tools; + using namespace std; + using namespace MPTV; + +diff --git a/src/utils.cpp b/src/utils.cpp +index 63c823a..9b8def8 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -13,8 +13,9 @@ + #include "settings.h" + #include + #include +-#include "p8-platform/util/StringUtils.h" ++#include + ++using namespace kodi::tools; + using namespace std; + + void Tokenize(const string& str, vector& tokens, const string& delimiters = " ") diff --git a/package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch b/package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch new file mode 100644 index 0000000000..98667913a8 --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0004-Remove-SAFE_DELETE.patch @@ -0,0 +1,289 @@ +From 00d0d90fdac9257ed02e24677ba4f008f2486c94 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Wed, 7 Oct 2020 18:00:57 +0100 +Subject: [PATCH] Remove SAFE_DELETE + +Signed-off-by: Bernd Kuhls +--- + src/lib/tsreader/FileReader.cpp | 9 ++++++++- + src/lib/tsreader/MemoryBuffer.cpp | 22 +++++++++++++--------- + src/lib/tsreader/MultiFileReader.cpp | 11 ++++++++++- + src/lib/tsreader/TSReader.cpp | 25 +++++++++++++++++-------- + src/pvrclient-mediaportal.cpp | 27 ++++++++++++++++++--------- + src/utils.h | 2 -- + 6 files changed, 66 insertions(+), 30 deletions(-) + +diff --git a/src/lib/tsreader/FileReader.cpp b/src/lib/tsreader/FileReader.cpp +index ac8725c..3df22f2 100644 +--- a/src/lib/tsreader/FileReader.cpp ++++ b/src/lib/tsreader/FileReader.cpp +@@ -38,7 +38,6 @@ + #include "p8-platform/threads/threads.h" + #include //std::min, std::max + #include "p8-platform/util/timeutils.h" // for usleep +-#include "p8-platform/util/util.h" + #include "utils.h" + #include + +@@ -58,6 +57,14 @@ + /* calcuate bitrate for file while reading */ + #define READ_BITRATE 0x10 + ++template void SafeDelete(T*& p) ++{ ++ if (p) ++ { ++ delete p; ++ p = nullptr; ++ } ++} + namespace MPTV + { + FileReader::FileReader() : +diff --git a/src/lib/tsreader/MemoryBuffer.cpp b/src/lib/tsreader/MemoryBuffer.cpp +index 6d411d7..609b575 100644 +--- a/src/lib/tsreader/MemoryBuffer.cpp ++++ b/src/lib/tsreader/MemoryBuffer.cpp +@@ -31,7 +31,6 @@ + + #include "p8-platform/util/timeutils.h" + #include "p8-platform/threads/mutex.h" +-#include "p8-platform/util/util.h" + #include "MemoryBuffer.h" + #include //for kodi::Log + #include "TSDebug.h" +@@ -59,11 +58,14 @@ void CMemoryBuffer::Clear() + P8PLATFORM::CLockObject BufferLock(m_BufferLock); + std::vector::iterator it = m_Array.begin(); + +- for ( ; it != m_Array.end(); ++it ) ++ for (auto& item : m_Array) + { +- BufferItem *item = *it; +- SAFE_DELETE_ARRAY(item->data); +- SAFE_DELETE(item); ++ if (item) ++ { ++ if (item->data) ++ delete[] item->data; ++ delete item; ++ } + } + + m_Array.clear(); +@@ -150,8 +152,9 @@ size_t CMemoryBuffer::ReadFromBuffer(unsigned char *pbData, size_t lDataLength) + if (item->nOffset >= item->nDataLength) + { + m_Array.erase(m_Array.begin()); +- SAFE_DELETE_ARRAY(item->data); +- SAFE_DELETE(item); ++ if (item->data) ++ delete[] item->data; ++ delete item; + } + } + return bytesWritten; +@@ -182,8 +185,9 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) + + m_BytesInBuffer -= copyLength; + m_Array.erase(m_Array.begin()); +- SAFE_DELETE_ARRAY(item2->data); +- SAFE_DELETE(item2); ++ if (item2->data) ++ delete[] item2->data; ++ delete item2; + } + if (m_BytesInBuffer > 0) + { +diff --git a/src/lib/tsreader/MultiFileReader.cpp b/src/lib/tsreader/MultiFileReader.cpp +index b8005b3..3828e06 100644 +--- a/src/lib/tsreader/MultiFileReader.cpp ++++ b/src/lib/tsreader/MultiFileReader.cpp +@@ -48,6 +48,15 @@ using namespace P8PLATFORM; + //Maximum time in msec to wait for the buffer file to become available - Needed for DVB radio (this sometimes takes some time) + #define MAX_BUFFER_TIMEOUT 1500 + ++template void SafeDelete(T*& p) ++{ ++ if (p) ++ { ++ delete p; ++ p = nullptr; ++ } ++} ++ + namespace MPTV + { + MultiFileReader::MultiFileReader() : +@@ -484,7 +493,7 @@ namespace MPTV + + TSDEBUG(ADDON_LOG_DEBUG, "MultiFileReader: Removing file %s\n", file->filename.c_str()); + +- SAFE_DELETE(file); ++ SafeDelete(file); + m_tsFiles.erase(m_tsFiles.begin()); + + filesToRemove--; +diff --git a/src/lib/tsreader/TSReader.cpp b/src/lib/tsreader/TSReader.cpp +index 3f9725b..4a72f4f 100644 +--- a/src/lib/tsreader/TSReader.cpp ++++ b/src/lib/tsreader/TSReader.cpp +@@ -44,6 +44,15 @@ + + using namespace std; + ++template void SafeDelete(T*& p) ++{ ++ if (p) ++ { ++ delete p; ++ p = nullptr; ++ } ++} ++ + namespace MPTV + { + CTsReader::CTsReader() : m_demultiplexer(*this), +@@ -69,10 +78,10 @@ namespace MPTV + + CTsReader::~CTsReader(void) + { +- SAFE_DELETE(m_fileReader); ++ SafeDelete(m_fileReader); + #ifdef LIVE555 +- SAFE_DELETE(m_buffer); +- SAFE_DELETE(m_rtspClient); ++ SafeDelete(m_buffer); ++ SafeDelete(m_rtspClient); + #endif + } + +@@ -225,8 +234,8 @@ namespace MPTV + + if ( !m_rtspClient->OpenStream(m_fileName.c_str()) ) + { +- SAFE_DELETE(m_rtspClient); +- SAFE_DELETE(m_buffer); ++ SafeDelete(m_rtspClient); ++ SafeDelete(m_buffer); + return E_FAIL; + } + +@@ -318,8 +327,8 @@ namespace MPTV + #ifdef LIVE555 + kodi::Log(ADDON_LOG_INFO, "TsReader: closing RTSP client"); + m_rtspClient->Stop(); +- SAFE_DELETE(m_rtspClient); +- SAFE_DELETE(m_buffer); ++ SafeDelete(m_rtspClient); ++ SafeDelete(m_buffer); + #endif + } + else +@@ -327,7 +336,7 @@ namespace MPTV + kodi::Log(ADDON_LOG_INFO, "TsReader: closing file"); + m_fileReader->CloseFile(); + } +- SAFE_DELETE(m_fileReader); ++ SafeDelete(m_fileReader); + m_State = State_Stopped; + } + } +diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp +index fdb31e7..5479950 100644 +--- a/src/pvrclient-mediaportal.cpp ++++ b/src/pvrclient-mediaportal.cpp +@@ -42,6 +42,15 @@ int g_iTVServerKodiBuild = 0; + #define TVSERVERKODI_RECOMMENDED_VERSION_STRING "1.2.3.122 till 1.20.0.140" + #define TVSERVERKODI_RECOMMENDED_VERSION_BUILD 140 + ++template void SafeDelete(T*& p) ++{ ++ if (p) ++ { ++ delete p; ++ p = nullptr; ++ } ++} ++ + /************************************************************/ + /** Class interface */ + +@@ -75,10 +84,10 @@ cPVRClientMediaPortal::~cPVRClientMediaPortal() + kodi::Log(ADDON_LOG_DEBUG, "->~cPVRClientMediaPortal()"); + Disconnect(); + +- SAFE_DELETE(Timer::lifetimeValues); +- SAFE_DELETE(m_tcpclient); +- SAFE_DELETE(m_genretable); +- SAFE_DELETE(m_lastSelectedRecording); ++ SafeDelete(Timer::lifetimeValues); ++ SafeDelete(m_tcpclient); ++ SafeDelete(m_genretable); ++ SafeDelete(m_lastSelectedRecording); + } + + string cPVRClientMediaPortal::SendCommand(const char* command) +@@ -321,7 +330,7 @@ void cPVRClientMediaPortal::Disconnect() + if ((CSettings::Get().GetStreamingMethod()==TSReader) && (m_tsreader != NULL)) + { + m_tsreader->Close(); +- SAFE_DELETE(m_tsreader); ++ SafeDelete(m_tsreader); + } + SendCommand("StopTimeshift:\n"); + } +@@ -1748,7 +1757,7 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe + m_iCurrentChannel = -1; + if (m_tsreader != nullptr) + { +- SAFE_DELETE(m_tsreader); ++ SafeDelete(m_tsreader); + } + return false; + } +@@ -1959,7 +1968,7 @@ void cPVRClientMediaPortal::CloseLiveStream(void) + if (CSettings::Get().GetStreamingMethod() == TSReader && m_tsreader) + { + m_tsreader->Close(); +- SAFE_DELETE(m_tsreader); ++ SafeDelete(m_tsreader); + } + result = SendCommand("StopTimeshift:\n"); + kodi::Log(ADDON_LOG_INFO, "CloseLiveStream: %s", result.c_str()); +@@ -2141,7 +2150,7 @@ void cPVRClientMediaPortal::CloseRecordedStream(void) + { + kodi::Log(ADDON_LOG_INFO, "CloseRecordedStream: Stop TSReader..."); + m_tsreader->Close(); +- SAFE_DELETE(m_tsreader); ++ SafeDelete(m_tsreader); + } + else + { +@@ -2409,7 +2418,7 @@ cRecording* cPVRClientMediaPortal::GetRecordingInfo(const kodi::addon::PVRRecord + { + return m_lastSelectedRecording; + } +- SAFE_DELETE(m_lastSelectedRecording); ++ SafeDelete(m_lastSelectedRecording); + } + + if (!IsUp()) +diff --git a/src/utils.h b/src/utils.h +index 823b46e..d03569a 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -11,13 +11,11 @@ + #include + #include + #include "uri.h" +-#include "p8-platform/util/util.h" + + #ifdef TARGET_WINDOWS + #include "windows/WindowsUtils.h" + #endif + +- + /** + * String tokenize + * Split string using the given delimiter into a vector of substrings diff --git a/package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch b/package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch new file mode 100644 index 0000000000..4d61d15b2d --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0005-Use-thread-sleep_for-instead-of-p8-time-utils.patch @@ -0,0 +1,308 @@ +From 4b4a16157870d5816339700616f1efdb60fb59e3 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Wed, 7 Oct 2020 18:12:10 +0100 +Subject: [PATCH] Use thread sleep_for instead of p8 time utils + +Signed-off-by: Bernd Kuhls +--- + src/lib/tsreader/DeMultiplexer.cpp | 6 ++++-- + src/lib/tsreader/FileReader.cpp | 5 +++-- + src/lib/tsreader/MemoryBuffer.cpp | 5 +++-- + src/lib/tsreader/MepoRTSPClient.cpp | 5 +++-- + src/lib/tsreader/MultiFileReader.cpp | 9 +++++---- + src/lib/tsreader/TSReader.cpp | 5 +++-- + src/pvrclient-mediaportal.cpp | 23 +++++++++++++---------- + 7 files changed, 34 insertions(+), 24 deletions(-) + +diff --git a/src/lib/tsreader/DeMultiplexer.cpp b/src/lib/tsreader/DeMultiplexer.cpp +index 63bf20e..436e452 100644 +--- a/src/lib/tsreader/DeMultiplexer.cpp ++++ b/src/lib/tsreader/DeMultiplexer.cpp +@@ -37,6 +37,8 @@ + #include //for kodi::Log + #include "TSReader.h" + ++#include ++ + #define MAX_BUF_SIZE 8000 + #define BUFFER_LENGTH 0x1000 + #define READ_SIZE (1316*30) +@@ -83,7 +85,7 @@ namespace MPTV + { + size_t BytesRead = ReadFromFile(); + if (0 == BytesRead) +- usleep(10000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } + m_bStarting = false; + } +@@ -248,7 +250,7 @@ namespace MPTV + { + size_t BytesRead = ReadFromFile(); + if (0 == BytesRead) +- usleep(10000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(10)); + dwBytesProcessed += BytesRead; + } + +diff --git a/src/lib/tsreader/FileReader.cpp b/src/lib/tsreader/FileReader.cpp +index 3df22f2..73b23af 100644 +--- a/src/lib/tsreader/FileReader.cpp ++++ b/src/lib/tsreader/FileReader.cpp +@@ -37,10 +37,10 @@ + #include "TSDebug.h" + #include "p8-platform/threads/threads.h" + #include //std::min, std::max +-#include "p8-platform/util/timeutils.h" // for usleep + #include "utils.h" + #include + ++#include + + /* indicate that caller can handle truncated reads, where function returns before entire buffer has been filled */ + #define READ_TRUNCATED 0x01 +@@ -145,7 +145,8 @@ namespace MPTV + } + } + } +- usleep(20000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(20)); ++ + } while (--Tmo); + + if (Tmo) +diff --git a/src/lib/tsreader/MemoryBuffer.cpp b/src/lib/tsreader/MemoryBuffer.cpp +index 609b575..0e736f2 100644 +--- a/src/lib/tsreader/MemoryBuffer.cpp ++++ b/src/lib/tsreader/MemoryBuffer.cpp +@@ -29,12 +29,13 @@ + + #ifdef LIVE555 + +-#include "p8-platform/util/timeutils.h" + #include "p8-platform/threads/mutex.h" + #include "MemoryBuffer.h" + #include //for kodi::Log + #include "TSDebug.h" + ++#include ++ + #define MAX_MEMORY_BUFFER_SIZE (1024L*1024L*12L) + + CMemoryBuffer::CMemoryBuffer(void) +@@ -197,7 +198,7 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) + + if (sleep) + { +- usleep(10000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } + return S_OK; + } +diff --git a/src/lib/tsreader/MepoRTSPClient.cpp b/src/lib/tsreader/MepoRTSPClient.cpp +index 4971986..ccd6761 100644 +--- a/src/lib/tsreader/MepoRTSPClient.cpp ++++ b/src/lib/tsreader/MepoRTSPClient.cpp +@@ -18,13 +18,14 @@ + + #if defined LIVE555 + +-#include "p8-platform/util/timeutils.h" + #include "MepoRTSPClient.h" + #include "MemorySink.h" + #include //for kodi::Log + #include "utils.h" + #include "os-dependent.h" + ++#include ++ + CRTSPClient::CRTSPClient() + { + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::CRTSPClient()"); +@@ -531,7 +532,7 @@ void CRTSPClient::FillBuffer(unsigned long byteCount) + + while ( IsRunning() && m_buffer->Size() < byteCount) + { +- usleep(5000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(5)); + if (GetTickCount64() - tickCount > 3000) + break; + } +diff --git a/src/lib/tsreader/MultiFileReader.cpp b/src/lib/tsreader/MultiFileReader.cpp +index 3828e06..21fd7b2 100644 +--- a/src/lib/tsreader/MultiFileReader.cpp ++++ b/src/lib/tsreader/MultiFileReader.cpp +@@ -39,10 +39,11 @@ + #include + #include "utils.h" + #include +-#include "p8-platform/util/timeutils.h" + #include "p8-platform/threads/threads.h" + #include + ++#include ++ + using namespace P8PLATFORM; + + //Maximum time in msec to wait for the buffer file to become available - Needed for DVB radio (this sometimes takes some time) +@@ -112,7 +113,7 @@ namespace MPTV + retryCount++; + kodi::Log(ADDON_LOG_DEBUG, "MultiFileReader: buffer file has zero length, closing, waiting 100 ms and re-opening. Attempt: %d.", retryCount); + m_TSBufferFile.CloseFile(); +- usleep(100000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(100)); + hResult = m_TSBufferFile.OpenFile(); + kodi::Log(ADDON_LOG_DEBUG, "MultiFileReader: buffer file opened return code %d.", hResult); + } +@@ -124,7 +125,7 @@ namespace MPTV + + do + { +- usleep(100000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(100)); + if (timeout.TimeLeft() == 0) + { + kodi::Log(ADDON_LOG_ERROR, "MultiFileReader: timed out while waiting for buffer file to become available"); +@@ -457,7 +458,7 @@ namespace MPTV + // try to clear local / remote SMB file cache. This should happen when we close the filehandle + m_TSBufferFile.CloseFile(); + m_TSBufferFile.OpenFile(); +- usleep(5000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(5)); + } + + if (Error) +diff --git a/src/lib/tsreader/TSReader.cpp b/src/lib/tsreader/TSReader.cpp +index 4a72f4f..40a4faf 100644 +--- a/src/lib/tsreader/TSReader.cpp ++++ b/src/lib/tsreader/TSReader.cpp +@@ -33,7 +33,6 @@ + #include "MultiFileReader.h" + #include "utils.h" + #include "TSDebug.h" +-#include "p8-platform/util/timeutils.h" + #include + #ifdef LIVE555 + #include "MemoryReader.h" +@@ -42,6 +41,8 @@ + #endif + #include "FileUtils.h" + ++#include ++ + using namespace std; + + template void SafeDelete(T*& p) +@@ -396,7 +397,7 @@ namespace MPTV + fileReader->OnChannelChange(); + + kodi::Log(ADDON_LOG_DEBUG, "%s:: move from %I64d to %I64d tsbufpos %I64d", __FUNCTION__, pos_before, pos_after, timeShiftBufferPos); +- usleep(100000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(100)); + + // Set the stream start times to this new channel + time(&m_startTime); +diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp +index 5479950..851b940 100644 +--- a/src/pvrclient-mediaportal.cpp ++++ b/src/pvrclient-mediaportal.cpp +@@ -10,7 +10,6 @@ + #include + #include + +-#include "p8-platform/util/timeutils.h" + #include + + #include "timers.h" +@@ -29,6 +28,8 @@ + #include + #include + ++#include ++ + using namespace kodi::tools; + using namespace std; + using namespace MPTV; +@@ -389,7 +390,7 @@ void* cPVRClientMediaPortal::Process(void) + if (keepWaiting) + { + // Wait for 1 minute before re-trying +- usleep(60000000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(60000)); + } + } + SetConnectionState(state); +@@ -1571,7 +1572,8 @@ PVR_ERROR cPVRClientMediaPortal::AddTimer(const kodi::addon::PVRTimer& timerinfo + if (timerinfo.GetStartTime() <= 0) + { + // Refresh the recordings list to see the newly created recording +- usleep(100000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(100)); ++ + kodi::addon::CInstancePVRClient::TriggerRecordingUpdate(); + } + +@@ -1785,7 +1787,8 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe + kodi::Log(ADDON_LOG_INFO, "Channel timeshift buffer: %s", timeshiftfields[2].c_str()); + if (channelinfo.GetIsRadio()) + { +- usleep(100000); // 100 ms sleep to allow the buffer to fill ++ // 100 ms sleep to allow the buffer to fill ++ std::this_thread::sleep_for(std::chrono::milliseconds(100)); + } + } + else +@@ -1796,7 +1799,7 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe + if (CSettings::Get().GetSleepOnRTSPurl() > 0) + { + kodi::Log(ADDON_LOG_INFO, "Sleeping %i ms before opening stream: %s", CSettings::Get().GetSleepOnRTSPurl(), timeshiftfields[0].c_str()); +- usleep(CSettings::Get().GetSleepOnRTSPurl() * 1000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(CSettings::Get().GetSleepOnRTSPurl())); + } + + // Check the returned stream URL. When the URL is an rtsp stream, we need +@@ -1878,7 +1881,7 @@ bool cPVRClientMediaPortal::OpenLiveStream(const kodi::addon::PVRChannel& channe + CloseLiveStream(); + return false; + } +- usleep(400000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(400)); + } + } + +@@ -1924,7 +1927,7 @@ int cPVRClientMediaPortal::ReadLiveStream(unsigned char *pBuffer, unsigned int i + + if (m_tsreader->Read(bufptr, read_wanted, &read_wanted) > 0) + { +- usleep(20000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(20)); + read_timeouts++; + return static_cast(read_wanted); + } +@@ -1948,7 +1951,7 @@ int cPVRClientMediaPortal::ReadLiveStream(unsigned char *pBuffer, unsigned int i + } + bufptr += read_wanted; + read_timeouts++; +- usleep(10000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } + } + read_timeouts = 0; +@@ -2175,7 +2178,7 @@ int cPVRClientMediaPortal::ReadRecordedStream(unsigned char *pBuffer, unsigned i + + if (m_tsreader->Read(bufptr, read_wanted, &read_wanted) > 0) + { +- usleep(20000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(20)); + return static_cast(read_wanted); + } + read_done += read_wanted; +@@ -2183,7 +2186,7 @@ int cPVRClientMediaPortal::ReadRecordedStream(unsigned char *pBuffer, unsigned i + if ( read_done < static_cast(iBufferSize) ) + { + bufptr += read_wanted; +- usleep(20000); ++ std::this_thread::sleep_for(std::chrono::milliseconds(20)); + } + } + diff --git a/package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch b/package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch new file mode 100644 index 0000000000..7d6e14115f --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0006-Use-std-thread-std-mutex-condition_variable-instead-.patch @@ -0,0 +1,673 @@ +From 482d898333facf53bd3208cf5e44a0cf3e1f4f3b Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Thu, 8 Oct 2020 14:59:55 +0100 +Subject: [PATCH] Use std::thread, std::mutex, condition_variable instead of + event + +Signed-off-by: Bernd Kuhls +--- + src/lib/tsreader/DeMultiplexer.cpp | 2 +- + src/lib/tsreader/DeMultiplexer.h | 4 +- + src/lib/tsreader/FileReader.cpp | 2 +- + src/lib/tsreader/MemoryBuffer.cpp | 15 +++-- + src/lib/tsreader/MemoryBuffer.h | 7 +- + src/lib/tsreader/MemoryReader.h | 1 + + src/lib/tsreader/MemorySink.cpp | 2 +- + src/lib/tsreader/MemorySink.h | 4 +- + src/lib/tsreader/MepoRTSPClient.cpp | 28 ++++---- + src/lib/tsreader/MepoRTSPClient.h | 10 ++- + src/lib/tsreader/MultiFileReader.cpp | 9 ++- + src/os-dependent.h | 95 ++++++++++++++++++++++++++++ + src/pvrclient-mediaportal.cpp | 29 ++++----- + src/pvrclient-mediaportal.h | 21 +++--- + 14 files changed, 168 insertions(+), 61 deletions(-) + +diff --git a/src/lib/tsreader/DeMultiplexer.cpp b/src/lib/tsreader/DeMultiplexer.cpp +index 436e452..3d0d9a2 100644 +--- a/src/lib/tsreader/DeMultiplexer.cpp ++++ b/src/lib/tsreader/DeMultiplexer.cpp +@@ -104,7 +104,7 @@ namespace MPTV + if (m_filter.IsSeeking()) + return 0; // Ambass : to check + +- P8PLATFORM::CLockObject lock(m_sectionRead); ++ std::lock_guard lock(m_sectionRead); + if (NULL == m_reader) + return 0; + +diff --git a/src/lib/tsreader/DeMultiplexer.h b/src/lib/tsreader/DeMultiplexer.h +index c7cd577..72ed87d 100644 +--- a/src/lib/tsreader/DeMultiplexer.h ++++ b/src/lib/tsreader/DeMultiplexer.h +@@ -37,7 +37,7 @@ + #include "PacketSync.h" + #include "TSHeader.h" + #include "PatParser.h" +-#include "p8-platform/threads/mutex.h" ++#include + + namespace MPTV + { +@@ -60,7 +60,7 @@ namespace MPTV + private: + unsigned long long m_LastDataFromRtsp; + bool m_bEndOfFile; +- P8PLATFORM::CMutex m_sectionRead; ++ std::mutex m_sectionRead; + FileReader* m_reader; + CPatParser m_patParser; + CTsReader& m_filter; +diff --git a/src/lib/tsreader/FileReader.cpp b/src/lib/tsreader/FileReader.cpp +index 73b23af..358b05f 100644 +--- a/src/lib/tsreader/FileReader.cpp ++++ b/src/lib/tsreader/FileReader.cpp +@@ -35,7 +35,7 @@ + #include "FileReader.h" + #include //for kodi::Log + #include "TSDebug.h" +-#include "p8-platform/threads/threads.h" ++#include "os-dependent.h" + #include //std::min, std::max + #include "utils.h" + #include +diff --git a/src/lib/tsreader/MemoryBuffer.cpp b/src/lib/tsreader/MemoryBuffer.cpp +index 0e736f2..b5400da 100644 +--- a/src/lib/tsreader/MemoryBuffer.cpp ++++ b/src/lib/tsreader/MemoryBuffer.cpp +@@ -29,7 +29,7 @@ + + #ifdef LIVE555 + +-#include "p8-platform/threads/mutex.h" ++#include "os-dependent.h" + #include "MemoryBuffer.h" + #include //for kodi::Log + #include "TSDebug.h" +@@ -56,7 +56,7 @@ bool CMemoryBuffer::IsRunning() + + void CMemoryBuffer::Clear() + { +- P8PLATFORM::CLockObject BufferLock(m_BufferLock); ++ std::lock_guard BufferLock(m_BufferLock); + std::vector::iterator it = m_Array.begin(); + + for (auto& item : m_Array) +@@ -104,14 +104,17 @@ size_t CMemoryBuffer::ReadFromBuffer(unsigned char *pbData, size_t lDataLength) + { + if (!m_bRunning) + return 0; +- m_event.Wait(5000); ++ ++ std::unique_lock lock(m_BufferLock); ++ m_condition.wait_for(lock, std::chrono::milliseconds(5000)); ++ + if (!m_bRunning) + return 0; + } + + // kodi::Log(ADDON_LOG_DEBUG, "get..%d/%d", lDataLength, m_BytesInBuffer); + size_t bytesWritten = 0; +- P8PLATFORM::CLockObject BufferLock(m_BufferLock); ++ std::lock_guard BufferLock(m_BufferLock); + + while (bytesWritten < lDataLength) + { +@@ -172,7 +175,7 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) + memcpy(item->data, pbData, lDataLength); + bool sleep = false; + { +- P8PLATFORM::CLockObject BufferLock(m_BufferLock); ++ std::lock_guard BufferLock(m_BufferLock); + m_Array.push_back(item); + m_BytesInBuffer += lDataLength; + +@@ -192,7 +195,7 @@ long CMemoryBuffer::PutBuffer(unsigned char *pbData, size_t lDataLength) + } + if (m_BytesInBuffer > 0) + { +- m_event.Broadcast(); ++ m_condition.notify_one(); + } + } + +diff --git a/src/lib/tsreader/MemoryBuffer.h b/src/lib/tsreader/MemoryBuffer.h +index 080553b..4f8708f 100644 +--- a/src/lib/tsreader/MemoryBuffer.h ++++ b/src/lib/tsreader/MemoryBuffer.h +@@ -30,7 +30,8 @@ + + #ifdef LIVE555 + +-#include "p8-platform/threads/mutex.h" ++#include ++#include + #include + + class CMemoryBuffer +@@ -55,9 +56,9 @@ class CMemoryBuffer + + protected: + std::vector m_Array; +- P8PLATFORM::CMutex m_BufferLock; ++ std::mutex m_BufferLock; + size_t m_BytesInBuffer; +- P8PLATFORM::CEvent m_event; ++ std::condition_variable m_condition; + bool m_bRunning; + }; + #endif //LIVE555 +diff --git a/src/lib/tsreader/MemoryReader.h b/src/lib/tsreader/MemoryReader.h +index fef4f98..288984b 100644 +--- a/src/lib/tsreader/MemoryReader.h ++++ b/src/lib/tsreader/MemoryReader.h +@@ -32,6 +32,7 @@ + + #include "FileReader.h" + #include "MemoryBuffer.h" ++#include "os-dependent.h" + + namespace MPTV + { +diff --git a/src/lib/tsreader/MemorySink.cpp b/src/lib/tsreader/MemorySink.cpp +index dafef56..af8b74c 100644 +--- a/src/lib/tsreader/MemorySink.cpp ++++ b/src/lib/tsreader/MemorySink.cpp +@@ -84,7 +84,7 @@ void CMemorySink::addData(unsigned char* data, size_t dataSize, struct timeval U + return; + } + +- P8PLATFORM::CLockObject BufferLock(m_BufferLock); ++ std::lock_guard BufferLock(m_BufferLock); + + m_bReEntrant = true; + m_buffer.PutBuffer(data, dataSize); +diff --git a/src/lib/tsreader/MemorySink.h b/src/lib/tsreader/MemorySink.h +index cc0f3c8..22d91c6 100644 +--- a/src/lib/tsreader/MemorySink.h ++++ b/src/lib/tsreader/MemorySink.h +@@ -35,7 +35,7 @@ + #endif + + #include "MemoryBuffer.h" +-#include "p8-platform/threads/mutex.h" ++#include + + class CMemorySink: public MediaSink + { +@@ -57,7 +57,7 @@ class CMemorySink: public MediaSink + private: // redefined virtual functions: + virtual Boolean continuePlaying(); + +- P8PLATFORM::CMutex m_BufferLock; ++ std::mutex m_BufferLock; + unsigned char* m_pSubmitBuffer; + int m_iSubmitBufferPos; + bool m_bReEntrant; +diff --git a/src/lib/tsreader/MepoRTSPClient.cpp b/src/lib/tsreader/MepoRTSPClient.cpp +index ccd6761..688ae84 100644 +--- a/src/lib/tsreader/MepoRTSPClient.cpp ++++ b/src/lib/tsreader/MepoRTSPClient.cpp +@@ -54,7 +54,7 @@ CRTSPClient::CRTSPClient() + m_env = NULL; + m_fDuration = 0.0f; + m_url[0] = '\0'; +- m_bRunning = false; ++ m_running = false; + } + + CRTSPClient::~CRTSPClient() +@@ -496,7 +496,9 @@ void CRTSPClient::StartBufferThread() + + if (!m_BufferThreadActive) + { +- CreateThread(); ++ m_running = true; ++ m_thread = std::thread([&] { Process(); }); ++ + m_BufferThreadActive = true; + } + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::StartBufferThread done"); +@@ -505,11 +507,12 @@ void CRTSPClient::StartBufferThread() + void CRTSPClient::StopBufferThread() + { + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::StopBufferThread"); +- m_bRunning = false; ++ m_running = false; + if (!m_BufferThreadActive) + return; + +- StopThread(); ++ if (m_thread.joinable()) ++ m_thread.join(); + + m_BufferThreadActive = false; + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::StopBufferThread done"); +@@ -539,25 +542,22 @@ void CRTSPClient::FillBuffer(unsigned long byteCount) + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::Fillbuffer...%d/%d\n", byteCount, m_buffer->Size() ); + } + +-void *CRTSPClient::Process() ++void CRTSPClient::Process() + { + m_BufferThreadActive = true; +- m_bRunning = true; + + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient:: thread started"); + +- while (m_env != NULL && !IsStopped()) ++ while (m_env != NULL && m_running) + { + m_env->taskScheduler().doEventLoop(); +- if (m_bRunning == false) ++ if (m_running == false) + break; + } + + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient:: thread stopped"); + + m_BufferThreadActive = false; +- +- return NULL; + } + + void CRTSPClient::Continue() +@@ -582,8 +582,12 @@ bool CRTSPClient::Pause() + if (m_ourClient != NULL && m_session != NULL) + { + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::Pause() stopthread"); +- StopThread(10000); // Ambass : sometimes 100mS ( prev value ) is not enough and thread is not stopped. +- // now stopping takes around 5 secs ?!?! why ???? ++ // Ambass : sometimes 100mS ( prev value ) is not enough and thread is not stopped. ++ // now stopping takes around 5 secs ?!?! why ???? ++ m_running = false; ++ if (m_thread.joinable()) ++ m_thread.join(); ++ + kodi::Log(ADDON_LOG_DEBUG, "CRTSPClient::Pause() thread stopped"); + RTSPClient* rtspClient=(RTSPClient*)m_ourClient; + rtspClient->pauseMediaSession(*m_session); +diff --git a/src/lib/tsreader/MepoRTSPClient.h b/src/lib/tsreader/MepoRTSPClient.h +index bd6e578..9bb0421 100644 +--- a/src/lib/tsreader/MepoRTSPClient.h ++++ b/src/lib/tsreader/MepoRTSPClient.h +@@ -31,7 +31,8 @@ + + #ifdef LIVE555 + +-#include "p8-platform/threads/threads.h" ++#include ++#include + #include "lib/tsreader/MemoryBuffer.h" + + #include "liveMedia.hh" +@@ -41,7 +42,7 @@ + + #define RTSP_URL_BUFFERSIZE 2048 + +-class CRTSPClient: public P8PLATFORM::CThread ++class CRTSPClient + { + public: + CRTSPClient(); +@@ -101,7 +102,7 @@ class CRTSPClient: public P8PLATFORM::CThread + + // Thread + private: +- virtual void *Process(void); ++ void Process(); + void StartBufferThread(); + void StopBufferThread(); + bool m_BufferThreadActive; +@@ -113,5 +114,8 @@ class CRTSPClient: public P8PLATFORM::CThread + bool m_bRunning; + bool m_bPaused; + char m_outFileName[1000]; ++ ++ std::atomic m_running = {false}; ++ std::thread m_thread; + }; + #endif //LIVE555 +diff --git a/src/lib/tsreader/MultiFileReader.cpp b/src/lib/tsreader/MultiFileReader.cpp +index 21fd7b2..5106418 100644 +--- a/src/lib/tsreader/MultiFileReader.cpp ++++ b/src/lib/tsreader/MultiFileReader.cpp +@@ -35,17 +35,16 @@ + #include "MultiFileReader.h" + #include //for kodi::Log + #include ++#include + #include "TSDebug.h" + #include + #include "utils.h" + #include +-#include "p8-platform/threads/threads.h" + #include ++#include "os-dependent.h" + + #include + +-using namespace P8PLATFORM; +- + //Maximum time in msec to wait for the buffer file to become available - Needed for DVB radio (this sometimes takes some time) + #define MAX_BUFFER_TIMEOUT 1500 + +@@ -121,12 +120,12 @@ namespace MPTV + if (RefreshTSBufferFile() == S_FALSE) + { + // For radio the buffer sometimes needs some time to become available, so wait and try it more than once +- P8PLATFORM::CTimeout timeout(MAX_BUFFER_TIMEOUT); ++ kodi::tools::CEndTime timeout(MAX_BUFFER_TIMEOUT); + + do + { + std::this_thread::sleep_for(std::chrono::milliseconds(100)); +- if (timeout.TimeLeft() == 0) ++ if (timeout.MillisLeft() == 0) + { + kodi::Log(ADDON_LOG_ERROR, "MultiFileReader: timed out while waiting for buffer file to become available"); + kodi::QueueNotification(QUEUE_ERROR, "", "Time out while waiting for buffer file"); +diff --git a/src/os-dependent.h b/src/os-dependent.h +index cdc6980..28c162c 100644 +--- a/src/os-dependent.h ++++ b/src/os-dependent.h +@@ -11,6 +11,13 @@ + + #if (defined(_WIN32) || defined(_WIN64)) + ++#include ++ ++/* Handling of 2-byte Windows wchar strings */ ++#define WcsLen wcslen ++#define WcsToMbs wcstombs ++typedef wchar_t Wchar_t; /* sizeof(wchar_t) = 2 bytes on Windows */ ++ + #ifndef _SSIZE_T_DEFINED + #ifdef _WIN64 + typedef __int64 ssize_t; +@@ -20,20 +27,108 @@ typedef _W64 int ssize_t; + #define _SSIZE_T_DEFINED + #endif + ++/* Prevent deprecation warnings */ ++#define strnicmp _strnicmp ++ ++#define PATH_SEPARATOR_CHAR '\\' ++ + #else + + #if (defined(TARGET_LINUX) || defined(TARGET_DARWIN)) + #include + #include + #include ++ ++#define strnicmp(X,Y,N) strncasecmp(X,Y,N) ++ + inline unsigned long long GetTickCount64(void) + { + auto now = std::chrono::steady_clock::now(); + return std::chrono::duration_cast(now.time_since_epoch()).count(); + }; ++ ++#define PATH_SEPARATOR_CHAR '/' ++ ++#if defined(__APPLE__) ++// for HRESULT ++#include ++#endif ++ ++/* Handling of 2-byte Windows wchar strings on non-Windows targets ++ * Used by The MediaPortal and ForTheRecord pvr addons ++ */ ++typedef uint16_t Wchar_t; /* sizeof(wchar_t) = 4 bytes on Linux, but the MediaPortal buffer files have 2-byte wchars */ ++ ++/* This is a replacement of the Windows wcslen() function which assumes that ++ * wchar_t is a 2-byte character. ++ * It is used for processing Windows wchar strings ++ */ ++inline size_t WcsLen(const Wchar_t *str) ++{ ++ const unsigned short *eos = (const unsigned short*)str; ++ while( *eos++ ) ; ++ return( (size_t)(eos - (const unsigned short*)str) -1); ++}; ++ ++/* This is a replacement of the Windows wcstombs() function which assumes that ++ * wchar_t is a 2-byte character. ++ * It is used for processing Windows wchar strings ++ */ ++inline size_t WcsToMbs(char *s, const Wchar_t *w, size_t n) ++{ ++ size_t i = 0; ++ const unsigned short *wc = (const unsigned short*) w; ++ while(wc[i] && (i < n)) ++ { ++ s[i] = wc[i]; ++ ++i; ++ } ++ if (i < n) s[i] = '\0'; ++ ++ return (i); ++}; ++ + #endif /* TARGET_LINUX || TARGET_DARWIN */ + + #endif + ++typedef long LONG; ++#if !defined(__APPLE__) ++typedef LONG HRESULT; ++#endif ++ ++#ifndef FAILED ++#define FAILED(Status) ((HRESULT)(Status)<0) ++#endif ++ ++#ifndef SUCCEEDED ++#define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) ++#endif ++ ++#define _FILE_OFFSET_BITS 64 ++#define FILE_BEGIN 0 ++#define FILE_CURRENT 1 ++#define FILE_END 2 ++ ++#ifndef S_OK ++#define S_OK 0L ++#endif ++ ++#ifndef S_FALSE ++#define S_FALSE 1L ++#endif ++ ++// Error codes ++#define ERROR_FILENAME_EXCED_RANGE 206L ++#define ERROR_INVALID_NAME 123L ++ ++#ifndef E_OUTOFMEMORY ++#define E_OUTOFMEMORY 0x8007000EL ++#endif ++ ++#ifndef E_FAIL ++#define E_FAIL 0x8004005EL ++#endif ++ + // Additional typedefs + typedef uint8_t byte; +diff --git a/src/pvrclient-mediaportal.cpp b/src/pvrclient-mediaportal.cpp +index 851b940..c1052e3 100644 +--- a/src/pvrclient-mediaportal.cpp ++++ b/src/pvrclient-mediaportal.cpp +@@ -28,8 +28,6 @@ + #include + #include + +-#include +- + using namespace kodi::tools; + using namespace std; + using namespace MPTV; +@@ -70,7 +68,6 @@ cPVRClientMediaPortal::cPVRClientMediaPortal(KODI_HANDLE instance, const std::st + m_BackendTime = 0; + m_tsreader = NULL; + m_genretable = NULL; +- m_iLastRecordingUpdate = 0; + m_signalStateCounter = 0; + m_iSignal = 0; + m_iSNR = 0; +@@ -99,7 +96,7 @@ string cPVRClientMediaPortal::SendCommand(const char* command) + + string cPVRClientMediaPortal::SendCommand(const string& command) + { +- P8PLATFORM::CLockObject critsec(m_mutex); ++ std::lock_guard critsec(m_mutex); + + if ( !m_tcpclient->send(command) ) + { +@@ -174,10 +171,10 @@ ADDON_STATUS cPVRClientMediaPortal::TryConnect() + case PVR_CONNECTION_STATE_SERVER_UNREACHABLE: + kodi::Log(ADDON_LOG_ERROR, "Could not connect to MediaPortal TV Server backend."); + // Start background thread for connecting to the backend +- if (!IsRunning()) ++ if (!m_running) + { +- kodi::Log(ADDON_LOG_INFO, "Waiting for a connection in the background."); +- CreateThread(); ++ m_running = true; ++ m_thread = std::thread([&] { Process(); }); + } + return ADDON_STATUS_LOST_CONNECTION; + case PVR_CONNECTION_STATE_CONNECTING: +@@ -190,7 +187,7 @@ ADDON_STATUS cPVRClientMediaPortal::TryConnect() + + PVR_CONNECTION_STATE cPVRClientMediaPortal::Connect(bool updateConnectionState) + { +- P8PLATFORM::CLockObject critsec(m_connectionMutex); ++ std::lock_guard critsec(m_connectionMutex); + + string result; + +@@ -317,9 +314,11 @@ void cPVRClientMediaPortal::Disconnect() + + kodi::Log(ADDON_LOG_INFO, "Disconnect"); + +- if (IsRunning()) ++ if (m_running) + { +- StopThread(1000); ++ m_running = false; ++ if (m_thread.joinable()) ++ m_thread.join(); + } + + if (m_tcpclient->is_valid() && m_bTimeShiftStarted) +@@ -361,14 +360,14 @@ bool cPVRClientMediaPortal::IsUp() + } + } + +-void* cPVRClientMediaPortal::Process(void) ++void cPVRClientMediaPortal::Process() + { + kodi::Log(ADDON_LOG_DEBUG, "Background thread started."); + + bool keepWaiting = true; + PVR_CONNECTION_STATE state; + +- while (!IsStopped() && keepWaiting) ++ while (m_running && keepWaiting) + { + state = Connect(false); + +@@ -396,8 +395,6 @@ void* cPVRClientMediaPortal::Process(void) + SetConnectionState(state); + + kodi::Log(ADDON_LOG_DEBUG, "Background thread finished."); +- +- return NULL; + } + + +@@ -1188,7 +1185,7 @@ PVR_ERROR cPVRClientMediaPortal::GetRecordings(bool deleted, kodi::addon::PVRRec + } + } + +- m_iLastRecordingUpdate = P8PLATFORM::GetTimeMs(); ++ m_iLastRecordingUpdate = std::chrono::system_clock::now(); + + return PVR_ERROR_NO_ERROR; + } +@@ -1383,7 +1380,7 @@ PVR_ERROR cPVRClientMediaPortal::GetTimers(kodi::addon::PVRTimersResultSet& resu + } + } + +- if ( P8PLATFORM::GetTimeMs() > m_iLastRecordingUpdate + 15000) ++ if ( std::chrono::system_clock::now() > m_iLastRecordingUpdate + std::chrono::milliseconds(15000)) + { + kodi::addon::CInstancePVRClient::TriggerRecordingUpdate(); + } +diff --git a/src/pvrclient-mediaportal.h b/src/pvrclient-mediaportal.h +index 3087634..e5da832 100644 +--- a/src/pvrclient-mediaportal.h ++++ b/src/pvrclient-mediaportal.h +@@ -7,6 +7,10 @@ + + #pragma once + ++#include ++#include ++#include ++#include + #include + + /* Master defines for client control */ +@@ -17,8 +21,6 @@ + #include "Cards.h" + #include "epg.h" + #include "channels.h" +-#include "p8-platform/threads/mutex.h" +-#include "p8-platform/threads/threads.h" + + /* Use a forward declaration here. Including RTSPClient.h via TSReader.h at this point gives compile errors */ + namespace MPTV +@@ -28,9 +30,7 @@ namespace MPTV + class cRecording; + + class ATTRIBUTE_HIDDEN cPVRClientMediaPortal +- : public kodi::addon::CInstancePVRClient, +- public P8PLATFORM::PreventCopy, +- public P8PLATFORM::CThread ++ : public kodi::addon::CInstancePVRClient + { + public: + /* Class interface */ +@@ -110,7 +110,7 @@ class ATTRIBUTE_HIDDEN cPVRClientMediaPortal + + private: + /* TVServerKodi Listening Thread */ +- void* Process(void); ++ void Process(); + PVR_CONNECTION_STATE Connect(bool updateConnectionState = true); + + void LoadGenreTable(void); +@@ -134,9 +134,9 @@ class ATTRIBUTE_HIDDEN cPVRClientMediaPortal + time_t m_BackendTime; + CCards m_cCards; + CGenreTable* m_genretable; +- P8PLATFORM::CMutex m_mutex; +- P8PLATFORM::CMutex m_connectionMutex; +- int64_t m_iLastRecordingUpdate; ++ std::mutex m_mutex; ++ std::mutex m_connectionMutex; ++ std::chrono::system_clock::time_point m_iLastRecordingUpdate; + MPTV::CTsReader* m_tsreader; + std::map m_channels; + int m_signalStateCounter; +@@ -145,6 +145,9 @@ class ATTRIBUTE_HIDDEN cPVRClientMediaPortal + + cRecording* m_lastSelectedRecording; + ++ std::atomic m_running = {false}; ++ std::thread m_thread; ++ + //Used for TV Server communication: + std::string SendCommand(const char* command); + std::string SendCommand(const std::string& command); diff --git a/package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch b/package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch new file mode 100644 index 0000000000..81f583c7f6 --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0007-Remove-charset-converter-dependency.patch @@ -0,0 +1,55 @@ +From bb752566a31029df4ca2c8a2d7fca6680570bfe6 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Thu, 8 Oct 2020 16:10:44 +0100 +Subject: [PATCH] Remove charset converter dependency + +Signed-off-by: Bernd Kuhls +--- + src/windows/FileUtils.cpp | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/windows/FileUtils.cpp b/src/windows/FileUtils.cpp +index 0c8a03e..f829b2a 100644 +--- a/src/windows/FileUtils.cpp ++++ b/src/windows/FileUtils.cpp +@@ -6,24 +6,36 @@ + */ + + #include "../FileUtils.h" +-#include "p8-platform/windows/CharsetConverter.h" + #include + #include "../utils.h" + #ifdef TARGET_WINDOWS_DESKTOP + #include + #endif + +-#ifdef TARGET_WINDOWS + #include + #include +-#endif ++ ++std::wstring ToW(const char* str, size_t length) ++{ ++ int result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, length, nullptr, 0); ++ if (result == 0) ++ return std::wstring(); ++ ++ auto newStr = std::make_unique(result); ++ result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, length, newStr.get(), result); ++ ++ if (result == 0) ++ return std::wstring(); ++ ++ return std::wstring(newStr.get(), result); ++} + + namespace OS + { + bool CFile::Exists(const std::string& strFileName, long* errCode) + { + std::string strWinFile = ToWindowsPath(strFileName); +- std::wstring strWFile = p8::windows::ToW(strWinFile.c_str()); ++ std::wstring strWFile = ToW(strWinFile.c_str(), 0); + DWORD dwAttr = GetFileAttributesW(strWFile.c_str()); + + if(dwAttr != 0xffffffff) diff --git a/package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch b/package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch new file mode 100644 index 0000000000..b38138df9d --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0008-Remove-p8-platform-dependency.patch @@ -0,0 +1,74 @@ +From e78eb2db7c42e302713d5e7129603e56d0e9b43b Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Thu, 8 Oct 2020 16:11:19 +0100 +Subject: [PATCH] Remove p8-platform dependency + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 7 ++----- + debian/control | 2 +- + depends/common/p8-platform/p8-platform.txt | 1 - + depends/windowsstore/p8-platform/p8-platform.txt | 1 - + 4 files changed, 3 insertions(+), 8 deletions(-) + delete mode 100644 depends/common/p8-platform/p8-platform.txt + delete mode 100644 depends/windowsstore/p8-platform/p8-platform.txt + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1226685..f612570 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,6 @@ project(pvr.mediaportal.tvserver) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) + + find_package(Kodi REQUIRED) +-find_package(p8-platform REQUIRED) + find_package(TinyXML REQUIRED) + + set(LIVE555_INCLUDE_DIR +@@ -17,8 +16,7 @@ set(LIVE555_INCLUDE_DIR + + set(LIVE555_DEFINES -DLIVE555 -D_WINSOCK_DEPRECATED_NO_WARNINGS -DSOCKLEN_T=socklen_t -DBSD=1) + +-include_directories(${p8-platform_INCLUDE_DIRS} +- ${TINYXML_INCLUDE_DIR} ++include_directories(${TINYXML_INCLUDE_DIR} + ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways + ${PROJECT_SOURCE_DIR}/src + ${PROJECT_BINARY_DIR} +@@ -229,8 +227,7 @@ source_group("Header Files\\lib\\live555" FILES ${LIVE555_HEADERS}) + # Make sure that CMake adds all files to the MSVC project + list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS} ${LIVE555_SOURCES} ${LIVE555_HEADERS}) + +-set(DEPLIBS ${p8-platform_LIBRARIES} +- ${TINYXML_LIBRARIES}) ++set(DEPLIBS ${TINYXML_LIBRARIES}) + + if(WIN32) + list(APPEND DEPLIBS ws2_32) +diff --git a/debian/control b/debian/control +index 667e47c..e81ff45 100644 +--- a/debian/control ++++ b/debian/control +@@ -2,7 +2,7 @@ Source: kodi-pvr-mediaportal-tvserver + Priority: extra + Maintainer: Nobody + Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev, +- libp8-platform-dev, kodi-addon-dev ++ kodi-addon-dev + Standards-Version: 4.1.2 + Section: libs + Homepage: http://kodi.tv +diff --git a/depends/common/p8-platform/p8-platform.txt b/depends/common/p8-platform/p8-platform.txt +deleted file mode 100644 +index 98ed58a..0000000 +--- a/depends/common/p8-platform/p8-platform.txt ++++ /dev/null +@@ -1 +0,0 @@ +-p8-platform https://github.com/xbmc/platform.git cee64e9dc0b69e8d286dc170a78effaabfa09c44 +diff --git a/depends/windowsstore/p8-platform/p8-platform.txt b/depends/windowsstore/p8-platform/p8-platform.txt +deleted file mode 100644 +index db6f782..0000000 +--- a/depends/windowsstore/p8-platform/p8-platform.txt ++++ /dev/null +@@ -1 +0,0 @@ +-p8-platform https://github.com/afedchin/platform.git win10 diff --git a/package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch b/package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch new file mode 100644 index 0000000000..793d3ce43d --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0009-Travis-changes-for-cpp17.patch @@ -0,0 +1,28 @@ +From e613bfbb4561173046451e9bb1ec64c7879de859 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Sat, 17 Oct 2020 14:06:04 +0100 +Subject: [PATCH] Travis changes for cpp17 + +Signed-off-by: Bernd Kuhls +--- + .travis.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 1f2b61f..285f827 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -10,11 +10,11 @@ env: + matrix: + include: + - os: linux +- dist: xenial ++ dist: bionic + sudo: required + compiler: gcc + - os: linux +- dist: xenial ++ dist: bionic + sudo: required + compiler: clang + - os: linux diff --git a/package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch b/package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch new file mode 100644 index 0000000000..09f4c80b96 --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0010-Remove-register-keyword-as-no-longer-valid-in-CPP17.patch @@ -0,0 +1,23 @@ +From 5cf2d4e05673964e269e4b9a2e779d20f57c0d17 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Sat, 6 Feb 2021 12:56:50 +0000 +Subject: [PATCH] Remove register keyword as no longer valid in CPP17 + +Signed-off-by: Bernd Kuhls +--- + src/lib/tsreader/DvbUtil.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/tsreader/DvbUtil.cpp b/src/lib/tsreader/DvbUtil.cpp +index 8c4798a..c973062 100644 +--- a/src/lib/tsreader/DvbUtil.cpp ++++ b/src/lib/tsreader/DvbUtil.cpp +@@ -77,7 +77,7 @@ namespace MPTV + //******************************************************************* + uint32_t crc32(char *data, int len) + { +- register int i; ++ int i; + uint32_t crc = 0xffffffff; + + for (i = 0; i < len; i++) diff --git a/package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch b/package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch new file mode 100644 index 0000000000..7fded54e7e --- /dev/null +++ b/package/kodi-pvr-mediaportal-tvserver/0011-changelog-and-version-v8.1.1.patch @@ -0,0 +1,42 @@ +From 79e33e1799976e2196132f90bd7f322f213c1a99 Mon Sep 17 00:00:00 2001 +From: phunkyfish +Date: Sat, 6 Feb 2021 00:16:19 +0000 +Subject: [PATCH] changelog and version v8.1.1 + +Signed-off-by: Bernd Kuhls +--- + pvr.mediaportal.tvserver/addon.xml.in | 2 +- + pvr.mediaportal.tvserver/changelog.txt | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/pvr.mediaportal.tvserver/addon.xml.in b/pvr.mediaportal.tvserver/addon.xml.in +index de30c2a..1944bc0 100644 +--- a/pvr.mediaportal.tvserver/addon.xml.in ++++ b/pvr.mediaportal.tvserver/addon.xml.in +@@ -1,7 +1,7 @@ + + + @ADDON_DEPENDS@ +diff --git a/pvr.mediaportal.tvserver/changelog.txt b/pvr.mediaportal.tvserver/changelog.txt +index 7d1630e..8e06c48 100644 +--- a/pvr.mediaportal.tvserver/changelog.txt ++++ b/pvr.mediaportal.tvserver/changelog.txt +@@ -1,3 +1,13 @@ ++v8.1.1 ++- Remove p8-platform dependency ++- Remove charset converter dependency ++- Use std::thread, std::mutex, condition_variable instead of event and bool defines ++- Use thread sleep_for instead of p8 time utils ++- Remove SAFE_DELETE ++- Use kodi StringUtils ++- Remove p8 os includes ++- Revert "Removed no more supported (C++17) declaration keyword (register)" ++ + v8.1.0 + - Update PVR API 7.1.0 + diff --git a/package/kodi-pvr-mediaportal-tvserver/Config.in b/package/kodi-pvr-mediaportal-tvserver/Config.in index 733ca8859e..e8f1e3d611 100644 --- a/package/kodi-pvr-mediaportal-tvserver/Config.in +++ b/package/kodi-pvr-mediaportal-tvserver/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_MEDIAPORTAL_TVSERVER bool "kodi-pvr-mediaportal-tvserver" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help MediaPortal TVServer PVR client addon for Kodi diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash index 53d4316d06..9f700ceef2 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9c05578566f7448dc3a7677587c804596aa314afd493cb9c62cc65ea883645aa kodi-pvr-mediaportal-tvserver-3.5.18-Leia.tar.gz -sha256 f9df5b0c11a23b2d5ca84828c67412ecd8752df46527285aeff48f4d7988d367 debian/copyright +sha256 862b8b0c7c1cd49f0a304dd7caeb6a02dd2b6f767fff256875457040e5ca1177 kodi-pvr-mediaportal-tvserver-8.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk index a00711c662..d2cacae8a5 100644 --- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 3.5.18-Leia +KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 8.1.0-Matrix KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+ -KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = debian/copyright -KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi-platform +KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = LICENSE.md +KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi tinyxml $(eval $(cmake-package)) From c84437722f69be1dd8776eda0fbdd7ccb9d6d0c9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:17 +0100 Subject: [PATCH 107/162] package/kodi-pvr-mythtv: bump version to 7.3.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/janbar/pvr.mythtv/commit/b847285c33ce4e469d29f8ada643c69d4360af62 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/Config.in | 1 - package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 4 ++-- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-mythtv/Config.in b/package/kodi-pvr-mythtv/Config.in index 798ff3e911..ebdbc00487 100644 --- a/package/kodi-pvr-mythtv/Config.in +++ b/package/kodi-pvr-mythtv/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_MYTHTV bool "kodi-pvr-mythtv" - select BR2_PACKAGE_KODI_PLATFORM help MythTV PVR for Kodi diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 1896592cf5..30a7ec841c 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b2048db252966d5f78828cacd41e85d00a522c03fe7f24a0f000f720fe7aff0a kodi-pvr-mythtv-5.10.19-Leia.tar.gz -sha256 0efb11009d447b39ec35d77dc265db3d1c3d261730bbc33b267587254d973ec8 debian/copyright +sha256 fa741677fc2d58689111d18c8eb1114115f4c33bc99267bb761f225e82fdc588 kodi-pvr-mythtv-7.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index e902bab148..98e83e2035 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 5.10.19-Leia +KODI_PVR_MYTHTV_VERSION = 7.3.0-Matrix KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ -KODI_PVR_MYTHTV_LICENSE_FILES = debian/copyright -KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform +KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md +KODI_PVR_MYTHTV_DEPENDENCIES = kodi $(eval $(cmake-package)) From 6e9b9f4aa2a5c5566523a4b183d9b8e465c13e42 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:18 +0100 Subject: [PATCH 108/162] package/kodi-pvr-nextpvr: bump version to 8.2.1-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.nextpvr/commit/98b78cee615f5efeb207583c8b75adbaa742e43c https://github.com/kodi-pvr/pvr.nextpvr/commit/304b0ba94fc2ffb5f2982e6ea4c31cd0e601a44e Added dependency to tinyxml2: https://github.com/kodi-pvr/pvr.nextpvr/commit/6855f12ad8496760fa0787660b2c8025ce77311a Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-nextpvr/Config.in | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 4 ++-- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-nextpvr/Config.in b/package/kodi-pvr-nextpvr/Config.in index e520426796..d260df833f 100644 --- a/package/kodi-pvr-nextpvr/Config.in +++ b/package/kodi-pvr-nextpvr/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_NEXTPVR bool "kodi-pvr-nextpvr" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML2 help Kodi's NextPVR client addon diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 345ece6df9..f8d9e6c853 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1f5576070a0bf076d1f28cdd547bc4ff134861c18a71cff7fd036eaacc357707 kodi-pvr-nextpvr-3.3.21-Leia.tar.gz -sha256 0bd576badce05c6b4315c415dabd77d80c871e72026c399f7a7bb8582e0911fe debian/copyright +sha256 ebe2b1f96b49c08c5960a6f75da6cb3cfc0cc30d6fafe43b77d2f2249915b752 kodi-pvr-nextpvr-8.2.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index b35216048c..bed6097c8a 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 3.3.21-Leia +KODI_PVR_NEXTPVR_VERSION = 8.2.1-Matrix KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ -KODI_PVR_NEXTPVR_LICENSE_FILES = debian/copyright -KODI_PVR_NEXTPVR_DEPENDENCIES = kodi-platform +KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md +KODI_PVR_NEXTPVR_DEPENDENCIES = kodi tinyxml2 $(eval $(cmake-package)) From f45a4ce07b5b9fe73e65c9964fdafbecd89819c8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:19 +0100 Subject: [PATCH 109/162] package/kodi-pvr-njoy: bump version to 7.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.njoy/commit/eb5613fb8bbf45643e211147f39f106ea9ff573d Added missing dependency to tinyxml. Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-njoy/Config.in | 2 +- package/kodi-pvr-njoy/kodi-pvr-njoy.hash | 4 ++-- package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-njoy/Config.in b/package/kodi-pvr-njoy/Config.in index 33c493cb8b..bb84ea3a66 100644 --- a/package/kodi-pvr-njoy/Config.in +++ b/package/kodi-pvr-njoy/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_KODI_PVR_NJOY bool "kodi-pvr-njoy" - select BR2_PACKAGE_KODI_PLATFORM + select BR2_PACKAGE_TINYXML help Kodi's Njoy N7 client addon diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash index 3071dfac67..76e5e988db 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8c42a3c3754d7a07de9682504c4883a584eb21a92b9af70f0129ffc2707c1554 kodi-pvr-njoy-3.4.2-Leia.tar.gz -sha256 9d42154eabd84ae131cc6384a3ea0fc622c3551595564bec7a6bec8df4a57fbd debian/copyright +sha256 26134e815efd38fa09507a6119e6463c4785a78a417e253558d23a94a9989613 kodi-pvr-njoy-7.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk index ca86d46d85..17a69af73b 100644 --- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_NJOY_VERSION = 3.4.2-Leia +KODI_PVR_NJOY_VERSION = 7.1.0-Matrix KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) KODI_PVR_NJOY_LICENSE = GPL-2.0+ -KODI_PVR_NJOY_LICENSE_FILES = debian/copyright -KODI_PVR_NJOY_DEPENDENCIES = kodi-platform +KODI_PVR_NJOY_LICENSE_FILES = LICENSE.md +KODI_PVR_NJOY_DEPENDENCIES = kodi tinyxml $(eval $(cmake-package)) From feba2e8b6ab692e64c22c8740579496540a9c876 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:20 +0100 Subject: [PATCH 110/162] package/kodi-pvr-octonet: bump version to 4.1.0-2-Matrix Switch dependency to kodi after upstream removed the dependency to libplatform and kodi-platform: https://github.com/DigitalDevices/pvr.octonet/commit/ec08c205408de47a08fdc6e540e21dc0d6e18bd7 https://github.com/DigitalDevices/pvr.octonet/commit/e7449d9537a650790c2e742a57277d46b6cf6b33 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-octonet/Config.in | 2 -- package/kodi-pvr-octonet/kodi-pvr-octonet.hash | 4 ++-- package/kodi-pvr-octonet/kodi-pvr-octonet.mk | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/kodi-pvr-octonet/Config.in b/package/kodi-pvr-octonet/Config.in index b8bcd7e218..e831194ba5 100644 --- a/package/kodi-pvr-octonet/Config.in +++ b/package/kodi-pvr-octonet/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_KODI_PVR_OCTONET bool "kodi-pvr-octonet" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp select BR2_PACKAGE_JSON_FOR_MODERN_CPP - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBPLATFORM help DigitalDevices Octonet PVR client addon for Kodi diff --git a/package/kodi-pvr-octonet/kodi-pvr-octonet.hash b/package/kodi-pvr-octonet/kodi-pvr-octonet.hash index 5ee0eeb6e9..8fdeac2a92 100644 --- a/package/kodi-pvr-octonet/kodi-pvr-octonet.hash +++ b/package/kodi-pvr-octonet/kodi-pvr-octonet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e55d440afe3b1f1bc1529d1f662d4d18f5334ecf01e023d34d5a7e419b6fbf10 kodi-pvr-octonet-e35cc373476a92aee11ec8e8a14fb8fc086a4f84.tar.gz -sha256 8547bcbe8bd72c18ac285fd801fcbff8806a988913741b14497f4aba88bba403 debian/copyright +sha256 091ba0288a8c12d42f6352b453fb39bcace3174c8763f6cbe3dc8fef40a33f2b kodi-pvr-octonet-4.1.0-2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk index 890a283565..becd43a4e4 100644 --- a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk +++ b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_OCTONET_VERSION = e35cc373476a92aee11ec8e8a14fb8fc086a4f84 +KODI_PVR_OCTONET_VERSION = 4.1.0-2-Matrix KODI_PVR_OCTONET_SITE = $(call github,DigitalDevices,pvr.octonet,$(KODI_PVR_OCTONET_VERSION)) KODI_PVR_OCTONET_LICENSE = GPL-2.0+ -KODI_PVR_OCTONET_LICENSE_FILES = debian/copyright -KODI_PVR_OCTONET_DEPENDENCIES = json-for-modern-cpp kodi-platform libplatform +KODI_PVR_OCTONET_LICENSE_FILES = LICENSE.md +KODI_PVR_OCTONET_DEPENDENCIES = json-for-modern-cpp kodi $(eval $(cmake-package)) From ea50ce3a067d0d79e86074be09e49d63fd1dd556 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:21 +0100 Subject: [PATCH 111/162] package/kodi-pvr-pctv: bump version to 6.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.pctv/commit/b6cebce2c9579a2bcce619dbba586eafd2cf2701 https://github.com/kodi-pvr/pvr.pctv/commit/db2eca67995017c7b3b4755e5bf674faaebe77ea Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-pctv/Config.in | 1 - package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 4 ++-- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-pctv/Config.in b/package/kodi-pvr-pctv/Config.in index 255cd4a5f0..11fe09b2f1 100644 --- a/package/kodi-pvr-pctv/Config.in +++ b/package/kodi-pvr-pctv/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_PCTV bool "kodi-pvr-pctv" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM help PCTV PVR client addon for Kodi diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index 30fb81a906..0e3f464cff 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 10124e5444c6cfb0c77bad1d1122f6ba5fc233248d6b33066ba799f4dedceeee kodi-pvr-pctv-2.4.7-Leia.tar.gz -sha256 43376e70ae80133530c8ce71a3b0dcde8529a8162d3b3956009eb8fc0f5c559c debian/copyright +sha256 94b8be4988cb6d8c61f6bdf237ddabb04d77fe4900f61411f5abf918eb5a078c kodi-pvr-pctv-6.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 851788c96b..78d500e3e8 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 2.4.7-Leia +KODI_PVR_PCTV_VERSION = 6.1.0-Matrix KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ -KODI_PVR_PCTV_LICENSE_FILES = debian/copyright -KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi-platform +KODI_PVR_PCTV_LICENSE_FILES = LICENSE.md +KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi $(eval $(cmake-package)) From 269e9548cdb8335ecae9d5f6028faaaf27782ef0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:22 +0100 Subject: [PATCH 112/162] package/kodi-pvr-stalker: bump version to 7.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.stalker/commit/8cee21986877bd4d324d078203e2bd9101e794ec https://github.com/kodi-pvr/pvr.stalker/commit/e30167549bbd7a33b2aca4bdc93ddf9e2b83c442 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-stalker/Config.in | 1 - package/kodi-pvr-stalker/kodi-pvr-stalker.hash | 4 ++-- package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-stalker/Config.in b/package/kodi-pvr-stalker/Config.in index d334d0c2cb..f82d5a497f 100644 --- a/package/kodi-pvr-stalker/Config.in +++ b/package/kodi-pvr-stalker/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_PVR_STALKER bool "kodi-pvr-stalker" select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_LIBXML2 help A PVR Client that connects Kodi to Stalker Middleware diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index cc129d90ec..545af9ec7e 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 03eb428f21d6b8526b6671278b60ac6dc5a761a515af27172d8ac5c814cc3f65 kodi-pvr-stalker-3.4.10-Leia.tar.gz -sha256 f9fa34b2caa07376a7a976c1f0b1b9761b37449afd4ceb1e7afa283492054237 debian/copyright +sha256 bce055008d0ae7212924f41753970e3176a218f6a45bd76b202463a43be3d192 kodi-pvr-stalker-7.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk index 0ae41171a9..5ca466981c 100644 --- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_STALKER_VERSION = 3.4.10-Leia +KODI_PVR_STALKER_VERSION = 7.1.0-Matrix KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) KODI_PVR_STALKER_LICENSE = GPL-2.0+ -KODI_PVR_STALKER_LICENSE_FILES = debian/copyright -KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform libxml2 +KODI_PVR_STALKER_LICENSE_FILES = LICENSE.md +KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi libxml2 $(eval $(cmake-package)) From 434dc09f2c639b362d76df7a251634172df44815 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:23 +0100 Subject: [PATCH 113/162] package/kodi-pvr-vbox: bump version to 8.1.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.vbox/commit/29bd329feb6a0b007299636d61f66b9efb526e5f https://github.com/kodi-pvr/pvr.vbox/commit/b007646f4389ce81f30ca60bdd7b7323e552ee22 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vbox/Config.in | 1 - package/kodi-pvr-vbox/kodi-pvr-vbox.hash | 4 ++-- package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-vbox/Config.in b/package/kodi-pvr-vbox/Config.in index c1c22c10d1..202e3c66e8 100644 --- a/package/kodi-pvr-vbox/Config.in +++ b/package/kodi-pvr-vbox/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_VBOX bool "kodi-pvr-vbox" - select BR2_PACKAGE_KODI_PLATFORM help Kodi PVR addon for interfacing with VBox Communications XTi TV Gateway diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash index b753b994a1..dc186f63f1 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98aadcf3d0109a7dc5f85b4e5473d595039b59c46b0686a2fbda88ff7631ee0c kodi-pvr-vbox-4.7.0-Leia.tar.gz -sha256 f535b79e33bdf4d270f8aed3fdcb92f807981f808d7f5e3c053c088e5ccf553b debian/copyright +sha256 b30548dfbf892f7bedbf191b5a9d93fa978fb794f897268876a1e607518e15af kodi-pvr-vbox-8.1.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk index b10bfc5b85..9ce667d496 100644 --- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_VBOX_VERSION = 4.7.0-Leia +KODI_PVR_VBOX_VERSION = 8.1.0-Matrix KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) KODI_PVR_VBOX_LICENSE = GPL-2.0+ -KODI_PVR_VBOX_LICENSE_FILES = debian/copyright -KODI_PVR_VBOX_DEPENDENCIES = kodi-platform +KODI_PVR_VBOX_LICENSE_FILES = LICENSE.md +KODI_PVR_VBOX_DEPENDENCIES = kodi $(eval $(cmake-package)) From dbe372ac12ad50a7d8048ddd3eea8cb7963b49bc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:24 +0100 Subject: [PATCH 114/162] package/kodi-pvr-vdr-vnsi: bump version to 8.2.1-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.vdr.vnsi/commit/d8af242ba923590330c65fded9034c1ac9b6157c https://github.com/kodi-pvr/pvr.vdr.vnsi/commit/49cc728f18bbe8df1d1779eb5e42e060fa9f78ed Added dependency to gcc >= 7 due to c++17 code added by https://github.com/kodi-pvr/pvr.vdr.vnsi/commit/8a3f3c8fe378a4aae4ac381db45d0ce980f44761 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vdr-vnsi/Config.in | 5 ++++- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash | 4 ++-- package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-vdr-vnsi/Config.in b/package/kodi-pvr-vdr-vnsi/Config.in index 768dec88fd..6b57900b29 100644 --- a/package/kodi-pvr-vdr-vnsi/Config.in +++ b/package/kodi-pvr-vdr-vnsi/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_KODI_PVR_VDR_VNSI bool "kodi-pvr-vdr-vnsi" - select BR2_PACKAGE_KODI_PLATFORM + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 help Kodi PVR addon VNSI https://github.com/kodi-pvr/pvr.vdr.vnsi + +comment "kodi-pvr-vdr-vnsi needs a toolchain w/ gcc >= 7" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index f7043b58a0..8b6548de9a 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f0ea8907e77ca014429bbe73d07c3410cc7be25a6db0df157863b87d2684affb kodi-pvr-vdr-vnsi-3.6.4-Leia.tar.gz -sha256 28266596fdf4162d4f15985e0108cd9ddb42531ddad2297011649c1af49f7fe2 debian/copyright +sha256 aebb00f433b93256760960149e41647d65c84fdf6a78d7467df304f26c8bc4b2 kodi-pvr-vdr-vnsi-8.2.2-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk index f467fa98f5..4eff02f264 100644 --- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_VDR_VNSI_VERSION = 3.6.4-Leia +KODI_PVR_VDR_VNSI_VERSION = 8.2.2-Matrix KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+ -KODI_PVR_VDR_VNSI_LICENSE_FILES = debian/copyright -KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi-platform +KODI_PVR_VDR_VNSI_LICENSE_FILES = LICENSE.md +KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi $(eval $(cmake-package)) From 6bd4830c82e2836d17d91cf91695d0f87b261a4d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:25 +0100 Subject: [PATCH 115/162] package/kodi-pvr-vuplus: bump version to 7.4.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.vuplus/commit/122a9b281668d31f921e842e8700b2f048121c16 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-vuplus/Config.in | 1 - package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash | 4 ++-- package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-vuplus/Config.in b/package/kodi-pvr-vuplus/Config.in index b6a03e843f..862f5f9267 100644 --- a/package/kodi-pvr-vuplus/Config.in +++ b/package/kodi-pvr-vuplus/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_KODI_PVR_VUPLUS bool "kodi-pvr-vuplus" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp select BR2_PACKAGE_JSON_FOR_MODERN_CPP - select BR2_PACKAGE_KODI_PLATFORM select BR2_PACKAGE_TINYXML help VuPlus PVR client addon for Kodi diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash index e80e51bc78..2b12649aea 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d7dd890e4491e211ff3781cdc043347ab7a4ef6e00619ac1b4641ed81b0c3626 kodi-pvr-vuplus-3.28.9-Leia.tar.gz -sha256 e98518889de8d38eaa6ddcb086b6e3b86efed98b501a5c666b9cf48f79e6df5d debian/copyright +sha256 2024ed208168089e51d9beade47fedec2e80e23044029f6919e27746f9634150 kodi-pvr-vuplus-7.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk index bf1de1178d..fee4e816ab 100644 --- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_VUPLUS_VERSION = 3.28.9-Leia +KODI_PVR_VUPLUS_VERSION = 7.4.0-Matrix KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) KODI_PVR_VUPLUS_LICENSE = GPL-2.0+ -KODI_PVR_VUPLUS_LICENSE_FILES = debian/copyright -KODI_PVR_VUPLUS_DEPENDENCIES = json-for-modern-cpp kodi-platform tinyxml +KODI_PVR_VUPLUS_LICENSE_FILES = LICENSE.md +KODI_PVR_VUPLUS_DEPENDENCIES = json-for-modern-cpp kodi tinyxml $(eval $(cmake-package)) From 818cff7bff1d4a97f20f4a0508b8edf0bf2876fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:26 +0100 Subject: [PATCH 116/162] package/kodi-pvr-wmc: bump version to 6.1.1-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/kodi-pvr/pvr.wmc/commit/6549e6f0cec7314dd4a34dc5cad96d6f76ac7751 https://github.com/kodi-pvr/pvr.wmc/commit/f824bd285df06a45fc0a2f57859fd5b28c426ad6 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-wmc/Config.in | 1 - package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 4 ++-- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-pvr-wmc/Config.in b/package/kodi-pvr-wmc/Config.in index 2672c83434..3daf4c387b 100644 --- a/package/kodi-pvr-wmc/Config.in +++ b/package/kodi-pvr-wmc/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KODI_PVR_WMC bool "kodi-pvr-wmc" - select BR2_PACKAGE_KODI_PLATFORM help Kodi's Windows Media Center client addon diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index d5387e8534..0da7c17c23 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fb150ba3b8b41cf164425b56ae5dda3a5fb2f64cdea7229900113965d492fee kodi-pvr-wmc-2.4.6-Leia.tar.gz -sha256 6d97c3d608a5d59565b567313bd3e53a1d0066ed59f4ae8e474c895d0c20e746 debian/copyright +sha256 b58b4d6d2358faf5887133ea1794a2d3f8b35f77411aacafa569d45f7bc4bb3a kodi-pvr-wmc-6.1.1-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index c280f89df4..7135fda9f2 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 2.4.6-Leia +KODI_PVR_WMC_VERSION = 6.1.1-Matrix KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ -KODI_PVR_WMC_LICENSE_FILES = debian/copyright -KODI_PVR_WMC_DEPENDENCIES = kodi-platform +KODI_PVR_WMC_LICENSE_FILES = LICENSE.md +KODI_PVR_WMC_DEPENDENCIES = kodi $(eval $(cmake-package)) From 62983606f8cb877b9e232cd09fcd1175fb831e5d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:27 +0100 Subject: [PATCH 117/162] package/kodi-pvr-zattoo: bump version to 19.7.3-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform and libplatform: https://github.com/rbuehlma/pvr.zattoo/commit/382c83d0cadcfb3152c577291ee0a2d1015a128c https://github.com/rbuehlma/pvr.zattoo/commit/a813b2c9f0510d2b9cd23d57b659ae5346c63065 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-zattoo/Config.in | 2 -- package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash | 4 ++-- package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/kodi-pvr-zattoo/Config.in b/package/kodi-pvr-zattoo/Config.in index 5dfadcadd1..9a6eb3fec5 100644 --- a/package/kodi-pvr-zattoo/Config.in +++ b/package/kodi-pvr-zattoo/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_KODI_PVR_ZATTOO bool "kodi-pvr-zattoo" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBPLATFORM select BR2_PACKAGE_RAPIDJSON select BR2_PACKAGE_TINYXML2 help diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index a9e2cd996c..824a40b96a 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9c3dc2ed9f8c39bcc4f5798439b85f2bdae1a427ffeb1b9d18aa5e2caca29f4e kodi-pvr-zattoo-18.1.23-Leia.tar.gz -sha256 d3670aef89085fd6b97665967a8422c89324afbc4720daa0975696a2ee92e236 debian/copyright +sha256 7f9f1e5907ea0ad8a30d073e67ad42a2ddc16a99f30f704a6b9690ce5dac3268 kodi-pvr-zattoo-19.7.3-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index cb995c9c78..58acd7edc6 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 18.1.23-Leia +KODI_PVR_ZATTOO_VERSION = 19.7.3-Matrix KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ -KODI_PVR_ZATTOO_LICENSE_FILES = debian/copyright -KODI_PVR_ZATTOO_DEPENDENCIES = kodi-platform libplatform rapidjson tinyxml2 +KODI_PVR_ZATTOO_LICENSE_FILES = LICENSE.md +KODI_PVR_ZATTOO_DEPENDENCIES = kodi rapidjson tinyxml2 $(eval $(cmake-package)) From de87bbe0b402c5dc97772d4780095778214edbf9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:28 +0100 Subject: [PATCH 118/162] package/kodi-screensaver-asteroids: bump version to 2.6.0-Matrix Remove dependency to opengl, opengles support was fixed upstream: https://github.com/xbmc/screensaver.asteroids/commit/360a02fc20925fa17179f3298dd4515b4354e266 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-asteroids/Config.in | 4 ---- .../kodi-screensaver-asteroids.hash | 4 ++-- .../kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/kodi-screensaver-asteroids/Config.in b/package/kodi-screensaver-asteroids/Config.in index 3d66c3dcc3..833e065dfa 100644 --- a/package/kodi-screensaver-asteroids/Config.in +++ b/package/kodi-screensaver-asteroids/Config.in @@ -1,11 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS bool "kodi-screensaver-asteroids" - depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_GLM help Asteroids screensaver for Kodi https://github.com/xbmc/screensaver.asteroids - -comment "kodi-screensaver-asteroids needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash index e6855a3bc6..a8886d2733 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f4b54ed79eedd1a39e24dcbe8d372dbfc9edbc9358499ea9ab28777dd9082ee3 kodi-screensaver-asteroids-2.3.3-Leia.tar.gz -sha256 297a1d34e6000f1b1a924f5ab75c16c2270968bfa47357dd8fa3799c9dfc47d8 debian/copyright +sha256 b60d0123dd2ad2326a03b2a66a3cdba3ac17f0a109c4ecedc3216699ca28cae2 kodi-screensaver-asteroids-2.6.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk index dcd0a3d34c..add0ca5b9b 100644 --- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.3.3-Leia +KODI_SCREENSAVER_ASTEROIDS_VERSION = 2.6.0-Matrix KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,xbmc,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = glm kodi $(eval $(cmake-package)) From 2ae0f23fcffc10a01561845188476c81aa98fe41 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:29 +0100 Subject: [PATCH 119/162] package/kodi-screensaver-asterwave: bump version to 3.3.0-Matrix Remove dependency to libsoil: https://github.com/xbmc/screensaver.asterwave/commit/8a778873754de09c93031408c71b3c40d198f3bc Add dependency to glm and remove dependency to opengl and libglu, opengles support was added upstream: https://github.com/xbmc/screensaver.asterwave/commit/fb1d7ca8bf45b278afdb7a0dd2be4117c0fe3508 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-asterwave/Config.in | 7 +------ .../kodi-screensaver-asterwave.hash | 4 ++-- .../kodi-screensaver-asterwave.mk | 10 +++++++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package/kodi-screensaver-asterwave/Config.in b/package/kodi-screensaver-asterwave/Config.in index b5e80cc535..ffb5caadd7 100644 --- a/package/kodi-screensaver-asterwave/Config.in +++ b/package/kodi-screensaver-asterwave/Config.in @@ -1,12 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE bool "kodi-screensaver-asterwave" - depends on BR2_PACKAGE_HAS_LIBGL # libglu, libsoil - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_LIBSOIL + select BR2_PACKAGE_GLM help AsterWave screensaver for Kodi https://github.com/xbmc/screensaver.asterwave - -comment "kodi-screensaver-asterwave needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash index a7fc05789c..8b47070194 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d61bcdd8b74b50a26eab1597718b12ec260f6c6cdde0f143dbc1ce958ca86c69 kodi-screensaver-asterwave-3.0.5-Leia.tar.gz -sha256 a0268e081014f3a555be39f7eb0fff759424963324915ad2ea56bf26668685e7 debian/copyright +sha256 4645ea5923df5a2cae84887b743c3963940344439c37ca2e18896d082ac76b1d kodi-screensaver-asterwave-3.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk index b982395ead..9e768fce85 100644 --- a/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ b/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk @@ -4,10 +4,14 @@ # ################################################################################ -KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.0.5-Leia +KODI_SCREENSAVER_ASTERWAVE_VERSION = 3.3.0-Matrix KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,xbmc,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) KODI_SCREENSAVER_ASTERWAVE_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil +KODI_SCREENSAVER_ASTERWAVE_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = glm kodi + +KODI_SCREENSAVER_ASTERWAVE_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" $(eval $(cmake-package)) From 017984a553b6d3737b9bc3217732b4b590ba35e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:30 +0100 Subject: [PATCH 120/162] package/kodi-screensaver-biogenesis: bump version to 2.5.0-Matrix Remove dependency to opengl, opengles support was fixed upstream: https://github.com/xbmc/screensaver.biogenesis/commit/2de1b7eb5897001f7bdf72ec4e390be749ccac13 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-biogenesis/Config.in | 4 ---- .../kodi-screensaver-biogenesis.hash | 4 ++-- .../kodi-screensaver-biogenesis.mk | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/kodi-screensaver-biogenesis/Config.in b/package/kodi-screensaver-biogenesis/Config.in index 9703e9091b..26f134d0bb 100644 --- a/package/kodi-screensaver-biogenesis/Config.in +++ b/package/kodi-screensaver-biogenesis/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS bool "kodi-screensaver-biogenesis" - depends on BR2_PACKAGE_HAS_LIBGL help BioGenesis screensaver for Kodi https://github.com/xbmc/screensaver.biogenesis - -comment "kodi-screensaver-biogenesis needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash index df07f9fbc5..1f2c5e6305 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b0f721d112282f633a769e7b077c5dd52e5045a8f1ae32c4e602b0e2e937acb0 kodi-screensaver-biogenesis-2.2.3-Leia.tar.gz -sha256 d38b9e2768b49acdedcb21a202d12753c8f1d7e85e5ee24ff1e4aee3c7601a65 debian/copyright +sha256 bf56384e6956674cd911c52b2807993d0a6e0ffa9623b5a1981a3153911e135a kodi-screensaver-biogenesis-2.5.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk index 562c279ec6..8b2d6b2ee5 100644 --- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.2.3-Leia +KODI_SCREENSAVER_BIOGENESIS_VERSION = 2.5.0-Matrix KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,xbmc,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi $(eval $(cmake-package)) From 6ee5476913f8bacf8e856ba344b2429b413fab65 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:31 +0100 Subject: [PATCH 121/162] package/kodi-screensaver-cpblobs: bump version to 3.4.0-Matrix Remove dependency to libsoil: https://github.com/xbmc/screensaver.cpblobs/commit/c505105f277b7e4bae0797e1c3cf89a0515ff3a5 Add dependency to glm and remove dependency to opengl, opengles support was added upstream: https://github.com/xbmc/screensaver.cpblobs/commit/cab48fbc8a7b288b758eb10c1c27caa99cc33f06 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-cpblobs/Config.in | 6 +----- .../kodi-screensaver-cpblobs.hash | 4 ++-- .../kodi-screensaver-cpblobs.mk | 10 +++++++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/kodi-screensaver-cpblobs/Config.in b/package/kodi-screensaver-cpblobs/Config.in index 4e0003bddc..7f9a591418 100644 --- a/package/kodi-screensaver-cpblobs/Config.in +++ b/package/kodi-screensaver-cpblobs/Config.in @@ -1,11 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS bool "kodi-screensaver-cpblobs" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL + select BR2_PACKAGE_GLM help CpBlobs screensaver for Kodi https://github.com/xbmc/screensaver.cpblobs - -comment "kodi-screensaver-cpblobs needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash index 4ff614a995..bc77c36248 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 afab934a2c93f73334943775f45f5a1d065e74714528bc700459d110e88e43a4 kodi-screensaver-cpblobs-3.0.5-Leia.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 eda36572da291d870dacbf3ad596e4ff3daed96350d9585583c279b55cfdc34a kodi-screensaver-cpblobs-3.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk index 01f6bdf3d3..628f254a42 100644 --- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk @@ -4,10 +4,14 @@ # ################################################################################ -KODI_SCREENSAVER_CPBLOBS_VERSION = 3.0.5-Leia +KODI_SCREENSAVER_CPBLOBS_VERSION = 3.4.0-Matrix KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,xbmc,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0 -KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE -KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = kodi libsoil +KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = glm kodi + +KODI_SCREENSAVER_CPBLOBS_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" $(eval $(cmake-package)) From 8004d2c0ad8cf443b7b272f212292fba9e127b2d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:32 +0100 Subject: [PATCH 122/162] package/kodi-screensaver-greynetic: bump version to 2.5.0-Matrix Remove dependency to opengl, add dependency to glm, opengles support was fixed upstream: https://github.com/xbmc/screensaver.greynetic/commit/aee7082c92f8c8aa1195c33db89e38753a039bba Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-greynetic/Config.in | 5 +---- .../kodi-screensaver-greynetic.hash | 4 ++-- .../kodi-screensaver-greynetic.mk | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/kodi-screensaver-greynetic/Config.in b/package/kodi-screensaver-greynetic/Config.in index 685feb8872..92db2855e6 100644 --- a/package/kodi-screensaver-greynetic/Config.in +++ b/package/kodi-screensaver-greynetic/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC bool "kodi-screensaver-greynetic" - depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_GLM help Greynetic screensaver for Kodi https://github.com/xbmc/screensaver.greynetic - -comment "kodi-screensaver-greynetic needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash index 87961fdae0..d1f4992240 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e9a24d3204e3d6d5b5302a865e37c6f2ae9e25a3536eeda4205830f5e0256555 kodi-screensaver-greynetic-2.2.3-Leia.tar.gz -sha256 2905fdee5c68dc4944c42711d45f47794e8fb881bd67d66d0875d10f9a2156a0 debian/copyright +sha256 093c77ad332dc5797f1866895218d6c6b4490ef1f9bd4cbdf15c000c3b881798 kodi-screensaver-greynetic-2.5.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk index 6311325540..b7c4a15b87 100644 --- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_GREYNETIC_VERSION = 2.2.3-Leia +KODI_SCREENSAVER_GREYNETIC_VERSION = 2.5.0-Matrix KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,xbmc,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi +KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = glm kodi $(eval $(cmake-package)) From 9bae62f5789d0b763a8d8c457eebc92dba53269e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:33 +0100 Subject: [PATCH 123/162] package/kodi-screensaver-matrixtrails: bump version to 2.6.0-Matrix Remove dependency to libsoil: https://github.com/xbmc/screensaver.matrixtrails/commit/92a0d44e9151cfce3be74e81a3e39f0688d69b7a Remove dependency to opengl, opengles support was fixed upstream: https://github.com/xbmc/screensaver.matrixtrails/commit/ea6408ee391c75ae7ee4cb9f948df2ff8c0c87c5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-matrixtrails/Config.in | 5 ----- .../kodi-screensaver-matrixtrails.hash | 4 ++-- .../kodi-screensaver-matrixtrails.mk | 10 +++++++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package/kodi-screensaver-matrixtrails/Config.in b/package/kodi-screensaver-matrixtrails/Config.in index 270a51c9f4..9f031ba10d 100644 --- a/package/kodi-screensaver-matrixtrails/Config.in +++ b/package/kodi-screensaver-matrixtrails/Config.in @@ -1,11 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS bool "kodi-screensaver-matrixtrails" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL help Matrix trails screensaver for Kodi https://github.com/xbmc/screensaver.matrixtrails - -comment "kodi-screensaver-matrixtrails needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash index 26b95cbc77..1f35f11b7d 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5a2f5bca0c197eea87f06376941c6d0ddbc81cf144d8c3854ac148fdec3400ec kodi-screensaver-matrixtrails-2.2.3-Leia.tar.gz -sha256 385a17599b44aaea10537374c1991c21a5e06153878917b12f96fc1cf8bbc118 debian/copyright +sha256 49986b82e7319e25ef2b3ec84b3892bbf1cb0b5253bd541da730c5cf5dd1940b kodi-screensaver-matrixtrails-2.6.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk index 10d3d45e08..a89ea72d5d 100644 --- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk @@ -4,10 +4,14 @@ # ################################################################################ -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.3-Leia +KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.6.0-Matrix KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil +KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi + +KODI_SCREENSAVER_MATRIXTRAILS_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)" $(eval $(cmake-package)) From 2d300aa916221f55cacce28c9f3056f2518f946b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:34 +0100 Subject: [PATCH 124/162] package/kodi-screensaver-pingpong: bump version to 2.4.0-Matrix Remove dependency to opengl, add dependency to glm, opengles support was added upstream: https://github.com/xbmc/screensaver.pingpong/commit/39ccbf75e6a7a56781329aeb508ae4f2ce210e4f Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-pingpong/Config.in | 5 +---- .../kodi-screensaver-pingpong.hash | 4 ++-- .../kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/kodi-screensaver-pingpong/Config.in b/package/kodi-screensaver-pingpong/Config.in index bc76fffd6e..2983f7c2ea 100644 --- a/package/kodi-screensaver-pingpong/Config.in +++ b/package/kodi-screensaver-pingpong/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG bool "kodi-screensaver-pingpong" - depends on BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_GLM help Ping-pong screensaver for Kodi https://github.com/xbmc/screensaver.pingpong - -comment "kodi-screensaver-pingpong needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash index 4b6114fd16..245fdfdbe9 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b87e65d2e3c290de7167e1098899d5816103958a99769d84e930ffd2cbfa7d00 kodi-screensaver-pingpong-2.1.3-Leia.tar.gz -sha256 96e9b817ea6384e3d2c5241c8a0504df11d6f8bd0a2f58f25df7152da64f263c debian/copyright +sha256 c38cda571b345d61882b43cea839536fa6fbfbb08e07231e8d8bc8adb8d28c08 kodi-screensaver-pingpong-2.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk index 929539f044..cd794128f3 100644 --- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_PINGPONG_VERSION = 2.1.3-Leia +KODI_SCREENSAVER_PINGPONG_VERSION = 2.4.0-Matrix KODI_SCREENSAVER_PINGPONG_SITE = $(call github,xbmc,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi +KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = glm kodi $(eval $(cmake-package)) From c4e4ef9357e9b5800f16fab81a741054ed5f29e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:35 +0100 Subject: [PATCH 125/162] package/kodi-screensaver-pyro: bump version to 3.3.0-Matrix Remove dependency to opengl, opengles support was added upstream: https://github.com/xbmc/screensaver.pyro/commit/d052f9997bcc0efc1c5dfb974a4bd24654e715fb Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-pyro/Config.in | 4 ---- package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash | 4 ++-- package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/package/kodi-screensaver-pyro/Config.in b/package/kodi-screensaver-pyro/Config.in index e2d1988ec5..9ee99883b4 100644 --- a/package/kodi-screensaver-pyro/Config.in +++ b/package/kodi-screensaver-pyro/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_PYRO bool "kodi-screensaver-pyro" - depends on BR2_PACKAGE_HAS_LIBGL help Pyro screensaver for Kodi https://github.com/xbmc/screensaver.pyro - -comment "kodi-screensaver-pyro needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash index fd51a7c1d3..db4244e8fa 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cf9ed582b70460682175366641e6a00eaea085a1d3477a02710ba8398a1d17bd kodi-screensaver-pyro-3.0.1-Leia.tar.gz -sha256 24354cf1e6058ba0a95c7652eab9f1be2224c835ce36d14e82c0f401f65a53b7 debian/copyright +sha256 83a3375166d6aaed01939bc370981ad46909fe1f1365fe7af22d4614fa6d06e6 kodi-screensaver-pyro-3.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk index 8a6ea93e83..dac03c6347 100644 --- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_PYRO_VERSION = 3.0.1-Leia +KODI_SCREENSAVER_PYRO_VERSION = 3.3.0-Matrix KODI_SCREENSAVER_PYRO_SITE = $(call github,xbmc,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_PYRO_LICENSE_FILES = debian/copyright +KODI_SCREENSAVER_PYRO_LICENSE_FILES = LICENSE.md KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi $(eval $(cmake-package)) From 792b03879c8e665345d8c26c1e3107e7b88936f8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:36 +0100 Subject: [PATCH 126/162] package/kodi-screensaver-rsxs: bump version Removed patch 0001, ImageMagick code was removed upstream: https://github.com/xbmc/screensavers.rsxs/commit/e3793a1e5d120b0354d07d6bf9dc175af883e134#diff-f9e414fa2a69e3c79d590dd6e91236778d803a84669f93f0e550483f7be105e9L31 Removed various dependencies after upstream cleanup: https://github.com/xbmc/screensavers.rsxs/commit/e3793a1e5d120b0354d07d6bf9dc175af883e134 Switched opengl dependency to render system used by Kodi. Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Disable-drempels.patch | 40 ------------------- package/kodi-screensaver-rsxs/Config.in | 10 ++--- .../kodi-screensaver-rsxs.hash | 4 +- .../kodi-screensaver-rsxs.mk | 6 +-- 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 package/kodi-screensaver-rsxs/0001-Disable-drempels.patch diff --git a/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch b/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch deleted file mode 100644 index e76a9b9943..0000000000 --- a/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 28c01686ba0d67d317e058776f01efba5e6471bd Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 13 Jul 2019 14:18:12 +0200 -Subject: [PATCH] Disable drempels - -Does not build with ImageMagick 7.x: - -src/drempels/TexMgr.cpp:31:10: fatal error: magick/api.h: - No such file or directory - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a86ccd0..b5ca03f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,8 +40,7 @@ include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Ko - if(ImageMagick_FOUND AND NOT ${OWN_IMAGE_MAGICK}) - message(STATUS "ImageMagick found in the system and is used") - else() -- message(STATUS "ImageMagick not found or forced and add custom created") -- add_subdirectory(lib/ImageMagick) -+ message(STATUS "ImageMagick not found") - endif() - add_subdirectory(lib/kodi/gui/gl) - add_subdirectory(lib/Implicit) -@@ -70,7 +69,6 @@ include(src/biof/CMakeLists.txt) - include(src/busyspheres/CMakeLists.txt) - include(src/colorfire/CMakeLists.txt) - include(src/cyclone/CMakeLists.txt) --include(src/drempels/CMakeLists.txt) - include(src/euphoria/CMakeLists.txt) - include(src/feedback/CMakeLists.txt) - include(src/fieldlines/CMakeLists.txt) --- -2.20.1 - diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in index 076c7effa0..e88df1fe49 100644 --- a/package/kodi-screensaver-rsxs/Config.in +++ b/package/kodi-screensaver-rsxs/Config.in @@ -1,17 +1,13 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS bool "kodi-screensaver-rsxs" - depends on BR2_PACKAGE_HAS_LIBGL # libglu + depends on BR2_PACKAGE_KODI_RENDER_SYSTEM_GL select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_GLI select BR2_PACKAGE_GLM - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_LIBTOOL - select BR2_PACKAGE_TIFF help RSXS screensaver add-ons for Kodi https://github.com/xbmc/screensavers.rsxs -comment "kodi-screensaver-rsxs needs an OpenGL backend" - depends on !BR2_PACKAGE_HAS_LIBGL +comment "kodi-screensaver-rsxs needs OpenGL as Kodi render system" + depends on !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash index f4987a44cd..ceb8d360f7 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8 kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz -sha256 fa0ff8b6a6267b9477be7d505aa384056633b4be17e0b9d308df9bd70d1c99f6 debian/copyright +sha256 343ecedbf6cfb75d43bb94e805aae807d61b0cd4f681a05c126f65839e3687a3 kodi-screensaver-rsxs-21c65de59546bde770225f023747a39b345baffd.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk index aa881d0d59..9b839b3112 100644 --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_SCREENSAVER_RSXS_VERSION = 7cb648507440d87948dec10d5bfdab3b722d37fe +KODI_SCREENSAVER_RSXS_VERSION = 21c65de59546bde770225f023747a39b345baffd KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) KODI_SCREENSAVER_RSXS_LICENSE = GPL-2.0+ -KODI_SCREENSAVER_RSXS_LICENSE_FILES = debian/copyright -KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm jpeg kodi libpng libtool tiff +KODI_SCREENSAVER_RSXS_LICENSE_FILES = LICENSE.md +KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm kodi $(eval $(cmake-package)) From 76c48a73ea4666b5e1ee4ee81e193c26465791c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:37 +0100 Subject: [PATCH 127/162] package/kodi-screensaver-stars: bump version to 2.4.0-Matrix Remove dependency to opengl, opengles support was added upstream: https://github.com/xbmc/screensaver.stars/commit/b0cb93b21888a5808f7701a794c5795f55e641d4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-screensaver-stars/Config.in | 4 ---- package/kodi-screensaver-stars/kodi-screensaver-stars.hash | 2 +- package/kodi-screensaver-stars/kodi-screensaver-stars.mk | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package/kodi-screensaver-stars/Config.in b/package/kodi-screensaver-stars/Config.in index a2e435c0f6..3a8713a56e 100644 --- a/package/kodi-screensaver-stars/Config.in +++ b/package/kodi-screensaver-stars/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_KODI_SCREENSAVER_STARS bool "kodi-screensaver-stars" - depends on BR2_PACKAGE_HAS_LIBGL help Starfield screensaver for Kodi https://github.com/xbmc/screensaver.stars - -comment "kodi-screensaver-stars needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash index b658517300..b98c4baaef 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 98972a9af45015d902ade50db822dbded52d4473acde6bc4b01a5ab8c4af4269 kodi-screensaver-stars-2.1.4-Leia.tar.gz +sha256 868105f6381bf5439f8c67d54dda00f2108a4363f4b25dfb12787ed65b602f0d kodi-screensaver-stars-2.4.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk index ca51921b50..c062de9488 100644 --- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SCREENSAVER_STARS_VERSION = 2.1.4-Leia +KODI_SCREENSAVER_STARS_VERSION = 2.4.0-Matrix KODI_SCREENSAVER_STARS_SITE = $(call github,xbmc,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+ KODI_SCREENSAVER_STARS_LICENSE_FILES = LICENSE.md From 61a7c4cbb511aaf0556ac2d121ee315cdc04b2db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:38 +0100 Subject: [PATCH 128/162] package/kodi-skin-confluence: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-skin-confluence/kodi-skin-confluence.hash | 2 +- package/kodi-skin-confluence/kodi-skin-confluence.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.hash b/package/kodi-skin-confluence/kodi-skin-confluence.hash index fdd4e828f6..e3d1ff73f4 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.hash +++ b/package/kodi-skin-confluence/kodi-skin-confluence.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dc4a0abf05db50caf8e70e4904b8c2c445008ec3d6d23381c9c31dedaf6109de kodi-skin-confluence-cffcb8320003e6048abe4b26316e5d5f3d50eac9.tar.gz +sha256 49ba4dcf4b512ac0a97bd1a4ebf14685d294d89a7a07c26ddda0fe730c8aa047 kodi-skin-confluence-37a196cdb58c0da87b5b22b047a5d44dc447f1ae.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.txt diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk index d9bd10bdfa..fcae506d1e 100644 --- a/package/kodi-skin-confluence/kodi-skin-confluence.mk +++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_SKIN_CONFLUENCE_VERSION = cffcb8320003e6048abe4b26316e5d5f3d50eac9 +KODI_SKIN_CONFLUENCE_VERSION = 37a196cdb58c0da87b5b22b047a5d44dc447f1ae KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION)) KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt From 39e482e791d799ec03db8e7655e21d092898e789 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:39 +0100 Subject: [PATCH 129/162] package/kodi-vfs-libarchive: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-vfs-libarchive/Config.in | 13 ++++++++++++ .../kodi-vfs-libarchive.hash | 3 +++ .../kodi-vfs-libarchive.mk | 21 +++++++++++++++++++ package/kodi/Config.in | 1 + 4 files changed, 38 insertions(+) create mode 100644 package/kodi-vfs-libarchive/Config.in create mode 100644 package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash create mode 100644 package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk diff --git a/package/kodi-vfs-libarchive/Config.in b/package/kodi-vfs-libarchive/Config.in new file mode 100644 index 0000000000..6720e5206e --- /dev/null +++ b/package/kodi-vfs-libarchive/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_KODI_VFS_LIBARCHIVE + bool "kodi-vfs-libarchive" + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_LIBARCHIVE + select BR2_PACKAGE_LZ4 + select BR2_PACKAGE_LZO + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_XZ + select BR2_PACKAGE_ZLIB + help + Libarchive VFS add-on for Kodi + + https://github.com/xbmc/vfs.libarchive diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash new file mode 100644 index 0000000000..59b3bc1078 --- /dev/null +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6fd70f0e2775e9c4eef2e8b529396f1e739fe3e43e0d4202d7f08ab4a30fa760 kodi-vfs-libarchive-2.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk new file mode 100644 index 0000000000..5278f50136 --- /dev/null +++ b/package/kodi-vfs-libarchive/kodi-vfs-libarchive.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# kodi-vfs-libarchive +# +################################################################################ + +KODI_VFS_LIBARCHIVE_VERSION = 2.0.0-Matrix +KODI_VFS_LIBARCHIVE_SITE = $(call github,xbmc,vfs.libarchive,$(KODI_VFS_LIBARCHIVE_VERSION)) +KODI_VFS_LIBARCHIVE_LICENSE = GPL-2.0+ +KODI_VFS_LIBARCHIVE_LICENSE_FILES = LICENSE.md +KODI_VFS_LIBARCHIVE_DEPENDENCIES = \ + bzip2 \ + kodi \ + libarchive \ + lz4 \ + lzo \ + openssl \ + xz \ + zlib + +$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index eefdd54990..a104ba53c3 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -347,6 +347,7 @@ menu "Skins" endmenu menu "Virtual file systems" + source "package/kodi-vfs-libarchive/Config.in" source "package/kodi-vfs-rar/Config.in" source "package/kodi-vfs-sftp/Config.in" endmenu From c01bff1a2b5abcd677e45929ed642b3165b5200c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:40 +0100 Subject: [PATCH 130/162] package/kodi-vfs-rar: bump version to 4.0.0-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-vfs-rar/kodi-vfs-rar.hash | 2 +- package/kodi-vfs-rar/kodi-vfs-rar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.hash b/package/kodi-vfs-rar/kodi-vfs-rar.hash index 22ad584fb8..e4d0f7fe63 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.hash +++ b/package/kodi-vfs-rar/kodi-vfs-rar.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5275c09eed7e8354849caa17c3d9699abcfa2437a7c7af3833bffd10fc1c577f kodi-vfs-rar-2.3.2-Leia.tar.gz +sha256 1111d1f90cc4addc2adb0884b779f4b47e30abb2766ba1708053e5f100b514bf kodi-vfs-rar-4.0.0-Matrix.tar.gz # License files sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a lib/UnrarXLib/license.txt sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-rar/kodi-vfs-rar.mk b/package/kodi-vfs-rar/kodi-vfs-rar.mk index c0d52a1d25..001bd7c61c 100644 --- a/package/kodi-vfs-rar/kodi-vfs-rar.mk +++ b/package/kodi-vfs-rar/kodi-vfs-rar.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_VFS_RAR_VERSION = 2.3.2-Leia +KODI_VFS_RAR_VERSION = 4.0.0-Matrix KODI_VFS_RAR_SITE = $(call github,xbmc,vfs.rar,$(KODI_VFS_RAR_VERSION)) KODI_VFS_RAR_LICENSE = unrar, GPL-2.0+ KODI_VFS_RAR_LICENSE_FILES = lib/UnrarXLib/license.txt LICENSE.md From d94599a175078e4644bf9a516c77a30707d75e2d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:41 +0100 Subject: [PATCH 131/162] package/kodi-vfs-sftp: bump version to 2.0.0-Matrix Upstream removed usage of libplatform https://github.com/xbmc/vfs.sftp/commit/a4fb0019a6b20c2e9b44ff80dd084002df6052a9 Added remaining dependencies and removed unused kodi-platform: https://github.com/xbmc/vfs.sftp/blob/Matrix/CMakeLists.txt#L6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-vfs-sftp/Config.in | 4 ++-- package/kodi-vfs-sftp/kodi-vfs-sftp.hash | 2 +- package/kodi-vfs-sftp/kodi-vfs-sftp.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/kodi-vfs-sftp/Config.in b/package/kodi-vfs-sftp/Config.in index a939bd927d..b742777ff0 100644 --- a/package/kodi-vfs-sftp/Config.in +++ b/package/kodi-vfs-sftp/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_KODI_VFS_SFTP bool "kodi-vfs-sftp" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBPLATFORM select BR2_PACKAGE_LIBSSH + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB help SFTP VFS addon for Kodi diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash index a17c2d32c6..d12a85437b 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.hash +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dc3db18b6cef90cd518b741e5c9bc7b3f4412774ee60bf70b451a8d2fc88a091 kodi-vfs-sftp-1.0.6-Leia.tar.gz +sha256 b15c5dde7b3aadb3e82e61cb9b0440812b6c2f65b38c6c25aef726f97e746f68 kodi-vfs-sftp-2.0.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk index 3870ff9b5b..b1b0bef36d 100644 --- a/package/kodi-vfs-sftp/kodi-vfs-sftp.mk +++ b/package/kodi-vfs-sftp/kodi-vfs-sftp.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VFS_SFTP_VERSION = 1.0.6-Leia +KODI_VFS_SFTP_VERSION = 2.0.0-Matrix KODI_VFS_SFTP_SITE = $(call github,xbmc,vfs.sftp,$(KODI_VFS_SFTP_VERSION)) KODI_VFS_SFTP_LICENSE = GPL-2.0+ KODI_VFS_SFTP_LICENSE_FILES = LICENSE.md -KODI_VFS_SFTP_DEPENDENCIES = kodi-platform libplatform libssh +KODI_VFS_SFTP_DEPENDENCIES = kodi libssh openssl zlib $(eval $(cmake-package)) From 7ad1e18bfb93cce3d397b3a2afc3ad418b828e01 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:42 +0100 Subject: [PATCH 132/162] package/kodi-visualisation-fishbmc: bump version to 6.3.0-Matrix Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-visualisation-fishbmc.hash | 4 ++-- .../kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash index 4e215f331c..f03602c003 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a03d4f64a6d44625d6936fd3abd359a0a08d11252663cae9fc5d061bd489c006 kodi-visualisation-fishbmc-5.1.3-Leia.tar.gz -sha256 684792cea796ea39d086ffd6cf5cb7c70ab8188dcf493707ba90d081d28f787e visualization.fishbmc/LICENSE +sha256 fd6a4383e36ed67590d40eb945d11bc5eae0c83e0ea56bfcadbc0ff03de0b2a4 kodi-visualisation-fishbmc-6.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk index defc183ff9..ecb118e52b 100644 --- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_FISHBMC_VERSION = 5.1.3-Leia +KODI_VISUALISATION_FISHBMC_VERSION = 6.3.0-Matrix KODI_VISUALISATION_FISHBMC_SITE = $(call github,xbmc,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+ -KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE +KODI_VISUALISATION_FISHBMC_LICENSE_FILES = LICENSE.md KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi $(eval $(cmake-package)) From f6c294916072cee037933a59d769b497dffec74a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:43 +0100 Subject: [PATCH 133/162] package/kodi-visualisation-goom: bump version 3.4.0-Matrix Switched opengl dependency to render system used by Kodi. Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-visualisation-goom/Config.in | 6 +++--- .../kodi-visualisation-goom/kodi-visualisation-goom.hash | 4 ++-- package/kodi-visualisation-goom/kodi-visualisation-goom.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/kodi-visualisation-goom/Config.in b/package/kodi-visualisation-goom/Config.in index 065bc1d773..18905bba3a 100644 --- a/package/kodi-visualisation-goom/Config.in +++ b/package/kodi-visualisation-goom/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_KODI_VISUALISATION_GOOM bool "kodi-visualisation-goom" - depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_KODI_RENDER_SYSTEM_GL select BR2_PACKAGE_GLM help GOOM visualiser for Kodi https://github.com/notspiff/visualization.goom -comment "kodi-visualization-goom needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL +comment "kodi-visualization-goom needs OpenGL as Kodi render system" + depends on !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index c9fa7dea9f..ab5bda33c4 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fdd656721f6d1b1962fd0a1e240eafb4710237ba70809dd0391cd10cacf4417c kodi-visualisation-goom-2.2.3-Leia.tar.gz -sha256 a6b36f495079206146ae0b11624a8db49a538f421ffe1341f8651c9e6b06f0b0 debian/copyright +sha256 8de34cd33977bb8fa5fd721993341f7d64bbf5b08e481438740287dd2a366079 kodi-visualisation-goom-3.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk index d83f857ae1..45f2f05ece 100644 --- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_GOOM_VERSION = 2.2.3-Leia +KODI_VISUALISATION_GOOM_VERSION = 3.4.0-Matrix KODI_VISUALISATION_GOOM_SITE = $(call github,xbmc,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+ -KODI_VISUALISATION_GOOM_LICENSE_FILES = debian/copyright +KODI_VISUALISATION_GOOM_LICENSE_FILES = LICENSE.md KODI_VISUALISATION_GOOM_DEPENDENCIES = glm kodi From eb9cef745cf6595617ae102dda1aacd48c2462b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:44 +0100 Subject: [PATCH 134/162] package/kodi-visualisation-shadertoy: bump version to 2.3.0-Matrix Switch dependency to kodi after upstream removed the dependency to kodi-platform: https://github.com/xbmc/visualization.shadertoy/commit/3fa4d118dcee2025620eb342d1a22a956beb06e5 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-visualisation-shadertoy/Config.in | 1 - .../kodi-visualisation-shadertoy.hash | 4 ++-- .../kodi-visualisation-shadertoy.mk | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/kodi-visualisation-shadertoy/Config.in b/package/kodi-visualisation-shadertoy/Config.in index 1fabba5ef5..aa671aae13 100644 --- a/package/kodi-visualisation-shadertoy/Config.in +++ b/package/kodi-visualisation-shadertoy/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY bool "kodi-visualisation-shadertoy" select BR2_PACKAGE_GLM - select BR2_PACKAGE_LIBPLATFORM help Shadertoy visualiser for Kodi diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash index 67ab8867e6..8ecdfb6d50 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 07724fc59cc5f960a941b8255af326e87fa9fbc8234498c7e21d8a46050e0dd4 kodi-visualisation-shadertoy-1.2.4-Leia.tar.gz -sha256 e33ac3ac6ca1bdd4a4a411481d43579d855622e7ecc207809b5f49ea617db480 debian/copyright +sha256 fbee4d8d4a41013705848eb89d4dcd55fe915a1ff997a60c800aa1bdd157530b kodi-visualisation-shadertoy-2.3.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk index 865abf02cc..f5ad505fe7 100644 --- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.4-Leia +KODI_VISUALISATION_SHADERTOY_VERSION = 2.3.0-Matrix KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+ -KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = debian/copyright -KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi libplatform +KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi $(eval $(cmake-package)) From fc992625b3eacef3530784c59aa12455ba6f33c7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:45 +0100 Subject: [PATCH 135/162] package/kodi-visualisation-spectrum: bump version to 3.4.0-Matrix Removed patch applied upstream: https://github.com/xbmc/visualization.spectrum/commit/46b605516b057823855c7f76dbc3f622dcf5983b Add dependency to glm due to upstream commit: https://github.com/xbmc/visualization.spectrum/commit/0a3e3885b87f61e9a511ec942b3c01679e4b3414 Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...Backport-Add-missing-cstddef-include.patch | 30 ------------------- package/kodi-visualisation-spectrum/Config.in | 1 + .../kodi-visualisation-spectrum.hash | 4 +-- .../kodi-visualisation-spectrum.mk | 6 ++-- 4 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch diff --git a/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch b/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch deleted file mode 100644 index 5b1bb0c47c..0000000000 --- a/package/kodi-visualisation-spectrum/0001-Backport-Add-missing-cstddef-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b2c54c1043c2396678005b578e85db30bdf5ccb9 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 18 Jan 2020 20:22:41 +0100 -Subject: [PATCH] [Backport] Add missing cstddef include - -Backported from https://github.com/xbmc/visualization.spectrum/pull/37 - -Patch sent upstream: -https://github.com/xbmc/visualization.spectrum/pull/38 - -Signed-off-by: Bernd Kuhls ---- - src/opengl_spectrum.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/opengl_spectrum.cpp b/src/opengl_spectrum.cpp -index 05409ea..2441fd6 100644 ---- a/src/opengl_spectrum.cpp -+++ b/src/opengl_spectrum.cpp -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.20.1 - diff --git a/package/kodi-visualisation-spectrum/Config.in b/package/kodi-visualisation-spectrum/Config.in index 3b2b0a25e2..deb623087f 100644 --- a/package/kodi-visualisation-spectrum/Config.in +++ b/package/kodi-visualisation-spectrum/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_SPECTRUM bool "kodi-visualisation-spectrum" + select BR2_PACKAGE_GLM help Spectrum visualiser for Kodi diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index ae78fbd355..e6473ab0a1 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ec88defbb90fdb03f075abdba39c436906a8fbad8f034da3e3b31f75842206cc kodi-visualisation-spectrum-3.0.2-Leia.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 0b08b99c0289a421425a5d3b39eafdf6262021e213bd3093e98704efb410d348 kodi-visualisation-spectrum-3.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk index c3d61c1ef4..42abc156cd 100644 --- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk +++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_SPECTRUM_VERSION = 3.0.2-Leia +KODI_VISUALISATION_SPECTRUM_VERSION = 3.4.0-Matrix KODI_VISUALISATION_SPECTRUM_SITE = $(call github,xbmc,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION)) KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+ -KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING -KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi +KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = glm kodi $(eval $(cmake-package)) From 4e4fccd71296523fc29f14a550e9faf647f1fa04 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:46 +0100 Subject: [PATCH 136/162] package/kodi-visualisation-starburst: bump version to 2.4.0-Matrix Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-visualisation-starburst.hash | 4 ++-- .../kodi-visualisation-starburst.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash index 834d71ae5c..b08da9788e 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5a06385dd4824373a00fe4e2139b3d851c51ed001f68671acf99d17ce348f5e2 kodi-visualisation-starburst-2.0.3-Leia.tar.gz -sha256 2e668b3da2f061a6d6ecc3cb96bdfb0f8fc9cc98c9e9f95454bc45b88708690f debian/copyright +sha256 fb991924b8f9a4f86d81b28ec629c131d36364f82914098356184c9ef03e753e kodi-visualisation-starburst-2.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk index 8d736f08e9..f19a82bf81 100644 --- a/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk +++ b/package/kodi-visualisation-starburst/kodi-visualisation-starburst.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_STARBURST_VERSION = 2.0.3-Leia +KODI_VISUALISATION_STARBURST_VERSION = 2.4.0-Matrix KODI_VISUALISATION_STARBURST_SITE = $(call github,xbmc,visualization.starburst,$(KODI_VISUALISATION_STARBURST_VERSION)) KODI_VISUALISATION_STARBURST_LICENSE = GPL-2.0+ -KODI_VISUALISATION_STARBURST_LICENSE_FILES = debian/copyright +KODI_VISUALISATION_STARBURST_LICENSE_FILES = LICENSE.md KODI_VISUALISATION_STARBURST_DEPENDENCIES = glm kodi $(eval $(cmake-package)) From e4ac6f11f21abc722412c034f3ad2806294807b3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:47 +0100 Subject: [PATCH 137/162] package/kodi-visualisation-waveform: bump version to 4.4.0-Matrix Add dependency to glm due to upstream commit: https://github.com/xbmc/visualization.waveform/commit/18e32dd2416fc58e91c977d3c3a4c27b6ca59c3b Switch license file to LICENSE.md. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-visualisation-waveform/Config.in | 1 + .../kodi-visualisation-waveform.hash | 4 ++-- .../kodi-visualisation-waveform.mk | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/kodi-visualisation-waveform/Config.in b/package/kodi-visualisation-waveform/Config.in index 56f25096f5..24a5f7f365 100644 --- a/package/kodi-visualisation-waveform/Config.in +++ b/package/kodi-visualisation-waveform/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORM bool "kodi-visualisation-waveform" + select BR2_PACKAGE_GLM help Waveform visualiser for Kodi diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index 578b2ea8a4..1255b6ed75 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d734cbe9d7e661e8d4e61ff2bada423fd8dba33c5148b5044f4b1a1997c51376 kodi-visualisation-waveform-3.1.2-Leia.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 d9acf0a3758bfc4ee6fa492bcdcf8764519bbf0f1b6a3b10807b65a0d031e55e kodi-visualisation-waveform-4.4.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk index 64a4db4fce..6c0ec3ac70 100644 --- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk @@ -4,10 +4,10 @@ # ################################################################################ -KODI_VISUALISATION_WAVEFORM_VERSION = 3.1.2-Leia +KODI_VISUALISATION_WAVEFORM_VERSION = 4.4.0-Matrix KODI_VISUALISATION_WAVEFORM_SITE = $(call github,xbmc,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+ -KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING -KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi +KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = glm kodi $(eval $(cmake-package)) From a806340de26dc6cd805e97698302ee1da94cdb61 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:48 +0100 Subject: [PATCH 138/162] package/kodi-visualisation-matrix: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-visualisation-matrix/Config.in | 7 +++++++ .../kodi-visualisation-matrix.hash | 3 +++ .../kodi-visualisation-matrix.mk | 13 +++++++++++++ package/kodi/Config.in | 1 + 4 files changed, 24 insertions(+) create mode 100644 package/kodi-visualisation-matrix/Config.in create mode 100644 package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash create mode 100644 package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk diff --git a/package/kodi-visualisation-matrix/Config.in b/package/kodi-visualisation-matrix/Config.in new file mode 100644 index 0000000000..db01f15231 --- /dev/null +++ b/package/kodi-visualisation-matrix/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_KODI_VISUALISATION_MATRIX + bool "kodi-visualisation-matrix" + select BR2_PACKAGE_GLM + help + Matrix themed visualization addon for Kodi + + https://github.com/xbmc/visualization.matrix diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash new file mode 100644 index 0000000000..38b9311d6e --- /dev/null +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 fc5c4790cbf957dbf8d504ae7c43eaeca122fde6423f1135029ff053135f8fd0 kodi-visualisation-matrix-1.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk new file mode 100644 index 0000000000..153c1c15b1 --- /dev/null +++ b/package/kodi-visualisation-matrix/kodi-visualisation-matrix.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-visualisation-matrix +# +################################################################################ + +KODI_VISUALISATION_MATRIX_VERSION = 1.0.0-Matrix +KODI_VISUALISATION_MATRIX_SITE = $(call github,xbmc,visualization.matrix,$(KODI_VISUALISATION_MATRIX_VERSION)) +KODI_VISUALISATION_MATRIX_LICENSE = GPL-2.0+ +KODI_VISUALISATION_MATRIX_LICENSE_FILES = LICENSE.md +KODI_VISUALISATION_MATRIX_DEPENDENCIES = glm kodi + +$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index a104ba53c3..01d068da44 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -355,6 +355,7 @@ endmenu menu "Visualisations" source "package/kodi-visualisation-fishbmc/Config.in" source "package/kodi-visualisation-goom/Config.in" + source "package/kodi-visualisation-matrix/Config.in" source "package/kodi-visualisation-shadertoy/Config.in" source "package/kodi-visualisation-spectrum/Config.in" source "package/kodi-visualisation-starburst/Config.in" From f470066ed679788e0852f23e28fad7e68abf23d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 2 Mar 2021 08:07:49 +0100 Subject: [PATCH 139/162] package/kodi-platform: remove package This package is not used by kodi addons anymore. No legacy handling needed because this package was never selectable. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...nfig.cmake-fix-for-cross-compilation.patch | 56 ------------------- package/kodi-platform/Config.in | 7 --- package/kodi-platform/kodi-platform.hash | 3 - package/kodi-platform/kodi-platform.mk | 14 ----- package/kodi/Config.in | 2 - 5 files changed, 82 deletions(-) delete mode 100644 package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch delete mode 100644 package/kodi-platform/Config.in delete mode 100644 package/kodi-platform/kodi-platform.hash delete mode 100644 package/kodi-platform/kodi-platform.mk diff --git a/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch b/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch deleted file mode 100644 index cc514b002b..0000000000 --- a/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a6e25dba4b5c1d911a4644a0ca116abc642cd72a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 30 Jul 2015 09:28:24 +0200 -Subject: [PATCH] kodiplatform-config.cmake: fix for cross-compilation - -Use CMAKE_FIND_ROOT_PATH in kodiplatform-config.cmake in order to make -it cross-compilation friendly. - -Patch sent upstream: https://github.com/xbmc/kodi-platform/pull/30 - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - kodiplatform-config.cmake.in | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25d8004..db23dc9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ if(NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - endif() - --set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") -+set(kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi") - IF(WIN32) - LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows") - ENDIF(WIN32) -diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in -index 3fc5273..1bc437a 100644 ---- a/kodiplatform-config.cmake.in -+++ b/kodiplatform-config.cmake.in -@@ -10,16 +10,16 @@ - # - # propagate these properties from one build system to the other - set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@") --set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+set (kodiplatform_INCLUDE_DIRS @TINYXML_INCLUDE_DIR@ ${CMAKE_FIND_ROOT_PATH}@kodiplatform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/include) - set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") - set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@") - set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated - if(WIN32) -- set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") -+ set (kodiplatform_LIBRARY "${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") - else(WIN32) -- set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") -+ set (kodiplatform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") - endif(WIN32) - set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@") - mark_as_advanced (kodiplatform_LIBRARY) --- -2.5.0 - diff --git a/package/kodi-platform/Config.in b/package/kodi-platform/Config.in deleted file mode 100644 index cde1925c07..0000000000 --- a/package/kodi-platform/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PLATFORM - bool - select BR2_PACKAGE_LIBPLATFORM - help - Kodi add-on platform support library - - https://github.com/xbmc/kodi-platform diff --git a/package/kodi-platform/kodi-platform.hash b/package/kodi-platform/kodi-platform.hash deleted file mode 100644 index 29a43cf021..0000000000 --- a/package/kodi-platform/kodi-platform.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 159165ae641da5eb273885ce53b8a4b84e62a595c4974f9d12c1b5d1428ef25c kodi-platform-809c5e9d711e378561440a896fcb7dbcd009eb3d.tar.gz -sha256 2f4bc4c1244b679121749378ff1a2b4b4e318897dac3d346a236432948ebeea7 debian/copyright diff --git a/package/kodi-platform/kodi-platform.mk b/package/kodi-platform/kodi-platform.mk deleted file mode 100644 index f1b97e3259..0000000000 --- a/package/kodi-platform/kodi-platform.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# kodi-platform -# -################################################################################ - -KODI_PLATFORM_VERSION = 809c5e9d711e378561440a896fcb7dbcd009eb3d -KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION)) -KODI_PLATFORM_LICENSE = GPL-2.0+ -KODI_PLATFORM_LICENSE_FILES = debian/copyright -KODI_PLATFORM_INSTALL_STAGING = YES -KODI_PLATFORM_DEPENDENCIES = libplatform kodi - -$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 01d068da44..782cca3c18 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -109,8 +109,6 @@ menuconfig BR2_PACKAGE_KODI if BR2_PACKAGE_KODI -source "package/kodi-platform/Config.in" - config BR2_PACKAGE_KODI_ALSA_LIB bool "alsa" select BR2_PACKAGE_ALSA_LIB From 698751c5641285b9e493d60ed8242f7ba9b094d1 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Wed, 3 Mar 2021 23:07:30 +0100 Subject: [PATCH 140/162] package/pigpio: bump to version 79 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/pigpio/pigpio.hash | 2 +- package/pigpio/pigpio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pigpio/pigpio.hash b/package/pigpio/pigpio.hash index b6de0c19f6..fecb7ccbeb 100644 --- a/package/pigpio/pigpio.hash +++ b/package/pigpio/pigpio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ef4a4dc7ca8ca2f97fbdb9fd75586f61be7222d0f6c14e58af6c9192ad42f682 pigpio-78.tar.gz +sha256 c5337c0b7ae888caf0262a6f476af0e2ab67065f7650148a0b21900b8d1eaed7 pigpio-79.tar.gz sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE diff --git a/package/pigpio/pigpio.mk b/package/pigpio/pigpio.mk index 345b315c42..e34974972a 100644 --- a/package/pigpio/pigpio.mk +++ b/package/pigpio/pigpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGPIO_VERSION = 78 +PIGPIO_VERSION = 79 PIGPIO_SITE = $(call github,joan2937,pigpio,v$(PIGPIO_VERSION)) PIGPIO_LICENSE = Unlicense PIGPIO_LICENSE_FILES = UNLICENCE From 8603fcbc254b2e625c9449951bdd84bc5b97fa10 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Tue, 2 Mar 2021 17:57:52 +0100 Subject: [PATCH 141/162] package/python-aioblescan: bump to version 0.2.7 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- ...001-Move-README-to-reStructured-text.patch | 35 +++++++++++++++++++ .../python-aioblescan/python-aioblescan.hash | 6 ++-- .../python-aioblescan/python-aioblescan.mk | 4 +-- 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 package/python-aioblescan/0001-Move-README-to-reStructured-text.patch diff --git a/package/python-aioblescan/0001-Move-README-to-reStructured-text.patch b/package/python-aioblescan/0001-Move-README-to-reStructured-text.patch new file mode 100644 index 0000000000..3db03bd835 --- /dev/null +++ b/package/python-aioblescan/0001-Move-README-to-reStructured-text.patch @@ -0,0 +1,35 @@ +From 62260e0a42dd6c1c10660f68a531c49bd6cade2e Mon Sep 17 00:00:00 2001 +From: Francois Wautier +Date: Thu, 25 Feb 2021 20:07:08 +0700 +Subject: [PATCH] Move README to reStructured text + +Signed-off-by: Grzegorz Blach +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 582a994..315b3bb 100644 +--- a/setup.py ++++ b/setup.py +@@ -4,7 +4,7 @@ import setuptools + + version = "0.2.7" + +-with open("README.md", "r") as fh: ++with open("README.rst", "r") as fh: + long_description = fh.read() + + setuptools.setup( +@@ -16,7 +16,7 @@ setuptools.setup( + author_email="francois@wautier.eu", + description="Scanning Bluetooth for advertised info with asyncio.", + long_description=long_description, +- long_description_content_type="text/markdown", ++ long_description_content_type="text/x-rst", + url="http://github.com/frawau/aioblescan", + keywords=["bluetooth", "advertising", "hci", "ble"], + license="MIT", +-- +2.27.0 + diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash index 902a7a30f8..99a715dcd0 100644 --- a/package/python-aioblescan/python-aioblescan.hash +++ b/package/python-aioblescan/python-aioblescan.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioblescan/json -md5 9ad3f04ea7ad4c81a53f8e1316985527 aioblescan-0.2.6.tar.gz -sha256 2e45c325e070a0ee4e952a7d0c56e95ad230643e1057fb5f3e95ea5c99081436 aioblescan-0.2.6.tar.gz +md5 fbcbf92260269d401a197636412f0c99 aioblescan-0.2.7.tar.gz +sha256 2987f575c5129a21e42ad59e439feb3c96e0ad7210ef73af8eba1344106e5f5f aioblescan-0.2.7.tar.gz # Locally computed sha256 checksums -sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt +sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk index 6350007c70..2ace10503e 100644 --- a/package/python-aioblescan/python-aioblescan.mk +++ b/package/python-aioblescan/python-aioblescan.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOBLESCAN_VERSION = 0.2.6 +PYTHON_AIOBLESCAN_VERSION = 0.2.7 PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz -PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/66/b8/888c2eb4323ed498dbc7deeb8aee0cfec9edd8c25184b06a8874bb0cf84f +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/78/2c/c09d8f83ed6c2ca6c4f803f2e5c349698eb78b82c8d5e9302a8eed1a7480 PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools PYTHON_AIOBLESCAN_LICENSE = MIT PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt From 065820d06733722c297d8ea44078b24321e7f727 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 4 Mar 2021 14:39:11 +0200 Subject: [PATCH 142/162] package/strace: bump to version 5.11 Update COPYING: copyright year update, and added note about the bundled Linux UAPI headers. Upstream commit 5bd8364f4202d ("Introduce bundled directory") says: According to analysis made by Kent Gibson at [1], we are allowed to re-distribute unmodified Linux kernel UAPI headers under the same terms as they are provided by the Linux kernel, and such re-distribution does not affect the license of strace itself. [1] https://lore.kernel.org/linux-gpio/20210128032641.GA11655@sol/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 7b211c78b9..e4fe690f61 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.10/strace-5.10.tar.xz.asc -sha256 fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c strace-5.10.tar.xz -sha256 6370eb67db918210944a8511a6995ebe9567852f26b4f15a01e5c8cf2aef7c46 COPYING +# https://strace.io/files/5.11/strace-5.11.tar.xz.asc +sha256 ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879 strace-5.11.tar.xz +sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 646be41e5b..e3e255fd61 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.10 +STRACE_VERSION = 5.11 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From db547e8b79a73d6766bec7523182ade58d79ad3e Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 4 Mar 2021 11:47:21 +0300 Subject: [PATCH 143/162] package/timescaledb: bump version to 2.1.0 Remove all PG13 upstream patches. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.1.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- ...1-Allow-building-against-PG13-source.patch | 85 ---- ...-wrapper-functions-for-base64-encodi.patch | 73 --- ...003-Add-missing-utils-acl.h-includes.patch | 149 ------ ...support-for-PG13-List-implementation.patch | 473 ------------------ ...djust-code-to-PG13-list-sort-changes.patch | 59 --- ...y-code-to-PG13-addRTEtoQuery-changes.patch | 37 -- ...G13-convert_tuples_by_name-signature.patch | 65 --- ...ode-to-PG13-tuple-conversion-changes.patch | 259 ---------- ...hypertable-expansion-to-PG13-changes.patch | 88 ---- ...decompress-code-to-Var-field-renames.patch | 41 -- ...1-Adjust-jsonb_utils-to-PG13-changes.patch | 39 -- ...AT_DropExpression-in-process_utility.patch | 48 -- ...013-Adjust-copy-code-to-PG13-changes.patch | 34 -- ...-PG13-command-completion-tag-changes.patch | 186 ------- ...-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch | 51 -- ...ode-to-PG13-planner_hook-signature-c.patch | 58 --- ...just-code-to-deparse_context-changes.patch | 34 -- .../timescaledb/0018-Update-compat.h.patch | 27 - ...just-code-to-PG13-tuptoaster-changes.patch | 70 --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 21 files changed, 2 insertions(+), 1878 deletions(-) delete mode 100644 package/timescaledb/0001-Allow-building-against-PG13-source.patch delete mode 100644 package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch delete mode 100644 package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch delete mode 100644 package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch delete mode 100644 package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch delete mode 100644 package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch delete mode 100644 package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch delete mode 100644 package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch delete mode 100644 package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch delete mode 100644 package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch delete mode 100644 package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch delete mode 100644 package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch delete mode 100644 package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch delete mode 100644 package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch delete mode 100644 package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch delete mode 100644 package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch delete mode 100644 package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch delete mode 100644 package/timescaledb/0018-Update-compat.h.patch delete mode 100644 package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch diff --git a/package/timescaledb/0001-Allow-building-against-PG13-source.patch b/package/timescaledb/0001-Allow-building-against-PG13-source.patch deleted file mode 100644 index 96de99144a..0000000000 --- a/package/timescaledb/0001-Allow-building-against-PG13-source.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 64c17f08c4a78cf6063651632d95906ab3bcb41b Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 19 Sep 2020 17:43:52 +0200 -Subject: [PATCH] Allow building against PG13 source - -This patch adjusts the version checks to allow building against -postgres 13. It also adjusts the cmake version check to allow -building against RC and devel versions. - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/21dc9b9c1a307e46eda5fa621488ebeb6ee9636c.patch ---- - CMakeLists.txt | 18 ++++++++---------- - src/compat.h | 7 ++++++- - 2 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8288b444..ce6e9d48 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -221,27 +221,25 @@ execute_process( - OUTPUT_VARIABLE PG_VERSION_STRING - OUTPUT_STRIP_TRAILING_WHITESPACE) - --if (NOT ${PG_VERSION_STRING} MATCHES "^PostgreSQL[ ]+([0-9]+)\\.([0-9]+)(\\.([0-9]+))*") -+if (NOT ${PG_VERSION_STRING} MATCHES "^PostgreSQL[ ]+([0-9]+)(\\.([0-9]+)|devel|rc[0-9]+)") - message(FATAL_ERROR "Could not parse PostgreSQL version ${PG_VERSION_STRING}") - endif () - - set(PG_VERSION_MAJOR ${CMAKE_MATCH_1}) --set(PG_VERSION_MINOR ${CMAKE_MATCH_2}) --set(PG_VERSION_PATCH ${CMAKE_MATCH_4}) -- --if (NOT ${PG_VERSION_PATCH} OR ${PG_VERSION_PATCH} EQUAL "") -- set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}") --else () -- set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}.${PG_VERSION_PATCH}") -+if (${CMAKE_MATCH_COUNT} GREATER "2" ) -+ set(PG_VERSION_MINOR ${CMAKE_MATCH_3}) -+else() -+ set(PG_VERSION_MINOR 0) - endif () -+set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}") - - message(STATUS "Compiling against PostgreSQL version ${PG_VERSION}") - - # Ensure that PostgreSQL version is supported and consistent - # with src/compat.h version check - if ((${PG_VERSION_MAJOR} LESS "11") OR -- (${PG_VERSION_MAJOR} GREATER "12")) -- message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 11 and 12") -+ (${PG_VERSION_MAJOR} GREATER "13")) -+ message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 11, 12 and 13") - endif() - - # Get PostgreSQL configuration from pg_config -diff --git a/src/compat.h b/src/compat.h -index 475217c6..267bb09a 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -24,15 +24,20 @@ - - #define is_supported_pg_version_11(version) ((version >= 110000) && (version < 120000)) - #define is_supported_pg_version_12(version) ((version >= 120000) && (version < 130000)) -+#define is_supported_pg_version_13(version) ((version >= 130000) && (version < 140000)) - - #define is_supported_pg_version(version) \ -- (is_supported_pg_version_11(version) || is_supported_pg_version_12(version)) -+ (is_supported_pg_version_11(version) || is_supported_pg_version_12(version) || \ -+ is_supported_pg_version_13(version)) - - #define PG11 is_supported_pg_version_11(PG_VERSION_NUM) - #define PG12 is_supported_pg_version_12(PG_VERSION_NUM) -+#define PG13 is_supported_pg_version_13(PG_VERSION_NUM) - - #define PG12_LT PG11 - #define PG12_GE !(PG12_LT) -+#define PG13_LT !(PG13) -+#define PG13_GE PG13 - - #if !(is_supported_pg_version(PG_VERSION_NUM)) - #error "Unsupported PostgreSQL version" --- -2.29.2 - diff --git a/package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch b/package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch deleted file mode 100644 index d54b49ef21..0000000000 --- a/package/timescaledb/0002-Add-compatibilty-wrapper-functions-for-base64-encodi.patch +++ /dev/null @@ -1,73 +0,0 @@ -From b020863a3ea18488448bc09234a4e3b26b68058d Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 19 Sep 2020 19:17:38 +0200 -Subject: [PATCH] Add compatibilty wrapper functions for base64 - encoding/decoding - -PG13 adds a destination length 4th argument to pg_b64_decode and -pg_b64_encode functions so this patch adds a macro that translates -to the 3 argument and 4 argument calls depending on postgres version. -This patch also adds checking of return values for those functions. - -https://github.com/postgres/postgres/commit/cfc40d384a - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/002510cb01e1d09767a526560f89c1857c1738a2.patch ---- - src/compat.h | 11 +++++++++++ - tsl/src/compression/compression.c | 12 ++++++++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/src/compat.h b/src/compat.h -index 267bb09a..d84f8754 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -347,4 +347,15 @@ get_vacuum_options(const VacuumStmt *stmt) - #endif - } - -+/* PG13 added a dstlen parameter to pg_b64_decode and pg_b64_encode */ -+#if PG13_LT -+#define pg_b64_encode_compat(src, srclen, dst, dstlen) pg_b64_encode((src), (srclen), (dst)) -+#define pg_b64_decode_compat(src, srclen, dst, dstlen) pg_b64_decode((src), (srclen), (dst)) -+#else -+#define pg_b64_encode_compat(src, srclen, dst, dstlen) \ -+ pg_b64_encode((src), (srclen), (dst), (dstlen)) -+#define pg_b64_decode_compat(src, srclen, dst, dstlen) \ -+ pg_b64_decode((src), (srclen), (dst), (dstlen)) -+#endif -+ - #endif /* TIMESCALEDB_COMPAT_H */ -diff --git a/tsl/src/compression/compression.c b/tsl/src/compression/compression.c -index 470ec4b9..169f74e9 100644 ---- a/tsl/src/compression/compression.c -+++ b/tsl/src/compression/compression.c -@@ -1424,7 +1424,11 @@ tsl_compressed_data_in(PG_FUNCTION_ARGS) - - decoded_len = pg_b64_dec_len(input_len); - decoded = palloc(decoded_len + 1); -- decoded_len = pg_b64_decode(input, input_len, decoded); -+ decoded_len = pg_b64_decode_compat(input, input_len, decoded, decoded_len); -+ -+ if (decoded_len < 0) -+ elog(ERROR, "could not decode base64-encoded compressed data"); -+ - decoded[decoded_len] = '\0'; - data = (StringInfoData){ - .data = decoded, -@@ -1446,7 +1450,11 @@ tsl_compressed_data_out(PG_FUNCTION_ARGS) - const char *raw_data = VARDATA(bytes); - int encoded_len = pg_b64_enc_len(raw_len); - char *encoded = palloc(encoded_len + 1); -- encoded_len = pg_b64_encode(raw_data, raw_len, encoded); -+ encoded_len = pg_b64_encode_compat(raw_data, raw_len, encoded, encoded_len); -+ -+ if (encoded_len < 0) -+ elog(ERROR, "could not base64-encode compressed data"); -+ - encoded[encoded_len] = '\0'; - - PG_RETURN_CSTRING(encoded); --- -2.29.2 - diff --git a/package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch b/package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch deleted file mode 100644 index 382c4e9259..0000000000 --- a/package/timescaledb/0003-Add-missing-utils-acl.h-includes.patch +++ /dev/null @@ -1,149 +0,0 @@ -From e68915d0aad6760c1feebb04219af9bfbccd71d7 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 26 Sep 2020 13:58:17 +0200 -Subject: [PATCH] Add missing utils/acl.h includes - -PG13 removed acl.h from objectaddress.h so the places that need it -need to now include it explicitly if they got it indirectly this -way previously. - -https://github.com/postgres/postgres/commit/3c173a53a8 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/be8dd086a089f7419824bbc3b77182b95d0bbba7.patch ---- - src/bgw/job.c | 1 + - src/bgw/scheduler.c | 1 + - src/chunk.c | 1 + - src/chunk_adaptive.c | 1 + - src/extension_utils.c | 1 + - src/license_guc.c | 1 + - src/process_utility.c | 1 + - tsl/src/bgw_policy/continuous_aggregate_api.c | 1 + - tsl/src/bgw_policy/job_api.c | 1 + - tsl/src/continuous_aggs/refresh.c | 1 + - 10 files changed, 10 insertions(+) - -diff --git a/src/bgw/job.c b/src/bgw/job.c -index 313caa94..3ae8c9f7 100644 ---- a/src/bgw/job.c -+++ b/src/bgw/job.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/src/bgw/scheduler.c b/src/bgw/scheduler.c -index 2d024317..7a7e360c 100644 ---- a/src/bgw/scheduler.c -+++ b/src/bgw/scheduler.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/chunk.c b/src/chunk.c -index c2671885..e5ffc3fa 100644 ---- a/src/chunk.c -+++ b/src/chunk.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/chunk_adaptive.c b/src/chunk_adaptive.c -index 470248ed..88e2910b 100644 ---- a/src/chunk_adaptive.c -+++ b/src/chunk_adaptive.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/extension_utils.c b/src/extension_utils.c -index 3fac177b..3d72c5f0 100644 ---- a/src/extension_utils.c -+++ b/src/extension_utils.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/license_guc.c b/src/license_guc.c -index 32629ca9..baa49be5 100644 ---- a/src/license_guc.c -+++ b/src/license_guc.c -@@ -5,6 +5,7 @@ - */ - #include - #include -+#include - #include - #include - #include -diff --git a/src/process_utility.c b/src/process_utility.c -index 3576cb97..8f915113 100644 ---- a/src/process_utility.c -+++ b/src/process_utility.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/tsl/src/bgw_policy/continuous_aggregate_api.c b/tsl/src/bgw_policy/continuous_aggregate_api.c -index 1c18d2e0..596f3bf7 100644 ---- a/tsl/src/bgw_policy/continuous_aggregate_api.c -+++ b/tsl/src/bgw_policy/continuous_aggregate_api.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/tsl/src/bgw_policy/job_api.c b/tsl/src/bgw_policy/job_api.c -index e1c24841..536ce692 100644 ---- a/tsl/src/bgw_policy/job_api.c -+++ b/tsl/src/bgw_policy/job_api.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/tsl/src/continuous_aggs/refresh.c b/tsl/src/continuous_aggs/refresh.c -index 71d5075f..46f83127 100644 ---- a/tsl/src/continuous_aggs/refresh.c -+++ b/tsl/src/continuous_aggs/refresh.c -@@ -4,6 +4,7 @@ - * LICENSE-TIMESCALE for a copy of the license. - */ - #include -+#include - #include - #include - #include --- -2.29.2 - diff --git a/package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch b/package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch deleted file mode 100644 index 2412b07d89..0000000000 --- a/package/timescaledb/0004-Add-support-for-PG13-List-implementation.patch +++ /dev/null @@ -1,473 +0,0 @@ -From 259ff80eb29c2c70e6afb77d266ce49cccbef223 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 19 Sep 2020 22:20:34 +0200 -Subject: [PATCH] Add support for PG13 List implementation - -PG13 changes the List implementation from a linked list to an array -while most of the API functions did not change a few them have slightly -different signature in PG13, additionally the list_make5 functions -got removed. - -https://github.com/postgres/postgres/commit/1cff1b95ab - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/b1a9c3b7b7d44ee78456931292655d52c252930d.patch ---- - .clang-format | 1 + - src/bgw/scheduler.c | 12 ++++++------ - src/cache.c | 10 ++++++++-- - src/chunk_append/chunk_append.c | 2 +- - src/chunk_append/exec.c | 4 ++-- - src/compat.h | 16 ++++++++++++++++ - src/import/planner.c | 2 +- - src/plan_agg_bookend.c | 7 ++++--- - src/plan_expand_hypertable.c | 13 +++++++++---- - test/src/bgw/test_job_refresh.c | 3 ++- - tsl/src/continuous_aggs/create.c | 2 +- - tsl/src/debug.c | 15 ++++++++++----- - tsl/src/fdw/deparse.c | 6 +++--- - .../nodes/decompress_chunk/decompress_chunk.c | 6 +++--- - tsl/src/nodes/decompress_chunk/exec.c | 3 ++- - tsl/src/nodes/gapfill/planner.c | 11 +++++++---- - 16 files changed, 76 insertions(+), 37 deletions(-) - -diff --git a/.clang-format b/.clang-format -index 5bb275cd..9aac7ef4 100644 ---- a/.clang-format -+++ b/.clang-format -@@ -60,6 +60,7 @@ ForEachMacros: - - foreach - - forboth - - for_each_cell -+ - for_each_cell_compat - - for_both_cell - - forthree - IncludeBlocks: Preserve # separate include blocks will not be merged -diff --git a/src/bgw/scheduler.c b/src/bgw/scheduler.c -index 7a7e360c..2630ff9f 100644 ---- a/src/bgw/scheduler.c -+++ b/src/bgw/scheduler.c -@@ -456,7 +456,7 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) - */ - terminate_and_cleanup_job(cur_sjob); - -- cur_ptr = lnext(cur_ptr); -+ cur_ptr = lnext_compat(cur_jobs_list, cur_ptr); - continue; - } - if (cur_sjob->job.fd.id == new_sjob->job.fd.id) -@@ -472,15 +472,15 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) - if (cur_sjob->state == JOB_STATE_SCHEDULED) - scheduled_bgw_job_transition_state_to(new_sjob, JOB_STATE_SCHEDULED); - -- cur_ptr = lnext(cur_ptr); -- new_ptr = lnext(new_ptr); -+ cur_ptr = lnext_compat(cur_jobs_list, cur_ptr); -+ new_ptr = lnext_compat(new_jobs, new_ptr); - } - else if (cur_sjob->job.fd.id > new_sjob->job.fd.id) - { - scheduled_bgw_job_transition_state_to(new_sjob, JOB_STATE_SCHEDULED); - - /* Advance the new_job list until we catch up to cur_list */ -- new_ptr = lnext(new_ptr); -+ new_ptr = lnext_compat(new_jobs, new_ptr); - } - } - -@@ -489,7 +489,7 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) - { - ListCell *ptr; - -- for_each_cell (ptr, cur_ptr) -+ for_each_cell_compat (ptr, cur_jobs_list, cur_ptr) - terminate_and_cleanup_job(lfirst(ptr)); - } - -@@ -498,7 +498,7 @@ ts_update_scheduled_jobs_list(List *cur_jobs_list, MemoryContext mctx) - /* Then there are more new jobs. Initialize all of them. */ - ListCell *ptr; - -- for_each_cell (ptr, new_ptr) -+ for_each_cell_compat (ptr, new_jobs, new_ptr) - scheduled_bgw_job_transition_state_to(lfirst(ptr), JOB_STATE_SCHEDULED); - } - -diff --git a/src/cache.c b/src/cache.c -index cc6b2d07..3b53485a 100644 ---- a/src/cache.c -+++ b/src/cache.c -@@ -7,6 +7,7 @@ - #include - - #include "cache.h" -+#include "compat.h" - - /* List of pinned caches. A cache occurs once in this list for every pin - * taken */ -@@ -105,7 +106,10 @@ ts_cache_pin(Cache *cache) - static void - remove_pin(Cache *cache, SubTransactionId subtxnid) - { -- ListCell *lc, *prev = NULL; -+ ListCell *lc; -+#if PG13_LT -+ ListCell *prev = NULL; -+#endif - - foreach (lc, pinned_caches) - { -@@ -113,12 +117,14 @@ remove_pin(Cache *cache, SubTransactionId subtxnid) - - if (cp->cache == cache && cp->subtxnid == subtxnid) - { -- pinned_caches = list_delete_cell(pinned_caches, lc, prev); -+ pinned_caches = list_delete_cell_compat(pinned_caches, lc, prev); - pfree(cp); - return; - } - -+#if PG13_LT - prev = lc; -+#endif - } - - /* should never reach here: there should always be a pin to remove */ -diff --git a/src/chunk_append/chunk_append.c b/src/chunk_append/chunk_append.c -index fb1c87ff..ed91ff39 100644 ---- a/src/chunk_append/chunk_append.c -+++ b/src/chunk_append/chunk_append.c -@@ -209,7 +209,7 @@ ts_chunk_append_path_create(PlannerInfo *root, RelOptInfo *rel, Hypertable *ht, - if (is_not_pruned) - { - merge_childs = lappend(merge_childs, child); -- flat = lnext(flat); -+ flat = lnext_compat(children, flat); - if (flat == NULL) - break; - } -diff --git a/src/chunk_append/exec.c b/src/chunk_append/exec.c -index 8f4dd5d6..84f79e23 100644 ---- a/src/chunk_append/exec.c -+++ b/src/chunk_append/exec.c -@@ -344,8 +344,8 @@ initialize_runtime_exclusion(ChunkAppendState *state) - state->runtime_number_exclusions++; - } - -- lc_clauses = lnext(lc_clauses); -- lc_constraints = lnext(lc_constraints); -+ lc_clauses = lnext_compat(state->filtered_ri_clauses, lc_clauses); -+ lc_constraints = lnext_compat(state->filtered_constraints, lc_constraints); - } - - state->runtime_initialized = true; -diff --git a/src/compat.h b/src/compat.h -index d84f8754..51c1c181 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -358,4 +358,20 @@ get_vacuum_options(const VacuumStmt *stmt) - pg_b64_decode((src), (srclen), (dst), (dstlen)) - #endif - -+/* PG13 changes the List implementation from a linked list to an array -+ * while most of the API functions did not change a few them have slightly -+ * different signature in PG13, additionally the list_make5 functions -+ * got removed. */ -+#if PG13_LT -+#define lnext_compat(l, lc) lnext((lc)) -+#define list_delete_cell_compat(l, lc, prev) list_delete_cell((l), (lc), (prev)) -+#define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (initcell)) -+#else -+#define lnext_compat(l, lc) lnext((l), (lc)) -+#define list_delete_cell_compat(l, lc, prev) list_delete_cell((l), (lc)) -+#define list_make5(x1, x2, x3, x4, x5) lappend(list_make4(x1, x2, x3, x4), x5) -+#define list_make5_oid(x1, x2, x3, x4, x5) lappend_oid(list_make4_oid(x1, x2, x3, x4), x5) -+#define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (list), (initcell)) -+#endif -+ - #endif /* TIMESCALEDB_COMPAT_H */ -diff --git a/src/import/planner.c b/src/import/planner.c -index 31a4889d..b907390d 100644 ---- a/src/import/planner.c -+++ b/src/import/planner.c -@@ -196,7 +196,7 @@ ts_make_partial_grouping_target(struct PlannerInfo *root, PathTarget *grouping_t - struct List *non_group_cols; - struct List *non_group_exprs; - int i; -- struct ListCell *lc; -+ ListCell *lc; - - partial_target = create_empty_pathtarget(); - non_group_cols = NIL; -diff --git a/src/plan_agg_bookend.c b/src/plan_agg_bookend.c -index d4d06f5b..5394cf5d 100644 ---- a/src/plan_agg_bookend.c -+++ b/src/plan_agg_bookend.c -@@ -696,13 +696,14 @@ build_first_last_path(PlannerInfo *root, FirstLastAggInfo *fl_info, Oid eqop, Oi - if (app->parent_reloid == rte->relid) - { - subroot->append_rel_list = -- list_delete_cell(subroot->append_rel_list, next, prev); -- next = prev != NULL ? prev->next : list_head(subroot->append_rel_list); -+ list_delete_cell_compat(subroot->append_rel_list, next, prev); -+ next = prev != NULL ? lnext_compat(subroot->append_rel_list, next) : -+ list_head(subroot->append_rel_list); - } - else - { - prev = next; -- next = next->next; -+ next = lnext_compat(subroot->append_rel_list, next); - } - } - } -diff --git a/src/plan_expand_hypertable.c b/src/plan_expand_hypertable.c -index 37282ce4..2b99c93b 100644 ---- a/src/plan_expand_hypertable.c -+++ b/src/plan_expand_hypertable.c -@@ -581,7 +581,8 @@ process_quals(Node *quals, CollectQualCtx *ctx, bool is_outer_join) - ListCell *prev pg_attribute_unused() = NULL; - List *additional_quals = NIL; - -- for (lc = list_head((List *) quals); lc != NULL; prev = lc, lc = lnext(lc)) -+ for (lc = list_head((List *) quals); lc != NULL; -+ prev = lc, lc = lnext_compat((List *) quals, lc)) - { - Expr *qual = lfirst(lc); - Relids relids = pull_varnos((Node *) qual); -@@ -611,7 +612,7 @@ process_quals(Node *quals, CollectQualCtx *ctx, bool is_outer_join) - * is called, so we can remove the functions from that directly - */ - #if PG12_LT -- quals = (Node *) list_delete_cell((List *) quals, lc, prev); -+ quals = (Node *) list_delete_cell_compat((List *) quals, lc, prev); - #endif - return quals; - } -@@ -663,7 +664,9 @@ process_quals(Node *quals, CollectQualCtx *ctx, bool is_outer_join) - static List * - remove_exclusion_fns(List *restrictinfo) - { -+#if PG13_LT - ListCell *prev = NULL; -+#endif - ListCell *lc = list_head(restrictinfo); - - while (lc != NULL) -@@ -682,11 +685,13 @@ remove_exclusion_fns(List *restrictinfo) - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("first parameter for chunks_in function needs to be record"))); - -- restrictinfo = list_delete_cell((List *) restrictinfo, lc, prev); -+ restrictinfo = list_delete_cell_compat((List *) restrictinfo, lc, prev); - return restrictinfo; - } -+#if PG13_LT - prev = lc; -- lc = lnext(lc); -+#endif -+ lc = lnext_compat(restrictinfo, lc); - } - return restrictinfo; - } -diff --git a/test/src/bgw/test_job_refresh.c b/test/src/bgw/test_job_refresh.c -index 51a3b0d7..d51415d4 100644 ---- a/test/src/bgw/test_job_refresh.c -+++ b/test/src/bgw/test_job_refresh.c -@@ -13,6 +13,7 @@ - #include - #include - -+#include "compat.h" - #include "export.h" - #include "bgw/scheduler.h" - -@@ -70,7 +71,7 @@ ts_test_job_refresh(PG_FUNCTION_ARGS) - memset(nulls, 0, sizeof(*nulls) * funcctx->tuple_desc->natts); - tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls); - -- funcctx->user_fctx = lnext(lc); -+ funcctx->user_fctx = lnext_compat(cur_scheduled_jobs, lc); - SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple)); - } - -diff --git a/tsl/src/continuous_aggs/create.c b/tsl/src/continuous_aggs/create.c -index bdf4470a..f767dabb 100644 ---- a/tsl/src/continuous_aggs/create.c -+++ b/tsl/src/continuous_aggs/create.c -@@ -1566,7 +1566,7 @@ fixup_userview_query_tlist(Query *userquery, List *tlist_aliases) - if (tle->resjunk) - continue; - tle->resname = pstrdup(strVal(lfirst(alist_item))); -- alist_item = lnext(alist_item); -+ alist_item = lnext_compat(tlist_aliases, alist_item); - if (alist_item == NULL) - break; /* done assigning aliases */ - } -diff --git a/tsl/src/debug.c b/tsl/src/debug.c -index 697bfc0b..023097ee 100644 ---- a/tsl/src/debug.c -+++ b/tsl/src/debug.c -@@ -168,7 +168,7 @@ append_func_expr(StringInfo buf, const Node *expr, const List *rtable) - foreach (l, e->args) - { - append_expr(buf, lfirst(l), rtable); -- if (lnext(l)) -+ if (lnext_compat(e->args, l)) - appendStringInfoString(buf, ", "); - } - appendStringInfoChar(buf, ')'); -@@ -217,7 +217,7 @@ append_restrict_clauses(StringInfo buf, PlannerInfo *root, List *clauses) - RestrictInfo *c = lfirst(cell); - - append_expr(buf, (Node *) c->clause, root->parse->rtable); -- if (lnext(cell)) -+ if (lnext_compat(clauses, cell)) - appendStringInfoString(buf, ", "); - } - } -@@ -270,7 +270,7 @@ append_pathkeys(StringInfo buf, const List *pathkeys, const List *rtable) - append_expr(buf, (Node *) mem->em_expr, rtable); - } - appendStringInfoChar(buf, ')'); -- if (lnext(i)) -+ if (lnext_compat(pathkeys, i)) - appendStringInfoString(buf, ", "); - } - appendStringInfoChar(buf, ')'); -@@ -601,7 +601,10 @@ tsl_debug_append_pruned_pathlist(StringInfo buf, PlannerInfo *root, RelOptInfo * - foreach (lc1, rel->pathlist) - { - Path *p1 = (Path *) lfirst(lc1); -- ListCell *lc2, *prev = NULL; -+ ListCell *lc2; -+#if PG13_LT -+ ListCell *prev = NULL; -+#endif - - foreach (lc2, fdw_info->considered_paths) - { -@@ -610,11 +613,13 @@ tsl_debug_append_pruned_pathlist(StringInfo buf, PlannerInfo *root, RelOptInfo * - if (path_is_origin(p1, p2)) - { - fdw_info->considered_paths = -- list_delete_cell(fdw_info->considered_paths, lc2, prev); -+ list_delete_cell_compat(fdw_info->considered_paths, lc2, prev); - fdw_utils_free_path(p2); - break; - } -+#if PG13_LT - prev = lc2; -+#endif - } - } - -diff --git a/tsl/src/fdw/deparse.c b/tsl/src/fdw/deparse.c -index d90636b5..efd7debb 100644 ---- a/tsl/src/fdw/deparse.c -+++ b/tsl/src/fdw/deparse.c -@@ -2211,7 +2211,7 @@ deparseSubscriptingRef(SubscriptingRef *node, deparse_expr_cxt *context) - { - deparseExpr(lfirst(lowlist_item), context); - appendStringInfoChar(buf, ':'); -- lowlist_item = lnext(lowlist_item); -+ lowlist_item = lnext_compat(node->reflowerindexpr, lowlist_item); - } - deparseExpr(lfirst(uplist_item), context); - appendStringInfoChar(buf, ']'); -@@ -2273,7 +2273,7 @@ deparseFuncExpr(FuncExpr *node, deparse_expr_cxt *context) - { - if (!first) - appendStringInfoString(buf, ", "); -- if (use_variadic && lnext(arg) == NULL) -+ if (use_variadic && lnext_compat(node->args, arg) == NULL) - appendStringInfoString(buf, "VARIADIC "); - deparseExpr((Expr *) lfirst(arg), context); - first = false; -@@ -2601,7 +2601,7 @@ deparseAggref(Aggref *node, deparse_expr_cxt *context) - first = false; - - /* Add VARIADIC */ -- if (use_variadic && lnext(arg) == NULL) -+ if (use_variadic && lnext_compat(node->args, arg) == NULL) - appendStringInfoString(buf, "VARIADIC "); - - deparseExpr((Expr *) n, context); -diff --git a/tsl/src/nodes/decompress_chunk/decompress_chunk.c b/tsl/src/nodes/decompress_chunk/decompress_chunk.c -index 90b6c7c3..1e36f5dc 100644 ---- a/tsl/src/nodes/decompress_chunk/decompress_chunk.c -+++ b/tsl/src/nodes/decompress_chunk/decompress_chunk.c -@@ -182,7 +182,7 @@ build_compressed_scan_pathkeys(SortInfo *sort_info, PlannerInfo *root, List *chu - - for (lc = list_head(chunk_pathkeys); - lc != NULL && bms_num_members(segmentby_columns) < info->num_segmentby_columns; -- lc = lnext(lc)) -+ lc = lnext_compat(chunk_pathkeys, lc)) - { - PathKey *pk = lfirst(lc); - var = (Var *) ts_find_em_expr_for_rel(pk->pk_eclass, info->chunk_rel); -@@ -1210,7 +1210,7 @@ build_sortinfo(RelOptInfo *chunk_rel, CompressionInfo *info, List *pathkeys) - * we keep looping even if we found all segmentby columns in case a - * columns appears both in baserestrictinfo and in ORDER BY clause - */ -- for (; lc != NULL; lc = lnext(lc)) -+ for (; lc != NULL; lc = lnext_compat(pathkeys, lc)) - { - Assert(bms_num_members(segmentby_columns) <= info->num_segmentby_columns); - pk = lfirst(lc); -@@ -1250,7 +1250,7 @@ build_sortinfo(RelOptInfo *chunk_rel, CompressionInfo *info, List *pathkeys) - * loop over the rest of pathkeys - * this needs to exactly match the configured compress_orderby - */ -- for (pk_index = 1; lc != NULL; lc = lnext(lc), pk_index++) -+ for (pk_index = 1; lc != NULL; lc = lnext_compat(pathkeys, lc), pk_index++) - { - bool reverse = false; - pk = lfirst(lc); -diff --git a/tsl/src/nodes/decompress_chunk/exec.c b/tsl/src/nodes/decompress_chunk/exec.c -index 035f2de4..f58e6f6c 100644 ---- a/tsl/src/nodes/decompress_chunk/exec.c -+++ b/tsl/src/nodes/decompress_chunk/exec.c -@@ -121,7 +121,8 @@ initialize_column_state(DecompressChunkState *state) - - state->columns = palloc0(state->num_columns * sizeof(DecompressChunkColumnState)); - -- for (i = 0, lc = list_head(state->varattno_map); i < state->num_columns; lc = lnext(lc), i++) -+ for (i = 0, lc = list_head(state->varattno_map); i < state->num_columns; -+ lc = lnext_compat(state->varattno_map, lc), i++) - { - DecompressChunkColumnState *column = &state->columns[i]; - column->attno = lfirst_int(lc); -diff --git a/tsl/src/nodes/gapfill/planner.c b/tsl/src/nodes/gapfill/planner.c -index 56bdffd5..765a14ce 100644 ---- a/tsl/src/nodes/gapfill/planner.c -+++ b/tsl/src/nodes/gapfill/planner.c -@@ -295,8 +295,10 @@ gapfill_build_pathtarget(PathTarget *pt_upper, PathTarget *pt_path, PathTarget * - /* - * check arguments past first argument dont have Vars - */ -- for (lc_arg = lnext(list_head(context.call.window->args)); lc_arg != NULL; -- lc_arg = lnext(lc_arg)) -+ for (lc_arg = lnext_compat(context.call.window->args, -+ list_head(context.call.window->args)); -+ lc_arg != NULL; -+ lc_arg = lnext_compat(context.call.window->args, lc_arg)) - { - if (contain_var_clause(lfirst(lc_arg))) - ereport(ERROR, -@@ -553,9 +555,10 @@ gapfill_adjust_window_targetlist(PlannerInfo *root, RelOptInfo *input_rel, RelOp - /* - * check arguments past first argument dont have Vars - */ -- for (lc_arg = lnext(list_head(context.call.window->args)); -+ for (lc_arg = lnext_compat(context.call.window->args, -+ list_head(context.call.window->args)); - lc_arg != NULL; -- lc_arg = lnext(lc_arg)) -+ lc_arg = lnext_compat(context.call.window->args, lc_arg)) - { - if (contain_var_clause(lfirst(lc_arg))) - ereport(ERROR, --- -2.29.2 - diff --git a/package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch b/package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch deleted file mode 100644 index f92cfc409d..0000000000 --- a/package/timescaledb/0005-Adjust-code-to-PG13-list-sort-changes.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4a149cb833dbb45507cd52e63707311e9642587c Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 19 Sep 2020 23:20:37 +0200 -Subject: [PATCH] Adjust code to PG13 list sort changes - -PG13 changes the name of the list sorting function from list_qsort -to list_sort. Additionally PG13 does in-place sort. - -https://github.com/postgres/postgres/commit/569ed7f483 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/13d8aac33b6fc5104c8ad1da816dc0d009fc13a7.patch ---- - src/bgw/scheduler.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/src/bgw/scheduler.c b/src/bgw/scheduler.c -index 2630ff9f..b9d1aa38 100644 ---- a/src/bgw/scheduler.c -+++ b/src/bgw/scheduler.c -@@ -530,10 +530,15 @@ ts_populate_scheduled_job_tuple(ScheduledBgwJob *sjob, Datum *values) - #endif - - static int -+#if PG13_LT - cmp_next_start(const void *left, const void *right) - { - const ListCell *left_cell = *((ListCell **) left); - const ListCell *right_cell = *((ListCell **) right); -+#else -+cmp_next_start(const ListCell *left_cell, const ListCell *right_cell) -+{ -+#endif - ScheduledBgwJob *left_sjob = lfirst(left_cell); - ScheduledBgwJob *right_sjob = lfirst(right_cell); - -@@ -549,10 +554,18 @@ cmp_next_start(const void *left, const void *right) - static void - start_scheduled_jobs(register_background_worker_callback_type bgw_register) - { -+ List *ordered_scheduled_jobs; - ListCell *lc; - Assert(CurrentMemoryContext == scratch_mctx); -+ - /* Order jobs by increasing next_start */ -- List *ordered_scheduled_jobs = list_qsort(scheduled_jobs, cmp_next_start); -+#if PG13_LT -+ ordered_scheduled_jobs = list_qsort(scheduled_jobs, cmp_next_start); -+#else -+ /* PG13 does in-place sort */ -+ ordered_scheduled_jobs = scheduled_jobs; -+ list_sort(ordered_scheduled_jobs, cmp_next_start); -+#endif - - foreach (lc, ordered_scheduled_jobs) - { --- -2.29.2 - diff --git a/package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch b/package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch deleted file mode 100644 index 435273e8a4..0000000000 --- a/package/timescaledb/0006-Adjust-copy-code-to-PG13-addRTEtoQuery-changes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 196943ff91a6a21c575fbca1f047544970ec4c98 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Thu, 24 Sep 2020 16:18:43 +0200 -Subject: [PATCH] Adjust copy code to PG13 addRTEtoQuery changes - -PG13 removes addRTEtoQuery and provides a similar function -addNSItemToQuery which has a different signature. - -https://github.com/postgres/postgres/commit/5815696bc6 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/10d1c2d698c1b7cbf5af86082287adda4f0c6e97.patch ---- - src/copy.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/copy.c b/src/copy.c -index 2e63dc76..c8ce93e6 100644 ---- a/src/copy.c -+++ b/src/copy.c -@@ -535,7 +535,12 @@ copy_constraints_and_check(ParseState *pstate, Relation rel, List *attnums) - { - ListCell *cur; - char *xactReadOnly; --#if PG12_GE -+#if PG13_GE -+ ParseNamespaceItem *nsitem = -+ addRangeTableEntryForRelation(pstate, rel, RowExclusiveLock, NULL, false, false); -+ RangeTblEntry *rte = nsitem->p_rte; -+ addNSItemToQuery(pstate, nsitem, true, true, true); -+#elif PG12 - RangeTblEntry *rte = - addRangeTableEntryForRelation(pstate, rel, RowExclusiveLock, NULL, false, false); - addRTEtoQuery(pstate, rte, false, true, true); --- -2.29.2 - diff --git a/package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch b/package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch deleted file mode 100644 index b6a0362f36..0000000000 --- a/package/timescaledb/0007-Adjust-code-to-PG13-convert_tuples_by_name-signature.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 1c50cdc9a1c06c58f9fa72ab963d595c9a99d3d8 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Thu, 24 Sep 2020 05:33:38 +0200 -Subject: [PATCH] Adjust code to PG13 convert_tuples_by_name signature - change - -PG13 removed the msg parameter from convert_tuples_by_name. - -https://github.com/postgres/postgres/commit/fe66125974 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/968de59f8cd981ba0ca9cca1929d4ba17fbc256f.patch ---- - src/chunk_insert_state.c | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/src/chunk_insert_state.c b/src/chunk_insert_state.c -index 398a8811..5dc294df 100644 ---- a/src/chunk_insert_state.c -+++ b/src/chunk_insert_state.c -@@ -379,8 +379,11 @@ setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNu - - if (NULL == chunk_attnos) - chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), -- RelationGetDescr(first_rel), -- gettext_noop("could not convert row type")); -+ RelationGetDescr(first_rel) -+#if PG13_LT -+ , gettext_noop("could not convert row type") -+#endif -+ ); - - onconflset = translate_clause(ts_chunk_dispatch_get_on_conflict_set(dispatch), - chunk_attnos, -@@ -484,8 +487,11 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) - * to work correctly in mapping hypertable attnos->chunk attnos. - */ - chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), -- RelationGetDescr(hyper_rel), -- gettext_noop("could not convert row type")); -+ RelationGetDescr(hyper_rel) -+#if PG13_LT -+ ,gettext_noop("could not convert row type") -+#endif -+ ); - - chunk_rri->ri_projectReturning = - get_adjusted_projection_info_returning(chunk_rri->ri_projectReturning, -@@ -590,8 +596,11 @@ ts_chunk_insert_state_create(Chunk *chunk, ChunkDispatch *dispatch) - if (chunk->relkind != RELKIND_FOREIGN_TABLE) - state->hyper_to_chunk_map = - convert_tuples_by_name(RelationGetDescr(parent_rel), -- RelationGetDescr(rel), -- gettext_noop("could not convert row type")); -+ RelationGetDescr(rel) -+#if PG13_LT -+ ,gettext_noop("could not convert row type") -+#endif -+ ); - - adjust_projections(state, dispatch, RelationGetForm(rel)->reltype); - --- -2.29.2 - diff --git a/package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch b/package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch deleted file mode 100644 index ce00ac34cc..0000000000 --- a/package/timescaledb/0008-Adjust-code-to-PG13-tuple-conversion-changes.patch +++ /dev/null @@ -1,259 +0,0 @@ -From 5c17cb0aa7f06bb3ac15d4ca72a37f59a10fa59e Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Thu, 24 Sep 2020 15:21:04 +0200 -Subject: [PATCH] Adjust code to PG13 tuple conversion changes - -PG13 changes the way attribute mappings are done and uses AttrMap -instead of AttrNumber[] in the new function signatures. This patch -changes ChunkInsertState to use TupleConversionMap which abstracts -this change. - -https://github.com/postgres/postgres/commit/e1551f96e6 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/2cb7c41276c8f8112bd225a020fef709a8e776ff.patch ---- - src/chunk_insert_state.c | 92 +++++++++++++++++++++------------------ - src/compat.h | 15 +++++++ - tsl/src/fdw/modify_exec.c | 4 ++ - 3 files changed, 69 insertions(+), 42 deletions(-) - -diff --git a/src/chunk_insert_state.c b/src/chunk_insert_state.c -index 5dc294df..f8200dd8 100644 ---- a/src/chunk_insert_state.c -+++ b/src/chunk_insert_state.c -@@ -120,7 +120,7 @@ create_chunk_result_relation_info(ChunkDispatch *dispatch, Relation rel) - - static ProjectionInfo * - get_adjusted_projection_info_returning(ProjectionInfo *orig, List *returning_clauses, -- AttrNumber *map, int map_size, Index varno, Oid rowtype, -+ TupleConversionMap *map, Index varno, Oid rowtype, - TupleDesc chunk_desc) - { - bool found_whole_row; -@@ -128,14 +128,15 @@ get_adjusted_projection_info_returning(ProjectionInfo *orig, List *returning_cla - Assert(returning_clauses != NIL); - - /* map hypertable attnos -> chunk attnos */ -- returning_clauses = castNode(List, -- map_variable_attnos((Node *) returning_clauses, -- varno, -- 0, -- map, -- map_size, -- rowtype, -- &found_whole_row)); -+ if (map != NULL) -+ returning_clauses = castNode(List, -+ map_variable_attnos_compat((Node *) returning_clauses, -+ varno, -+ 0, -+ map->attrMap, -+ map->outdesc->natts, -+ rowtype, -+ &found_whole_row)); - - return ExecBuildProjectionInfo(returning_clauses, - orig->pi_exprContext, -@@ -145,7 +146,7 @@ get_adjusted_projection_info_returning(ProjectionInfo *orig, List *returning_cla - } - - static List * --translate_clause(List *inclause, AttrNumber *chunk_attnos, Index varno, Relation hyper_rel, -+translate_clause(List *inclause, TupleConversionMap *chunk_map, Index varno, Relation hyper_rel, - Relation chunk_rel) - { - List *clause = copyObject(inclause); -@@ -153,23 +154,23 @@ translate_clause(List *inclause, AttrNumber *chunk_attnos, Index varno, Relation - - /* map hypertable attnos -> chunk attnos for the "excluded" table */ - clause = castNode(List, -- map_variable_attnos((Node *) clause, -- INNER_VAR, -- 0, -- chunk_attnos, -- RelationGetDescr(hyper_rel)->natts, -- RelationGetForm(chunk_rel)->reltype, -- &found_whole_row)); -+ map_variable_attnos_compat((Node *) clause, -+ INNER_VAR, -+ 0, -+ chunk_map->attrMap, -+ RelationGetDescr(hyper_rel)->natts, -+ RelationGetForm(chunk_rel)->reltype, -+ &found_whole_row)); - - /* map hypertable attnos -> chunk attnos for the hypertable */ - clause = castNode(List, -- map_variable_attnos((Node *) clause, -- varno, -- 0, -- chunk_attnos, -- RelationGetDescr(hyper_rel)->natts, -- RelationGetForm(chunk_rel)->reltype, -- &found_whole_row)); -+ map_variable_attnos_compat((Node *) clause, -+ varno, -+ 0, -+ chunk_map->attrMap, -+ RelationGetDescr(hyper_rel)->natts, -+ RelationGetForm(chunk_rel)->reltype, -+ &found_whole_row)); - - return clause; - } -@@ -193,7 +194,11 @@ adjust_hypertable_tlist(List *tlist, TupleConversionMap *map) - { - List *new_tlist = NIL; - TupleDesc chunk_tupdesc = map->outdesc; -+#if PG13_GE -+ AttrNumber *attrMap = map->attrMap->attnums; -+#else - AttrNumber *attrMap = map->attrMap; -+#endif - AttrNumber chunk_attrno; - - for (chunk_attrno = 1; chunk_attrno <= chunk_tupdesc->natts; chunk_attrno++) -@@ -351,7 +356,8 @@ get_default_existing_slot(ChunkInsertState *state, ChunkDispatch *dispatch) - * columns, etc. - */ - static void --setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNumber *chunk_attnos) -+setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, -+ TupleConversionMap *chunk_map) - { - TupleConversionMap *map = state->hyper_to_chunk_map; - ResultRelInfo *chunk_rri = get_chunk_rri(state); -@@ -377,16 +383,17 @@ setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNu - - Assert(map->outdesc == RelationGetDescr(chunk_rel)); - -- if (NULL == chunk_attnos) -- chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), -- RelationGetDescr(first_rel) -+ if (NULL == chunk_map) -+ chunk_map = convert_tuples_by_name(RelationGetDescr(chunk_rel), -+ RelationGetDescr(first_rel) - #if PG13_LT -- , gettext_noop("could not convert row type") -+ , -+ gettext_noop("could not convert row type") - #endif -- ); -+ ); - - onconflset = translate_clause(ts_chunk_dispatch_get_on_conflict_set(dispatch), -- chunk_attnos, -+ chunk_map, - hyper_rri->ri_RangeTableIndex, - hyper_rel, - chunk_rel); -@@ -412,7 +419,7 @@ setup_on_conflict_state(ChunkInsertState *state, ChunkDispatch *dispatch, AttrNu - if (NULL != onconflict_where) - { - List *clause = translate_clause(castNode(List, onconflict_where), -- chunk_attnos, -+ chunk_map, - hyper_rri->ri_RangeTableIndex, - hyper_rel, - chunk_rel); -@@ -476,7 +483,7 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) - ResultRelInfo *chunk_rri = cis->result_relation_info; - Relation hyper_rel = dispatch->hypertable_result_rel_info->ri_RelationDesc; - Relation chunk_rel = cis->rel; -- AttrNumber *chunk_attnos = NULL; -+ TupleConversionMap *chunk_map = NULL; - OnConflictAction onconflict_action = ts_chunk_dispatch_get_on_conflict_action(dispatch); - - if (ts_chunk_dispatch_has_returning(dispatch)) -@@ -486,19 +493,19 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) - * to have the hypertable_desc in the out spot for map_variable_attnos - * to work correctly in mapping hypertable attnos->chunk attnos. - */ -- chunk_attnos = convert_tuples_by_name_map(RelationGetDescr(chunk_rel), -- RelationGetDescr(hyper_rel) -+ chunk_map = convert_tuples_by_name(RelationGetDescr(chunk_rel), -+ RelationGetDescr(hyper_rel) - #if PG13_LT -- ,gettext_noop("could not convert row type") -+ , -+ gettext_noop("could not convert row type") - #endif -- ); -+ ); - - chunk_rri->ri_projectReturning = - get_adjusted_projection_info_returning(chunk_rri->ri_projectReturning, - ts_chunk_dispatch_get_returning_clauses( - dispatch), -- chunk_attnos, -- RelationGetDescr(hyper_rel)->natts, -+ chunk_map, - dispatch->hypertable_result_rel_info - ->ri_RangeTableIndex, - rowtype, -@@ -511,7 +518,7 @@ adjust_projections(ChunkInsertState *cis, ChunkDispatch *dispatch, Oid rowtype) - set_arbiter_indexes(cis, dispatch); - - if (onconflict_action == ONCONFLICT_UPDATE) -- setup_on_conflict_state(cis, dispatch, chunk_attnos); -+ setup_on_conflict_state(cis, dispatch, chunk_map); - } - } - -@@ -598,9 +605,10 @@ ts_chunk_insert_state_create(Chunk *chunk, ChunkDispatch *dispatch) - convert_tuples_by_name(RelationGetDescr(parent_rel), - RelationGetDescr(rel) - #if PG13_LT -- ,gettext_noop("could not convert row type") -+ , -+ gettext_noop("could not convert row type") - #endif -- ); -+ ); - - adjust_projections(state, dispatch, RelationGetForm(rel)->reltype); - -diff --git a/src/compat.h b/src/compat.h -index 51c1c181..1b2ed8e5 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -374,4 +374,19 @@ get_vacuum_options(const VacuumStmt *stmt) - #define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (list), (initcell)) - #endif - -+/* PG13 removes the natts parameter from map_variable_attnos */ -+#if PG13_LT -+#define map_variable_attnos_compat(node, varno, sublevels_up, map, natts, rowtype, found_wholerow) \ -+ map_variable_attnos((node), \ -+ (varno), \ -+ (sublevels_up), \ -+ (map), \ -+ (natts), \ -+ (rowtype), \ -+ (found_wholerow)) -+#else -+#define map_variable_attnos_compat(node, varno, sublevels_up, map, natts, rowtype, found_wholerow) \ -+ map_variable_attnos((node), (varno), (sublevels_up), (map), (rowtype), (found_wholerow)) -+#endif -+ - #endif /* TIMESCALEDB_COMPAT_H */ -diff --git a/tsl/src/fdw/modify_exec.c b/tsl/src/fdw/modify_exec.c -index 38d0e0c6..5307079d 100644 ---- a/tsl/src/fdw/modify_exec.c -+++ b/tsl/src/fdw/modify_exec.c -@@ -202,7 +202,11 @@ convert_attrs(TupleConversionMap *map, List *attrs) - - for (i = 0; i < map->outdesc->natts; i++) - { -+#if PG13_GE -+ if (map->attrMap->attnums[i] == attnum) -+#else - if (map->attrMap[i] == attnum) -+#endif - { - new_attrs = lappend_int(new_attrs, AttrOffsetGetAttrNumber(i)); - break; --- -2.29.2 - diff --git a/package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch b/package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch deleted file mode 100644 index 9e615134ba..0000000000 --- a/package/timescaledb/0009-Adjust-hypertable-expansion-to-PG13-changes.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 8cf647f2995afbd594d67abb1e6556b97096a1c6 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Thu, 24 Sep 2020 04:42:45 +0200 -Subject: [PATCH] Adjust hypertable expansion to PG13 changes - -PG13 merges setup_append_rel_array into setup_simple_rel_arrays -which we use to build the append_rel_array. - -https://github.com/postgres/postgres/commit/1661a40505 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2735/commits/e6e2711d8e00958cb0a35c23f4e81a75f273113a.patch ---- - src/plan_expand_hypertable.c | 30 ++++++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - -diff --git a/src/plan_expand_hypertable.c b/src/plan_expand_hypertable.c -index 2b99c93b..4baa1b4c 100644 ---- a/src/plan_expand_hypertable.c -+++ b/src/plan_expand_hypertable.c -@@ -95,6 +95,24 @@ is_time_bucket_function(Expr *node) - return false; - } - -+#if PG13_GE -+/* PG13 merged setup_append_rel_array with setup_simple_rel_arrays */ -+static void -+setup_append_rel_array(PlannerInfo *root) -+{ -+ root->append_rel_array = -+ repalloc(root->append_rel_array, root->simple_rel_array_size * sizeof(AppendRelInfo *)); -+ ListCell *lc; -+ foreach (lc, root->append_rel_list) -+ { -+ AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc); -+ int child_relid = appinfo->child_relid; -+ -+ root->append_rel_array[child_relid] = appinfo; -+ } -+} -+#endif -+ - /* - * Pre-check to determine if an expression is eligible for constification. - * A more thorough check is in constify_timestamptz_op_interval. -@@ -1146,7 +1164,6 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * - .join_conditions = NIL, - .propagate_conditions = NIL, - }; -- Size old_rel_array_len; - Index first_chunk_index = 0; - #if PG12_GE - Index i; -@@ -1178,6 +1195,11 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * - propagate_join_quals(root, rel, &ctx); - - inh_oids = get_chunk_oids(&ctx, root, rel, ht); -+ -+ /* nothing to do here if we have no chunks and no data nodes */ -+ if (list_length(inh_oids) + list_length(ht->data_nodes) == 0) -+ return; -+ - oldrelation = table_open(parent_oid, NoLock); - - /* -@@ -1185,7 +1207,10 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * - * children to them. We include potential data node rels we might need to - * create in case of a distributed hypertable. - */ -- old_rel_array_len = root->simple_rel_array_size; -+#if PG12_GE -+ expand_planner_arrays(root, list_length(inh_oids) + list_length(ht->data_nodes)); -+#else -+ Size old_rel_array_len = root->simple_rel_array_size; - root->simple_rel_array_size += (list_length(inh_oids) + list_length(ht->data_nodes)); - root->simple_rel_array = - repalloc(root->simple_rel_array, root->simple_rel_array_size * sizeof(RelOptInfo *)); -@@ -1200,6 +1225,7 @@ ts_plan_expand_hypertable_chunks(Hypertable *ht, PlannerInfo *root, RelOptInfo * - memset(root->simple_rte_array + old_rel_array_len, - 0, - list_length(inh_oids) * sizeof(*root->simple_rte_array)); -+#endif - - /* Adding partition info will make PostgreSQL consider the inheritance - * children as part of a partitioned relation. This will enable --- -2.29.2 - diff --git a/package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch b/package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch deleted file mode 100644 index 34ecdb4339..0000000000 --- a/package/timescaledb/0010-Adjust-decompress-code-to-Var-field-renames.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d0f82f514eb1f59d63fcbfe71ec99d5d8f82649d Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Fri, 25 Sep 2020 14:23:01 +0200 -Subject: [PATCH] Adjust decompress code to Var field renames - -PG13 renames the varnoold and varoattno field of Var to varnosyn and -varattnosyn. - -https://github.com/postgres/postgres/commit/9ce77d75c5 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2786/commits/d46b5de84b975d6f394a7f1fa94a34c5062f50ca.patch ---- - tsl/src/nodes/decompress_chunk/decompress_chunk.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tsl/src/nodes/decompress_chunk/decompress_chunk.c b/tsl/src/nodes/decompress_chunk/decompress_chunk.c -index 1e36f5dc..4a6fa782 100644 ---- a/tsl/src/nodes/decompress_chunk/decompress_chunk.c -+++ b/tsl/src/nodes/decompress_chunk/decompress_chunk.c -@@ -739,11 +739,15 @@ create_var_for_compressed_equivalence_member(Var *var, const EMCreationContext * - if (var->varlevelsup == 0) - { - var->varno = context->compressed_relid_idx; -- var->varnoold = context->compressed_relid_idx; - var->varattno = - get_attnum(context->compressed_relid, NameStr(context->current_col_info->attname)); -- -+#if PG13_GE -+ var->varnosyn = var->varno; -+ var->varattnosyn = var->varattno; -+#else -+ var->varnoold = var->varno; - var->varoattno = var->varattno; -+#endif - - return (Node *) var; - } --- -2.29.2 - diff --git a/package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch b/package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch deleted file mode 100644 index f117e15058..0000000000 --- a/package/timescaledb/0011-Adjust-jsonb_utils-to-PG13-changes.patch +++ /dev/null @@ -1,39 +0,0 @@ -From aef77c6cf3bac36f93ba44244ecd8a23de701896 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 26 Sep 2020 02:14:28 +0200 -Subject: [PATCH] Adjust jsonb_utils to PG13 changes - -PG13 moved jsonapi.h from utils to common. - -https://github.com/postgres/postgres/commit/beb4699091 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2787/commits/aa1e0c8ac78ca109994269c659d52983fe49db7f.patch ---- - src/jsonb_utils.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/jsonb_utils.c b/src/jsonb_utils.c -index 46173871..dd901a38 100644 ---- a/src/jsonb_utils.c -+++ b/src/jsonb_utils.c -@@ -9,9 +9,15 @@ - #include - #include - #include --#include - - #include "compat.h" -+ -+#if PG13_LT -+#include -+#else -+#include -+#endif -+ - #include "export.h" - - #include "jsonb_utils.h" --- -2.29.2 - diff --git a/package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch b/package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch deleted file mode 100644 index 9a3bb58c75..0000000000 --- a/package/timescaledb/0012-Handle-AT_DropExpression-in-process_utility.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8a2ed03f78601596e1f74fa2e75f9cdf52c4ff83 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Fri, 25 Sep 2020 14:31:55 +0200 -Subject: [PATCH] Handle AT_DropExpression in process_utility - -PG13 adds a new ALTER TABLE subcommand for dropping the generated -property from a column. - -https://github.com/postgres/postgres/commit/f595117e24 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/cdb29e2e61ec3f3b52fb8962d12a15727757e35b.patch ---- - src/process_utility.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/process_utility.c b/src/process_utility.c -index 8f915113..0f76f141 100644 ---- a/src/process_utility.c -+++ b/src/process_utility.c -@@ -3266,6 +3266,9 @@ process_altertable_end_subcmd(Hypertable *ht, Node *parsetree, ObjectAddress *ob - case AT_AddColumnRecurse: - case AT_DropColumn: - case AT_DropColumnRecurse: -+#if PG13_GE -+ case AT_DropExpression: -+#endif - - /* - * adding and dropping columns handled in -@@ -3276,9 +3279,11 @@ process_altertable_end_subcmd(Hypertable *ht, Node *parsetree, ObjectAddress *ob - case AT_DropConstraintRecurse: - /* drop constraints handled by process_ddl_sql_drop */ - break; -- case AT_ProcessedConstraint: /* internal command never hit in our -- * test code, so don't know how to -- * handle */ -+#if PG13_LT -+ case AT_ProcessedConstraint: /* internal command never hit in our -+ * test code, so don't know how to -+ * handle */ -+#endif - case AT_ReAddComment: /* internal command never hit in our test - * code, so don't know how to handle */ - case AT_AddColumnToView: /* only used with views */ --- -2.29.2 - diff --git a/package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch b/package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch deleted file mode 100644 index 46686527bc..0000000000 --- a/package/timescaledb/0013-Adjust-copy-code-to-PG13-changes.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5cea3a687f7227997deb0eacbb061c586c6713f7 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 26 Sep 2020 02:57:38 +0200 -Subject: [PATCH] Adjust copy code to PG13 changes - -PG13 adds a CmdType argument to ExecComputeStoredGenerated. - -https://github.com/postgres/postgres/commit/c6679e4fca - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/a2d15828cbbbe7570afb03bb930df083ddeafd7a.patch ---- - src/copy.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/copy.c b/src/copy.c -index c8ce93e6..e38ae15e 100644 ---- a/src/copy.c -+++ b/src/copy.c -@@ -379,7 +379,11 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call - /* Compute stored generated columns */ - if (resultRelInfo->ri_RelationDesc->rd_att->constr && - resultRelInfo->ri_RelationDesc->rd_att->constr->has_generated_stored) -+#if PG13_GE -+ ExecComputeStoredGenerated(estate, myslot, CMD_INSERT); -+#else - ExecComputeStoredGenerated(estate, myslot); -+#endif - #endif - /* - * If the target is a plain table, check the constraints of --- -2.29.2 - diff --git a/package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch b/package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch deleted file mode 100644 index d5331fab19..0000000000 --- a/package/timescaledb/0014-Adjust-code-to-PG13-command-completion-tag-changes.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 6ef08914041b6166db6f77dd516ae8d66d0ecce6 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Wed, 30 Sep 2020 01:47:01 +0200 -Subject: [PATCH] Adjust code to PG13 command completion tag changes - -PG13 changes the representation of command completion tags to structs. - -https://github.com/postgres/postgres/commit/2f9661311b - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/d37ec4e23bc678bc84f126c5b952fb1707ad7fe4.patch ---- - src/loader/loader.c | 13 +++++++- - src/process_utility.c | 59 +++++++++++++++++++++++++++--------- - src/process_utility.h | 4 +++ - tsl/test/src/test_ddl_hook.c | 4 +++ - 4 files changed, 65 insertions(+), 15 deletions(-) - -diff --git a/src/loader/loader.c b/src/loader/loader.c -index f60f9e77..ed35f288 100644 ---- a/src/loader/loader.c -+++ b/src/loader/loader.c -@@ -464,7 +464,14 @@ post_analyze_hook(ParseState *pstate, Query *query) - static void - loader_process_utility_hook(PlannedStmt *pstmt, const char *query_string, - ProcessUtilityContext context, ParamListInfo params, -- QueryEnvironment *queryEnv, DestReceiver *dest, char *completion_tag) -+ QueryEnvironment *queryEnv, DestReceiver *dest, -+#if PG13_GE -+ QueryCompletion *qc -+#else -+ char *completion_tag -+#endif -+ -+) - { - bool is_distributed_database = false; - char *dist_uuid = NULL; -@@ -500,7 +507,11 @@ loader_process_utility_hook(PlannedStmt *pstmt, const char *query_string, - else - process_utility = standard_ProcessUtility; - -+#if PG13_GE -+ process_utility(pstmt, query_string, context, params, queryEnv, dest, qc); -+#else - process_utility(pstmt, query_string, context, params, queryEnv, dest, completion_tag); -+#endif - - /* - * Show a NOTICE warning message in case of dropping a -diff --git a/src/process_utility.c b/src/process_utility.c -index 0f76f141..d9d7514d 100644 ---- a/src/process_utility.c -+++ b/src/process_utility.c -@@ -91,7 +91,12 @@ prev_ProcessUtility(ProcessUtilityArgs *args) - args->params, - args->queryEnv, - args->dest, -- args->completion_tag); -+#if PG13_GE -+ args->qc -+#else -+ args->completion_tag -+#endif -+ ); - } - else - { -@@ -102,7 +107,12 @@ prev_ProcessUtility(ProcessUtilityArgs *args) - args->params, - args->queryEnv, - args->dest, -- args->completion_tag); -+#if PG13_GE -+ args->qc -+#else -+ args->completion_tag -+#endif -+ ); - } - } - -@@ -493,8 +503,13 @@ process_copy(ProcessUtilityArgs *args) - /* Performs acl check in here inside `copy_security_check` */ - timescaledb_DoCopy(stmt, args->query_string, &processed, ht); - -+#if PG13_GE -+ args->qc->commandTag = CMDTAG_COPY; -+ args->qc->nprocessed = processed; -+#else - if (args->completion_tag) - snprintf(args->completion_tag, COMPLETION_TAG_BUFSIZE, "COPY " UINT64_FORMAT, processed); -+#endif - - process_add_hypertable(args, ht); - -@@ -3646,7 +3661,11 @@ process_ddl_command_start(ProcessUtilityArgs *args) - return false; - - if (check_read_only) -+#if PG13_GE -+ PreventCommandIfReadOnly(CreateCommandName(args->parsetree)); -+#else - PreventCommandIfReadOnly(CreateCommandTag(args->parsetree)); -+#endif - - return handler(args); - } -@@ -3845,18 +3864,30 @@ process_ddl_sql_drop(EventTriggerDropObject *obj) - static void - timescaledb_ddl_command_start(PlannedStmt *pstmt, const char *query_string, - ProcessUtilityContext context, ParamListInfo params, -- QueryEnvironment *queryEnv, DestReceiver *dest, char *completion_tag) --{ -- ProcessUtilityArgs args = { .query_string = query_string, -- .context = context, -- .params = params, -- .dest = dest, -- .completion_tag = completion_tag, -- .pstmt = pstmt, -- .parsetree = pstmt->utilityStmt, -- .queryEnv = queryEnv, -- .parse_state = make_parsestate(NULL), -- .hypertable_list = NIL }; -+ QueryEnvironment *queryEnv, DestReceiver *dest, -+#if PG13_GE -+ QueryCompletion *qc -+#else -+ char *completion_tag -+#endif -+) -+{ -+ ProcessUtilityArgs args = { -+ .query_string = query_string, -+ .context = context, -+ .params = params, -+ .dest = dest, -+#if PG13_GE -+ .qc = qc, -+#else -+ .completion_tag = completion_tag, -+#endif -+ .pstmt = pstmt, -+ .parsetree = pstmt->utilityStmt, -+ .queryEnv = queryEnv, -+ .parse_state = make_parsestate(NULL), -+ .hypertable_list = NIL -+ }; - - bool altering_timescaledb = false; - DDLResult result; -diff --git a/src/process_utility.h b/src/process_utility.h -index ac5519f4..f66448fb 100644 ---- a/src/process_utility.h -+++ b/src/process_utility.h -@@ -24,7 +24,11 @@ typedef struct ProcessUtilityArgs - ParamListInfo params; - DestReceiver *dest; - List *hypertable_list; -+#if PG13_GE -+ QueryCompletion *qc; -+#else - char *completion_tag; -+#endif - } ProcessUtilityArgs; - - typedef enum -diff --git a/tsl/test/src/test_ddl_hook.c b/tsl/test/src/test_ddl_hook.c -index 4fb58f02..d01e6114 100644 ---- a/tsl/test/src/test_ddl_hook.c -+++ b/tsl/test/src/test_ddl_hook.c -@@ -80,7 +80,11 @@ test_ddl_command_end(EventTriggerData *command) - ListCell *cell; - Hypertable *ht; - -+#if PG13_GE -+ elog(NOTICE, "test_ddl_command_end: %s", GetCommandTagName(command->tag)); -+#else - elog(NOTICE, "test_ddl_command_end: %s", command->tag); -+#endif - - if (tsl_delayed_execution_list == NIL) - return; --- -2.29.2 - diff --git a/package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch b/package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch deleted file mode 100644 index 8ce69e17c9..0000000000 --- a/package/timescaledb/0015-Adjust-copy-to-PG13-HEAP_INSERT_SKIP_WAL-change.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 399acf6de6d02b3362faa13379b6bd948b91e20c Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Fri, 2 Oct 2020 00:58:57 +0200 -Subject: [PATCH] Adjust copy to PG13 HEAP_INSERT_SKIP_WAL change - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/446f977be8ead518579b3c5b2458429f27518b48.patch ---- - src/copy.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/copy.c b/src/copy.c -index e38ae15e..1187a696 100644 ---- a/src/copy.c -+++ b/src/copy.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -215,8 +216,10 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call - ccstate->rel->rd_newRelfilenodeSubid != InvalidSubTransactionId) - { - ti_options |= HEAP_INSERT_SKIP_FSM; -+#if PG13_LT - if (!XLogIsNeeded()) - ti_options |= HEAP_INSERT_SKIP_WAL; -+#endif - } - - /* -@@ -449,8 +452,13 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call - * If we skipped writing WAL, then we need to sync the heap (but not - * indexes since those use WAL anyway) - */ -+#if PG13_LT - if (ti_options & HEAP_INSERT_SKIP_WAL) - heap_sync(ccstate->rel); -+#else -+ if (!RelationNeedsWAL(ccstate->rel)) -+ smgrimmedsync(ccstate->rel->rd_smgr, MAIN_FORKNUM); -+#endif - - return processed; - } --- -2.29.2 - diff --git a/package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch b/package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch deleted file mode 100644 index 130d66b1bc..0000000000 --- a/package/timescaledb/0016-Adjust-planner-code-to-PG13-planner_hook-signature-c.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 280db3fdb6c365dd37d82afaeeebd16efa70e965 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Wed, 30 Sep 2020 01:45:29 +0200 -Subject: [PATCH] Adjust planner code to PG13 planner_hook signature - change - -PG13 adds the query string as argument to the planner_hook. - -https://github.com/postgres/postgres/commit/6aba63ef3e - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/90e3eb3df98f3165f08a17bf5548e3a30713de26.patch ---- - src/planner.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/planner.c b/src/planner.c -index b4d4907a..cd40fa84 100644 ---- a/src/planner.c -+++ b/src/planner.c -@@ -278,7 +278,12 @@ preprocess_query(Node *node, Query *rootquery) - } - - static PlannedStmt * -+#if PG13_GE -+timescaledb_planner(Query *parse, const char *query_string, int cursor_opts, -+ ParamListInfo bound_params) -+#else - timescaledb_planner(Query *parse, int cursor_opts, ParamListInfo bound_params) -+#endif - { - PlannedStmt *stmt; - ListCell *lc; -@@ -302,11 +307,19 @@ timescaledb_planner(Query *parse, int cursor_opts, ParamListInfo bound_params) - preprocess_query((Node *) parse, parse); - - if (prev_planner_hook != NULL) -- /* Call any earlier hooks */ -+ /* Call any earlier hooks */ -+#if PG13_GE -+ stmt = (prev_planner_hook)(parse, query_string, cursor_opts, bound_params); -+#else - stmt = (prev_planner_hook)(parse, cursor_opts, bound_params); -+#endif - else -- /* Call the standard planner */ -+ /* Call the standard planner */ -+#if PG13_GE -+ stmt = standard_planner(parse, query_string, cursor_opts, bound_params); -+#else - stmt = standard_planner(parse, cursor_opts, bound_params); -+#endif - - if (ts_extension_is_loaded()) - { --- -2.29.2 - diff --git a/package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch b/package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch deleted file mode 100644 index 87a12b2d9a..0000000000 --- a/package/timescaledb/0017-Adjust-code-to-deparse_context-changes.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d7960c761542d7e90e91a32e91b82459e5fcc84f Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 3 Oct 2020 15:53:19 +0200 -Subject: [PATCH] Adjust code to deparse_context changes - -PG13 changes EXPLAIN to use Plan instead PlanState as context. - -https://github.com/postgres/postgres/commit/6ef77cf46e - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2498/commits/20c5ef33fc9c6d47cd6a95ca79b0b260ee3cfd25.patch ---- - src/chunk_append/explain.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/chunk_append/explain.c b/src/chunk_append/explain.c -index 0111cf72..7ee089c1 100644 ---- a/src/chunk_append/explain.c -+++ b/src/chunk_append/explain.c -@@ -84,7 +84,11 @@ show_sort_group_keys(ChunkAppendState *state, List *ancestors, ExplainState *es) - initStringInfo(&sortkeybuf); - - /* Set up deparsing context */ -+#if PG13_GE -+ context = set_deparse_context_plan(es->deparse_cxt, plan, ancestors); -+#else - context = set_deparse_context_planstate(es->deparse_cxt, (Node *) state, ancestors); -+#endif - useprefix = (list_length(es->rtable) > 1 || es->verbose); - - for (keyno = 0; keyno < nkeys; keyno++) --- -2.29.2 - diff --git a/package/timescaledb/0018-Update-compat.h.patch b/package/timescaledb/0018-Update-compat.h.patch deleted file mode 100644 index 6e6dd9db8c..0000000000 --- a/package/timescaledb/0018-Update-compat.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 67744f30f481a05e3cb6a2e73c0cb17117a2eb38 Mon Sep 17 00:00:00 2001 -From: fidomax -Date: Mon, 11 Jan 2021 14:16:06 +0300 -Subject: [PATCH] Update compat.h - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/pull/2801/commits/6a927ee84c91797025fc48ac4aab74c3344ebdad.patch ---- - src/compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compat.h b/src/compat.h -index 1b2ed8e5..6b461e38 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -371,7 +371,7 @@ get_vacuum_options(const VacuumStmt *stmt) - #define list_delete_cell_compat(l, lc, prev) list_delete_cell((l), (lc)) - #define list_make5(x1, x2, x3, x4, x5) lappend(list_make4(x1, x2, x3, x4), x5) - #define list_make5_oid(x1, x2, x3, x4, x5) lappend_oid(list_make4_oid(x1, x2, x3, x4), x5) --#define for_each_cell_compat(cell, list, initcell) for_each_cell ((cell), (list), (initcell)) -+#define for_each_cell_compat(cell, list, initcell) for_each_cell (cell, list, initcell) - #endif - - /* PG13 removes the natts parameter from map_variable_attnos */ --- -2.29.2 - diff --git a/package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch b/package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch deleted file mode 100644 index 0793bf1d26..0000000000 --- a/package/timescaledb/0019-Adjust-code-to-PG13-tuptoaster-changes.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 42ac10738119c7d31892d8c3f45d525ad5bda756 Mon Sep 17 00:00:00 2001 -From: Sven Klemm -Date: Sat, 26 Sep 2020 02:19:56 +0200 -Subject: [PATCH] Adjust code to PG13 tuptoaster changes - -PG13 split tuptoaster.c into three separate files. This patch also -removes unnecesary tuptoaster.h includes. - -https://github.com/postgres/postgres/commit/8b94dab066 - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/timescale/timescaledb/commit/2bef612c04435cdb5257d40373c4955a0d617c39.patch ---- - tsl/src/remote/async.c | 1 - - tsl/src/remote/stmt_params.c | 1 - - tsl/src/reorder.c | 7 ++++++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/tsl/src/remote/async.c b/tsl/src/remote/async.c -index f3462809..0d55deb7 100644 ---- a/tsl/src/remote/async.c -+++ b/tsl/src/remote/async.c -@@ -13,7 +13,6 @@ - #include - #include - #include --#include - - #include "compat.h" - #if PG12_GE -diff --git a/tsl/src/remote/stmt_params.c b/tsl/src/remote/stmt_params.c -index 0f315f37..1682d476 100644 ---- a/tsl/src/remote/stmt_params.c -+++ b/tsl/src/remote/stmt_params.c -@@ -6,7 +6,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/tsl/src/reorder.c b/tsl/src/reorder.c -index c4b42c12..7f301b2b 100644 ---- a/tsl/src/reorder.c -+++ b/tsl/src/reorder.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -58,6 +57,12 @@ - #include - #endif - -+#if PG13_LT -+#include -+#else -+#include -+#endif -+ - #include "chunk.h" - #include "chunk_index.h" - #include "hypertable_cache.h" --- -2.29.2 - diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index f275c3d4b0..f84bd04cc0 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 96e51d5240547f0223c34b91263f6fffca46927710764bf450aa61e9756189bd timescaledb-2.0.1.tar.gz +sha256 6de2af2ecfd7bff9b3634b6c5c29b209b25e147858d460469e8eb88e6d198692 timescaledb-2.1.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 0d5dc12d9d..783017636b 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.0.1 +TIMESCALEDB_VERSION = 2.1.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 06d695cd70dfcab7806bf778919744f7847ec1c2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 22 Feb 2021 18:52:02 +0100 Subject: [PATCH 144/162] package/libnss: bump version to 3.62 Release Notes: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.62_release_notes Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index ad632f724a..85c694bc66 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_61_RTM/src/SHA256SUMS -sha256 312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370 nss-3.61.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_62_RTM/src/SHA256SUMS +sha256 86d6df7cece25b8d4efa53e4c19af903c484eb79871163f37b5232bb406a5478 nss-3.62.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 3bc3197e34..07991ae786 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.61 +LIBNSS_VERSION = 3.62 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From d8e6179807bdfc89608a037e31c0dcc43382bcb0 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 5 Mar 2021 16:41:39 +0100 Subject: [PATCH 145/162] toolchain: disable gcc bug 60620 if gcc version >= 10.x Since gcc version 10.x bug 60620 doesn't show anymore, so let's make it enabled up to versino 10.x excluded. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- toolchain/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index ce7e7f6cc4..1940c076a9 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -154,10 +154,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620 # ICE: in do_output_reload, at reload1.c:7978 on microblaze. -# It's still not fixed in gcc 9.x +# This bug no longer exists in gcc 10.x config BR2_TOOLCHAIN_HAS_GCC_BUG_90620 bool default y if BR2_microblaze + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93847 # ICE: compiler error: Segmentation fault on Nios II. This bug From bd77d4557209e047b071710196ce0acc4e0ba8ac Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Thu, 4 Mar 2021 14:40:49 +0100 Subject: [PATCH 146/162] package/mawk: new package Interpreter for the AWK Programming Language. Signed-off-by: Ismael Luceno Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in | 1 + package/mawk/Config.in | 6 ++++++ package/mawk/mawk.hash | 2 ++ package/mawk/mawk.mk | 13 +++++++++++++ 5 files changed, 23 insertions(+) create mode 100644 package/mawk/Config.in create mode 100644 package/mawk/mawk.hash create mode 100644 package/mawk/mawk.mk diff --git a/DEVELOPERS b/DEVELOPERS index 42f3c66274..9031d99b97 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1123,6 +1123,7 @@ F: package/exempi/ N: Ismael Luceno F: package/axel/ +F: package/mawk/ N: Jagan Teki F: board/amarula/ diff --git a/package/Config.in b/package/Config.in index 1cfbabeb86..992e46a319 100644 --- a/package/Config.in +++ b/package/Config.in @@ -178,6 +178,7 @@ menu "Development tools" source "package/jq/Config.in" source "package/libtool/Config.in" source "package/make/Config.in" + source "package/mawk/Config.in" source "package/patch/Config.in" source "package/pkgconf/Config.in" source "package/ripgrep/Config.in" diff --git a/package/mawk/Config.in b/package/mawk/Config.in new file mode 100644 index 0000000000..80118b3f6d --- /dev/null +++ b/package/mawk/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_MAWK + bool "mawk" + help + Interpreter for the AWK Programming Language. + + http://invisible-island.net/mawk/mawk.html diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash new file mode 100644 index 0000000000..69761f77df --- /dev/null +++ b/package/mawk/mawk.hash @@ -0,0 +1,2 @@ +sha256 7fd4cd1e1fae9290fe089171181bbc6291dfd9bca939ca804f0ddb851c8b8237 mawk-1.3.4-20200120.tgz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk new file mode 100644 index 0000000000..c4a486215d --- /dev/null +++ b/package/mawk/mawk.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# mawk +# +################################################################################ + +MAWK_VERSION = 1.3.4-20200120 +MAWK_SITE = https://invisible-mirror.net/archives/mawk +MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz +MAWK_LICENSE = GPL-2.0 +MAWK_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) From 97bec5b4cc880b5e7aa2e15b492cc3bea527c663 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Wed, 24 Feb 2021 11:31:50 +0100 Subject: [PATCH 147/162] package/lttng-tools: bump version to 2.12.3 Remove patch 001 as it has been fixed upstream. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- ...nts-ns-tp.h-Fix-build-with-musl-libc.patch | 46 ------------------- package/lttng-tools/lttng-tools.hash | 4 +- package/lttng-tools/lttng-tools.mk | 2 +- 3 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch diff --git a/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch b/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch deleted file mode 100644 index e3e0f3a777..0000000000 --- a/package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 73f906d4d6806afb1962751ccb0fe6c15f320d94 Mon Sep 17 00:00:00 2001 -From: Ovidiu Panait -Date: Mon, 18 May 2020 16:39:26 +0300 -Subject: [PATCH] tests: gen-ust-events-ns/tp.h: Fix build with musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix the following build error with musl libc: -In file included from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:14, - from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.c:10: -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~ -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~ -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~~~ -../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'? - 17 | TP_ARGS(ino_t, ns_ino), - | ^~~~~~~ - -Signed-off-by: Ovidiu Panait -Signed-off-by: Jérémie Galarneau -Change-Id: Ic7a73c6754fc30a62bdf6519062c07be65a2eaba -[Retrieved from: -https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94] -Signed-off-by: Fabrice Fontaine ---- - tests/utils/testapp/gen-ust-events-ns/tp.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h -index 4dbfed51a..e0ddb29a6 100644 ---- a/tests/utils/testapp/gen-ust-events-ns/tp.h -+++ b/tests/utils/testapp/gen-ust-events-ns/tp.h -@@ -11,6 +11,7 @@ - #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ) - #define _TRACEPOINT_TP_H - -+#include - #include - - TRACEPOINT_EVENT(tp, tptest, diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index a27b419e75..a94ecc4a35 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.1.tar.bz2.sha256 -sha256 0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8 lttng-tools-2.12.1.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.3.tar.bz2.sha256 +sha256 2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153 lttng-tools-2.12.3.tar.bz2 # Locally computed sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index e0e99e3270..d66233414e 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.12.1 +LTTNG_TOOLS_VERSION = 2.12.3 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES From aa6818f5efa8f8503bc5db292e115960039e83db Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Wed, 24 Feb 2021 11:31:51 +0100 Subject: [PATCH 148/162] package/lttng-libust: bump to version 2.12.1 Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/lttng-libust/lttng-libust.hash | 4 ++-- package/lttng-libust/lttng-libust.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash index 62a65897f4..40bd870e86 100644 --- a/package/lttng-libust/lttng-libust.hash +++ b/package/lttng-libust/lttng-libust.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-ust/lttng-ust-2.12.0.tar.bz2.sha256 -sha256 1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528 lttng-ust-2.12.0.tar.bz2 +# From https://lttng.org/files/lttng-ust/lttng-ust-2.12.1.tar.bz2.sha256 +sha256 48a3948b168195123a749d22818809bd25127bb5f1a66458c3c012b210d2a051 lttng-ust-2.12.1.tar.bz2 # Hash for license file sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index f3c660c56f..69dc4473f0 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -5,7 +5,7 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.12.0 +LTTNG_LIBUST_VERSION = 2.12.1 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING From 52912b2cb0112cff94fbe36f367ad5e5d24b139c Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Wed, 24 Feb 2021 11:31:52 +0100 Subject: [PATCH 149/162] package/lttng-libust: set rundir to /run/lttng unconditionally Buildroot ensures that all init-systems have a /run directory, this should be the preferred location. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/lttng-libust/lttng-libust.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index 69dc4473f0..608e8781b1 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -11,11 +11,10 @@ LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl LTTNG_LIBUST_LICENSE_FILES = COPYING LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux -LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples - -ifeq ($(BR2_INIT_SYSTEMD),y) -LTTNG_LIBUST_CONF_OPTS += --with-lttng-system-rundir=/run/lttng -endif +LTTNG_LIBUST_CONF_OPTS = \ + --disable-man-pages \ + --disable-examples \ + --with-lttng-system-rundir=/run/lttng ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python From 9441b93ca474b8112de490b96cbaf77e08a3be2d Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Wed, 24 Feb 2021 11:31:53 +0100 Subject: [PATCH 150/162] package/lttng-tools: set rundir to /run/lttng unconditionally Buildroot ensures that all init-systems have a /run directory, this should be the preferred location. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/lttng-tools/lttng-tools.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index d66233414e..8789ded333 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -10,12 +10,10 @@ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES LTTNG_TOOLS_LICENSE = GPL-2.0, LGPL-2.1 (include/lttng/*, src/lib/lttng-ctl/*) LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Clause GPL-2.0 LGPL-2.1 MIT) -LTTNG_TOOLS_CONF_OPTS += --disable-man-pages LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux - -ifeq ($(BR2_INIT_SYSTEMD),y) -LTTNG_TOOLS_CONF_OPTS += --with-lttng-system-rundir=/run/lttng -endif +LTTNG_TOOLS_CONF_OPTS = \ + --disable-man-pages \ + --with-lttng-system-rundir=/run/lttng ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust From 80d1bc9b199491cc3cff3b0d82fed939355df2b0 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Thu, 25 Feb 2021 16:33:41 +0100 Subject: [PATCH 151/162] boot/optee-os: bump to version 3.12.0 Bump OP-TEE OS package version to OP-TEE release 3.12.0. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- boot/optee-os/Config.in | 4 ++-- boot/optee-os/optee-os.hash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 3076be6b42..8e833ecd75 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -18,7 +18,7 @@ choice Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.11.0" + bool "3.12.0" help Use the latest release tag from the OP-TEE OS official Git repository. @@ -50,7 +50,7 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.11.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.12.0" if BR2_TARGET_OPTEE_OS_LATEST default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 0d60cebea1..36bc1d9593 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.11.0.tar.gz -sha256 3c34eda1052fbb9ed36fcfdfaecfd2685023b9290670c1a5982f8a0457bfd2cb optee-os-3.11.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.12.0/optee-os-3.12.0.tar.gz +sha256 b13991099f25d00dac479db93b55034cb93d206e296f2c7aa9c42b92bca2c783 optee-os-3.12.0.tar.gz # Locally computed sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE From 4ecb88f1d37b670300b7e648c76baa613337e559 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Thu, 25 Feb 2021 16:33:42 +0100 Subject: [PATCH 152/162] package/optee-benchmark: bump to version 3.12.0 Remove main-fix-typo patch since merged in OP-TEE OS 3.12.0 and bump OP-TEE Benchmark package version to OP-TEE release 3.12.0. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- .../optee-benchmark/0001-main-fix-typo.patch | 55 ------------------- package/optee-benchmark/optee-benchmark.hash | 4 +- package/optee-benchmark/optee-benchmark.mk | 2 +- 3 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 package/optee-benchmark/0001-main-fix-typo.patch diff --git a/package/optee-benchmark/0001-main-fix-typo.patch b/package/optee-benchmark/0001-main-fix-typo.patch deleted file mode 100644 index 8ad5a26f13..0000000000 --- a/package/optee-benchmark/0001-main-fix-typo.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ffa935dc881c394a824e063c8fde7dd102e06d8c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 8 May 2020 23:39:59 +0200 -Subject: [PATCH] main: fix typo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The function yaml_mapping_start_event_initialize() -take yaml_mapping_style_t style as last argument: - -int yaml_mapping_start_event_initialize( - yaml_event_t *event, - const yaml_char_t *anchor, - const yaml_char_t *tag, - int implicit, - yaml_mapping_style_t style) - -Use YAML_ANY_MAPPING_STYLE instead of YAML_ANY_SEQUENCE_STYLE - -Fixes: -main.c:173:5: error: implicit conversion from ‘enum yaml_sequence_style_e’ to ‘yaml_mapping_style_t’ {aka ‘enum yaml_mapping_style_e’} [-Werror=enum-conversion] - 173 | YAML_ANY_SEQUENCE_STYLE)) - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Romain Naour ---- - main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/main.c b/main.c -index 29a7c42..1685d3e 100644 ---- a/main.c -+++ b/main.c -@@ -170,7 +170,7 @@ static bool init_emitter(FILE *ts_file) - /* Mapping start */ - if (!yaml_mapping_start_event_initialize(&event, - NULL, NULL , YAML_IMPLICIT, -- YAML_ANY_SEQUENCE_STYLE)) -+ YAML_ANY_MAPPING_STYLE)) - ERROR_GOTO(emitter_delete, - "Failed to initialize YAML mapping start event"); - if (!yaml_emitter_emit(&emitter, &event)) -@@ -263,7 +263,7 @@ static bool fill_timestamp(uint32_t core, uint64_t count, uint64_t addr, - /* Mapping start */ - if (!yaml_mapping_start_event_initialize(&event, - NULL, NULL , YAML_IMPLICIT, -- YAML_ANY_SEQUENCE_STYLE)) -+ YAML_ANY_MAPPING_STYLE)) - ERROR_RETURN_FALSE( - "Failed to initialize YAML mapping start event"); - if (!yaml_emitter_emit(&emitter, &event)) --- -2.25.4 - diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 12d1ddea88..144069b6f3 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.11.0.tar.gz -sha256 34c314a5cda1e9e3b92f01759585722b44503d9eea19f6b936fc951f5acbac16 optee-benchmark-3.11.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.12.0/optee-benchmark-3.12.0.tar.gz +sha256 468635656fa483911cf605a96711d848f8e0f6b4a6137208226de364dee25fe4 optee-benchmark-3.12.0.tar.gz # Locally computed sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index f9d7cae302..c17a7045d4 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.11.0 +OPTEE_BENCHMARK_VERSION = 3.12.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE From 0267ea39ee6106e7d4a72c57a209004692ee7897 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Thu, 25 Feb 2021 16:33:43 +0100 Subject: [PATCH 153/162] package/optee-client: bump to version 3.12.0 Remove local patch file since issue addressed in OP-TEE mainline since 3.12.0 and bump OP-TEE Client package version to OP-TEE release 3.12.0. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- .../0001-libckteec-replace-initializer.patch | 93 ------------------- package/optee-client/optee-client.hash | 4 +- package/optee-client/optee-client.mk | 2 +- 3 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 package/optee-client/0001-libckteec-replace-initializer.patch diff --git a/package/optee-client/0001-libckteec-replace-initializer.patch b/package/optee-client/0001-libckteec-replace-initializer.patch deleted file mode 100644 index 21c75d142e..0000000000 --- a/package/optee-client/0001-libckteec-replace-initializer.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 4fff84cebc05a238a8fed3c66d7dcde18f9574fb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 2 Nov 2020 08:04:14 +0100 -Subject: [PATCH] =?UTF-8?q?libckteec:=20replace=20{=C2=A0}=20initializer?= - =?UTF-8?q?=20by=20{=C2=A00=20}?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Replace { } initializer by { 0 } to fix the following build failure with -gcc 4.8: - -libckteec/src/pkcs11_processing.c: In function 'ck_create_object': -libckteec/src/pkcs11_processing.c:22:9: error: missing initializer for field 'buffer' of 'struct serializer' [-Werror=missing-field-initializers] - struct serializer obj = { }; - ^ - -Fixes: http://autobuild.buildroot.org/results/a3d663adb943aee814180f01d6e153b3309be962 -Reviewed-by: Etienne Carriere -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/OP-TEE/optee_client/pull/230] ---- - libckteec/src/pkcs11_processing.c | 4 ++-- - libckteec/src/serialize_ck.c | 4 ++-- - libckteec/src/serializer.c | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libckteec/src/pkcs11_processing.c b/libckteec/src/pkcs11_processing.c -index 2eb191f5..8eebe769 100644 ---- a/libckteec/src/pkcs11_processing.c -+++ b/libckteec/src/pkcs11_processing.c -@@ -19,7 +19,7 @@ CK_RV ck_create_object(CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR attribs, - CK_ULONG count, CK_OBJECT_HANDLE_PTR handle) - { - CK_RV rv = CKR_GENERAL_ERROR; -- struct serializer obj = { }; -+ struct serializer obj = { 0 }; - size_t ctrl_size = 0; - TEEC_SharedMemory *ctrl = NULL; - TEEC_SharedMemory *out_shm = NULL; -@@ -114,7 +114,7 @@ CK_RV ck_encdecrypt_init(CK_SESSION_HANDLE session, - { - CK_RV rv = CKR_GENERAL_ERROR; - TEEC_SharedMemory *ctrl = NULL; -- struct serializer obj = { }; -+ struct serializer obj = { 0 }; - uint32_t session_handle = session; - uint32_t key_handle = key; - size_t ctrl_size = 0; -diff --git a/libckteec/src/serialize_ck.c b/libckteec/src/serialize_ck.c -index 1fc26ddc..0e5df90a 100644 ---- a/libckteec/src/serialize_ck.c -+++ b/libckteec/src/serialize_ck.c -@@ -39,7 +39,7 @@ static CK_RV serialize_indirect_attribute(struct serializer *obj, - CK_ATTRIBUTE_PTR attr = NULL; - CK_ULONG count = 0; - CK_RV rv = CKR_GENERAL_ERROR; -- struct serializer obj2 = { }; -+ struct serializer obj2 = { 0 }; - - switch (attribute->type) { - /* These are serialized each separately */ -@@ -263,7 +263,7 @@ static CK_RV serialize_mecha_aes_iv(struct serializer *obj, - CK_RV serialize_ck_mecha_params(struct serializer *obj, - CK_MECHANISM_PTR mechanism) - { -- CK_MECHANISM mecha = { }; -+ CK_MECHANISM mecha = { 0 }; - CK_RV rv = CKR_GENERAL_ERROR; - - memset(obj, 0, sizeof(*obj)); -diff --git a/libckteec/src/serializer.c b/libckteec/src/serializer.c -index 0e3df65c..d94932ba 100644 ---- a/libckteec/src/serializer.c -+++ b/libckteec/src/serializer.c -@@ -14,7 +14,7 @@ - - CK_RV init_serial_object(struct serializer *obj) - { -- struct pkcs11_object_head head = { }; -+ struct pkcs11_object_head head = { 0 }; - - memset(obj, 0, sizeof(*obj)); - -@@ -23,7 +23,7 @@ CK_RV init_serial_object(struct serializer *obj) - - void finalize_serial_object(struct serializer *obj) - { -- struct pkcs11_object_head head = { }; -+ struct pkcs11_object_head head = { 0 }; - - head.attrs_size = obj->size - sizeof(head); - head.attrs_count = obj->item_count; diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index d8e507dba7..253c29e22a 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.11.0.tar.gz -sha256 91f8ec191cd999ee666b6203ec376415d5dc90a8a9955f3d5fce1f48df77169b optee-client-3.11.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.12.0/optee-client-3.12.0.tar.gz +sha256 f75c45b40147217fa8f4a2ae1e4c06b24eb45d35167854fa9ad3ec3d6a73e858 optee-client-3.12.0.tar.gz # Locally computed sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 8108fc2130..0ae8426fc1 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.11.0 +OPTEE_CLIENT_VERSION = 3.12.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE From 0198de312d94e59cef2825869a6af381552cf9eb Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Thu, 25 Feb 2021 16:33:44 +0100 Subject: [PATCH 154/162] package/optee-examples: bump to version 3.12.0 Bump OP-TEE Examples package version to OP-TEE release 3.12.0. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- package/optee-examples/optee-examples.hash | 4 ++-- package/optee-examples/optee-examples.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index 230d5d3ccf..d43534832a 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.11.0.tar.gz -sha256 b910479a2d432014b6c49aafed27e26dd6f930e7c31d277c1500c1b60b4b3876 optee-examples-3.11.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.12.0/optee-examples-3.12.0.tar.gz +sha256 d3ae2cc4c51900a887f4c93e58571305bd37d60718a281953c3d775b3113f1f8 optee-examples-3.12.0.tar.gz # Locally computed sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index b6f77c72f0..ca7956e5bc 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.11.0 +OPTEE_EXAMPLES_VERSION = 3.12.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE From 2ed41deaf7d5e53e7c70150105813d5c3714e5e4 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Thu, 25 Feb 2021 16:33:45 +0100 Subject: [PATCH 155/162] package/optee-test: bump to version 3.12.0 Bump OP-TEE Test package version to OP-TEE release 3.12.0. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- package/optee-test/optee-test.hash | 4 ++-- package/optee-test/optee-test.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 52e2373bf7..0c789e1cd1 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.11.0.tar.gz -sha256 54d4b7e2ad22cd409ee8e25e990c1878690b1b5eb8843f649d12022888186a53 optee-test-3.11.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.12.0/optee-test-3.12.0.tar.gz +sha256 beebdc98e95af2e7a20595f7d6ca716872efde1ec74a48ab07be599f21e8ad70 optee-test-3.12.0.tar.gz # Locally computed sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 1f4f586672..2304b15925 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.11.0 +OPTEE_TEST_VERSION = 3.12.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md From 6a47e70743abcedba51ae406853a3f414f9ff48a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Nov 2020 21:43:49 +0100 Subject: [PATCH 156/162] package/optee-client: disable -Werror Disable -Werror thanks to CFG_WERROR which is available since version 3.3.0 and https://github.com/OP-TEE/optee_client/commit/5355fdb841bce4f7cce3dd37fc31fa91bd625c98 to fix the following build failure with optee-client 3.11.0: /home/giuliobenetti/autobuild/run/instance-2/output-1/build/optee-client-3.11.0/libckteec/src/pkcs11_processing.c: In function 'ck_create_object': /home/giuliobenetti/autobuild/run/instance-2/output-1/build/optee-client-3.11.0/libckteec/src/pkcs11_processing.c:22:9: error: missing initializer for field 'buffer' of 'struct serializer' [-Werror=missing-field-initializers] struct serializer obj = { }; ^ Fixes: - http://autobuild.buildroot.org/results/a3d663adb943aee814180f01d6e153b3309be962 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/optee-client/optee-client.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index 0ae8426fc1..22f205e407 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -11,7 +11,8 @@ OPTEE_CLIENT_LICENSE_FILES = LICENSE OPTEE_CLIENT_INSTALL_STAGING = YES OPTEE_CLIENT_CONF_OPTS = \ - -DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) + -DCFG_TEE_FS_PARENT_PATH=$(BR2_PACKAGE_OPTEE_CLIENT_TEE_FS_PATH) \ + -DCFG_WERROR=OFF define OPTEE_CLIENT_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ From b2821ca786f31066eaab4687607fbcfec268c36f Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 30 Oct 2020 08:50:44 +0100 Subject: [PATCH 157/162] package/optee-test: add deps on openssl when enabled Add a dependency on openssl upon BR2_PACKAGE_LIBOPENSSL=y to enable some for OP-TEE embedded tests. Building with libressl makes the optee-test test tool fail on a certificate test; so we explicitly depend on libopenssl. Signed-off-by: Etienne Carriere [yann.morin.1998@free.fr: - match the depenency to libopenssl, since that's is what is used in the condition (BR2_PACKAGE_LIBOPENSSL) - add a blurb to explain why libopenssl is used, not the virutal openssl ] Signed-off-by: Yann E. MORIN --- package/optee-test/optee-test.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 2304b15925..a2d18dadfc 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -11,6 +11,10 @@ OPTEE_TEST_LICENSE_FILES = LICENSE.md OPTEE_TEST_DEPENDENCIES = optee-client optee-os +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +OPTEE_TEST_DEPENDENCIES += libopenssl +endif + OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK) # Trusted Application are not built from CMake due to ta_dev_kit From 0c308c482802d9830ae5618b60ab50a84127dacf Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Sun, 7 Mar 2021 17:34:55 +0100 Subject: [PATCH 158/162] package/ruby: update hashes Commit af5226f2fd1292a26f2dfda32f41cbbad7aa4cc6 forgot to update hash of LEGAL and BSDL files. Those two files have mostly undergone reoraganizing. A few new files have also been listed. The resulting licensing does not change fundamentally, especially sine we already list 'others' in the list of licenses applicable to Ruby. Fixes: - http://autobuild.buildroot.net/results/448/4484fcce51dd2556156631d20b35bbba44abc171/build-end.log .. - http://autobuild.buildroot.net/results/c60/c60e5923159b3d66b422eb988f5d49e1c73e8710/build-end.log Signed-off-by: Bartosz Bilas [yann.morin.1998@free.fr: explain what changed] Signed-off-by: Yann E. MORIN --- package/ruby/ruby.hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index b4594fcaba..ec9492aa5e 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,6 +1,6 @@ # https://www.ruby-lang.org/en/news/2020/12/25/ruby-3-0-0-released/ sha256 68bfaeef027b6ccd0032504a68ae69721a70e97d921ff328c0c8836c798f6cb1 ruby-3.0.0.tar.xz # License files, Locally calculated -sha256 b09ca195d2de08f0aacfa8793d0af62d7681c304b3ef714b75813721823295a6 LEGAL +sha256 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING -sha256 a5e3042dacb53eebda91f3b1caefbfec8307711df8c4ed1ed20e4e97c43307a4 BSDL +sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL From 71088383869f761e54280d41d844e146da9569b6 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Sun, 7 Mar 2021 20:45:33 +0100 Subject: [PATCH 159/162] boot/at91bootstrap3: fix checksum of license Commit ca1604388a86d73c548c6e65eadd13f424685838 updated the checksum of the tarball, but failed to update the one of main.c, which serves as a license file. Signed-off-by: Edgar Bonet Signed-off-by: Yann E. MORIN --- boot/at91bootstrap3/at91bootstrap3.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index 6671a4ac70..6b6257b0ab 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz -sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c +sha256 fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a main.c From d1133a6927bf8cf920b6b39ad1ed9ab5aa395e7b Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Sun, 7 Mar 2021 22:19:33 +0800 Subject: [PATCH 160/162] package/libuhttpd: bump version to 3.10.1 Signed-off-by: Jianhui Zhao Signed-off-by: Yann E. MORIN --- package/libuhttpd/libuhttpd.hash | 2 +- package/libuhttpd/libuhttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash index e772cc84ee..4b0b5027c6 100644 --- a/package/libuhttpd/libuhttpd.hash +++ b/package/libuhttpd/libuhttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 78b1c670e4f259346a1e49e57d158c619eace23f0b72821b0ff2ba991f7dcc51 libuhttpd-3.10.0.tar.gz +sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index 06d7bc7d5e..326c78face 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUHTTPD_VERSION = 3.10.0 +LIBUHTTPD_VERSION = 3.10.1 LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION) LIBUHTTPD_LICENSE = MIT LIBUHTTPD_LICENSE_FILES = LICENSE From 807dd03eec9dfc5aab1677d639729ed68f052b2e Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Sun, 7 Mar 2021 16:21:47 +0100 Subject: [PATCH 161/162] package/frotz: Update to version 2.53 This version should now also compile fine on systems without pthreads, so we can remove the dependency on BR2_TOOLCHAIN_HAS_THREADS again. While we're at it, also fix a typo in the description (replace "can not" with "cannot"). Signed-off-by: Thomas Huth Signed-off-by: Yann E. MORIN --- package/frotz/Config.in | 6 +----- package/frotz/frotz.hash | 2 +- package/frotz/frotz.mk | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/frotz/Config.in b/package/frotz/Config.in index b73beea330..9473f5944d 100644 --- a/package/frotz/Config.in +++ b/package/frotz/Config.in @@ -1,14 +1,10 @@ config BR2_PACKAGE_FROTZ bool "frotz" - depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_NCURSES help Frotz is an interpreter for old Infocom adventure games and - other Z-code games. Note that frotz can not be run as root. + other Z-code games. Note that frotz cannot be run as root. You must add a normal user to your buildroot configuration to be able to use it. https://661.org/proj/if/frotz/ - -comment "frotz needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/frotz/frotz.hash b/package/frotz/frotz.hash index 14f1a7fbe2..e5024aa2cd 100644 --- a/package/frotz/frotz.hash +++ b/package/frotz/frotz.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e488140791259a1a8c9e16a0c467ca69b694b918c28ffe3d83c654bcb253cca frotz-2.51.tar.bz2 +sha256 8da558828dd74d6d6ee30483bb32276ef918b8b72b7f6e89b4f7cb27e7abf58b frotz-2.53.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frotz/frotz.mk b/package/frotz/frotz.mk index ce27bdf0bf..cc0421358c 100644 --- a/package/frotz/frotz.mk +++ b/package/frotz/frotz.mk @@ -4,7 +4,7 @@ # ################################################################################ -FROTZ_VERSION = 2.51 +FROTZ_VERSION = 2.53 FROTZ_SOURCE = frotz-$(FROTZ_VERSION).tar.bz2 FROTZ_SITE = https://gitlab.com/DavidGriffith/frotz/-/archive/$(FROTZ_VERSION) FROTZ_DEPENDENCIES = host-pkgconf ncurses From ff084e1933625cd40aecfd1e37869156372b8682 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 7 Mar 2021 17:32:27 +0100 Subject: [PATCH 162/162] package/nano: bump to version 5.6.1 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 152766aa3b..cbb4977223 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v5/nano-5.6.tar.xz.asc +# https://www.nano-editor.org/dist/v5/nano-5.6.1.tar.xz.asc # using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 fce183e4a7034d07d219c79aa2f579005d1fd49f156db6e50f53543a87637a32 nano-5.6.tar.xz +sha256 760d7059e0881ca0ee7e2a33b09d999ec456ff7204df86bee58eb6f523ee8b09 nano-5.6.1.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 43f5f5f0b2..77126fd4b0 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 5 -NANO_VERSION = $(NANO_VERSION_MAJOR).6 +NANO_VERSION = $(NANO_VERSION_MAJOR).6.1 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+