From 146c232692e72154e5987f83e9bd0678e3b86e20 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Nov 2021 21:04:33 +0100 Subject: [PATCH 001/176] configs/raspberrypi*: bump kernel version to 9878a11 (5.10.78) Now based on 5.10.78 (from 5.10.76). Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- configs/raspberrypicm4io_64_defconfig | 2 +- configs/raspberrypicm4io_defconfig | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index e49be1af7a..64f7a93377 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig index 6be7401f6c..f3e7c453ab 100644 --- a/configs/raspberrypi0w_defconfig +++ b/configs/raspberrypi0w_defconfig @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index c59ee064b9..7befbf07e6 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig index 7d863c1731..ebb6e2252b 100644 --- a/configs/raspberrypi3_64_defconfig +++ b/configs/raspberrypi3_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index f923a3028b..6a9c4e0d02 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig index dea5060590..7d06b0bb5e 100644 --- a/configs/raspberrypi3_qt5we_defconfig +++ b/configs/raspberrypi3_qt5we_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig index 436ea57f13..2b5446d8f1 100644 --- a/configs/raspberrypi4_64_defconfig +++ b/configs/raspberrypi4_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index ca506b38df..ac555ddd5e 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index f6fa92fb34..257e59536e 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig index f29e4c492a..1ab379c557 100644 --- a/configs/raspberrypicm4io_64_defconfig +++ b/configs/raspberrypicm4io_64_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig index fac706c4d2..9941754e25 100644 --- a/configs/raspberrypicm4io_defconfig +++ b/configs/raspberrypicm4io_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources From 1f051ef2e8f7ffd9291fe7b6db2a384d6eb788c7 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Nov 2021 21:04:34 +0100 Subject: [PATCH 002/176] package/rpi-firmware: bump version to fa9a006 Changelog: kernel: Bump to 5.10.78 kernel: VC4 PixelValve and HDMI Drivers Locking Improvements for 5.10 kernel: Bump to 5.10.77 kernel: dtoverlays: Update all image sensor overlays for Media Controller option kernel: drm/vc4: Add support for non-standard modes in VEC kernel: Bump to 5.10.76 kernel: Bump to 5.10.75 firmware: video_decode: i/p port enable/disable without o/p active could stall firmware: clock-2711: Limit PLLB VCO frequency to the high range kernel: Bump to 5.10.74 kernel: ARM: dts: bcm2835_audio missing firmware reference kernel: vcio rewrite kernel: Bump to 5.10.73 kernel: Bump to 5.10.71 kernel: Bump to 5.10.69 kernel: Bump to 5.10.67 kernel: Bump to 5.10.66 kernel: Bump to 5.10.65 kernel: Bump to 5.10.64 kernel: Enable driver for RTL8111H used in cm4 carrier boards Signed-off-by: Peter Seiderer [yann.morin.1998@free.fr: actually fill-in the changelog] Signed-off-by: Yann E. MORIN --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 0ff7a73a37..7cbfd1b249 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 80af5efb51677edb7af6746a553dc2d8ad3f532ff44e4b7263f1e12d4bf72ffd rpi-firmware-2ef3800b1b71c0e30c2a61ecad6e007ae96ea342.tar.gz +sha256 a079a31fc80a23421589edcacef94faa713b12d3e77b92710ae2594c8d549477 rpi-firmware-fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 3a4741a0ff..5e8b0379ba 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 2ef3800b1b71c0e30c2a61ecad6e007ae96ea342 +RPI_FIRMWARE_VERSION = fa9a00624e7d5d3dcdb297dff132dc32cc2d9a25 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 76875989326d9122db272c1a0f49b92961c3f2af Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Nov 2021 21:04:35 +0100 Subject: [PATCH 003/176] package/rpi-userland: bump version to bab9bf8 Changelog (since 6e8f786): - 7f72bc2 userland: Reduce debug_sym error messages - 0093675 interface/vcos: Get rid of LLTHREAD cast warning - 705ff8e hello_fft: Update outdated link to V3D spec - bab9bf8 hello_fft: Remove unused function declaration Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-userland/rpi-userland.hash | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 4927a8b43b..da573f3eae 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1ac871911e52b9fe07b3daa080b21bcdec3f1d2926cc98c934794780a4bf8d8 rpi-userland-6e8f786db223c2ab6eb9098a5cb0e5e1b25281cd.tar.gz +sha256 e1ac871911e52b9fe07b3daa080b21bcdec3f1d2926cc98c934794780a4bf8d8 rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index a670a4a02d..09a7f6af74 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = 6e8f786db223c2ab6eb9098a5cb0e5e1b25281cd +RPI_USERLAND_VERSION = bab9bf8790cd69660d443ce43b4e372999f3f7ac RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE From d5ef29e9953ccff61db1e2818e2e7ef408cbd5ac Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Nov 2021 21:04:36 +0100 Subject: [PATCH 004/176] package/rpi-bt-firmware: bump version to 3888ba2 Changelog (since 883b726): - 3e020f7 Add 43436S firmware Future Zero 2 W boards will have an alternative version of 43436 that should have different firmware, named brcmfmac43436s-sdio. - 3888ba2 Merge pull request #18 from HiassofT/43436S Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +- package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash index 3f37d964d0..7e60aa4632 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.hash +++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0e7fcfe75a8990815a184dc55f8fdf5d0644d351a15a7aef865ff90ff4ca8eb4 rpi-bt-firmware-883b72628de1d7efa45b421da0cbf175ac2374f8.tar.gz +sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-bt-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk index 13358b4fda..8d658ce435 100644 --- a/package/rpi-bt-firmware/rpi-bt-firmware.mk +++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 883b72628de1d7efa45b421da0cbf175ac2374f8 +RPI_BT_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx From b88c545efd79ea6e287884213ed6cdab1f670e7a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Nov 2021 21:04:37 +0100 Subject: [PATCH 005/176] package/rpi-wifi-firmware: bump version to 3888ba2 Changelog (since 883b726): - 3e020f7 Add 43436S firmware Future Zero 2 W boards will have an alternative version of 43436 that should have different firmware, named brcmfmac43436s-sdio. - 3888ba2 Merge pull request #18 from HiassofT/43436S Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash index 3bd62306eb..09cd197dd8 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0e7fcfe75a8990815a184dc55f8fdf5d0644d351a15a7aef865ff90ff4ca8eb4 rpi-wifi-firmware-883b72628de1d7efa45b421da0cbf175ac2374f8.tar.gz +sha256 9bd61431d42322eb0610bd7eed218da255c4472efc203be4332a0872bb562ade rpi-wifi-firmware-3888ba29898bb3f056d5f1eb283cb8de4c533bef.tar.gz sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk index 582e0aa8f5..a467f2c7b4 100644 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 883b72628de1d7efa45b421da0cbf175ac2374f8 +RPI_WIFI_FIRMWARE_VERSION = 3888ba29898bb3f056d5f1eb283cb8de4c533bef RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx From 6983c511f9e0ddbefc9d46bdef09f0d4d1a6bb52 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 11 Nov 2021 21:04:38 +0100 Subject: [PATCH 006/176] board/raspberrypi/readme.txt: add missing dtb files Add missing dtb files: - bcm2708-rpi-cm.dtb from genimage-raspberrypi.cfg - bcm2708-rpi-zero.dtb from genimage-raspberrypi0.cfg: - bcm2708-rpi-zero-w.dtb from genimage-raspberrypi0w.cfg - bcm2710-rpi-cm3.dtb from genimage-raspberrypi3.cfg - bcm2837-rpi-3-b.dtb from genimage-raspberrypi3-64.cfg Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- board/raspberrypi/readme.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 98c44d80a1..d20096b5e6 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -76,11 +76,16 @@ After building, you should obtain this tree: output/images/ +-- bcm2708-rpi-b.dtb [1] +-- bcm2708-rpi-b-plus.dtb [1] + +-- bcm2708-rpi-cm.dtb [1] + +-- bcm2708-rpi-zero.dtb [1] + +-- bcm2708-rpi-zero-w.dtb [1] +-- bcm2709-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] + +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ From 19575e9e9e0a9cdf900f95a56e00654fd77d1ca0 Mon Sep 17 00:00:00 2001 From: Julien Grossholtz Date: Thu, 11 Nov 2021 21:04:39 +0100 Subject: [PATCH 007/176] board/raspberrypi: add Raspberry Pi Zero 2 W The Raspberry-Pi Zero 2 W is an affordable single board computer. It is a more powerful drop-in replacement for the Raspberry Pi Zero W. The board incorporates an Raspberry-Pi RP3A0 system-in-package (SiP) with a Broadcom BCM2710A1 and 512MB LPDDR2 SDRAM. The CPU is a quad-core 1Ghz 64-bit Arm Cortex-A53. As for other Raspberry-Pis it also provides 2.4GHz 802.11 b/g/n Wifi, Bluetooth 4.2 and BLE. The BCM2710 cpu is similar to the Raspberry-Pi 3, it uses the same kernel configuration as the Raspberry-Pi 2 and 3. Signed-off-by: Julien Grossholtz [Based on https://patchwork.ozlabs.org/project/buildroot/patch/20211030213600.3445223-3-julien.grossholtz@openest.io/ - reformat genimage-raspberrypizero2w.cfg according to the beautify patch-set - update kernel version to 9878a11 (5.10.78) - use new bcm2710-rpi-zero-2-w dtb - update commit log about kernel config (RPi2/3) - add DEVELOPERS entries for Julien ] Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ board/raspberrypi/config_zero2w.txt | 29 +++++++++++++++ .../genimage-raspberrypizero2w.cfg | 32 +++++++++++++++++ board/raspberrypi/readme.txt | 5 +++ board/raspberrypizero2w | 1 + configs/raspberrypizero2w_defconfig | 36 +++++++++++++++++++ 6 files changed, 105 insertions(+) create mode 100644 board/raspberrypi/config_zero2w.txt create mode 100644 board/raspberrypi/genimage-raspberrypizero2w.cfg create mode 120000 board/raspberrypizero2w create mode 100644 configs/raspberrypizero2w_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index 70262eac8c..6f812eb564 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1512,7 +1512,9 @@ N: Julien Corjon F: package/qt5/ N: Julien Grossholtz +F: board/raspberrypi/ F: board/technologic/ts7680/ +F: configs/raspberrypizero2w_defconfig F: configs/ts7680_defconfig F: package/paho-mqtt-c diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt new file mode 100644 index 0000000000..9e6b7f5ccf --- /dev/null +++ b/board/raspberrypi/config_zero2w.txt @@ -0,0 +1,29 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +start_file=start.elf +fixup_file=fixup.dat + +kernel=zImage + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 + +# How much memory in MB to assign to the GPU on Pi models having +# 256, 512 or 1024 MB total memory +gpu_mem_256=100 +gpu_mem_512=100 +gpu_mem_1024=100 + +# fixes rpi (3B, 3B+, 3A+, 4B ,zero W and zero 2) ttyAMA0 serial console +dtoverlay=miniuart-bt + +# enable autoprobing of Bluetooth driver without need of hciattach/btattach +dtoverlay=krnbt=on diff --git a/board/raspberrypi/genimage-raspberrypizero2w.cfg b/board/raspberrypi/genimage-raspberrypizero2w.cfg new file mode 100644 index 0000000000..b510fea563 --- /dev/null +++ b/board/raspberrypi/genimage-raspberrypizero2w.cfg @@ -0,0 +1,32 @@ +image boot.vfat { + vfat { + files = { + "bcm2710-rpi-zero-2-w.dtb", + "rpi-firmware/bootcode.bin", + "rpi-firmware/cmdline.txt", + "rpi-firmware/config.txt", + "rpi-firmware/fixup.dat", + "rpi-firmware/start.elf", + "rpi-firmware/overlays", + "zImage" + } + } + + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index d20096b5e6..c81fd801ae 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -28,6 +28,10 @@ For model Zero (model A+ in smaller form factor): $ make raspberrypi0_defconfig +For model Zero 2 W (model B3 in smaller form factor): + + $ make raspberrypizero2w_defconfig + For model 2 B: $ make raspberrypi2_defconfig @@ -79,6 +83,7 @@ After building, you should obtain this tree: +-- bcm2708-rpi-cm.dtb [1] +-- bcm2708-rpi-zero.dtb [1] +-- bcm2708-rpi-zero-w.dtb [1] + +-- bcm2710-rpi-zero-2-w.dtb [1] +-- bcm2709-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] diff --git a/board/raspberrypizero2w b/board/raspberrypizero2w new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypizero2w @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig new file mode 100644 index 0000000000..ddd6b97b06 --- /dev/null +++ b/configs/raspberrypizero2w_defconfig @@ -0,0 +1,36 @@ +BR2_arm=y +BR2_cortex_a53=y +BR2_ARM_FPU_NEON_VFPV4=y + +# Linux headers same as kernel, 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-zero-2-w" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypizero2w/config_zero2w.txt" + +# MicroSD images generation tools +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh" From 377c3e5f4c7580a5bf81586e1f41ddc0bdb83cff Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 13 Nov 2021 13:42:34 +0100 Subject: [PATCH 008/176] support/pkg-stats: support values with an equal sign in them The heuristic to extract the various variables of interest is pretty crude: we filter on variables ending with certain suffixes (like '%_VERSION' to get the version strings). However, in doing so, we may dump variables that are not actual package versions (especially with br2-external trees), and those may contain one or more equal sign. And anyway, an actual package version string may very well contain an equal sign too. But the current situation is that the output of 'printvars' is split on all equal signs, which will not fit in the 2-tuple we assign the result, thus causing an exception. Fix that by limiting to a single split. Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 65ffa05f17..3992c8312a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -388,7 +388,7 @@ def package_init_make_info(): for item in variable_list: # Get variable name and value - pkgvar, value = item.split("=") + pkgvar, value = item.split("=", maxsplit=1) # Strip the suffix according to the variable if pkgvar.endswith("_LICENSE"): From 420c988045ccd1b82392f995e3d5cd9f79a73b3f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 11 Nov 2021 19:24:53 +0200 Subject: [PATCH 009/176] package/libcurl: bump to version 7.80.0 Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index b13f01c874..c488df57b1 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-7.79.1.tar.xz.asc +# https://curl.se/download/curl-7.80.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 curl-7.79.1.tar.xz +sha256 a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab curl-7.80.0.tar.xz sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a70ebe4113..24591f2e0a 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.79.1 +LIBCURL_VERSION = 7.80.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 04b668e86803172d0c0354570a6b4b063dab7e51 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 11 Nov 2021 15:38:34 -0300 Subject: [PATCH 010/176] configs/imx6-sabreauto: bump U-Boot and kernel Bump U-Boot to 2021.10 and kernel to 5.15.1 version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6-sabreauto_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx6-sabreauto_defconfig b/configs/imx6-sabreauto_defconfig index a77b57e4f9..7df774988a 100644 --- a/configs/imx6-sabreauto_defconfig +++ b/configs/imx6-sabreauto_defconfig @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabreauto" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_NEEDS_LZOP=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y @@ -33,7 +33,7 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto imx6dl-sabreauto imx6qp-sabreauto" From f82a83582520fa5bf5a05c9308da91ee20639710 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Nov 2021 11:53:44 +0100 Subject: [PATCH 011/176] package/haproxy: bump to version 2.4.8 This is a bug fix release which addresses quite a number of issues https://www.mail-archive.com/haproxy@formilux.org/msg41404.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index 2e39fb4aa5..c29857cd9c 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.7.tar.gz.sha256 -sha256 52af97f72f22ffd8a7a995fafc696291d37818feda50a23caef7dc0622421845 haproxy-2.4.7.tar.gz +# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.8.tar.gz.sha256 +sha256 e3e4c1ad293bc25e8d8790cc5e45133213dda008bfd0228bf3077259b32ebaa5 haproxy-2.4.8.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 0434c73348..33a2e92777 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).7 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From 4c44bf34ad706e36c779085ba35211bda7288240 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 11 Nov 2021 07:25:20 +0100 Subject: [PATCH 012/176] configs/globalscale_espressobin: update to Linux 5.15.1 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- configs/globalscale_espressobin_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/globalscale_espressobin_defconfig b/configs/globalscale_espressobin_defconfig index 37d9c1859c..8d44b25ae7 100644 --- a/configs/globalscale_espressobin_defconfig +++ b/configs/globalscale_espressobin_defconfig @@ -2,13 +2,13 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 5.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11.21" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/globalscale/espressobin/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 98e37c8c46e3c53d7d394dd1cc74a90e63fbacca Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 13:56:16 +0100 Subject: [PATCH 013/176] package/x11r7/xorgproto: bump version to 2021.5 Release notes: https://lists.x.org/archives/xorg-announce/2021-September/003108.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xorgproto/xorgproto.hash | 6 +++--- package/x11r7/xorgproto/xorgproto.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index a88c129dd0..802217ce77 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-April/003085.html -sha256 0f5157030162844b398e7ce69b8bb967c2edb8064b0a9c9bb5517eb621459fbf xorgproto-2021.4.tar.bz2 -sha512 0d905e5f135daf7005e23371cbdc41a62d99567e0a20784e71ead0092ffd1e7582733819f7198add1d97edcc9aa80012ae01d2be8367280d69b41d0c25349367 xorgproto-2021.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-September/date.html +sha256 aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015 xorgproto-2021.5.tar.bz2 +sha512 0f5c4ee4fd56cd46f4d5850bcf3e04c92d2e98de54d0113987cb49fc83cf1f4d0e50e976333179c72fe2178cfa15ec6c1bfc4e76fc3bc2a4be80616ce079da87 xorgproto-2021.5.tar.bz2 # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index 59f0640241..1d5cd4caa8 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2021.4 +XORGPROTO_VERSION = 2021.5 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2 XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT From 621a076fcaae7f18f8b34f46db3508c068cfec5a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 13:56:17 +0100 Subject: [PATCH 014/176] package/x11r7/xlib_libXi: bump version to 1.8 Reformatted hashes, removed md5 and sha1 hashes. Release notes: https://lists.x.org/archives/xorg-announce/2021-September/003109.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXi/xlib_libXi.hash | 10 ++++------ package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index 1235631321..a86ef13225 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-June/002999.html -md5 62c4af0839072024b4b1c8cbe84216c7 libXi-1.7.10.tar.bz2 -sha1 79052e50ea07ce2431f8988a60553d9091d46207 libXi-1.7.10.tar.bz2 -sha256 36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061 libXi-1.7.10.tar.bz2 -sha512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218 libXi-1.7.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-September/003109.html +sha256 2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00 libXi-1.8.tar.bz2 +sha512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba libXi-1.8.tar.bz2 # Locally computed -sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING +sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index ad4cf5f96f..b4802cf018 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.7.10 +XLIB_LIBXI_VERSION = 1.8 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_LICENSE = MIT From dfc468c4af354dbead36aec0c80b986415ac4be9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 13:56:18 +0100 Subject: [PATCH 015/176] package/x11r7/xdriver_xf86-input-libinput: bump version to 1.2.0 Switched _SITE to https. Release notes: https://lists.x.org/archives/xorg-announce/2021-September/003110.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-input-libinput.hash | 6 +++--- .../xdriver_xf86-input-libinput.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index 3ee726bfdc..a2f295d6b5 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-June/003094.html -sha256 e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16 xf86-input-libinput-1.1.0.tar.bz2 -sha512 7def9a4834a9203d1672613b1a4b384a0eb3d664818865b375969bf9ca96c512b752859acc8916de9224f7e488f8d59953308e53b983dfa8031ca01fd707fa2b xf86-input-libinput-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2021-September/003110.html +sha256 f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6 xf86-input-libinput-1.2.0.tar.bz2 +sha512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d xf86-input-libinput-1.2.0.tar.bz2 # Locally computed sha256 4114220b281561e80f3422f0e7ae8d3e1fc85131ffc2e3b6265119e66f1adb27 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 73cdad9b85..21d962aa52 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.1.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.0 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xorgproto From 39a796c21444196b2de8c3bb1ff0c12d2123afa8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 13:56:19 +0100 Subject: [PATCH 016/176] package/x11r7/xlib_libxcvt: new package Needed for X.org xserver 21.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/Config.in | 1 + package/x11r7/xlib_libxcvt/Config.in | 8 ++++++++ package/x11r7/xlib_libxcvt/xlib_libxcvt.hash | 5 +++++ package/x11r7/xlib_libxcvt/xlib_libxcvt.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/x11r7/xlib_libxcvt/Config.in create mode 100644 package/x11r7/xlib_libxcvt/xlib_libxcvt.hash create mode 100644 package/x11r7/xlib_libxcvt/xlib_libxcvt.mk diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index b891fb42ce..63259e88da 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -52,6 +52,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xlib_libXxf86vm/Config.in source package/x11r7/xlib_libdmx/Config.in source package/x11r7/xlib_libfontenc/Config.in + source package/x11r7/xlib_libxcvt/Config.in source package/x11r7/xlib_libxkbfile/Config.in source package/x11r7/xlib_libxshmfence/Config.in source package/x11r7/xlib_xtrans/Config.in diff --git a/package/x11r7/xlib_libxcvt/Config.in b/package/x11r7/xlib_libxcvt/Config.in new file mode 100644 index 0000000000..4e51648de7 --- /dev/null +++ b/package/x11r7/xlib_libxcvt/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_XLIB_LIBXCVT + bool "libxcvt" + help + libxcvt is a library providing a standalone version of the X + server implementation of the VESA CVT standard timing mode- + lines generator. + + https://gitlab.freedesktop.org/xorg/lib/libxcvt diff --git a/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash b/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash new file mode 100644 index 0000000000..71ae9170ac --- /dev/null +++ b/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash @@ -0,0 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2021-October/003114.html +sha256 27ebce180d355f94c1992930bedb40a36f6d7312ee50bf7f0acbcd22f33e8c29 libxcvt-0.1.1.tar.xz +sha512 50e9cd0283858823d4cfde75f06e23ffc42983272cb1f75408052fb5b76a4bb6f9de7d42d8ff9ec0dae6e95eefebc6273e03c919a92f237585db55eaf1a57005 libxcvt-0.1.1.tar.xz +# Locally calculated +sha256 4849851554bdeda9a2a85ce93946b786605e009685941b8b907a9a36b02ae068 COPYING diff --git a/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk b/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk new file mode 100644 index 0000000000..33a55dfa20 --- /dev/null +++ b/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# xlib_libxcvt +# +################################################################################ + +XLIB_LIBXCVT_VERSION = 0.1.1 +XLIB_LIBXCVT_SOURCE = libxcvt-$(XLIB_LIBXCVT_VERSION).tar.xz +XLIB_LIBXCVT_SITE = https://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXCVT_LICENSE = MIT +XLIB_LIBXCVT_LICENSE_FILES = COPYING +XLIB_LIBXCVT_INSTALL_STAGING = YES + +$(eval $(meson-package)) From d9185c6ba38430a017ed996c4180e141881ba570 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 13:56:20 +0100 Subject: [PATCH 017/176] package/x11r7/xserver_xorg-server: bump version to 21.1.1 Removed patches which were applied upstream: 0001-modesettings-needs-dri2.patch https://gitlab.freedesktop.org/xorg/xserver/-/commit/9c81b8f5b5d7bc987f73e8ef01a81e61205e58ee 0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch https://gitlab.freedesktop.org/xorg/xserver/-/commit/836f93de99b35050d78d61d3654f7c5655184144 0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch https://gitlab.freedesktop.org/xorg/xserver/-/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db 0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch https://gitlab.freedesktop.org/xorg/xserver/-/commit/e50c85f4ebf559a3bac4817b41074c43d4691779 0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch https://gitlab.freedesktop.org/xorg/xserver/-/commit/0148a15da1616a868d71abe1b56e3f28cc79533c Renumbered remaining patch. Removed xwayland options: https://gitlab.freedesktop.org/xorg/xserver/-/commit/4ee66f574a70948ca90a5db94dd666a389a5ff3e Added dependency to xlib_libxcvt: https://gitlab.freedesktop.org/xorg/xserver/-/commit/a4ab57cb748674823744a8ef5a0b416ee553efe8 Release notes: https://lists.x.org/archives/xorg-announce/2021-October/003115.html https://lists.x.org/archives/xorg-announce/2021-November/003116.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...001-include-misc.h-fix-uClibc-build.patch} | 0 .../0001-modesettings-needs-dri2.patch | 20 ----- ...nd-Makefile.am-fix-build-without-glx.patch | 45 ------------ ...mon-xf86Init.c-fix-build-without-glx.patch | 45 ------------ ...probing-a-non-PCI-platform-device-on.patch | 33 --------- ...-define-inb-outb-and-friends-on-mips.patch | 73 ------------------- package/x11r7/xserver_xorg-server/Config.in | 1 + .../xserver_xorg-server.hash | 6 +- .../xserver_xorg-server.mk | 14 +--- 9 files changed, 6 insertions(+), 231 deletions(-) rename package/x11r7/xserver_xorg-server/{0002-include-misc.h-fix-uClibc-build.patch => 0001-include-misc.h-fix-uClibc-build.patch} (100%) delete mode 100644 package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch delete mode 100644 package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch delete mode 100644 package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch delete mode 100644 package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch delete mode 100644 package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch diff --git a/package/x11r7/xserver_xorg-server/0002-include-misc.h-fix-uClibc-build.patch b/package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/0002-include-misc.h-fix-uClibc-build.patch rename to package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch diff --git a/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch deleted file mode 100644 index 74917720cb..0000000000 --- a/package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch +++ /dev/null @@ -1,20 +0,0 @@ -Kernel modesettings support also depends on dri2, see -http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46 - -Patch sent upstream: https://gitlab.freedesktop.org/xorg/xserver/issues/479 - -[rebased for version 1.20.0] -Signed-off-by: Bernd Kuhls - -diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac ---- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200 -+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200 -@@ -1962,7 +1962,7 @@ - XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS" - fi - -- if test "x$DRM" = xyes; then -+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then - XORG_DRIVER_MODESETTING=yes - fi - diff --git a/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch deleted file mode 100644 index 5f19a26d14..0000000000 --- a/package/x11r7/xserver_xorg-server/0003-hw-xwayland-Makefile.am-fix-build-without-glx.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b1d2a82d644518c1a75775244ac63be738aaf062 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 19 Apr 2019 10:19:50 +0200 -Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx - -Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to -Xwayland_LDFLAGS but GLX can be disabled through --disable-glx. -In this case, build fails on: - -make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop. -make[3]: *** Waiting for unfinished jobs.... - -Fixes: - - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/xserver/merge_requests/173] ---- - hw/xwayland/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am -index bc1cb8506..502879e2a 100644 ---- a/hw/xwayland/Makefile.am -+++ b/hw/xwayland/Makefile.am -@@ -21,10 +21,14 @@ Xwayland_SOURCES = \ - $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/mi/miinitext.c - -+if GLX -+GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la -+endif -+ - Xwayland_LDADD = \ - $(glamor_lib) \ - $(XWAYLAND_LIBS) \ -- $(top_builddir)/glx/libglxvnd.la \ -+ $(GLXVND_LIB) \ - $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la \ - $(XSERVER_SYS_LIBS) --- -2.20.1 - diff --git a/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch b/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch deleted file mode 100644 index de086fb665..0000000000 --- a/package/x11r7/xserver_xorg-server/0004-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 49456e0a37fac7bc9d1f01bc1519fb0d699956db Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 27 Dec 2019 23:33:37 +0100 -Subject: [PATCH] hw/xfree86/common/xf86Init.c: fix build without glx - -Since commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b, an include on -glxvndabi.h has been added to hw/xfree86/common/xf86Init.c - -However, if glx is disabled through --disable-glx and GLX headers are -not installed in the build's environment, build fails on: - -In file included from xf86Init.c:81: -../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory - 64 | #include - | ^~~~~~~~~~~~~~~ - -Fix this failure by removing this include which does not seem to be -needed (an other option would have been to keep it under an ifdef GLXEXT -block) - -Fixes: - - http://autobuild.buildroot.org/results/de838a843f97673d1381a55fd4e9b07164693913 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://gitlab.freedesktop.org/xorg/xserver/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db] ---- - hw/xfree86/common/xf86Init.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index 0631c7237..e6fb11398 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -78,7 +78,6 @@ - #include "xf86InPriv.h" - #include "picturestr.h" - #include "randrstr.h" --#include "glxvndabi.h" - #include "xf86Bus.h" - #ifdef XSERVER_LIBPCIACCESS - #include "xf86VGAarbiter.h" --- -2.24.1 - diff --git a/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch deleted file mode 100644 index 7802fd96c9..0000000000 --- a/package/x11r7/xserver_xorg-server/0005-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Fri, 26 Oct 2018 17:47:30 -0700 -Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system - with PCI. - -Some Broadcom set-top-box boards have PCI busses, but the GPU is still -probed through DT. We would dereference a null busid here in that -case. - -Signed-off-by: Eric Anholt -Backported from: e50c85f4ebf559a3bac4817b41074c43d4691779 -Signed-off-by: Joseph Kogut ---- - hw/xfree86/common/xf86platformBus.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index cef47da03..dadbac6c8 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -289,7 +289,7 @@ xf86platformProbe(void) - for (i = 0; i < xf86_num_platform_devices; i++) { - char *busid = xf86_platform_odev_attributes(i)->busid; - -- if (pci && (strncmp(busid, "pci:", 4) == 0)) { -+ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) { - platform_find_pci_info(&xf86_platform_devices[i], busid); - } - --- -2.24.1 - diff --git a/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch b/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch deleted file mode 100644 index 469ca7e3fc..0000000000 --- a/package/x11r7/xserver_xorg-server/0006-compiler.h-don-t-define-inb-outb-and-friends-on-mips.patch +++ /dev/null @@ -1,73 +0,0 @@ -From de5e24b5036a1a5a877f8f30169e3497d0e296d6 Mon Sep 17 00:00:00 2001 -From: Julien Cristau -Date: Wed, 6 Jan 2021 10:20:53 +0100 -Subject: [PATCH] compiler.h: don't define inb/outb and friends on mips -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The definition relies on IOPortBase, which is only ever set in -hw/xfree86/os-support/bsd/arm_video.c - -This caused build failures on linux/mips with GCC 10, due to this -change (from https://gcc.gnu.org/gcc-10/changes.html#c): - -"GCC now defaults to -fno-common. As a result, global variable accesses -are more efficient on various targets. In C, global variables with -multiple tentative definitions now result in linker errors. With --fcommon such definitions are silently merged during linking." - -As a result anything including compiler.h would get its own definition -of IOPortBase and the linker would error out. - -Signed-off-by: Raphaël Mélotte ---- - hw/xfree86/common/compiler.h | 8 ++------ - hw/xfree86/os-support/bsd/arm_video.c | 3 +++ - 2 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h -index 2b2008b3f..eb788d3fd 100644 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -518,14 +518,10 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset, - barrier(); - } - --#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) --#if defined(__arm32__) || defined(__mips64) -+#elif defined(__arm32__) && !defined(__linux__) - #define PORT_SIZE long --#else --#define PORT_SIZE short --#endif - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) -diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c -index dd1020e33..180d70543 100644 ---- a/hw/xfree86/os-support/bsd/arm_video.c -+++ b/hw/xfree86/os-support/bsd/arm_video.c -@@ -65,6 +65,7 @@ - #include "xf86Priv.h" - #include "xf86_OSlib.h" - #include "xf86OSpriv.h" -+#include "compiler.h" - - #if defined(__NetBSD__) && !defined(MAP_FILE) - #define MAP_FLAGS MAP_SHARED -@@ -162,6 +163,8 @@ xf86DisableIO() - - #if defined(USE_ARC_MMAP) || defined(__arm32__) - -+unsigned int IOPortBase; -+ - Bool - xf86EnableIO() - { --- -2.32.0 - diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 7f37f2f1ac..4fb03051dd 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XLIB_LIBXCVT select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 8eb56ba027..d389e6713a 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-July/003100.html -sha256 40aa4e96a56a81a301f15a9b10e06a22700f12b42d9e0e453c7f11d354386300 xorg-server-1.20.13.tar.xz -sha512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 xorg-server-1.20.13.tar.xz +# From https://lists.x.org/archives/xorg-announce/2021-November/003116.html +sha256 782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755 xorg-server-21.1.1.tar.xz +sha512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d xorg-server-21.1.1.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 6d0876f1fd..bedf05c8fa 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,17 +4,14 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.20.13 +XSERVER_XORG_SERVER_VERSION = 21.1.1 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_SELINUX_MODULES = xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES -# xfont_font-util is needed only for autoreconf -XSERVER_XORG_SERVER_AUTORECONF = YES XSERVER_XORG_SERVER_DEPENDENCIES = \ - xfont_font-util \ xutil_util-macros \ xlib_libX11 \ xlib_libXau \ @@ -32,6 +29,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xlib_libXdamage \ xlib_libXxf86vm \ xlib_libxkbfile \ + xlib_libxcvt \ xlib_xtrans \ xdata_xbitmaps \ xorgproto \ @@ -67,14 +65,6 @@ XSERVER_XORG_SERVER_CONF_OPTS += \ --disable-systemd-logind endif -# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyyy) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-xwayland -XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland wayland-protocols xlib_libXcomposite -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland -endif - ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess From 345087ee5137a1aa28f1d0f54e914b9cc186c3f8 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 13 Nov 2021 16:31:21 +0100 Subject: [PATCH 018/176] package/smcroute: bump version to v2.5.4 - Drop backported patch, included in new release - https://github.com/troglobit/smcroute/releases/tag/2.5.4 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- ...Avoid-trying-to-delete-inactive-VIFs.patch | 51 ------------------- package/smcroute/smcroute.hash | 3 +- package/smcroute/smcroute.mk | 2 +- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch diff --git a/package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch b/package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch deleted file mode 100644 index 07f49dffcf..0000000000 --- a/package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8ce1d117a31e35d97fb955b82edf13514267eaab Mon Sep 17 00:00:00 2001 -From: Joachim Wiberg -Date: Tue, 28 Sep 2021 11:09:47 +0200 -Subject: [PATCH] Avoid trying to delete inactive VIFs -Organization: Westermo Network Technologies AB - -When probing interfaces at startup, there's a check for IFF_MULTICAST, -if this flag is not set we try to delete its corresponding VIF/MIF. -This is for hanlding .conf reload scenarios where an interface has had -its MULTICAST flag dropped. - -However, when starting up on Linux systems, the loopback interface has -no MULTICAST flag set. This leads to the following bogus warning: - - Failed deleting VIF for iface lo: Resource temporarily unavailable - -This patch makes sure to check if we have a registered kernel VIF/MIF -for an interface before attempting to delete it. - -Signed-off-by: Joachim Wiberg ---- - src/mroute.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/mroute.c b/src/mroute.c -index 291e9c4..6a80a47 100644 ---- a/src/mroute.c -+++ b/src/mroute.c -@@ -298,6 +298,9 @@ static int mroute4_del_vif(struct iface *iface) - if (iface->mrdisc) - rc = mrdisc_deregister(iface->vif); - -+ if (iface->vif == ALL_VIFS) -+ return 0; -+ - if (kern_vif_del(iface)) { - switch (errno) { - case ENOENT: -@@ -910,6 +913,9 @@ static int mroute6_del_mif(struct iface *iface) - { - int rc = 0; - -+ if (iface->mif == ALL_VIFS) -+ return 0; -+ - if (kern_mif_del(iface) && errno != ENOENT) { - switch (errno) { - case ENOENT: --- -2.25.1 - diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash index 26d55adf88..ddc38eddd2 100644 --- a/package/smcroute/smcroute.hash +++ b/package/smcroute/smcroute.hash @@ -1,6 +1,5 @@ # Upstream .sha256 from GitHub -sha256 4342b95c99e410cab75e9ee80f20480e0170d8b07b8e31553ba1bec3e377fc56 smcroute-2.5.3.tar.gz +sha256 96b890fd6fbf8553010f62beda991742f7b4e7e8aea3e75335fb6048b15869da smcroute-2.5.4.tar.gz # Locally generated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 d260ea4b9d4b01317568850c3271e3923b546ea4ad57c899e79434f1cc8bcf0b 0001-Avoid-trying-to-delete-inactive-VIFs.patch diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index 913647e7bf..81f540088a 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.5.3 +SMCROUTE_VERSION = 2.5.4 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING From 200f46b940965ea3eccab4b277f4990ec6ee755f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Nov 2021 17:51:10 +0100 Subject: [PATCH 019/176] package/libqb: bump to version 2.0.3 Use official tarball and so drop autoreconf https://github.com/ClusterLabs/libqb/releases/tag/v2.0.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libqb/libqb.hash | 4 +++- package/libqb/libqb.mk | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/libqb/libqb.hash b/package/libqb/libqb.hash index 0a01a9bbb5..b2c216f24c 100644 --- a/package/libqb/libqb.hash +++ b/package/libqb/libqb.hash @@ -1,3 +1,5 @@ +# From https://github.com/ClusterLabs/libqb/releases/download/v2.0.3/libqb-2.0.3.sha256 +sha256 a74582bc886fa625f5238374c7c8ca98672a2519c8196b91276be55886d84e9c libqb-2.0.3.tar.xz + # Locally calculated -sha256 f72769c66479c51ac176b56837637b29d200f9dad40d23c5fdcb10f3a53ab1e4 libqb-2.0.2.tar.gz sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libqb/libqb.mk b/package/libqb/libqb.mk index a9cf5e3fb9..fb132365f1 100644 --- a/package/libqb/libqb.mk +++ b/package/libqb/libqb.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBQB_VERSION = 2.0.2 -LIBQB_SITE = $(call github,ClusterLabs,libqb,v$(LIBQB_VERSION)) +LIBQB_VERSION = 2.0.3 +LIBQB_SOURCE = libqb-$(LIBQB_VERSION).tar.xz +LIBQB_SITE = \ + https://github.com/ClusterLabs/libqb/releases/download/v$(LIBQB_VERSION) LIBQB_LICENSE = LGPL-2.1+ LIBQB_LICENSE_FILES = COPYING LIBQB_CPE_ID_VENDOR = clusterlabs LIBQB_INSTALL_STAGING = YES -LIBQB_AUTORECONF = YES LIBQB_DEPENDENCIES = libxml2 # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test From b35be2baf2cb3039baa047c6c00715df4aa18cc4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Nov 2021 18:02:01 +0100 Subject: [PATCH 020/176] package/tinyxml2: bump to version 9.0.0 Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinyxml2/tinyxml2.hash | 4 ++-- package/tinyxml2/tinyxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tinyxml2/tinyxml2.hash b/package/tinyxml2/tinyxml2.hash index 3c59d159b5..ff799bc2eb 100644 --- a/package/tinyxml2/tinyxml2.hash +++ b/package/tinyxml2/tinyxml2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6ce574fbb46751842d23089485ae73d3db12c1b6639cda7721bf3a7ee862012c tinyxml2-8.0.0.tar.gz -sha256 9332252e9b9e46db8285d4a3f0bf25f139bf1dca6781b956d57f2302efca6432 LICENSE.txt +sha256 cc2f1417c308b1f6acc54f88eb70771a0bf65f76282ce5c40e54cfe52952702c tinyxml2-9.0.0.tar.gz +sha256 9332252e9b9e46db8285d4a3f0bf25f139bf1dca6781b956d57f2302efca6432 LICENSE.txt diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index d760d54a2f..0a857e5732 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYXML2_VERSION = 8.0.0 +TINYXML2_VERSION = 9.0.0 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = LICENSE.txt From e87da5514c81a87736e3b8fc6dc1bc5077e4765c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Nov 2021 12:10:27 +0100 Subject: [PATCH 021/176] package/libsoup: add gssapi support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libsoup/libsoup.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index a8b4cf12bb..1a26714992 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -25,7 +25,6 @@ LIBSOUP_DEPENDENCIES = \ LIBSOUP_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBSOUP_CONF_OPTS = \ - -Dgssapi=disabled \ -Dgtk_doc=false \ -Dntlm=disabled \ -Dsysprof=disabled \ @@ -47,6 +46,15 @@ else LIBSOUP_CONF_OPTS += -Dintrospection=disabled endif +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +LIBSOUP_CONF_OPTS += \ + -Dgssapi=enabled \ + -Dkrb5_config=$(STAGING_DIR)/usr/bin/krb5-config +LIBSOUP_DEPENDENCIES += libkrb5 +else +LIBSOUP_CONF_OPTS += -Dgssapi=disabled +endif + ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) LIBSOUP_CONF_OPTS += -Dgnome=true else From 130a28d446564ce1053ddd977fcd4da9243e24c1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Nov 2021 12:24:14 +0100 Subject: [PATCH 022/176] package/bind: add gssapi support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/bind/bind.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index ba32d6150a..e329c803a3 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -35,7 +35,6 @@ BIND_CONF_OPTS = \ --with-libjson=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ - --with-gssapi=no \ --enable-filter-aaaa \ --disable-backtrace @@ -53,6 +52,13 @@ else BIND_CONF_OPTS += --disable-linux-caps endif +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +BIND_CONF_OPTS += --with-gssapi=$(STAGING_DIR)/usr/bin/krb5-config +BIND_DEPENDENCIES += libkrb5 +else +BIND_CONF_OPTS += --with-gssapi=no +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr BIND_DEPENDENCIES += libxml2 From cc9b5797515b3c8f21c2d70c980dc3e0a93200c9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Nov 2021 11:15:54 +0100 Subject: [PATCH 023/176] package/qt5/qt5base: add zstd optional dependency zstd is an optional dependency which is enabled by default since version 5.13.0 and https://github.com/qt/qtbase/commit/f25bc30d8d9d13fffd34213dfbf5e7373a18222a Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9da3de468a..b04d710d78 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -116,6 +116,13 @@ else QT5BASE_CONFIGURE_OPTS += -no-cups endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +QT5BASE_DEPENDENCIES += zstd +QT5BASE_CONFIGURE_OPTS += -zstd +else +QT5BASE_CONFIGURE_OPTS += -no-zstd +endif + # Qt5 SQL Plugins ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) From 9e767b942f5985e1f9e7125d715bdb7334e4f81c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Nov 2021 11:33:49 +0100 Subject: [PATCH 024/176] package/qt5/qt5base: add libkrb5 optional dependency libkrb5 is an optional dependency which is enabled by default (with no user option) since version 5.14.0 and https://github.com/qt/qtbase/commit/93b7b0ec76572427291d8e2eef9a10eb499417a9 Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b04d710d78..ba2971dc08 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -233,6 +233,8 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBKRB5),libkrb5) + QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) From ed4ec60500b4973adbc73f1e0a1e860c0c7f41df Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Nov 2021 18:16:50 +0100 Subject: [PATCH 025/176] package/dehydrated: bump to version 0.7.0 https://github.com/dehydrated-io/dehydrated/releases/tag/v0.7.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dehydrated/Config.in | 2 +- package/dehydrated/dehydrated.hash | 4 ++-- package/dehydrated/dehydrated.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/dehydrated/Config.in b/package/dehydrated/Config.in index 979938d70c..13b3632f9d 100644 --- a/package/dehydrated/Config.in +++ b/package/dehydrated/Config.in @@ -30,4 +30,4 @@ config BR2_PACKAGE_DEHYDRATED You probably need to install a custom /etc/dehydrated/config with the rootfs overlay. - https://github.com/lukas2511/dehydrated + https://github.com/dehydrated-io/dehydrated diff --git a/package/dehydrated/dehydrated.hash b/package/dehydrated/dehydrated.hash index 388dd24749..0452645256 100644 --- a/package/dehydrated/dehydrated.hash +++ b/package/dehydrated/dehydrated.hash @@ -1,6 +1,6 @@ # Locally computed after verifying -# https://github.com/lukas2511/dehydrated/releases/download/v0.6.5/dehydrated-0.6.5.tar.gz.asc +# https://github.com/dehydrated-io/dehydrated/releases/download/v0.7.0/dehydrated-0.7.0.tar.gz.asc # with key 3C2F2605E078A1E18F4793909C4DBE6CF438F333 from https://keybase.io/lukas2511 -sha256 10aabd0027450bc70a18e49acaca7a9697e0cfb92368d3e508b7a4d6d69bfa35 dehydrated-0.6.5.tar.gz +sha256 1c5f12c2e57e64b1762803f82f0f7e767a72e65a6ce68e4d1ec197e61b9dc4f9 dehydrated-0.7.0.tar.gz # License, locally computed sha256 b4583b7dd07e3e2a08906de38e7e329d41f921ed9dcb6310b3886e013a6b8723 LICENSE diff --git a/package/dehydrated/dehydrated.mk b/package/dehydrated/dehydrated.mk index 17c67b8478..28fb5a4912 100644 --- a/package/dehydrated/dehydrated.mk +++ b/package/dehydrated/dehydrated.mk @@ -4,8 +4,8 @@ # ################################################################################ -DEHYDRATED_VERSION = 0.6.5 -DEHYDRATED_SITE = https://github.com/lukas2511/dehydrated/releases/download/v$(DEHYDRATED_VERSION) +DEHYDRATED_VERSION = 0.7.0 +DEHYDRATED_SITE = https://github.com/dehydrated-io/dehydrated/releases/download/v$(DEHYDRATED_VERSION) DEHYDRATED_LICENSE = MIT DEHYDRATED_LICENSE_FILES = LICENSE From e68fba55fd80022c691e677b71462b60d1083838 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Nov 2021 18:25:54 +0100 Subject: [PATCH 026/176] package/squashfs: bump to version 4.5 - Drop patch (already in version) - Update indentation in hash file (two spaces) https://github.com/plougher/squashfs-tools/blob/4.5/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ols-fix-build-failure-against-gcc-10.patch | 49 ------------------- package/squashfs/squashfs.hash | 4 +- package/squashfs/squashfs.mk | 2 +- 3 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch diff --git a/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch b/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch deleted file mode 100644 index a5fc487aac..0000000000 --- a/package/squashfs/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e1cdcfd94172a0b1ba4c9df70f4d69a41c687404 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sun, 26 Jan 2020 18:35:13 +0000 -Subject: [PATCH] squashfs-tools: fix build failure against gcc-10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -cc ... -o mksquashfs -ld: read_fs.o:(.bss+0x0): - multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here -ld: read_fs.o:(.bss+0x8): - multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Toralf Förster -Bug: https://bugs.gentoo.org/706456 -Signed-off-by: Sergei Trofimovich - -[Upstream: https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5.patch] -Signed-off-by: Peter Seiderer ---- - squashfs-tools/mksquashfs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 1beefef..b650306 100644 ---- a/squashfs-tools/mksquashfs.h -+++ b/squashfs-tools/mksquashfs.h -@@ -143,7 +143,7 @@ struct append_file { - #endif - - extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; --struct cache *bwriter_buffer, *fwriter_buffer; -+extern struct cache *bwriter_buffer, *fwriter_buffer; - extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, - *to_frag, *locked_fragment, *to_process_frag; - extern struct append_file **file_mapping; --- -2.26.2 - diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash index 1f08b530a0..09a2bae364 100644 --- a/package/squashfs/squashfs.hash +++ b/package/squashfs/squashfs.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 a7fa4845e9908523c38d4acf92f8a41fdfcd19def41bd5090d7ad767a6dc75c3 squashfs-4.4.tar.gz +sha256 b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd squashfs-4.5.tar.gz # License files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index cbc3c906d8..f64d441c9b 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUASHFS_VERSION = 4.4 +SQUASHFS_VERSION = 4.5 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING From f727b6da04c21732bbd07d8c70aa814bc56014a1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 13 Nov 2021 18:28:01 +0100 Subject: [PATCH 027/176] package/memcached: bump to version 1.6.12 https://github.com/memcached/memcached/wiki/ReleaseNotes1610 https://github.com/memcached/memcached/wiki/ReleaseNotes1611 https://github.com/memcached/memcached/wiki/ReleaseNotes1612 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index a86a6f9f73..22c794d07b 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.9.tar.gz.sha1 -sha1 42ae062094fdf083cfe7b21ff377c781011c2be1 memcached-1.6.9.tar.gz +# From http://www.memcached.org/files/memcached-1.6.12.tar.gz.sha1 +sha1 40d43e98f149e13e6c81eee813e6734f23413a01 memcached-1.6.12.tar.gz # Locally computed -sha256 d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1 memcached-1.6.9.tar.gz +sha256 f291a35f82ef9756ed1d952879ef5f4be870f932bdfcb2ab61356609abf82346 memcached-1.6.12.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index f233e11806..8f3506f9d4 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.9 +MEMCACHED_VERSION = 1.6.12 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From f84350e7255c94329fc87f3783bee03469fc0159 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 20:46:05 +0100 Subject: [PATCH 028/176] package/xmrig: bump version to 6.15.3 Release notes: https://github.com/xmrig/xmrig/releases/tag/v6.15.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 810a9381b8..7ecbb046d6 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27a6c34ee1bec60f8c49a5e2b97223971f579a26a4632fb64c4a4556b3bb04ae xmrig-6.15.2.tar.gz +sha256 37005e61b9ce833bef252c787a73eddce0c636b2b8737672bba59535e2c91b41 xmrig-6.15.3.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 071eddae32..7bcf44c70a 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.15.2 +XMRIG_VERSION = 6.15.3 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 0f0b1f59c310447ff259499baab6093a7e17b512 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 10 Nov 2021 20:37:28 +0100 Subject: [PATCH 029/176] package/ntp: run ntpd as ntp user - in case libcap is enabled use the now enabled '-u' option to run nptd as user/group ntp Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/ntp/{S49ntp => S49ntp.in} | 2 +- package/ntp/ntp.mk | 15 +++++++++++++-- package/ntp/{ntpd.service => ntpd.service.in} | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) rename package/ntp/{S49ntp => S49ntp.in} (96%) rename package/ntp/{ntpd.service => ntpd.service.in} (85%) diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp.in similarity index 96% rename from package/ntp/S49ntp rename to package/ntp/S49ntp.in index 66c5f70a5f..11c03b888f 100644 --- a/package/ntp/S49ntp +++ b/package/ntp/S49ntp.in @@ -6,7 +6,7 @@ DAEMON="ntpd" PIDFILE="/var/run/$DAEMON.pid" -NTPD_ARGS="-g" +NTPD_ARGS="@NTPD_EXTRA_ARGS@ -g" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index ff23cdc2b6..96b099d5b1 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -44,6 +44,10 @@ endif ifeq ($(BR2_PACKAGE_LIBCAP),y) NTP_CONF_OPTS += --enable-linuxcaps NTP_DEPENDENCIES += libcap +define NTP_USERS + ntp -1 ntp -1 * - - - ntpd user +endef +NTP_DAEMON_EXTRA_ARGS = -u ntp:ntp else NTP_CONF_OPTS += --disable-linuxcaps endif @@ -109,11 +113,18 @@ endif ifeq ($(BR2_PACKAGE_NTP_NTPD),y) define NTP_INSTALL_INIT_SYSV_NTPD - $(INSTALL) -D -m 755 package/ntp/S49ntp $(TARGET_DIR)/etc/init.d/S49ntp + mkdir -p $(TARGET_DIR)/etc/init.d + sed -e 's%@NTPD_EXTRA_ARGS@%$(NTP_DAEMON_EXTRA_ARGS)%g' \ + package/ntp/S49ntp.in \ + > $(TARGET_DIR)/etc/init.d/S49ntp + chmod 0755 $(TARGET_DIR)/etc/init.d/S49ntp endef define NTP_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/ntp/ntpd.service $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system + sed -e 's%@NTPD_EXTRA_ARGS@%$(NTP_DAEMON_EXTRA_ARGS)%g' \ + package/ntp/ntpd.service.in \ + > $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service endef endif diff --git a/package/ntp/ntpd.service b/package/ntp/ntpd.service.in similarity index 85% rename from package/ntp/ntpd.service rename to package/ntp/ntpd.service.in index 9a0f4c6dbf..b7db4a2878 100644 --- a/package/ntp/ntpd.service +++ b/package/ntp/ntpd.service.in @@ -9,7 +9,7 @@ PIDFile=/run/ntpd.pid # correct time to work, but we likely won't acquire that without NTP. Let's # break this chicken-and-egg cycle here. Environment=SYSTEMD_NSS_RESOLVE_VALIDATE=0 -ExecStart=/usr/sbin/ntpd -g -p /run/ntpd.pid +ExecStart=/usr/sbin/ntpd @NTPD_EXTRA_ARGS@ -g -p /run/ntpd.pid [Install] WantedBy=multi-user.target From f250847551b4f1314ea69e026125c225605fd840 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 18:07:07 +0100 Subject: [PATCH 030/176] package/timescaledb: bump version to 2.5.0 This version adds support for PostgreSQL 14. Release notes: https://github.com/timescale/timescaledb/releases/tag/2.5.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 4e3e91e152..88390bc674 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b206a376251259eb745eee819e7a853b3fbab9dc8443303714484a0fef89a2a4 timescaledb-2.4.2.tar.gz +sha256 9d67fe70aa01cea5feceb084adc01eca8a082d847f917e68e073ab67e497af76 timescaledb-2.5.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 4adf2bdbb3..39ba9e6ef4 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.4.2 +TIMESCALEDB_VERSION = 2.5.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 0f31b1f19cd2f81c2e7fe7a0600c150b8f555fe2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 18:07:08 +0100 Subject: [PATCH 031/176] package/postgresql: security bump version to 13.5 Release notes: https://www.postgresql.org/about/news/postgresql-141-135-129-1114-1019-and-9624-released-2349/ Fixes CVE-2021-23214 and CVE-2021-23222. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 2dcc1823d6..7e25c08aad 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v13.4/postgresql-13.4.tar.bz2.sha256 -sha256 ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd postgresql-13.4.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v13.5/postgresql-13.5.tar.bz2.sha256 +sha256 9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3 postgresql-13.5.tar.bz2 # License file, Locally calculated sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 3b6c6e21e7..e40ab45c20 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 13.4 +POSTGRESQL_VERSION = 13.5 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From c9bd02911565819789120370178e82da5dfbacc0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 Nov 2021 18:07:09 +0100 Subject: [PATCH 032/176] package/postgresql: bump version to 14.1 Release notes: https://www.postgresql.org/about/news/postgresql-14-released-2318/ https://www.postgresql.org/about/news/postgresql-141-135-129-1114-1019-and-9624-released-2349/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 7e25c08aad..c2017a1226 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v13.5/postgresql-13.5.tar.bz2.sha256 -sha256 9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3 postgresql-13.5.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 +sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 # License file, Locally calculated sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index e40ab45c20..32aef0c68c 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 13.5 +POSTGRESQL_VERSION = 14.1 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 4b0cc4537514159e72154a88657d3de46b5c7ab7 Mon Sep 17 00:00:00 2001 From: Ramon Fried Date: Mon, 8 Nov 2021 10:59:48 +0200 Subject: [PATCH 033/176] package/bitwise: bump version to 0.43 Signed-off-by: Ramon Fried Signed-off-by: Thomas Petazzoni --- package/bitwise/bitwise.hash | 2 +- package/bitwise/bitwise.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bitwise/bitwise.hash b/package/bitwise/bitwise.hash index 5493c642a6..c8daa0aa64 100644 --- a/package/bitwise/bitwise.hash +++ b/package/bitwise/bitwise.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3d43cef47bf8f49e85f7ed381c3eaf1df921ca51805e0962f1a97a517e1d1d2 bitwise-v0.42.tar.gz +sha256 f524f794188a10defc4df673d8cf0b3739f93e58e93aff0cdb8a99fbdcca2ffb bitwise-v0.43.tar.gz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/bitwise/bitwise.mk b/package/bitwise/bitwise.mk index 237f7753cd..33d8f6776b 100644 --- a/package/bitwise/bitwise.mk +++ b/package/bitwise/bitwise.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITWISE_VERSION = 0.42 +BITWISE_VERSION = 0.43 BITWISE_SITE = https://github.com/mellowcandle/bitwise/releases/download/v$(BITWISE_VERSION) BITWISE_SOURCE = bitwise-v$(BITWISE_VERSION).tar.gz BITWISE_DEPENDENCIES = ncurses readline From 9ec3b986e66ba481de4ca3abb4d83470e8861264 Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 8 Nov 2021 11:32:27 +0100 Subject: [PATCH 034/176] package/openlayers: bump to version 6.9.0 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 306996090c..e29365fc91 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 07d06f17f44399d86ddeac8d8000d39ff9db503257f77c59e5743d5934463623 v6.8.1-dist.zip +sha256 35a0b37a5c1e7c48553215c6e8c24a12bac8e9048f008fc61c4b329cf6611b5c v6.9.0-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 7a4922edc4..b20ea9977c 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.8.1 +OPENLAYERS_VERSION = 6.9.0 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From c2c15af2b840c41d7bee34c1f244551eefce6ba5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 8 Nov 2021 20:51:36 +0200 Subject: [PATCH 035/176] package/socat: bump to version 1.7.4.2 Bug fixes release. Update README hash for version update. Update comment; we do not patch configure.in. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/socat/socat.hash | 6 +++--- package/socat/socat.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 5a4c520455..0d9d0ba76c 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,8 +1,8 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 36cad050ecf4981ab044c3fbd75c643f socat-1.7.4.1.tar.bz2 +md5 003686f80d820072649660b85f80c58f socat-1.7.4.2.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9 socat-1.7.4.1.tar.bz2 +sha256 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763 socat-1.7.4.2.tar.bz2 # Locally calculated -sha256 b1ebebbce145027f4268211f36d121b083aeeabdc1736eb144b8afd8e86ce8da README +sha256 062e425b43da6b3df6d8657639b5e2c781781572b5d8867444fd6d2487ac7644 README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 61c9852565..cf2a31b096 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.1 +SOCAT_VERSION = 1.7.4.2 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception @@ -24,7 +24,7 @@ SOCAT_CONF_ENV += \ endif # We need to run autoconf to regenerate the configure script, since we patch -# configure.in and Makefile.in. However, the package only uses autoconf and not +# Makefile.in. However, the package only uses autoconf and not # automake, so we can't use the normal autoreconf logic. SOCAT_DEPENDENCIES = host-autoconf From 7fcf5f3152f2881e2db3357e61abb793782e90e2 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Mon, 8 Nov 2021 20:27:42 +0100 Subject: [PATCH 036/176] package/mxml: bump to version 3.3 mxml 3.3 is a bug fix release. Changes include: - Cleaned up usage of free throughout the library - Added more error handling to the library - Fixed potential memory leak in mxmlLoad* functions - Fixed mxmlSaveString with a buffer size of 0 - Fixed MXML_MINOR_VERSION value in "mxml.h" - Fixed POSIX threading support for MingW - Fixed some minor memory leaks found by Coverity. Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/mxml/mxml.hash | 2 +- package/mxml/mxml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mxml/mxml.hash b/package/mxml/mxml.hash index 70f82cada8..38056f4c3a 100644 --- a/package/mxml/mxml.hash +++ b/package/mxml/mxml.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b894f6c64964f2e77902564c17ba00f5d077a7a24054e7c1937903b0bd42c974 mxml-3.2.tar.gz +sha256 7cf976366f9e8e4f8cff7d35a59bcf6201c769fce9e58015d64f4b6de1fe3dd8 mxml-3.3.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE sha256 ed63aec4c75b9c21a5156b40052138032269bd27fd6f4bc0c51389807cdc7db9 NOTICE diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk index 85930ab388..5563015b02 100644 --- a/package/mxml/mxml.mk +++ b/package/mxml/mxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -MXML_VERSION = 3.2 +MXML_VERSION = 3.3 MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/v$(MXML_VERSION) MXML_LICENSE = Apache-2.0 with exceptions MXML_LICENSE_FILES = LICENSE NOTICE From 7ccfc1ffbddd9b6195967f83fc78833decd10ef1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 8 Nov 2021 20:49:34 +0100 Subject: [PATCH 037/176] package/luarocks: bump to version 3.8.0 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luarocks/luarocks.hash | 2 +- package/luarocks/luarocks.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 42e039214c..d80e08a200 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9255d97fee95cec5b54fc6ac718b11bf5029e45bed7873e053314919cd448551 luarocks-3.7.0.tar.gz +sha256 56ab9b90f5acbc42eb7a94cf482e6c058a63e8a1effdf572b8b2a6323a06d923 luarocks-3.8.0.tar.gz sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 28a421925e..028e144e25 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUAROCKS_VERSION = 3.7.0 -LUAROCKS_SITE = http://luarocks.org/releases +LUAROCKS_VERSION = 3.8.0 +LUAROCKS_SITE = https://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From bd06a3b9b507b14f3cf69f45ed165d132790ad75 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 8 Nov 2021 21:19:40 +0100 Subject: [PATCH 038/176] package/iproute2: bump version to 5.15.0 For details see [1]. [1] https://lore.kernel.org/all/20211101164705.6f4f2e41@hermes.local Signed-off-by: Peter Seiderer Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 2837edb09d..d8d619cbda 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 210fa785a52f3763c4287fd5ae63e246f6311bfaa48c424baab6d383bb7591d4 iproute2-5.14.0.tar.xz +sha256 38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff iproute2-5.15.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index fdf442a429..4162e38eb7 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 5.14.0 +IPROUTE2_VERSION = 5.15.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From c8bff717dfbde3c461a8fad3409293e7fccee621 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 8 Nov 2021 21:44:01 +0100 Subject: [PATCH 039/176] package/ima-evm-utils: bump version to 1.4 Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/ima-evm-utils/ima-evm-utils.hash | 4 ++-- package/ima-evm-utils/ima-evm-utils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ima-evm-utils/ima-evm-utils.hash b/package/ima-evm-utils/ima-evm-utils.hash index 2cdba227ad..2267a59b79 100644 --- a/package/ima-evm-utils/ima-evm-utils.hash +++ b/package/ima-evm-utils/ima-evm-utils.hash @@ -1,4 +1,4 @@ # sha1 from sourceforge, sha256 locally computed -sha1 034d163533ae5f9c06001b375ec7e5a1b09a3853 ima-evm-utils-1.3.2.tar.gz -sha256 c2b206e7f9fbe62a938b7ae59e31906fefae4d5351fe01db739bd8346b75d4a7 ima-evm-utils-1.3.2.tar.gz +sha1 f23d8a406759a469b0223b0bfb302ada4407a1d1 ima-evm-utils-1.4.tar.gz +sha256 fcf85b31d6292051b3679e5f17ffa7f89b6898957aad0f59aa4e9878884b27d1 ima-evm-utils-1.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index cc53e02dd6..7ee34d5e1a 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMA_EVM_UTILS_VERSION = 1.3.2 +IMA_EVM_UTILS_VERSION = 1.4 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING From ab4e346c52b804949c9e2da2e4374654e0abe54d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 8 Nov 2021 23:29:01 +0100 Subject: [PATCH 040/176] package/ell: bump version to 0.45 - Changelog (since 0.44, from [1]): ver 0.45: Fix issue with ICMPv6 and handling re-entrantly callbacks. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 84016c0ce0..4bb2688c48 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 41a6f8fa4d285b52cb7a5a87bda3e7370ecaac02d94aaa7ec1a23f0480b8bc3f ell-0.44.tar.xz +sha256 fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7 ell-0.45.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 47137e2530..963fad4bae 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.44 +ELL_VERSION = 0.45 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From ff0d53405157ce82f6b56c74654c75c07b9ce92d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 8 Nov 2021 23:29:02 +0100 Subject: [PATCH 041/176] package/iwd: bump version to 1.19 - removed 0001-build-Add-reallocarray-to-missing-h.patch (from upstream [1]) - removed 0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch (from upstream [2]) - Changelog (since 1.18, from [3]): ver 1.19: Fix issue with handling OCV if offloading is supported. Fix issue with handling SA Query on channel switch event. Fix issue with starting FT-over-DS actions after roaming. Add support for OWE transition networks. Add support for extended key IDs. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=ec1c348b4fd67619fa0c2f55ae644f6a8014d971 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 [3] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...-build-Add-reallocarray-to-missing-h.patch | 55 ------------------- ...nfig-Remove-usage-of-in6_addr__in6_u.patch | 32 ----------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 package/iwd/0001-build-Add-reallocarray-to-missing-h.patch delete mode 100644 package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch diff --git a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch b/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch deleted file mode 100644 index ef6114f1af..0000000000 --- a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ec1c348b4fd67619fa0c2f55ae644f6a8014d971 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Sep 2021 21:17:44 +0200 -Subject: build: Add reallocarray to missing.h - -reallocarray has been added to glibc relatively recently (version 2.26, -from 2017) and apparently not all users run new enough glibc. Moreover, -reallocarray is not available with uclibc-ng. So use realloc if -reallocarray is not available to avoid the following build failure -raised since commit 891b78e9e892a3bcd800eb3a298e6380e9a15dd1: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: src/sae.o: in function `sae_rx_authenticate': -sae.c:(.text+0xd74): undefined reference to `reallocarray' - -Fixes: - - http://autobuild.buildroot.org/results/c6d3f86282c44645b4f1c61882dc63ccfc8eb35a - -[Retrieved from: -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=ec1c348b4fd67619fa0c2f55ae644f6a8014d971] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 1 + - src/missing.h | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c6250401..51d9da93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,6 +129,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}", - - AC_CHECK_FUNCS(explicit_bzero) - AC_CHECK_FUNCS(rawmemchr) -+AC_CHECK_FUNCS(reallocarray) - - AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) - -diff --git a/src/missing.h b/src/missing.h -index 2cc80aee..a5b92952 100644 ---- a/src/missing.h -+++ b/src/missing.h -@@ -37,3 +37,10 @@ _Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") - _Pragma("GCC diagnostic pop") - } - #endif -+ -+#ifndef HAVE_REALLOCARRAY -+static inline void *reallocarray(void *ptr, size_t nmemb, size_t size) -+{ -+ return realloc(ptr, nmemb * size); -+} -+#endif --- -cgit 1.2.3-1.el7 - diff --git a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch b/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch deleted file mode 100644 index f6b3d24516..0000000000 --- a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001 -From: Andrew Zaborowski -Date: Thu, 16 Sep 2021 01:58:29 +0200 -Subject: netconfig: Remove usage of in6_addr.__in6_u - -in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in -the headers shipped with musl libc for example. The POSIX compliant and -universal way of accessing it is in6_addr.s6_addr. - -[Retrieved from: -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7] -Signed-off-by: Fabrice Fontaine ---- - src/netconfig.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/netconfig.c b/src/netconfig.c -index ce95db0b..421270c9 100644 ---- a/src/netconfig.c -+++ b/src/netconfig.c -@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr) - struct in6_addr in6_addr; - char *addr_str = l_malloc(INET6_ADDRSTRLEN); - -- memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); -+ memcpy(in6_addr.s6_addr, addr, 16); - - if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str, - INET6_ADDRSTRLEN)))) { --- -cgit 1.2.3-1.el7 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 7c010ed891..008a2db011 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55 iwd-1.18.tar.xz +sha256 dd65a8795f6127fb1b9e29f2092686b0590a0d3738c2b90c792ccd320deaf966 iwd-1.19.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 96bdc56e93..afa6e3bdeb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.18 +IWD_VERSION = 1.19 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From b17f4ea1c639e610893e540a8f196d455e467abc Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 8 Nov 2021 23:52:28 +0100 Subject: [PATCH 042/176] package/hwdata: bump version to 0.353 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index be8576d8d2..8479e94339 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 fafcc97421ba766e08a2714ccc3eebb0daabc99e67d53c2d682721dd01ccf7a7 hwdata-0.345.tar.gz +sha256 14d120ae58f71da18d7731f44e65a818e4209d621b41fba6f0cd03278a002c1d hwdata-0.353.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 0485603f16..8341757a11 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.345 +HWDATA_VERSION = 0.353 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From 74d8e71cd72a2caf2e3089ada566be6ddf74d5ba Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 9 Nov 2021 00:18:52 +0100 Subject: [PATCH 043/176] package/libv4l: bump version to 1.22.1 - remove 001-keymap.h-add-missing-includes-to-fix-musl-build.patch (superseeded by upstream commit [1]) - add handling of new --with-libudev/--without-libudev option For details see [2]. [1] https://git.linuxtv.org/v4l-utils.git/commit/?id=976a2f681b4e4e16edffd972d53a623b895c5646 [2] https://git.linuxtv.org/v4l-utils.git/tree/ChangeLog?h=stable-1.22 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...d-missing-includes-to-fix-musl-build.patch | 68 ------------------- package/libv4l/libv4l.hash | 2 +- package/libv4l/libv4l.mk | 6 +- 3 files changed, 5 insertions(+), 71 deletions(-) delete mode 100644 package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch diff --git a/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch b/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch deleted file mode 100644 index 238f8fc377..0000000000 --- a/package/libv4l/0001-keymap.h-add-missing-includes-to-fix-musl-build.patch +++ /dev/null @@ -1,68 +0,0 @@ -From baba68cdcb44fc11d0ba8ce2c13eb5b06bbd9b33 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Wed, 30 Oct 2019 07:15:23 +0100 -Subject: [PATCH] keymap.h: add missing includes to fix musl build - -Needed to fix these build errors: - -In file included from keymap.c:13:0: -keymap.h:23:2: error: unknown type name 'u_int32_t' - u_int32_t scancode; - -keymap.h:36:1: error: unknown type name 'error_t' - error_t parse_keymap(char *fname, struct keymap **keymap, bool verbose); - -Signed-off-by: Bernd Kuhls ---- -Patch was not sent upstream due to broken mailing list setup: - -: host vger.kernel.org[209.132.180.67] said: 553 - 5.7.1 Hello [xx.xx.xx.xx], for your MAIL FROM address - policy analysis reported: Your address is not - liked source for email (in reply to MAIL FROM command) - -Hello [xx.xx.xx.xx], for your MAIL FROM address - policy analysis reported: Your address is not liked source for email - - utils/common/keymap.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utils/common/keymap.h b/utils/common/keymap.h -index f2b29632..bb1edce9 100644 ---- a/utils/common/keymap.h -+++ b/utils/common/keymap.h -@@ -1,4 +1,8 @@ - /* SPDX-License-Identifier: GPL-2.0 */ -+ -+#include -+#include -+ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -diff -uNr v4l-utils-1.18.0.orig/utils/ir-ctl/keymap.h v4l-utils-1.18.0/utils/ir-ctl/keymap.h ---- v4l-utils-1.18.0.orig/utils/ir-ctl/keymap.h 2019-09-22 11:22:54.000000000 +0200 -+++ v4l-utils-1.18.0/utils/ir-ctl/keymap.h 2019-10-30 07:06:18.250548011 +0100 -@@ -1,4 +1,8 @@ - /* SPDX-License-Identifier: GPL-2.0 */ -+ -+#include -+#include -+ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -diff -uNr v4l-utils-1.18.0.orig/utils/keytable/keymap.h v4l-utils-1.18.0/utils/keytable/keymap.h ---- v4l-utils-1.18.0.orig/utils/keytable/keymap.h 2019-09-22 11:22:54.000000000 +0200 -+++ v4l-utils-1.18.0/utils/keytable/keymap.h 2019-10-30 07:06:56.218816126 +0100 -@@ -1,4 +1,8 @@ - /* SPDX-License-Identifier: GPL-2.0 */ -+ -+#include -+#include -+ - #ifndef __KEYMAP_H - #define __KEYMAP_H - --- -2.20.1 diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index e45dd576bd..d99d5e0992 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature # https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2.asc # with key 05D0169C26E41593418129DF199A64FADFB500FF -sha256 956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7 v4l-utils-1.20.0.tar.bz2 +sha256 65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31 v4l-utils-1.22.1.tar.bz2 # Locally calculated sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 7b61823cec..b11c8975d1 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBV4L_VERSION = 1.20.0 +LIBV4L_VERSION = 1.22.1 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES @@ -45,8 +45,10 @@ LIBV4L_DEPENDENCIES += libgl endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBV4L_CONF_OPTS += --with-udevdir=/usr/lib/udev +LIBV4L_CONF_OPTS += --with-libudev --with-udevdir=/usr/lib/udev LIBV4L_DEPENDENCIES += udev +else +LIBV4L_CONF_OPTS += --without-libudev endif ifeq ($(BR2_PACKAGE_LIBGLU),y) From 914a8133a0e4c7e356a3016cf10bf65441a08e9a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 14 Nov 2021 14:57:22 +0100 Subject: [PATCH 044/176] package/qt5declarative: move the qt5gui select from qt5declarative to qt5quick MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As requested/suggested by Sergey Kuzminov([1]) move the qt5gui select from qt5declarative to qt5quick. The qt5declarative (without qt5quick) compiles and installs fine without qt5gui enabled and code inspection of the qt5declarative souce package *.pro files shows the unconditionally gui dependencies only in for doc-snippets and/or test projectes or real the qt5quick moduls. [1] https://lore.kernel.org/buildroot/6fd05f97-7fb9-96d8-cca0-5063be8ad620@gmail.com Reported-by: "Кузьминов Сергей" Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5declarative/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 3ba9224c22..5ec83daa27 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - select BR2_PACKAGE_QT5BASE_GUI help Qt is a cross-platform application and UI framework for developers using C++. @@ -16,6 +15,7 @@ if BR2_PACKAGE_QT5DECLARATIVE config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" + select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE endif From c9ddee54a5971823dd3cdeb2727ca0950e245365 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 13 Nov 2021 01:24:50 +0100 Subject: [PATCH 045/176] package/trace-cmd: bump to version 2.9.6 Update to version 2.9.6. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/trace-cmd/trace-cmd.hash | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 78ff3472c3..1f34a0da60 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 026cce03b4ae61f19848646acecf151dd7dd62617859edcf73ae954eb65b2653 trace-cmd-trace-cmd-v2.9.5-br1.tar.gz +sha256 9401a43bda4837dfde5e64e0dbe5d3918bf50eb86b4d23fa89713b0f2defcbc1 trace-cmd-trace-cmd-v2.9.6-br1.tar.gz sha256 b1d04b850c1c7471b0f0896f6c6f0fcfc9f07e2dd183a5f5826af269fe9e88fb COPYING sha256 70f297763149e72306919c924e164f83041d5e512868d4c8c1826c171b3e49f9 COPYING.LIB sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSES/GPL-2.0 diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk index f9b54ed765..a592b1f027 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = trace-cmd-v2.9.5 +TRACE_CMD_VERSION = trace-cmd-v2.9.6 TRACE_CMD_SITE = https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git TRACE_CMD_SITE_METHOD = git TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1 From 9c9b10efb0ce472bee3943b2e49ad943e794fabf Mon Sep 17 00:00:00 2001 From: Jan Kraval Date: Wed, 10 Nov 2021 08:36:37 +0100 Subject: [PATCH 046/176] rtl8189fs: bump revision to e10294d2 Update out-of-tree driver to make it work with Linux kernel v5.15. Signed-off-by: Jan Kraval Signed-off-by: Thomas Petazzoni --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index f42799b48e..a7c3641841 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7d425e18ebc427b3df5ff31185b4dc29c6bfd54f8e167f57c2254cea341a26c6 rtl8189fs-62c31d577c385316bb99107f60e63169dacc37db.tar.gz +sha256 2350a15f866ac82a33c11f9505f2deb0f4aa819b9ac1f4809f8d6893412e73fd rtl8189fs-e10294d2ded27586149fedee1f834d75477b8b40.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 4112b135ad..83c7f3ee0d 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = 62c31d577c385316bb99107f60e63169dacc37db +RTL8189FS_VERSION = e10294d2ded27586149fedee1f834d75477b8b40 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 3302281d8dbd99ded36f1d2af7d88db73b7b2bc3 Mon Sep 17 00:00:00 2001 From: Jan Kraval Date: Wed, 10 Nov 2021 08:36:38 +0100 Subject: [PATCH 047/176] configs/orangepi_lite: bump kernel and u-boot versions Bump Linux to 5.15.1 and U-Boot to 2021.10. Signed-off-by: Jan Kraval Signed-off-by: Thomas Petazzoni --- configs/orangepi_lite_defconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index e75943c986..e834816456 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -22,18 +22,18 @@ 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="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite/genimage.cfg" From ba85cb155e046d6b873326a6854490feb4602874 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 9 Nov 2021 19:16:00 +0100 Subject: [PATCH 048/176] package/libevdev: bump version to 1.12.0 For details see [1]. [1] https://lists.freedesktop.org/archives/input-tools/2021-November/001573.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/libevdev/libevdev.hash | 6 +++--- package/libevdev/libevdev.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index 584a9941c5..68a5ebdcba 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/input-tools/2021-February/001557.html -sha256 63f4ea1489858a109080e0b40bd43e4e0903a1e12ea888d581db8c495747c2d0 libevdev-1.11.0.tar.xz -sha512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d libevdev-1.11.0.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2021-November/001573.html +sha256 2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237 libevdev-1.12.0.tar.xz +sha512 6c1c1362d5112cdf3816d1f735c27e625f5463ebf10a83d675cd9364c3fb291ebcb91c051da442f1a36ed28ba7dd99af74546707f61274f7d5715c544a0ed04c libevdev-1.12.0.tar.xz # Hash for license files: sha256 6f13de7ce28e4948ba95170e0723ee1254c1978ce1f127af82aeca597b567cb9 COPYING diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index f6172809fd..cd80154be2 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.11.0 +LIBEVDEV_VERSION = 1.12.0 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = MIT From 5d6e55627453a80c887b26ade354a174b6b4fb04 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 9 Nov 2021 21:29:32 +0100 Subject: [PATCH 049/176] package/lualogging: bump to version 1.6.0 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lualogging/lualogging.hash | 2 +- package/lualogging/lualogging.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lualogging/lualogging.hash b/package/lualogging/lualogging.hash index 45f1868856..294ef95adb 100644 --- a/package/lualogging/lualogging.hash +++ b/package/lualogging/lualogging.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 70451dbec500dbc760f0eae666a10b19a0ba9bcbfa5dd8d3134908e5ae6d28b1 lualogging-1.5.1-1.src.rock +sha256 d29c9c78e4266d9390069b2a5f7afacfcf9189dea12ce3774a5aa4e3cdbcd89f lualogging-1.6.0-1.src.rock sha256 4d95b123e667a13615f567a829aa39211dd55b0b48c9f247bf3fcc5c0b485da7 lualogging/COPYRIGHT diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk index 9c94e588a9..4d01f546e9 100644 --- a/package/lualogging/lualogging.mk +++ b/package/lualogging/lualogging.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALOGGING_VERSION = 1.5.1-1 +LUALOGGING_VERSION = 1.6.0-1 LUALOGGING_SUBDIR = lualogging LUALOGGING_LICENSE = MIT LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT From fd680ed98d6b5dc21ba130efc2f3886d91170b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 7 Nov 2021 10:33:11 +0000 Subject: [PATCH 050/176] package/luv: bump to version 1.42.0-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 6dfd8b9f19..2fb2b5c4fc 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b5228a9d0eaacd9f862b6270c732d5c90773a28ce53b6d9e32a14050e7947f36 luv-1.42.0-0.tar.gz +sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index fae94fa6b2..2dc9af3b7a 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.42.0-0 +LUV_VERSION = 1.42.0-1 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt From f89b3e14cf3510887d959e7c8f53c1dfde052935 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:36 +0100 Subject: [PATCH 051/176] board/olimex/a20_olinuxino/genimage.cfg: fix option suffix With commit[1] I've introduced a code style bug: offset = 8KB so let's substitute 8KB with 8K. [1]: https://gitlab.com/buildroot.org/buildroot/-/commit/43bfa1cf1046b0e44e87a02bc5a358bf1de5bfdd Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/olimex/a20_olinuxino/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/olimex/a20_olinuxino/genimage.cfg b/board/olimex/a20_olinuxino/genimage.cfg index 5a735ed2de..b48e12a831 100644 --- a/board/olimex/a20_olinuxino/genimage.cfg +++ b/board/olimex/a20_olinuxino/genimage.cfg @@ -5,7 +5,7 @@ image sdcard.img { partition u-boot { in-partition-table = "no" image = "u-boot-sunxi-with-spl.bin" - offset = 8KB + offset = 8K size = 1016K # 1MB - 8KB } From 11db258cd6e018227b6899632442b1753a2c3318 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:37 +0100 Subject: [PATCH 052/176] board/altera/socrates_cyclone5/genimage.cfg: fix offset suffix For consistency 'offset = 256k' must be 'offset = 256K' Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/altera/socrates_cyclone5/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/altera/socrates_cyclone5/genimage.cfg b/board/altera/socrates_cyclone5/genimage.cfg index 0af3f2ec60..d31c3838be 100644 --- a/board/altera/socrates_cyclone5/genimage.cfg +++ b/board/altera/socrates_cyclone5/genimage.cfg @@ -24,7 +24,7 @@ image uboot.img { partition uboot-full { in-partition-table = "no" image = "u-boot.img" - offset = 256k + offset = 256K } size = 1M From e89a95ca4a103a169007793a060d08acfd50901a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:38 +0100 Subject: [PATCH 053/176] board/friendlyarm/nanopi-neo2/genimage.cfg: fix comment For consistency comment '# 1MB - 40K' must be '# 1MB - 40KB'. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/friendlyarm/nanopi-neo2/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg index 45d081e197..3163a06592 100644 --- a/board/friendlyarm/nanopi-neo2/genimage.cfg +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -24,7 +24,7 @@ image sdcard.img { in-partition-table = "no" image = "u-boot.itb" offset = 40K - size = 1M # 1MB - 40K + size = 1M # 1MB - 40KB } partition boot { From 9fa7dbbbba298db9b99f442b171fa47640bf3cb8 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:39 +0100 Subject: [PATCH 054/176] board/orangepi/orangepi-pc2/genimage.cfg: fix comment For consistency comment '# 1MB - 40K' must be '# 1MB - 40KB'. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepi-pc2/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/orangepi/orangepi-pc2/genimage.cfg b/board/orangepi/orangepi-pc2/genimage.cfg index 72adc47518..cc8695c9f1 100644 --- a/board/orangepi/orangepi-pc2/genimage.cfg +++ b/board/orangepi/orangepi-pc2/genimage.cfg @@ -24,7 +24,7 @@ image sdcard.img { in-partition-table = "no" image = "u-boot.itb" offset = 40K - size = 1M # 1MB - 40K + size = 1M # 1MB - 40KB } partition boot { From a76bc8bcf366cf57ea14d2de96f116b6daca10ee Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:40 +0100 Subject: [PATCH 055/176] board/minnowboard/genimage.cfg: fix option assignment spaces Option 'size=10M' must be 'size = 10M'. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/minnowboard/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/minnowboard/genimage.cfg b/board/minnowboard/genimage.cfg index 34b3070901..2eccce2de4 100644 --- a/board/minnowboard/genimage.cfg +++ b/board/minnowboard/genimage.cfg @@ -9,7 +9,7 @@ image efi-part.vfat { } } - size=10M + size = 10M } # Create the sdcard image, pulling in From 0ac19f1bf0b7872f5913dcd9d60075c9ed3c2452 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:41 +0100 Subject: [PATCH 056/176] board/kontron/pitx-imx8m/genimage.cfg: fix option suffix Option 'offset = 33k' must be 'offset = 33K'. Signed-off-by: Giulio Benetti Acked-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- board/kontron/pitx-imx8m/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg index c335b0c026..c78ef0f910 100644 --- a/board/kontron/pitx-imx8m/genimage.cfg +++ b/board/kontron/pitx-imx8m/genimage.cfg @@ -5,7 +5,7 @@ image sdcard.img { partition imx-boot { in-partition-table = "no" image = "imx8-boot-sd.bin" - offset = 33k + offset = 33K } partition rootfs { From f863c6ca874acd060a7db90bf67ef43267345257 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:42 +0100 Subject: [PATCH 057/176] board/kontron/smarc-sal28/genimage.cfg: fix option suffix Option 'offset = 4k' must be 'offset = 4K'. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/kontron/smarc-sal28/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/kontron/smarc-sal28/genimage.cfg b/board/kontron/smarc-sal28/genimage.cfg index f3fb77e00a..8c8a7baaae 100644 --- a/board/kontron/smarc-sal28/genimage.cfg +++ b/board/kontron/smarc-sal28/genimage.cfg @@ -4,7 +4,7 @@ image sdcard-emmc.img { } partition rcw { - offset = 4k + offset = 4K in-partition-table = "no" image = "rcw.bin" } From ba9f42d5ebab83d8302b5da9e8c28b2fb7121940 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:44 +0100 Subject: [PATCH 058/176] board/nezha/genimage.cfg: fix offset value notation Option "offset = 12288K" must be "offset = 12M" according to the new guidelines specified in Buildroot Manual with previous patch. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/nezha/genimage.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/nezha/genimage.cfg b/board/nezha/genimage.cfg index 9860b83eca..783391fb99 100644 --- a/board/nezha/genimage.cfg +++ b/board/nezha/genimage.cfg @@ -19,7 +19,7 @@ image sdcard.img { partition u-boot-1 { in-partition-table = "no" image = "u-boot.toc1" - offset = 12288K + offset = 12M } partition u-boot-2 { From 425a1e9f2013fee5a39531268326ba8b861d5af4 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 9 Nov 2021 11:18:43 +0100 Subject: [PATCH 059/176] docs/manual: add allowed notations section for genimage.cfg files Add allowed notations section for genimage.cfg files by specifying the accepted suffix or prefix. Note that "K" has been decided to specify KiloBytes as 1024 bytes. This has been done because in Buildroot the 90% of the cases were using "K" and not "k". Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- docs/manual/writing-rules.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 28cb0fe4f1..3eec095d0e 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -192,6 +192,12 @@ image sdimage.img { * Filename must at least begin with genimage prefix and have the .cfg extension to be easy to recognize. +* Allowed notations for +offset+ and +size+ options are: +G+, +M+, +K+ + (not +k+). If it's not possible to express a precise byte count + with notations above then use hexadecimal +0x+ prefix or, as last + chance, the byte count. In comments instead use +GB+, +MB+, +KB+ + (not +kb+) in place of +G+, +M+, +K+. + The +genimage.cfg+ files are the input for the genimage tool used in Buildroot to generate the final image file(i.e. sdcard.img). For further details about the _genimage_ language, refer to From d191854b0e1049f052fb48155736c57cadb7003b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:08 +0100 Subject: [PATCH 060/176] package/kodi-audiodecoder-modplug: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash | 2 +- package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash index f3736c192c..7bab017241 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 ff3cb9816a30530d522f6a9a23eb49eb5301fb7880f402de6fc1dea31d3469f6 kodi-audiodecoder-modplug-19.0.0-Matrix.tar.gz +sha256 4c422cacf456ab9eda5e2836d2789c3756bfbae03265a01647dd8f935261d9ec kodi-audiodecoder-modplug-19.0.1-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 ce5619e8c7..9b2cf98dbc 100644 --- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.0-Matrix +KODI_AUDIODECODER_MODPLUG_VERSION = 19.0.1-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 = LICENSE.md From 6333d3140819b3ed62f991f89f8325801feebed1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:09 +0100 Subject: [PATCH 061/176] package/kodi-audiodecoder-nosefart: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash | 2 +- .../kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash index 61507e8229..56a73306bd 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 4975c65b5acd002cf772707170e54bcbcc48d7898dd2e6b4239bab56636b44e7 kodi-audiodecoder-nosefart-19.0.0-Matrix.tar.gz +sha256 d5ed3013f42860afec661e72bdcb4ebb10e98705d3a7c9826dfe29d2c394709d kodi-audiodecoder-nosefart-19.0.1-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 91be43c580..4e12c965d5 100644 --- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.0-Matrix +KODI_AUDIODECODER_NOSEFART_VERSION = 19.0.1-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 = LICENSE.md From 34e12c4c3bfe7b2b23912d99a138fa8e43bc169b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:10 +0100 Subject: [PATCH 062/176] package/kodi-audiodecoder-sidplay: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash | 2 +- package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash index 906573adbf..28999afb7b 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 0da9327e99b18a4ab42f71709ec07ea4e58d9c5f677192c7fa6f5ebb4db5fd08 kodi-audiodecoder-sidplay-19.0.0-Matrix.tar.gz +sha256 a4fe4f0c48649222930c8c574156c5c3b2ad82fc97de2bdbd0c5e510402853ec kodi-audiodecoder-sidplay-19.0.1-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 171171c28d..173a2b10ca 100644 --- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SIDPLAY_VERSION = 19.0.0-Matrix +KODI_AUDIODECODER_SIDPLAY_VERSION = 19.0.1-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 = LICENSE.md From 886d14edef7697f6801dc5ad098d98119ded8e1e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:11 +0100 Subject: [PATCH 063/176] package/kodi-audiodecoder-snesapu: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash | 2 +- package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash index 714f2f8719..c8bf76ada7 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 8b4c75ccfbcf829922e9dbf10d9ec75c4312ac6ad1837d3cf39833395fb036be kodi-audiodecoder-snesapu-19.0.0-Matrix.tar.gz +sha256 f7a346b751900f4b66e8a3e7d3c3579b0b10a112e6ed6901553c4c9fc72bbb3b kodi-audiodecoder-snesapu-19.0.1-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 ac77f76f14..5397e765f7 100644 --- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.0-Matrix +KODI_AUDIODECODER_SNESAPU_VERSION = 19.0.1-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 = LICENSE.md From 0d00e1d703698fa94ebd2fb5ec6d9252b2c1ba36 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:12 +0100 Subject: [PATCH 064/176] package/kodi-audiodecoder-stsound: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash | 2 +- package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash index d370ca5566..5f8d4564c8 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 dc168de296dafae86a83e36f687f4dd4fd41c3d3134afbb05415f860f750e779 kodi-audiodecoder-stsound-19.0.0-Matrix.tar.gz +sha256 1c740e69047d93d34cfe8c574f923f8dd205adb997fb5d1444a55a6b9d9f0f75 kodi-audiodecoder-stsound-19.0.1-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 bd432e734a..491be3a7ba 100644 --- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIODECODER_STSOUND_VERSION = 19.0.0-Matrix +KODI_AUDIODECODER_STSOUND_VERSION = 19.0.1-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 = LICENSE.md From 50610e7a4555e4c3493f8181dec6de835de48183 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:13 +0100 Subject: [PATCH 065/176] package/kodi-audiodecoder-timidity: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash | 2 +- .../kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash index 19efb1dfd5..0120c1ff3b 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 c2a0701978e71102859c7cb308422fe26fb87741d0eab9656650eaea156c3d56 kodi-audiodecoder-timidity-19.0.0-Matrix.tar.gz +sha256 c33bcf24a6a9ca8c594c3d587c0efa5f1469c9402b3a934aaa5d21f1cbf41e9a kodi-audiodecoder-timidity-19.0.1-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 d6c47d11cd..824015a93f 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 = 19.0.0-Matrix +KODI_AUDIODECODER_TIMIDITY_VERSION = 19.0.1-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 From 8274bb968f3a7caa792cc2bbf7d9aa177ea2d1d1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:14 +0100 Subject: [PATCH 066/176] package/kodi-pvr-iptvsimple: bump version to 19.0.2-Matrix 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 ffc1396c29..c130e92fa0 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 f94ed09b9e54897936785f6bcf64a0adf40a9aa56fba4f5dff46a1846ce04c7c kodi-pvr-iptvsimple-19.0.1-Matrix.tar.gz +sha256 357442201f4192e13da43c81356bac01fc76d46fd96f4d010f214b29873766c9 kodi-pvr-iptvsimple-19.0.2-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 3752854cb8..58497c64b1 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 = 19.0.1-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.0.2-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 = LICENSE.md From 60ee17b02f2589dbdf099710b983e28884bc76fd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:15 +0100 Subject: [PATCH 067/176] package/kodi-pvr-mythtv: bump version to 19.0.2-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index f336c39f2f..5d0e2738bd 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 14d76fda4b9c8e7ac068071e322432fe585357154a2b2bae23d051def766f06d kodi-pvr-mythtv-19.0.0-Matrix.tar.gz +sha256 f5a2c0d4c742db3e8465369f4845faa87c76572290edc1792cf188ad977752b4 kodi-pvr-mythtv-19.0.2-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 fe89082913..b897667d67 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 19.0.0-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.2-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 = LICENSE.md From c96d38828f59c7e018d69ed3cc5ff479d23aff30 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:43:16 +0100 Subject: [PATCH 068/176] package/kodi-pvr-wmc: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index 32f98a1271..bfd95b37f7 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 d3cfa954c01ddec0f69e6777a12fca6314ee579d770a4be8728657e323a8eb8c kodi-pvr-wmc-19.0.0-Matrix.tar.gz +sha256 f8e05a70948f31289a5c1a19114e904e088189ad12bf478dc4ab8e3b7dca211e kodi-pvr-wmc-19.0.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 313335b91a..2eaaaaa77a 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 19.0.0-Matrix +KODI_PVR_WMC_VERSION = 19.0.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 = LICENSE.md From 84172271134260eb2c37e56f70f346857e28e998 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Nov 2021 09:44:54 +0100 Subject: [PATCH 069/176] package/kodi-audioencoder-lame: bump version to 19.1.0-Matrix Release notes: https://github.com/xbmc/audioencoder.lame/releases/tag/19.1.0-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-audioencoder-lame/Config.in | 1 + package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-lame/Config.in b/package/kodi-audioencoder-lame/Config.in index dc6a0cd7e5..b050ac6b93 100644 --- a/package/kodi-audioencoder-lame/Config.in +++ b/package/kodi-audioencoder-lame/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_KODI_AUDIOENCODER_LAME bool "kodi-audioencoder-lame" select BR2_PACKAGE_KODI_OPTICALDRIVE select BR2_PACKAGE_LAME + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help An audioencoder addon for Kodi diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index 7863ff497c..080bef06d2 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 e2bdf17e5739cc025627a92421b967e5dda3cb35d2e4bb948a64ac97bf0e734e kodi-audioencoder-lame-19.0.0-Matrix.tar.gz +sha256 054593ea6572cd1e6ea771758bd759c630f47abef1ad2eeb332d453fc6c03e0b kodi-audioencoder-lame-19.1.0-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 b774ac63e9..d2c2750022 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.0.0-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 19.1.0-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 = LICENSE.md @@ -12,4 +12,8 @@ KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame KODI_AUDIOENCODER_LAME_CONF_OPTS += \ -DLAME_INCLUDE_DIRS=$(STAGING_DIR)/usr/include +ifeq ($(BR2_ENABLE_LOCALE),) +KODI_AUDIOENCODER_LAME_DEPENDENCIES += libiconv +endif + $(eval $(cmake-package)) From 91a4a169eb8ee620aae7f5d1ec211ce14b02e1d6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Oct 2021 21:01:30 +0200 Subject: [PATCH 070/176] package/perl-convert-asn1: bump to version 0.33 diff LICENSE: remove trailing spaces Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-convert-asn1/perl-convert-asn1.hash | 6 +++--- package/perl-convert-asn1/perl-convert-asn1.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-convert-asn1/perl-convert-asn1.hash b/package/perl-convert-asn1/perl-convert-asn1.hash index eb7973c313..644517af51 100644 --- a/package/perl-convert-asn1/perl-convert-asn1.hash +++ b/package/perl-convert-asn1/perl-convert-asn1.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1e12b263a5042804bb1c59ddce899876 Convert-ASN1-0.31.tar.gz -sha256 6fe4c1ba744c3a8212bf2c9b2703d93530acc153435cf2f93633540b439fbbeb Convert-ASN1-0.31.tar.gz +md5 80425835020da77c48c05a40e25bbf7e Convert-ASN1-0.33.tar.gz +sha256 1fdf004520c79e3a244cf9688616293516c11793d746c761f367496eb3d06076 Convert-ASN1-0.33.tar.gz # computed by scancpan -sha256 db9e46a932b02253c8bddc05a44a0c1c6979627190afb2251dd76462dd370d79 LICENSE +sha256 70884b19a3537bf179538c3b7d7896a56ade509dafe6b8d545c5999a9c05f8a9 LICENSE diff --git a/package/perl-convert-asn1/perl-convert-asn1.mk b/package/perl-convert-asn1/perl-convert-asn1.mk index c39fe3412f..affe775aca 100644 --- a/package/perl-convert-asn1/perl-convert-asn1.mk +++ b/package/perl-convert-asn1/perl-convert-asn1.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_CONVERT_ASN1_VERSION = 0.31 +PERL_CONVERT_ASN1_VERSION = 0.33 PERL_CONVERT_ASN1_SOURCE = Convert-ASN1-$(PERL_CONVERT_ASN1_VERSION).tar.gz PERL_CONVERT_ASN1_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TI/TIMLEGGE PERL_CONVERT_ASN1_LICENSE = Artistic or GPL-1.0+ From 3c55bba24b02ff8391753649ca63ec1363a3e8ea Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Oct 2021 21:01:31 +0200 Subject: [PATCH 071/176] package/perl-libwww-perl: bump to version 6.57 diff LICENSE: remove trailing spaces Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-libwww-perl/perl-libwww-perl.hash | 6 +++--- package/perl-libwww-perl/perl-libwww-perl.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index 709e94647b..2c9b19d6ef 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 0ef270c43ee93e22c2086ba9998aa11a libwww-perl-6.56.tar.gz -sha256 94362e68e5c6782f3987a9dec6adc409d20e28665dbf28ff47d1d701443ce7ce libwww-perl-6.56.tar.gz +md5 e0b7b07a01f19cc507d3a9b55951ce3a libwww-perl-6.57.tar.gz +sha256 30c242359cb808f3fe2b115fb90712410557f0786ad74844f9801fd719bc42f8 libwww-perl-6.57.tar.gz # computed by scancpan -sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENSE +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index 10fda9de60..23e2aa3bb8 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.56 +PERL_LIBWWW_PERL_VERSION = 6.57 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ From 6350bd24e53ab2a3038c1e30f1b40465c80f0344 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Oct 2021 21:01:32 +0200 Subject: [PATCH 072/176] package/mojolicious: bump to version 9.22 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mojolicious/perl-mojolicious.hash | 4 ++-- package/perl-mojolicious/perl-mojolicious.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index fbb1c7d991..cc29c35535 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ea3861504ab25b237f124842f8765b01 Mojolicious-9.19.tar.gz -sha256 45056d66b08e544fd77033fafe1730c1d45615e46a92892fc77fb241754a1a97 Mojolicious-9.19.tar.gz +md5 c7a00b4bd8fa2db991c9b918d34041d3 Mojolicious-9.22.tar.gz +sha256 6b76e024d3d6c077ad984ea3b3d229f093373d5e06438aca248235150d029043 Mojolicious-9.22.tar.gz # computed by scancpan sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.mk b/package/perl-mojolicious/perl-mojolicious.mk index 8252dc7fd9..559b995cdc 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 9.19 +PERL_MOJOLICIOUS_VERSION = 9.22 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 From 682c7e7bcbc24bb0993fe954356953448c2ba52a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Oct 2021 21:01:33 +0200 Subject: [PATCH 073/176] package/perl-mozilla-ca: bump to version 20211001 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-mozilla-ca/perl-mozilla-ca.hash | 4 ++-- package/perl-mozilla-ca/perl-mozilla-ca.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.hash b/package/perl-mozilla-ca/perl-mozilla-ca.hash index c577d4887e..07966f9906 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.hash +++ b/package/perl-mozilla-ca/perl-mozilla-ca.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 8ac3fe1a83c45da3f468f78ab8133ea6 Mozilla-CA-20200520.tar.gz -sha256 b3ca0002310bf24a16c0d5920bdea97a2f46e77e7be3e7377e850d033387c726 Mozilla-CA-20200520.tar.gz +md5 843e42f367ea3c7abc5de5b6225791dc Mozilla-CA-20211001.tar.gz +sha256 122c8900000a9d388aa8e44f911cab6c118fe8497417917a84a8ec183971b449 Mozilla-CA-20211001.tar.gz # computed by scancpan sha256 95cd63dae5c2bf6e7cf33435981614a36c85ef01fc7a02464e05e58a5355398e README diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.mk b/package/perl-mozilla-ca/perl-mozilla-ca.mk index 3bcb947f72..6b970c0f94 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.mk +++ b/package/perl-mozilla-ca/perl-mozilla-ca.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOZILLA_CA_VERSION = 20200520 +PERL_MOZILLA_CA_VERSION = 20211001 PERL_MOZILLA_CA_SOURCE = Mozilla-CA-$(PERL_MOZILLA_CA_VERSION).tar.gz PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AB/ABH PERL_MOZILLA_CA_LICENSE = MPL-2.0 From 99a47828c13acf82a6af921b26fda2f77ae25317 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Oct 2021 21:01:34 +0200 Subject: [PATCH 074/176] package/perl-path-tiny: bump to version 0.120 diff LICENSE: - Copyright [yyyy] [name of copyright owner] + Copyright 2014 David Golden Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl-path-tiny/perl-path-tiny.hash | 6 +++--- package/perl-path-tiny/perl-path-tiny.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 855af46e1a..6899d5c6b4 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cb34fd356725ec12b78e88ddac37db08 Path-Tiny-0.118.tar.gz -sha256 32138d8d0f4c9c1a84d2a8f91bc5e913d37d8a7edefbb15a10961bfed560b0fd Path-Tiny-0.118.tar.gz +md5 046d14dde6e3568aee5085487dd4769e Path-Tiny-0.120.tar.gz +sha256 66a1164981d449da46cc88383fe37f9e352e87e9570bfb960e43fe8ff016ee1b Path-Tiny-0.120.tar.gz # computed by scancpan -sha256 a999b03d2b80e5c7f987289ac835fa2d88cafa9f0df24adf8a1fd21e175acd79 LICENSE +sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index 08cc66712e..cd4c3bc496 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.118 +PERL_PATH_TINY_VERSION = 0.120 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 From 6ad98fab7a2a4f84d9ec38d86af6282f27a4a4c9 Mon Sep 17 00:00:00 2001 From: Moritz Bitsch Date: Tue, 19 Oct 2021 08:23:29 +0200 Subject: [PATCH 075/176] package/network-manager: make readline optional for network-manager This removes the hard dependency on readline which is GPL-3.0+ licensed. If readline is enabled the dependency is added and nmcli is built. Signed-off-by: Moritz Bitsch Signed-off-by: Thomas Petazzoni --- package/network-manager/Config.in | 1 - package/network-manager/network-manager.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 43987451b6..2534963918 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -18,7 +18,6 @@ config BR2_PACKAGE_NETWORK_MANAGER select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_WIRELESS_TOOLS select BR2_PACKAGE_WIRELESS_TOOLS_LIB - select BR2_PACKAGE_READLINE select BR2_PACKAGE_LIBNDP help NetworkManager is a set of co-operative tools that make diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index fbd5b1c85c..453d1fc617 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ - libgcrypt wireless_tools util-linux host-intltool readline libndp + libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md NETWORK_MANAGER_CPE_ID_VENDOR = gnome @@ -49,6 +49,13 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-concheck endif +ifeq ($(BR2_PACKAGE_READLINE),y) +NETWORK_MANAGER_DEPENDENCIES += readline +NETWORK_MANAGER_CONF_OPTS += --with-nmcli=yes +else +NETWORK_MANAGER_CONF_OPTS += --with-nmcli=no +endif + ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes From 7c8f98557324c8ef6bebb613402e2ee619004d8b Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Mon, 25 Oct 2021 21:14:09 +0300 Subject: [PATCH 076/176] package/libmdbx: bump version to 0.11.1 This is stable bugfix release of libmdbx. So it is reasonable to backport this patch to all applicable releases/branches of buildroot. Please refer to the ChangeLog for more historical information and actual TODOs. https://github.com/erthink/libmdbx/blob/master/ChangeLog.md Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.11.1 Signed-off-by: Leonid Yuriev Signed-off-by: Thomas Petazzoni --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 7cc835a96a..c8b50f9ac3 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ # Hashes from: https://github.com/erthink/libmdbx/releases/ -sha256 a8f2436c4d008886e044f568a22bda44329fb1c67f175d91a929ff8e2065340a libmdbx-amalgamated-0.10.3.tar.gz +sha256 f954ba8c9768914a92c2b46aac0d66bec674dbb4d7b0f01e362ea2921746ddaa libmdbx-amalgamated-0.11.1.tar.gz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 76bd56dfd7..02d00b1a5a 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMDBX_VERSION = 0.10.3 +LIBMDBX_VERSION = 0.11.1 LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO From d72a7997668a73d7d796603c7e96bca132226971 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 25 Oct 2021 21:01:19 +0200 Subject: [PATCH 077/176] package/gdbm: bump to version 1.22 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/gdbm/gdbm.hash | 6 +++--- package/gdbm/gdbm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gdbm/gdbm.hash b/package/gdbm/gdbm.hash index f68a16e2f3..59f9ea62de 100644 --- a/package/gdbm/gdbm.hash +++ b/package/gdbm/gdbm.hash @@ -1,6 +1,6 @@ # From https://www.gnu.org.ua/software/gdbm/download.html -md5 a285c6e2dfed78668664c0555a7d202b gdbm-1.21.tar.gz -sha1 f6eec6113f04a4b5fd2c1cfead10e7d65c8f3d89 gdbm-1.21.tar.gz +md5 0bbd38f12656e4728e2f7c4708aec014 gdbm-1.22.tar.gz +sha1 c45cc0178cbf41828369b07749d41778741703bd gdbm-1.22.tar.gz # Locally computed -sha256 b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2 gdbm-1.21.tar.gz +sha256 f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762 gdbm-1.22.tar.gz sha256 690d762f2e8e149ab1e2d6a409a3853b6151a2533b2382fae549a176d6bedecf COPYING diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk index 3c52d12542..52624f5807 100644 --- a/package/gdbm/gdbm.mk +++ b/package/gdbm/gdbm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDBM_VERSION = 1.21 +GDBM_VERSION = 1.22 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm GDBM_LICENSE = GPL-3.0+ GDBM_LICENSE_FILES = COPYING From f6a6219d941919de447e92637b238f5420ec1e7d Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 15 Nov 2021 16:13:04 +0100 Subject: [PATCH 078/176] package/vuejs: bump to version 3.2.22 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs/vuejs.hash | 2 +- package/vuejs/vuejs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index 1801a0c6e9..9dd0fb548b 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 464ea5fdbcb51eee0b5f4762f169024b36a3bcd2c039ea8608b17fdd8a8595e9 vue-3.2.6.tgz +sha256 770ff74851f7454977f084becd76b05b3fad4d52f048df5405d41849c125956c vue-3.2.22.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index e2fc2c2dfb..b74002e932 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.2.6 +VUEJS_VERSION = 3.2.22 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT From 9f2c9f3d58f051ce0baf53b936701083db2dbdae Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 15 Nov 2021 16:13:05 +0100 Subject: [PATCH 079/176] package/vuejs-router: bump to version 4.0.12 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs-router/vuejs-router.hash | 2 +- package/vuejs-router/vuejs-router.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index 1e5f850ca6..13ce97d32c 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 317ae9b916b9a8c5ec521697c345bef15759887d63342ddf19c18ff05ca279b9 vue-router-4.0.11.tgz +sha256 baf5e9dfb0a1e344f0f460a5cd521e17fd3842386ce36b8e6d53c1053d49cf1e vue-router-4.0.12.tgz sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index 3f6bcc5067..9c7dcc76bf 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.0.11 +VUEJS_ROUTER_VERSION = 4.0.12 VUEJS_ROUTER_SOURCE = vue-router-$(VUEJS_ROUTER_VERSION).tgz VUEJS_ROUTER_SITE = https://registry.npmjs.org/vue-router/- VUEJS_ROUTER_LICENSE = MIT From 5fdcb18aecec28aedbacb86ecdcb29e59efcf56a Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Mon, 15 Nov 2021 16:26:03 +0100 Subject: [PATCH 080/176] package/psplash: bump to revision 44afb75 This includes the following changes: 44afb75 Add configure options to disable progress bar fdbd111 Improve warnings from probing for double buffering f5203fd Update mailing list details since the move to groups.io 0a902f7 Fix psplash-systemd failures 4cf1330 Remove generated psplash-poky-img.h aea172a Makefile.am: Fix out of tree builds Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- package/psplash/psplash.hash | 2 +- package/psplash/psplash.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/psplash/psplash.hash b/package/psplash/psplash.hash index 87fcdadd6d..77090d08f6 100644 --- a/package/psplash/psplash.hash +++ b/package/psplash/psplash.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2c1344dd8414415d80a01484b1cc29e78f99c31d5266189540e5966a7dc6e10e psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c-br1.tar.gz +sha256 c9f71754f4606e46212a4851d6c1145e4ae8752fd11a2b40e825f04bf79b22ec psplash-44afb7506d43cca15582b4c5b90ba5580344d75d-br1.tar.gz sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk index 199509ecd6..5e61f2392f 100644 --- a/package/psplash/psplash.mk +++ b/package/psplash/psplash.mk @@ -4,7 +4,7 @@ # ################################################################################ -PSPLASH_VERSION = fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c +PSPLASH_VERSION = 44afb7506d43cca15582b4c5b90ba5580344d75d PSPLASH_SITE = git://git.yoctoproject.org/psplash PSPLASH_LICENSE = GPL-2.0+ PSPLASH_LICENSE_FILES = COPYING From 6170020898ca154f9a8c83bf9068207ae958594b Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Sun, 14 Nov 2021 16:34:36 +0300 Subject: [PATCH 081/176] package/bdwgc: bump to 8.0.6 - Remove patch (already in version) - Change URL to Github releases - Hash of the license file changed due to a copyright year update Signed-off-by: Ivan Maidanski Signed-off-by: Thomas Petazzoni --- ...ference-to-__data_start-linker-error.patch | 33 ------------------- package/bdwgc/Config.in | 2 +- package/bdwgc/bdwgc.hash | 4 +-- package/bdwgc/bdwgc.mk | 4 +-- 4 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch diff --git a/package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch b/package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch deleted file mode 100644 index 81221c9f66..0000000000 --- a/package/bdwgc/0001-Fix-undefined-reference-to-__data_start-linker-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 301ef15aefa6764466c374d07efb511b1c3862cc Mon Sep 17 00:00:00 2001 -From: Nikita Ermakov -Date: Wed, 20 May 2020 17:57:17 +0300 -Subject: [PATCH] Fix 'undefined reference to __data_start' linker error on - RISC-V - -Issue #294 (bdwgc). - -* include/private/gcconfig.h [RISCV && LINUX] (__data_start): Add -attribute(weak). - -(cherry picked from commit 538562ad01b181f4cc3913da1ac06a77945cd9b9) -Signed-off-by: Romain Naour ---- - include/private/gcconfig.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h -index d9d45da1..d6cefa6f 100644 ---- a/include/private/gcconfig.h -+++ b/include/private/gcconfig.h -@@ -2943,7 +2943,7 @@ EXTERN_C_BEGIN - # define ALIGNMENT (CPP_WORDSZ/8) - # ifdef LINUX - # define OS_TYPE "LINUX" -- extern int __data_start[]; -+ extern int __data_start[] __attribute__((__weak__)); - # define DATASTART ((ptr_t)__data_start) - # define LINUX_STACKBOTTOM - # define DYNAMIC_LOADING --- -2.30.2 - diff --git a/package/bdwgc/Config.in b/package/bdwgc/Config.in index 95139efb93..aad2bc9ef2 100644 --- a/package/bdwgc/Config.in +++ b/package/bdwgc/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_BDWGC be used as a garbage collecting replacement for C 'malloc' or C++ 'new'. - http://www.hboehm.info/gc/ + https://www.hboehm.info/gc/ diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash index 4d22131964..d0459969b5 100644 --- a/package/bdwgc/bdwgc.hash +++ b/package/bdwgc/bdwgc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d gc-8.0.4.tar.gz -sha256 aeeaabbf44e67d413e18719f0c6ac9c23387ab0b33e7a15ee46cf59ddef12cc7 README.QUICK +sha256 3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11 gc-8.0.6.tar.gz +sha256 0aab7a56a92ed878c4a5464cf282d65f38bcdee64fe9cf213e26254bddb3f340 README.QUICK diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index 57dd82cab4..d1c9d4dfdc 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -4,9 +4,9 @@ # ################################################################################ -BDWGC_VERSION = 8.0.4 +BDWGC_VERSION = 8.0.6 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz -BDWGC_SITE = http://www.hboehm.info/gc/gc_source +BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION) BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK From c1723424b8189730087006fc879fdae0cc123ca1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 25 Oct 2021 23:55:20 +0200 Subject: [PATCH 082/176] package/p7zip: add 7za support Add 7za stand-alone executable as 7zr is a "light-version" of 7za that only handles 7z archives and cannot handle encrypted archives. Fixes: - https://bugs.buildroot.org/show_bug.cgi?id=14266 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/p7zip/Config.in | 22 ++++++++++++++++++++++ package/p7zip/p7zip.mk | 11 +++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/package/p7zip/Config.in b/package/p7zip/Config.in index badfb9b9e8..3b30fd71cc 100644 --- a/package/p7zip/Config.in +++ b/package/p7zip/Config.in @@ -12,6 +12,28 @@ config BR2_PACKAGE_P7ZIP http://sourceforge.net/projects/p7zip +if BR2_PACKAGE_P7ZIP + +choice + prompt "p7zip binary" + default BR2_PACKAGE_P7ZIP_7ZR + +config BR2_PACKAGE_P7ZIP_7ZA + bool "7za" + help + Stand-alone executable that handles fewer archive formats + than 7z + +config BR2_PACKAGE_P7ZIP_7ZR + bool "7zr" + help + Stand-alone executable which is a "light-version" of 7za that + only handles 7z archives and cannot handle encrypted archives + +endchoice + +endif + comment "p7zip needs a toolchain w/ threads, wchar, C++" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk index f94b55ecd2..b6c5adae26 100644 --- a/package/p7zip/p7zip.mk +++ b/package/p7zip/p7zip.mk @@ -10,6 +10,12 @@ P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction P7ZIP_LICENSE_FILES = DOC/License.txt P7ZIP_CPE_ID_VENDOR = 7-zip +ifeq ($(BR2_PACKAGE_P7ZIP_7ZA),y) +P7ZIP_TARGET = 7za +else +P7ZIP_TARGET = 7zr +endif + # p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and # CXXFLAGS, so we can't pass them. Instead, it accepts ALLFLAGS_C # and ALLFLAGS_CPP as variables to pass the CFLAGS and CXXFLAGS. @@ -17,11 +23,12 @@ define P7ZIP_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" ALLFLAGS_C="$(TARGET_CFLAGS)" \ CXX="$(TARGET_CXX)" ALLFLAGS_CPP="$(TARGET_CXXFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - -C $(@D) 7zr + -C $(@D) $(P7ZIP_TARGET) endef define P7ZIP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/7zr $(TARGET_DIR)/usr/bin/7zr + $(INSTALL) -D -m 0755 $(@D)/bin/$(P7ZIP_TARGET) \ + $(TARGET_DIR)/usr/bin/$(P7ZIP_TARGET) endef $(eval $(generic-package)) From ab816582a6eb58381129e22d1c43ea9251edc621 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 26 Oct 2021 01:44:00 +0300 Subject: [PATCH 083/176] package/libwpe: bump to version 1.12.0 Release notes: https://wpewebkit.org/release/libwpe-1.12.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 200b6c2798..2ebe4f19bd 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.10.1.tar.xz.sums -md5 f60fc13b519a66d262afb76c77441870 libwpe-1.10.1.tar.xz -sha1 1a8085b9a172d37e952c07bbb09b1654d4161ab2 libwpe-1.10.1.tar.xz -sha256 a327b3ffcf2356dbe8148c1db4bbdc5359d7e7163d177f67551a8393b144adf0 libwpe-1.10.1.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.12.0.tar.xz.sums +md5 5a3f11789535d826370ba465ea141393 libwpe-1.12.0.tar.xz +sha1 91aa47a593a5db511d667b3bdbaa76dee4301311 libwpe-1.12.0.tar.xz +sha256 e8eeca228a6b4c36294cfb63f7d3ba9ada47a430904a5a973b3c99c96a44c18c libwpe-1.12.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index 6396fe696d..fe3c4b16d7 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.10.1 +LIBWPE_VERSION = 1.12.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES From 8e63b437740db01f5e2daac69cb88301f275bcc4 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 26 Oct 2021 01:44:01 +0300 Subject: [PATCH 084/176] package/wpebackend-fdo: bump to version 1.12.0 Most of the changes from this release were already in 1.10.0, but it has some Meson build fixes and the new DMA-BUF buffer pool support. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.12.0.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index f280024b28..06289900b0 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.10.0.tar.xz.sums -md5 306adbb0c66dc753e1794c83b7a2682b wpebackend-fdo-1.10.0.tar.xz -sha1 bf71718a213c6511dea278ade5ce90967d181995 wpebackend-fdo-1.10.0.tar.xz -sha256 b89dfd3500a4dec711132cd7bff72599e67d56a419d000730e14bb99547509cc wpebackend-fdo-1.10.0.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.12.0.tar.xz.sums +md5 c43b34a4b4933bcd80068ae5776ee346 wpebackend-fdo-1.12.0.tar.xz +sha1 e2576d564bd6d9a86737a4cd31dd5827ebc00fdf wpebackend-fdo-1.12.0.tar.xz +sha256 6239c9c15523410798d66315de6b491712ab30009ba180f3e0dd076d9b0074ac wpebackend-fdo-1.12.0.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index 72f0ad9019..5fe9c5397f 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.10.0 +WPEBACKEND_FDO_VERSION = 1.12.0 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From 86f46249b397d01e1ed9bd9df0885d0034de0722 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 26 Oct 2021 01:44:02 +0300 Subject: [PATCH 085/176] package/wpewebkit: bump to version 2.34.1 Update to a new major release which brings in improvements and a number of new features. Release notes: https://wpewebkit.org/release/wpewebkit-2.34.0.html https://wpewebkit.org/release/wpewebkit-2.34.1.html Some of the new features require additional dependencies: HTTP/2 requires libsoup3, which is not yet in packaged in Buildroot, and disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2); and the color management support needs LCMS2 (which will be enabled in a follow-up patch.) Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...e-build-issues-with-ENABLE_VIDEO-OFF.patch | 78 +++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 8 +- package/wpewebkit/wpewebkit.mk | 4 +- 3 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch diff --git a/package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch b/package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch new file mode 100644 index 0000000000..932ade101c --- /dev/null +++ b/package/wpewebkit/0001-WPE-GTK-Multiple-build-issues-with-ENABLE_VIDEO-OFF.patch @@ -0,0 +1,78 @@ +From afc83d41293333f694630451f865a7a257a9b917 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Mon, 25 Oct 2021 23:45:15 +0300 +Subject: [PATCH] [WPE][GTK] Multiple build issues with ENABLE_VIDEO=OFF + https://bugs.webkit.org/show_bug.cgi?id=232264 + +.: + +Reviewed by NOBODY (OOPS!). + +* Source/cmake/WebKitFeatures.cmake: Make ENABLE_MEDIA_SESSION depend on ENABLE_VIDEO. + +Source/WebCore: + +Reviewed by NOBODY (OOPS!). + +No new tests needed. + +* accessibility/AXObjectCache.cpp: +(WebCore::isSimpleImage): Guard usage of HTMLMediaElement with ENABLE(VIDEO). +* page/EventHandler.cpp: +(WebCore::EventHandler::textRecognitionCandidateElement const): Ditto. +* platform/graphics/BifurcatedGraphicsContext.cpp: Ditto. +* platform/graphics/displaylists/DisplayListRecorder.h: Guard usage of MediaPlayer with +ENABLE(VIDEO). +* platform/graphics/displaylists/DisplayListRecorderImpl.cpp: Ditto. +* platform/graphics/displaylists/DisplayListRecorderImpl.h: Ditto. + +Source/WebKit: + +* WebProcess/WebCoreSupport/ShareableBitmapUtilities.cpp: +(WebKit::createShareableBitmap): Guard usage of RenderVideo with ENABLE(VIDEO). + +Signed-off-by: Adrian Perez de Castro +--- +Upstream status: https://trac.webkit.org/changeset/284858/webkit + + Source/WebCore/accessibility/AXObjectCache.cpp | 2 ++ + Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/Source/WebCore/accessibility/AXObjectCache.cpp b/Source/WebCore/accessibility/AXObjectCache.cpp +index f2451102040..930b969dcc2 100644 +--- a/Source/WebCore/accessibility/AXObjectCache.cpp ++++ b/Source/WebCore/accessibility/AXObjectCache.cpp +@@ -528,9 +528,11 @@ static bool isSimpleImage(const RenderObject& renderer) + || (is(node) && downcast(node)->hasAttributeWithoutSynchronization(usemapAttr))) + return false; + ++#if ENABLE(VIDEO) + // Exclude video and audio elements. + if (is(node)) + return false; ++#endif // ENABLE(VIDEO) + + return true; + } +diff --git a/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp b/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp +index c0ce72c5ffc..d7ead303f3c 100644 +--- a/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp ++++ b/Source/WebCore/platform/graphics/BifurcatedGraphicsContext.cpp +@@ -269,11 +269,13 @@ void BifurcatedGraphicsContext::drawPattern(NativeImage& nativeImage, const Floa + m_secondaryContext.drawPattern(nativeImage, imageSize, destRect, tileRect, patternTransform, phase, spacing, options); + } + ++#if ENABLE(VIDEO) + void BifurcatedGraphicsContext::paintFrameForMedia(MediaPlayer& player, const FloatRect& destination) + { + m_primaryContext.paintFrameForMedia(player, destination); + m_secondaryContext.paintFrameForMedia(player, destination); + } ++#endif // ENABLE(VIDEO) + + void BifurcatedGraphicsContext::scale(const FloatSize& scale) + { +-- +2.33.1 + diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index ff8bd1f30a..acb3ec4a3e 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.32.4.tar.xz.sums -md5 94ca1cc3f7b2de8b96c59d6e59cafcd0 wpewebkit-2.32.4.tar.xz -sha1 19b8ebdbfef193ca50f7625703d871db87624f86 wpewebkit-2.32.4.tar.xz -sha256 381f1422cbc319db1aa42dda48de39590ed90ac3bec6b81ec83f3f2cae5c3eeb wpewebkit-2.32.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.34.1.tar.xz.sums +md5 915e583b0e7e82efa155cbce917d6319 wpewebkit-2.34.1.tar.xz +sha1 452081b6df9d079f26d22bd0dca9e90f87943089 wpewebkit-2.34.1.tar.xz +sha256 cb336986341be9c3a9b1ca2c18de0d29d90ae4e77b9967a6f6879597e7a969f7 wpewebkit-2.34.1.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 0242f7a288..606a1531c0 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.32.4 +WPEWEBKIT_VERSION = 2.34.1 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -23,6 +23,8 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF \ + -DUSE_LCMS=OFF \ + -DUSE_SOUP2=ON \ -DSILENCE_CROSS_COMPILATION_NOTICES=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) From 84e90ce45c34eb21596e4208510605ddb507419a Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 26 Oct 2021 01:44:03 +0300 Subject: [PATCH 086/176] package/wpewebkit: use lcms2 for if available Make wpewebkit support color management if the lcms2 package has been selected. Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wpewebkit/wpewebkit.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 606a1531c0..fbe87862a7 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -23,7 +23,6 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DUSE_LCMS=OFF \ -DUSE_SOUP2=ON \ -DSILENCE_CROSS_COMPILATION_NOTICES=ON @@ -67,6 +66,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_LCMS2),y) +WPEWEBKIT_CONF_OPTS += -DUSE_LCMS=ON +WPEWEBKIT_DEPENDENCIES += lcms2 +else +WPEWEBKIT_CONF_OPTS += -DUSE_LCMS=OFF +endif + ifeq ($(BR2_PACKAGE_WOFF2),y) WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON WPEWEBKIT_DEPENDENCIES += woff2 From 3db4d486d689b4a9d59c8f7637211893b0a1cb1b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Oct 2021 21:56:01 +0200 Subject: [PATCH 087/176] package/libmediaart: bump to version 1.9.5 - Switch to meson-package - Drop BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE which is not supported anymore - Update indentation in hash file (two spaces) https://gitlab.gnome.org/GNOME/libmediaart/-/blob/1.9.5/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 9 ++ .../0001-meson-add-introspection-option.patch | 87 +++++++++++++++++++ .../0002-meson-add-unit_tests-option.patch | 48 ++++++++++ package/libmediaart/Config.in | 8 +- package/libmediaart/libmediaart.hash | 6 +- package/libmediaart/libmediaart.mk | 25 ++---- 6 files changed, 157 insertions(+), 26 deletions(-) create mode 100644 package/libmediaart/0001-meson-add-introspection-option.patch create mode 100644 package/libmediaart/0002-meson-add-unit_tests-option.patch diff --git a/Config.in.legacy b/Config.in.legacy index 40011a1890..f3ecf981c0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,15 @@ endif ############################################################################### +comment "Legacy options removed in 2022.02" + +config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE + bool "libmediaart 'none' backend removed" + select BR2_LEGACY + help + 'none' backend has been removed from libmediaart since version + 1.9.5. + comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS diff --git a/package/libmediaart/0001-meson-add-introspection-option.patch b/package/libmediaart/0001-meson-add-introspection-option.patch new file mode 100644 index 0000000000..2b849040fe --- /dev/null +++ b/package/libmediaart/0001-meson-add-introspection-option.patch @@ -0,0 +1,87 @@ +From ee7d8736af172cd5ad71a0bd511c39daf401e3f6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 5 Oct 2021 23:35:26 +0200 +Subject: [PATCH] meson: add introspection option + +Add introspection option + +Fix #3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/libmediaart/-/merge_requests/14] +--- + libmediaart/meson.build | 42 +++++++++++++++++++++-------------------- + meson_options.txt | 2 ++ + 2 files changed, 24 insertions(+), 20 deletions(-) + +diff --git a/libmediaart/meson.build b/libmediaart/meson.build +index 56e00ab..2f44e63 100644 +--- a/libmediaart/meson.build ++++ b/libmediaart/meson.build +@@ -41,28 +41,30 @@ libmediaart = shared_library( + install: true, + ) + +-gir_args = [ +- '--quiet', +- '-DLIBMEDIAART_COMPILATION', +-] ++if get_option('introspection') ++ gir_args = [ ++ '--quiet', ++ '-DLIBMEDIAART_COMPILATION', ++ ] + +-libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart, +- sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers, +- nsversion: libmediaart_api_version, +- namespace: 'MediaArt', +- identifier_prefix: 'MediaArt', +- symbol_prefix: 'media_art', +- includes: ['Gio-2.0', 'GObject-2.0'], +- header: 'libmediaart/mediaart.h', +- export_packages: 'libmediaart-' + libmediaart_api_version, +- extra_args: gir_args, +- install: true +-) ++ libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart, ++ sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers, ++ nsversion: libmediaart_api_version, ++ namespace: 'MediaArt', ++ identifier_prefix: 'MediaArt', ++ symbol_prefix: 'media_art', ++ includes: ['Gio-2.0', 'GObject-2.0'], ++ header: 'libmediaart/mediaart.h', ++ export_packages: 'libmediaart-' + libmediaart_api_version, ++ extra_args: gir_args, ++ install: true ++ ) + +-libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version, +- sources: libmediaart_gir_and_typelib[0], +- packages: 'gio-2.0', +- install: true) ++ libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version, ++ sources: libmediaart_gir_and_typelib[0], ++ packages: 'gio-2.0', ++ install: true) ++endif + + libmediaart_dep = declare_dependency( + link_with: libmediaart, +diff --git a/meson_options.txt b/meson_options.txt +index 3ef49ba..b8c51b1 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,7 @@ + option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'], + description: 'Which image processing backend to use') ++option('introspection', type : 'boolean', value : 'true', ++ description : 'Enable / disable the GObject-Introspection integration') + option('gtk_doc', + type: 'boolean', + value: 'false', +-- +2.33.0 + diff --git a/package/libmediaart/0002-meson-add-unit_tests-option.patch b/package/libmediaart/0002-meson-add-unit_tests-option.patch new file mode 100644 index 0000000000..3519ff1984 --- /dev/null +++ b/package/libmediaart/0002-meson-add-unit_tests-option.patch @@ -0,0 +1,48 @@ +From 01d94777d9d1906750db0e27e2e7b8f228ae4343 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 9 Oct 2021 23:45:53 +0200 +Subject: [PATCH] meson: add unit_tests option + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet (waiting feedback on first patch)] +--- + meson_options.txt | 2 ++ + tests/meson.build | 14 ++++++++------ + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index b8c51b1..1172f93 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,6 +2,8 @@ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'q + description: 'Which image processing backend to use') + option('introspection', type : 'boolean', value : 'true', + description : 'Enable / disable the GObject-Introspection integration') ++option('unit_tests', type : 'boolean', value : 'true', ++ description : 'Enable / disable unit tests') + option('gtk_doc', + type: 'boolean', + value: 'false', +diff --git a/tests/meson.build b/tests/meson.build +index 28834c0..02c96a1 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -1,7 +1,9 @@ +-mediaart_test = executable('mediaart-test', +- 'mediaarttest.c', +- dependencies: libmediaart_dep, +-) ++if get_option('unit_tests') ++ mediaart_test = executable('mediaart-test', ++ 'mediaarttest.c', ++ dependencies: libmediaart_dep, ++ ) + +-test('mediaart', mediaart_test, +- env: 'G_TEST_SRCDIR=' + meson.current_source_dir()) ++ test('mediaart', mediaart_test, ++ env: 'G_TEST_SRCDIR=' + meson.current_source_dir()) ++endif +-- +2.33.0 + diff --git a/package/libmediaart/Config.in b/package/libmediaart/Config.in index c11d6f49d9..d7973444ae 100644 --- a/package/libmediaart/Config.in +++ b/package/libmediaart/Config.in @@ -18,13 +18,7 @@ if BR2_PACKAGE_LIBMEDIAART choice prompt "media art backend" - default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE - -config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE - bool "none" - help - With no backend, libmediaart will not be able to process MP3 - album art. + default BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF config BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF bool "gdk-pixbuf" diff --git a/package/libmediaart/libmediaart.hash b/package/libmediaart/libmediaart.hash index d51c056223..d7115b20d4 100644 --- a/package/libmediaart/libmediaart.hash +++ b/package/libmediaart/libmediaart.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/libmediaart/1.9/libmediaart-1.9.4.sha256sum: -sha256 a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d libmediaart-1.9.4.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/libmediaart/1.9/libmediaart-1.9.5.sha256sum: +sha256 07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6 libmediaart-1.9.5.tar.xz # Locally computed: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk index 0d110a43e5..b4c09d85e1 100644 --- a/package/libmediaart/libmediaart.mk +++ b/package/libmediaart/libmediaart.mk @@ -5,39 +5,32 @@ ################################################################################ LIBMEDIAART_VERSION_MAJOR = 1.9 -LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).4 +LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).5 LIBMEDIAART_SOURCE = libmediaart-$(LIBMEDIAART_VERSION).tar.xz LIBMEDIAART_SITE = \ http://ftp.gnome.org/pub/gnome/sources/libmediaart/$(LIBMEDIAART_VERSION_MAJOR) LIBMEDIAART_LICENSE = LGPL-2.1+ LIBMEDIAART_LICENSE_FILES = COPYING.LESSER LIBMEDIAART_INSTALL_STAGING = YES -LIBMEDIAART_DEPENDENCIES = libglib2 -LIBMEDIAART_CONF_OPTS = --disable-unit-tests +LIBMEDIAART_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) +LIBMEDIAART_CONF_OPTS = -Dunit_tests=false +LIBMEDIAART_LDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y) LIBMEDIAART_DEPENDENCIES += gdk-pixbuf -LIBMEDIAART_CONF_OPTS += \ - --enable-gdkpixbuf \ - --disable-qt +LIBMEDIAART_CONF_OPTS += -Dimage_library=gdk-pixbuf else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y) # qt5 needs c++11 (since qt-5.7) LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" LIBMEDIAART_DEPENDENCIES += qt5base -LIBMEDIAART_CONF_OPTS += \ - --disable-gdkpixbuf \ - --enable-qt -else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE),y) -LIBMEDIAART_CONF_OPTS += \ - --disable-gdkpixbuf \ - --disable-qt +LIBMEDIAART_CONF_OPTS += -Dimage_library=qt5 endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBMEDIAART_CONF_OPTS += --enable-introspection +LIBMEDIAART_CONF_OPTS += -Dintrospection=true LIBMEDIAART_DEPENDENCIES += gobject-introspection else -LIBMEDIAART_CONF_OPTS += --disable-introspection +LIBMEDIAART_CONF_OPTS += -Dintrospection=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From e9df5b0fc3f6e8bb36deedefb392bbc968116ee7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 26 Oct 2021 15:47:03 -0600 Subject: [PATCH 088/176] package/python-markupsafe: bump to version 2.0.1 Drop python2 support. Remove python3-markupsafe host build as python2 host builds for markupsafe are not supported, python3 host builds are moved to python-markupsafe. Remove python3-jinja2 host build as python2 host builds for jinja2 are not supported, python3 host builds are moved to python-jinja2. Remove python3-mako host build as python2 host builds for mako are not supported, python3 host builds are moved to python-mako. Propagate reverse python3 dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gnuradio/gnuradio.mk | 2 +- package/jailhouse/Config.in | 6 +++--- package/libcamera/libcamera.mk | 2 +- package/mesa3d/mesa3d.mk | 2 +- package/python-flask-babel/Config.in | 1 + package/python-flask-cors/Config.in | 1 + package/python-flask-expects-json/Config.in | 1 + package/python-flask-jsonrpc/Config.in | 1 + package/python-flask-login/Config.in | 1 + package/python-flask-sqlalchemy/Config.in | 1 + package/python-flask/Config.in | 1 + package/python-jinja2/Config.in | 4 ++-- package/python-jinja2/python-jinja2.mk | 16 +++------------ package/python-mako/python-mako.mk | 4 ++-- package/python-markupsafe/Config.in | 1 + .../python-markupsafe/python-markupsafe.hash | 9 +++++---- .../python-markupsafe/python-markupsafe.mk | 7 ++++--- package/python-wtforms/Config.in | 1 + package/python3-jinja2/python3-jinja2.hash | 1 - package/python3-jinja2/python3-jinja2.mk | 20 ------------------- package/python3-mako/python3-mako.hash | 1 - package/python3-mako/python3-mako.mk | 18 ----------------- .../python3-markupsafe.hash | 1 - .../python3-markupsafe/python3-markupsafe.mk | 16 --------------- package/systemd/systemd.mk | 4 ++-- package/uhd/uhd.mk | 2 +- 26 files changed, 34 insertions(+), 90 deletions(-) delete mode 120000 package/python3-jinja2/python3-jinja2.hash delete mode 100644 package/python3-jinja2/python3-jinja2.mk delete mode 120000 package/python3-mako/python3-mako.hash delete mode 100644 package/python3-mako/python3-mako.mk delete mode 120000 package/python3-markupsafe/python3-markupsafe.hash delete mode 100644 package/python3-markupsafe/python3-markupsafe.mk diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 36d7ee65cf..2272a1162a 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -20,7 +20,7 @@ endif # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ + host-python3 \ host-python-mako \ host-python-six \ host-swig \ diff --git a/package/jailhouse/Config.in b/package/jailhouse/Config.in index 596b4951db..445414162f 100644 --- a/package/jailhouse/Config.in +++ b/package/jailhouse/Config.in @@ -11,15 +11,15 @@ if BR2_PACKAGE_JAILHOUSE config BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS bool "helper scripts" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MAKO # runtime help Python-based helpers for the Jailhouse Hypervisor. https://github.com/siemens/jailhouse -comment "helper scripts require Python" - depends on !BR2_PACKAGE_PYTHON +comment "helper scripts require Python3" + depends on !BR2_PACKAGE_PYTHON3 endif diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 5a5f2800b9..0052ca558a 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -10,7 +10,7 @@ LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ host-pkgconf \ - host-python3-jinja2 \ + host-python-jinja2 \ host-python3-ply \ host-python3-pyyaml \ gnutls diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index dc63d8c9f4..e5cb65df36 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -20,7 +20,7 @@ MESA3D_PROVIDES = MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ - host-python3-mako \ + host-python-mako \ expat \ libdrm \ zlib diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in index 272d9ef1c1..52f05f1e6a 100644 --- a/package/python-flask-babel/Config.in +++ b/package/python-flask-babel/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK_BABEL bool "python-flask-babel" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_BABEL # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in index e2e84797f9..f34f77e5b0 100644 --- a/package/python-flask-cors/Config.in +++ b/package/python-flask-cors/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK_CORS bool "python-flask-cors" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in index 901234762e..efe4c248d3 100644 --- a/package/python-flask-expects-json/Config.in +++ b/package/python-flask-expects-json/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON bool "python-flask-expects-json" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime help diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in index c8ecd854b3..4bc13f9bcb 100644 --- a/package/python-flask-jsonrpc/Config.in +++ b/package/python-flask-jsonrpc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK_JSONRPC bool "python-flask-jsonrpc" + depends on BR2_PACKAGE_PYTHON3 # runtime dependency select BR2_PACKAGE_PYTHON_FLASK help diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in index 88c413e2a2..00fa58d783 100644 --- a/package/python-flask-login/Config.in +++ b/package/python-flask-login/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK_LOGIN bool "python-flask-login" + depends on BR2_PACKAGE_PYTHON3 # runtime dependency select BR2_PACKAGE_PYTHON_FLASK help diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in index fa4a035110..e96bd7078c 100644 --- a/package/python-flask-sqlalchemy/Config.in +++ b/package/python-flask-sqlalchemy/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY bool "python-flask-sqlalchemy" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime help diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in index 0e5b64ce59..56bfe10f01 100644 --- a/package/python-flask/Config.in +++ b/package/python-flask/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_FLASK bool "python-flask" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in index 5b99df75b8..8ba2fa4df8 100644 --- a/package/python-jinja2/Config.in +++ b/package/python-jinja2/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PYTHON_JINJA2 bool "python-jinja2" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime - select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_UNICODEDATA help Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index f91cac6937..e3f47f953a 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,7 +4,6 @@ # ################################################################################ -# Please keep in sync with package/python3-jinja2/python3-jinja2.mk PYTHON_JINJA2_VERSION = 2.11.3 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7 @@ -14,20 +13,11 @@ PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst PYTHON_JINJA2_CPE_ID_VENDOR = pocoo PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 -# In host build, setup.py tries to download markupsafe if it is not installed +# In host/target build, setup.py tries to download markupsafe if it is not installed +PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe -# Both asyncsupport.py and asyncfilters.py use async feature, that is -# not available in Python 2 and some features available in Python 3.6. -# So in both cases *.py compilation would produce compiler errors. -# Hence remove both files after package extraction. -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT - rm $(@D)/src/jinja2/asyncsupport.py $(@D)/src/jinja2/asyncfilters.py -endef - -PYTHON_JINJA2_POST_EXTRACT_HOOKS = PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT -endif +HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 6529d0d520..26fe95c606 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,8 +4,6 @@ # ################################################################################ -# Please keep in sync with -# package/python3-mako/python3-mako.mk PYTHON_MAKO_VERSION = 1.1.5 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/d1/42/ff293411e980debfc647be9306d89840c8b82ea24571b014f1a35b2ad80f @@ -13,6 +11,8 @@ PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE +HOST_PYTHON_MAKO_NEEDS_HOST_PYTHON = python3 + # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in index 48421e0a32..cd7cb2d8e9 100644 --- a/package/python-markupsafe/Config.in +++ b/package/python-markupsafe/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_MARKUPSAFE bool "python-markupsafe" + depends on BR2_PACKAGE_PYTHON3 help MarkupSafe implements a XML/HTML/XHTML Markup safe string for Python. diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash index df07662a86..520bb405fb 100644 --- a/package/python-markupsafe/python-markupsafe.hash +++ b/package/python-markupsafe/python-markupsafe.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/markupsafe/json, sha256 locally computed -md5 43fd756864fe42063068e092e220c57b MarkupSafe-1.1.1.tar.gz -sha256 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b MarkupSafe-1.1.1.tar.gz -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst +# md5, sha256 from https://pypi.org/pypi/markupsafe/json +md5 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz +sha256 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a MarkupSafe-2.0.1.tar.gz +# Locally computed sha256 checksums +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index f067d94f34..14a8d06dfe 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -4,13 +4,14 @@ # ################################################################################ -# Please keep in sync with package/python3-markupsafe/python3-markupsafe.mk -PYTHON_MARKUPSAFE_VERSION = 1.1.1 +PYTHON_MARKUPSAFE_VERSION = 2.0.1 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz -PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094 +PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst +HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3 + $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in index 33a17d3d37..0cc136fc13 100644 --- a/package/python-wtforms/Config.in +++ b/package/python-wtforms/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_WTFORMS bool "python-wtforms" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime help A flexible forms validation and rendering library for diff --git a/package/python3-jinja2/python3-jinja2.hash b/package/python3-jinja2/python3-jinja2.hash deleted file mode 120000 index 543e981aa0..0000000000 --- a/package/python3-jinja2/python3-jinja2.hash +++ /dev/null @@ -1 +0,0 @@ -../python-jinja2/python-jinja2.hash \ No newline at end of file diff --git a/package/python3-jinja2/python3-jinja2.mk b/package/python3-jinja2/python3-jinja2.mk deleted file mode 100644 index 5d29e1d889..0000000000 --- a/package/python3-jinja2/python3-jinja2.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python3-jinja2 -# -################################################################################ - -PYTHON3_JINJA2_VERSION = 2.11.3 -PYTHON3_JINJA2_SOURCE = Jinja2-$(PYTHON3_JINJA2_VERSION).tar.gz -PYTHON3_JINJA2_SITE = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7 -PYTHON3_JINJA2_SETUP_TYPE = setuptools -PYTHON3_JINJA2_LICENSE = BSD-3-Clause -PYTHON3_JINJA2_LICENSE_FILES = LICENSE.rst -PYTHON3_JINJA2_CPE_ID_VENDOR = pocoo -PYTHON3_JINJA2_CPE_ID_PRODUCT = jinja2 - -HOST_PYTHON3_JINJA2_NEEDS_HOST_PYTHON = python3 -# In host build, setup.py tries to download markupsafe if it is not installed -HOST_PYTHON3_JINJA2_DEPENDENCIES = host-python3-markupsafe - -$(eval $(host-python-package)) diff --git a/package/python3-mako/python3-mako.hash b/package/python3-mako/python3-mako.hash deleted file mode 120000 index 068be91fb0..0000000000 --- a/package/python3-mako/python3-mako.hash +++ /dev/null @@ -1 +0,0 @@ -../python-mako/python-mako.hash \ No newline at end of file diff --git a/package/python3-mako/python3-mako.mk b/package/python3-mako/python3-mako.mk deleted file mode 100644 index dfe600a4e4..0000000000 --- a/package/python3-mako/python3-mako.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python3-mako -# -################################################################################ - -# Please keep in sync with -# package/python-mako/python-mako.mk -PYTHON3_MAKO_VERSION = 1.1.5 -PYTHON3_MAKO_SOURCE = Mako-$(PYTHON3_MAKO_VERSION).tar.gz -PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/d1/42/ff293411e980debfc647be9306d89840c8b82ea24571b014f1a35b2ad80f -PYTHON3_MAKO_SETUP_TYPE = setuptools -PYTHON3_MAKO_LICENSE = MIT -PYTHON3_MAKO_LICENSE_FILES = LICENSE -HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako -HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) diff --git a/package/python3-markupsafe/python3-markupsafe.hash b/package/python3-markupsafe/python3-markupsafe.hash deleted file mode 120000 index 947cfa12d7..0000000000 --- a/package/python3-markupsafe/python3-markupsafe.hash +++ /dev/null @@ -1 +0,0 @@ -../python-markupsafe/python-markupsafe.hash \ No newline at end of file diff --git a/package/python3-markupsafe/python3-markupsafe.mk b/package/python3-markupsafe/python3-markupsafe.mk deleted file mode 100644 index 58f6e67b64..0000000000 --- a/package/python3-markupsafe/python3-markupsafe.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python3-markupsafe -# -################################################################################ - -PYTHON3_MARKUPSAFE_VERSION = 1.1.1 -PYTHON3_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON3_MARKUPSAFE_VERSION).tar.gz -PYTHON3_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094 -PYTHON3_MARKUPSAFE_SETUP_TYPE = setuptools -PYTHON3_MARKUPSAFE_LICENSE = BSD-3-Clause -PYTHON3_MARKUPSAFE_LICENSE_FILES = LICENSE.rst - -HOST_PYTHON3_MARKUPSAFE_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package)) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a8b11faa5e..619c2b48c9 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -14,7 +14,7 @@ SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ - host-python3-jinja2 \ + host-python-jinja2 \ kmod \ libcap \ util-linux-libs \ @@ -738,7 +738,7 @@ HOST_SYSTEMD_DEPENDENCIES = \ host-patchelf \ host-libcap \ host-gperf \ - host-python3-jinja2 + host-python-jinja2 HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) diff --git a/package/uhd/uhd.mk b/package/uhd/uhd.mk index 125eb05121..5da1697925 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -15,7 +15,7 @@ UHD_INSTALL_STAGING = YES UHD_DEPENDENCIES = \ boost \ - $(if $(BR2_PACKAGE_PYTHON),host-python,host-python3) \ + host-python3 \ host-python-mako UHD_CONF_OPTS = \ From 873dc46faf204439da1adc9deed5102cdc522f41 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 26 Oct 2021 15:47:04 -0600 Subject: [PATCH 089/176] package/python-jinja2: bump to version 3.0.2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/python-jinja2/python-jinja2.hash | 4 ++-- package/python-jinja2/python-jinja2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash index 51590b17d2..afd07e89f1 100644 --- a/package/python-jinja2/python-jinja2.hash +++ b/package/python-jinja2/python-jinja2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jinja2/json -md5 231dc00d34afb2672c497713fa9cdaaa Jinja2-2.11.3.tar.gz -sha256 a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6 Jinja2-2.11.3.tar.gz +md5 059f89375d7ea60eb7013f341f0b89e7 Jinja2-3.0.2.tar.gz +sha256 827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 Jinja2-3.0.2.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index e3f47f953a..bb53f95699 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 2.11.3 +PYTHON_JINJA2_VERSION = 3.0.2 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/f8/86/7c0eb6e8b05385d1ce682abc0f994abd1668e148fb52603fa86e15d4c110 PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst From 12c01079bdb4a82ac91dee3e9826b070faaddb78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Wed, 27 Oct 2021 10:35:02 +0200 Subject: [PATCH 090/176] package/stress-ng: bump to version 0.13.05 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project URL returns 404 error because: Quoting Coling King: "Unfortunately when I left Canonical last week they removed my tarballs" So use github and update hash. Signed-off-by: Sébastien Szymanski Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/stress-ng/Config.in | 2 +- package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 64b473b75c..839cbb1cc0 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_STRESS_NG subsystems of a computer as well as the various operating system kernel interfaces. - http://kernel.ubuntu.com/~cking/stress-ng/ + https://github.com/ColinIanKing/stress-ng comment "stress-ng needs a toolchain w/ headers >= 3.3" depends on !BR2_nios2 && !BR2_arc diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index f3eb76fa82..2e3f998769 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f37f739e4d15343360a47980b67dc8b2a6bf3d4d3ef727d55e2dd99a0b64f9ea stress-ng-0.13.01.tar.xz +sha256 3de49e1100866634f549e99c1644283d0cde817b844a69dcf7f80afa2227d350 stress-ng-0.13.05.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index e0b385e756..0b2287c7fb 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,9 +4,8 @@ # ################################################################################ -STRESS_NG_VERSION = 0.13.01 -STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz -STRESS_NG_SITE = https://kernel.ubuntu.com/~cking/tarballs/stress-ng +STRESS_NG_VERSION = 0.13.05 +STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING From 033ef8497aba5a87e3812ca474af2320fbabe72f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 28 Oct 2021 17:31:07 +0200 Subject: [PATCH 091/176] package/kodi: use libgbm virtual package Kodi needs gbm_bo_get_fd: https://github.com/xbmc/xbmc/blob/Matrix/xbmc/utils/GBMBufferObject.cpp#L54 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/kodi/Config.in | 3 ++- package/kodi/kodi.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index af7604428e..e594219418 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -22,7 +22,8 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM bool default y depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_MESA3D_GBM + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 934cce6de2..a2c42b64c9 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -92,7 +92,7 @@ endif ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM),y) KODI_CORE_PLATFORM_NAME += gbm -KODI_DEPENDENCIES += libinput libxkbcommon mesa3d +KODI_DEPENDENCIES += libgbm libinput libxkbcommon endif ifeq ($(BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND),y) From 147e2a27151f5e35311f66e374f0ec5ea9c10505 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 10:48:34 +0100 Subject: [PATCH 092/176] package/jpeg-turbo: bump version to 2.1.2 Changelogs: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.0 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.1 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.2 Updated license hashes due to upstream commits: https://github.com/libjpeg-turbo/libjpeg-turbo/commits/main/LICENSE.md https://github.com/libjpeg-turbo/libjpeg-turbo/commits/main/README.ijg Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/jpeg-turbo/jpeg-turbo.hash | 12 ++++++------ package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index 1a22b1d6ff..de82199659 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.6/ -sha1 5406c7676d7df89fb4da791ad5af51202910fb25 libjpeg-turbo-2.0.6.tar.gz -md5 4cada3f0bdc93d826fa31bf9e4469ef6 libjpeg-turbo-2.0.6.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.2/ +sha1 65c51c543b1fbba6db9ff5bee474ccb0b52a929f libjpeg-turbo-2.1.2.tar.gz +md5 e181bd78884dd5392a869209bfa41d4a libjpeg-turbo-2.1.2.tar.gz # Locally computed -sha256 d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb libjpeg-turbo-2.0.6.tar.gz -sha256 0b7a24c3906d26dfbe24e96e9415549b387c3227140dc6b7ab2fb924254e37a1 LICENSE.md -sha256 01ccef626ec864773c681d4a4056f72af9052d619e0609df0d369117f8b3efdf README.ijg +sha256 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 libjpeg-turbo-2.1.2.tar.gz +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 LICENSE.md +sha256 4b7b9f8c03bb8d60270dfd12684e70ab21e4abfd27e73905cd1a7c4cae6f5cdb README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 5c977dc029..ddae019839 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.0.6 +JPEG_TURBO_VERSION = 2.1.2 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) From 3da8a3cfd658863a2e22c8ba2460ec9184686146 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:01:08 +0100 Subject: [PATCH 093/176] package/intel-gmmlib: bump version to 21.3.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index cb4bd691c4..88f82a9596 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d26a6512a1b3ca604dabe035ddaf47b4b445bd503eac69a59e4acb2d1f54634b intel-gmmlib-21.3.1.tar.gz +sha256 77473df5440915e7c487a0f1c3f6236a8c29610528c6f0833da9caae834a1741 intel-gmmlib-21.3.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 5feda94308..2071d9f533 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 21.3.1 +INTEL_GMMLIB_VERSION = 21.3.3 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 5563869d26e47e89cd56c6ddf256358e2c2b8cda Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:01:09 +0100 Subject: [PATCH 094/176] package/intel-mediadriver: bump version to 21.4.1 Rebased patch. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Add-MEDIA-BUILD-HARDENING-option.patch | 3 ++- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch index 1bb92de5c3..968445759a 100644 --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch +++ b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch @@ -12,6 +12,7 @@ Patch sent upstream: https://github.com/intel/media-driver/pull/1242 Signed-off-by: Fabrice Fontaine Signed-off-by: Bernd Kuhls +[Bernd: rebased for version 21.4.1] --- cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- @@ -88,7 +89,7 @@ diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.c index f089ea45f..b0b428914 100755 --- a/media_driver/media_top_cmake.cmake +++ b/media_driver/media_top_cmake.cmake -@@ -111,7 +111,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) +@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") endif() diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 4376f46ff0..97b7256e36 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 182925ed21c0a9843a63865e34dc35bf713294260d14ceb29e8de0de2e34733f intel-media-21.3.5.tar.gz +sha256 4cd9f2b4da82883a8ed4fb45ba8f186c32941b5f4f3b7d61f2b2b8c19e634281 intel-media-21.4.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index a62ebab414..3c329cbf71 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 21.3.5 +INTEL_MEDIADRIVER_VERSION = 21.4.1 INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 0db05a3d0a57187a017199aad66e97645078f3a1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:01:10 +0100 Subject: [PATCH 095/176] package/intel-mediasdk: bump version to 21.4.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/intel-mediasdk/intel-mediasdk.hash | 2 +- package/intel-mediasdk/intel-mediasdk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 8143867995..69a7422741 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f13869298d3946d7d91e58846e274ef62cd5af2473f59f36b57b2c27ebfd87c intel-mediasdk-21.3.5.tar.gz +sha256 d9358dc784c4146fd21faffbba03c304684978de1ce34d3714bd2c6b50233d14 intel-mediasdk-21.4.1.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index a0492412e8..57276bbd74 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 21.3.5 +INTEL_MEDIASDK_VERSION = 21.4.1 INTEL_MEDIASDK_SITE = http://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE From 76a9c46b766e093ebb2e1705a5448fd9469e121c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:04:49 +0100 Subject: [PATCH 096/176] package/fetchmail: bump version to 6.4.24 Release notes: https://sourceforge.net/p/fetchmail/mailman/message/37388106/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 9935858b20..3d4c3da3dc 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37376434/ -sha256 5f7a5e13731431134a2ca535bbced7adc666d3aeb93169a0830945d91f492300 fetchmail-6.4.23.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37388106/ +sha256 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf fetchmail-6.4.24.tar.xz # Locally computed: sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index c909bb5cfb..7d6be71954 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).23 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).24 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From 93dec5ec24cb909d42107658291494460f52a2cc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:18:16 +0100 Subject: [PATCH 097/176] package/dovecot-pigeonhole: bump version to 0.5.17 Release notes: https://dovecot.org/pipermail/dovecot-news/2021-October/000467.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 3b7c04834c..c70c48a5a8 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938 dovecot-2.3-pigeonhole-0.5.16.tar.gz +sha256 031e823966c53121e289b3ecdcfa4bc35ed9d22ecbf5d93a8eb140384e78d648 dovecot-2.3-pigeonhole-0.5.17.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 490bad35c6..dddb7f31e0 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.16 +DOVECOT_PIGEONHOLE_VERSION = 0.5.17 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From b5da5e55451d280fac82b97749bbb51f3e5213c6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:18:17 +0100 Subject: [PATCH 098/176] package/dovecot: bump version to 2.3.17 Release notes: https://dovecot.org/pipermail/dovecot-news/2021-October/000465.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index c7cbf46e47..a9043a2d83 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12 dovecot-2.3.16.tar.gz +sha256 224412cd77a23a3ffb857da294da200883d956082cff7257942eff2789bd2df9 dovecot-2.3.17.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 733917b062..f8d28081bf 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).16 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From 5373215617d5e9747335ec3354207933a4bd9ba5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:22:43 +0100 Subject: [PATCH 099/176] package/jsoncpp: bump version to 1.9.5 Updates license hash due to upstream whitespace fixes: https://github.com/open-source-parsers/jsoncpp/commit/be4a512887e350adc8b1ae19bc2cb81d15c8846f#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7 Release notes: https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/jsoncpp/jsoncpp.hash | 4 ++-- package/jsoncpp/jsoncpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jsoncpp/jsoncpp.hash b/package/jsoncpp/jsoncpp.hash index 0070a1874e..99266ae42d 100644 --- a/package/jsoncpp/jsoncpp.hash +++ b/package/jsoncpp/jsoncpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999 jsoncpp-1.9.4.tar.gz -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a LICENSE +sha256 f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2 jsoncpp-1.9.5.tar.gz +sha256 cec0db5f6d7ed6b3a72647bd50aed02e13c3377fd44382b96dc2915534c042ad LICENSE diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 829459df4d..e7022bfd39 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.9.4 +JSONCPP_VERSION = 1.9.5 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE From c95b9b98b811fcad463890ac6e57ff9eb5008967 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:30:25 +0100 Subject: [PATCH 100/176] package/libcodec2: bump version to 1.0.1 Reformatted hashes. Release notes: https://github.com/drowe67/codec2/releases/tag/v1.0.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libcodec2/libcodec2.hash | 4 ++-- package/libcodec2/libcodec2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcodec2/libcodec2.hash b/package/libcodec2/libcodec2.hash index ec4f1f1a32..795ca37006 100644 --- a/package/libcodec2/libcodec2.hash +++ b/package/libcodec2/libcodec2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 19181a446f4df3e6d616b50cabdac4485abb9cd3242cf312a0785f892ed4c76c libcodec2-0.9.2.tar.gz -sha256 9ebb6f82b7380a62ac74c5f0322c88e6744dedf2ebe1f54d6f088282b39844bf COPYING +sha256 14227963940d79e0ec5af810f37101b30e1c7e8555abd96c56b3c0473abac8ef libcodec2-1.0.1.tar.gz +sha256 9ebb6f82b7380a62ac74c5f0322c88e6744dedf2ebe1f54d6f088282b39844bf COPYING diff --git a/package/libcodec2/libcodec2.mk b/package/libcodec2/libcodec2.mk index 8410ffc90a..b4f08a496e 100644 --- a/package/libcodec2/libcodec2.mk +++ b/package/libcodec2/libcodec2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCODEC2_VERSION = 0.9.2 +LIBCODEC2_VERSION = 1.0.1 LIBCODEC2_SITE = $(call github,drowe67,codec2,v$(LIBCODEC2_VERSION)) LIBCODEC2_LICENSE = LGPL-2.1 LIBCODEC2_LICENSE_FILES = COPYING From 7d3a43f23f88aab33d645c81dd46a9fc5f23cd80 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:33:38 +0100 Subject: [PATCH 101/176] package/libdrm: bump version to 2.4.108 Updated license due to upstream commits: https://cgit.freedesktop.org/mesa/drm/log/xf86drm.c?h=main Release notes: https://lists.freedesktop.org/archives/dri-devel/2021-November/330279.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 8 ++++---- package/libdrm/libdrm.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index d3f35b3de0..ee14d4c124 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2021-July/313594.html -sha256 c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888 libdrm-2.4.107.tar.xz -sha512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0 libdrm-2.4.107.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2021-November/330279.html +sha256 a1d7948cbc536763fde14b4beb5e4da7867607966d4cf46301087e8b8fe3d6a0 libdrm-2.4.108.tar.xz +sha512 6a841dc3eb8eae7d75e1d35d23a14d51aff758e5a251dbcf6fc8c28d973d935a4a2f6751b405e956b2777d93c651721199ac80c3cd14b87d021668120d6bc974 libdrm-2.4.108.tar.xz # Hash for license file -sha256 7e952c6666ed17c99f91ee7af13c688b8769b0feaf6f4558bf6ad3e07512e1e6 xf86drm.c +sha256 e64a695d0f18bfba26071afdfe19dd6ff4030d0dc1c47304059b724b23955ddb xf86drm.c diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index c15be3e671..0e4029fed2 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.107 +LIBDRM_VERSION = 2.4.108 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From d6e79bde26cd723f8843f7604292304b356a9369 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:36:13 +0100 Subject: [PATCH 102/176] package/ytree: bump version to 2.04 Release notes: https://www.han.de/~werner/ytree.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ytree/ytree.hash | 2 +- package/ytree/ytree.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ytree/ytree.hash b/package/ytree/ytree.hash index 17d0d24c74..88ca8282bf 100644 --- a/package/ytree/ytree.hash +++ b/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 583aa71552d1347e0eabe39a236fa5a174bf67dde98871853b9fe2a233bcaef1 ytree-2.03.tar.gz +sha256 6e7a8b7f68efe6d365abe33a1d06d739ad85f22a3d54ddd0aec24a3478d66642 ytree-2.04.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/package/ytree/ytree.mk b/package/ytree/ytree.mk index fdecc0b19b..a64ebe83ed 100644 --- a/package/ytree/ytree.mk +++ b/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.03 +YTREE_VERSION = 2.04 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING From 11c75a7af825f1bf2097a817b1af6edbd47d67a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 11:39:58 +0100 Subject: [PATCH 103/176] package/x11r7/xkeyboard-config: bump version to 2.34 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xkeyboard-config/xkeyboard-config.hash | 2 +- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index fe80291557..a5ae7a7039 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1feee317ba39b91902b0cbd2987c0c73e6afbfc8f4c096367a5c86c216c036a8 xkeyboard-config-2.32.tar.bz2 +sha256 b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce xkeyboard-config-2.34.tar.bz2 sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index 0fd681b59a..fe46dae3b7 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,7 +4,7 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.32 +XKEYBOARD_CONFIG_VERSION = 2.34 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT From ed63b18caf588ad0fed68cd65bca9db58b24e1f0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Nov 2021 12:02:06 +0100 Subject: [PATCH 104/176] package/assimp: bump to version 5.1.0 - Drop patches (already in version) - Update hash of license file, date updated with https://github.com/assimp/assimp/commit/4e7e47bd436f4a97775be22dcdb8e99f5c158606 https://github.com/assimp/assimp/commit/7d68eab4a7183d701782a3e86e54be2938440918 https://github.com/assimp/assimp/releases/tag/v5.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...Converter-use-proper-64-bit-constant.patch | 37 - ...p-to-fix-gcc-build-for-v9-2-0-32-bit.patch | 1638 ----------------- ...oses-2954-upgrade-to-latest-greatest.patch | 243 --- package/assimp/assimp.hash | 4 +- package/assimp/assimp.mk | 2 +- 5 files changed, 3 insertions(+), 1921 deletions(-) delete mode 100644 package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch delete mode 100644 package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch delete mode 100644 package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch diff --git a/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch b/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch deleted file mode 100644 index 1b23d66364..0000000000 --- a/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 30a2ecc7939449f235282eb6de42e367fc5b1867 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 14 Jan 2016 22:13:15 +0100 -Subject: [PATCH] Fix FBXConverter: use proper 64-bit constant - -Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes: - - code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type - -Signed-off-by: Peter Seiderer -[Rebased on 5.0.1] -Signed-off-by: Peter Seiderer ---- - code/FBX/FBXConverter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/code/FBX/FBXConverter.cpp b/code/FBXConverter.cpp -index e0c6b9c..b1e9a71 100644 ---- a/code/FBX/FBXConverter.cpp -+++ b/code/FBX/FBXConverter.cpp -@@ -67,7 +67,7 @@ namespace FBX { - - #define MAGIC_NODE_TAG "_$AssimpFbx$" - --#define CONVERT_FBX_TIME(time) static_cast(time) / 46186158000L -+#define CONVERT_FBX_TIME(time) static_cast(time) / 46186158000LL - - // XXX vc9's debugger won't step into anonymous namespaces - //namespace { --- -2.1.4 - diff --git a/package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch b/package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch deleted file mode 100644 index 4b86cc584f..0000000000 --- a/package/assimp/0002-closes-2733-update-of-zlip-to-fix-gcc-build-for-v9-2-0-32-bit.patch +++ /dev/null @@ -1,1638 +0,0 @@ -From f78446b14aff46db2ef27d062a275b6a01fd68b1 Mon Sep 17 00:00:00 2001 -From: Kim Kulling -Date: Tue, 19 Nov 2019 20:30:40 +0100 -Subject: [PATCH] closes https://github.com/assimp/assimp/issues/2733: update - of zlip to fix gcc build for v9.2.0 32 bit - -[Retrieved (and updated to remove .gitignore and appveyor.yml) from: -https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1] -Signed-off-by: Fabrice Fontaine ---- - contrib/zip/.gitignore | 2 + - contrib/zip/CMakeLists.txt | 83 +++++- - contrib/zip/README.md | 12 +- - contrib/zip/appveyor.yml | 2 +- - contrib/zip/src/miniz.h | 457 ++++++++++++++++++++++++++++---- - contrib/zip/src/zip.c | 62 +++-- - contrib/zip/src/zip.h | 457 ++++++++++++++++---------------- - contrib/zip/test/CMakeLists.txt | 27 +- - contrib/zip/test/test.c | 38 ++- - contrib/zip/test/test_miniz.c | 25 +- - 10 files changed, 821 insertions(+), 344 deletions(-) - -diff --git a/contrib/zip/CMakeLists.txt b/contrib/zip/CMakeLists.txt -index b46dbb1db0..77916d2e14 100644 ---- a/contrib/zip/CMakeLists.txt -+++ b/contrib/zip/CMakeLists.txt -@@ -1,10 +1,14 @@ --cmake_minimum_required(VERSION 2.8) --project(zip) --enable_language(C) -+cmake_minimum_required(VERSION 3.0) -+ -+project(zip -+ LANGUAGES C -+ VERSION "0.1.15") - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) - -+option(CMAKE_DISABLE_TESTING "Disable test creation" OFF) -+ - if (MSVC) -- # Use secure functions by defaualt and suppress warnings about "deprecated" functions -+ # Use secure functions by default and suppress warnings about "deprecated" functions - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1") -@@ -12,28 +16,80 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic") -+ if(ENABLE_COVERAGE) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") -+ endif() - endif (MSVC) - - # zip - set(SRC src/miniz.h src/zip.h src/zip.c) - add_library(${PROJECT_NAME} ${SRC}) --target_include_directories(${PROJECT_NAME} INTERFACE src) -+target_include_directories(${PROJECT_NAME} PUBLIC -+ $ -+ $ -+) - - # test - if (NOT CMAKE_DISABLE_TESTING) - enable_testing() - add_subdirectory(test) - find_package(Sanitizers) -- add_sanitizers(${PROJECT_NAME} test.exe) -- add_sanitizers(${PROJECT_NAME} test_miniz.exe) -+ add_sanitizers(${PROJECT_NAME} ${test_out} ${test_miniz_out}) - endif() - -+#### -+# Installation (https://github.com/forexample/package-example) { -+ -+set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -+set(INCLUDE_INSTALL_DIR "include") -+ -+set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -+ -+# Configuration -+set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") -+set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") -+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -+set(NAMESPACE "${PROJECT_NAME}::") -+ -+# Include module with fuction 'write_basic_package_version_file' -+include(CMakePackageConfigHelpers) -+ -+# Note: PROJECT_VERSION is used as a VERSION -+write_basic_package_version_file( -+ "${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion -+) -+ -+# Use variables: -+# * TARGETS_EXPORT_NAME -+# * PROJECT_NAME -+configure_package_config_file( -+ "cmake/Config.cmake.in" -+ "${PROJECT_CONFIG}" -+ INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" -+) -+ -+install( -+ FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" -+ DESTINATION "${CONFIG_INSTALL_DIR}" -+) -+ -+install( -+ EXPORT "${TARGETS_EXPORT_NAME}" -+ NAMESPACE "${NAMESPACE}" -+ DESTINATION "${CONFIG_INSTALL_DIR}" -+) -+ -+# } -+ - install(TARGETS ${PROJECT_NAME} -+ EXPORT ${TARGETS_EXPORT_NAME} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -- COMPONENT library) --install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION include) -+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR} -+) -+install(FILES ${PROJECT_SOURCE_DIR}/src/zip.h DESTINATION ${INCLUDE_INSTALL_DIR}/zip) - - # uninstall target (https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake) - if(NOT TARGET uninstall) -@@ -45,3 +101,12 @@ if(NOT TARGET uninstall) - add_custom_target(uninstall - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake) - endif() -+ -+find_package(Doxygen) -+if(DOXYGEN_FOUND) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) -+ add_custom_target(doc -+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile -+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -+ COMMENT "Generating API documentation with Doxygen" VERBATIM) -+endif() -diff --git a/contrib/zip/README.md b/contrib/zip/README.md -index d5fb8cd203..14eb9a34c8 100644 ---- a/contrib/zip/README.md -+++ b/contrib/zip/README.md -@@ -71,7 +71,7 @@ int arg = 2; - zip_extract("foo.zip", "/tmp", on_extract_entry, &arg); - ``` - --* Extract a zip entry into memory. -+* Extract a zip entry into memory. - ```c - void *buf = NULL; - size_t bufsize; -@@ -89,7 +89,7 @@ zip_close(zip); - free(buf); - ``` - --* Extract a zip entry into memory (no internal allocation). -+* Extract a zip entry into memory (no internal allocation). - ```c - unsigned char *buf; - size_t bufsize; -@@ -110,7 +110,7 @@ zip_close(zip); - free(buf); - ``` - --* Extract a zip entry into memory using callback. -+* Extract a zip entry into memory using callback. - ```c - struct buffer_t { - char *data; -@@ -144,7 +144,7 @@ free(buf.data); - ``` - - --* Extract a zip entry into a file. -+* Extract a zip entry into a file. - ```c - struct zip_t *zip = zip_open("foo.zip", 0, 'r'); - { -@@ -157,7 +157,7 @@ struct zip_t *zip = zip_open("foo.zip", 0, 'r'); - zip_close(zip); - ``` - --* List of all zip entries -+* List of all zip entries - ```c - struct zip_t *zip = zip_open("foo.zip", 0, 'r'); - int i, n = zip_total_entries(zip); -@@ -174,7 +174,7 @@ for (i = 0; i < n; ++i) { - zip_close(zip); - ``` - --## Bindings -+# Bindings - Compile zip library as a dynamic library. - ```shell - $ mkdir build -diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h -index 2c27a94d8d..c4fcfb83e6 100644 ---- a/contrib/zip/src/miniz.h -+++ b/contrib/zip/src/miniz.h -@@ -221,6 +221,7 @@ - #ifndef MINIZ_HEADER_INCLUDED - #define MINIZ_HEADER_INCLUDED - -+#include - #include - - // Defines to completely disable specific portions of miniz.c: -@@ -284,7 +285,8 @@ - /* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */ - #if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES) - #if MINIZ_X86_OR_X64_CPU --/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */ -+/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient -+ * integer loads and stores from unaligned addresses. */ - #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 - #define MINIZ_UNALIGNED_USE_MEMCPY - #else -@@ -354,6 +356,44 @@ enum { - MZ_FIXED = 4 - }; - -+/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or -+ * modify this enum. */ -+typedef enum { -+ MZ_ZIP_NO_ERROR = 0, -+ MZ_ZIP_UNDEFINED_ERROR, -+ MZ_ZIP_TOO_MANY_FILES, -+ MZ_ZIP_FILE_TOO_LARGE, -+ MZ_ZIP_UNSUPPORTED_METHOD, -+ MZ_ZIP_UNSUPPORTED_ENCRYPTION, -+ MZ_ZIP_UNSUPPORTED_FEATURE, -+ MZ_ZIP_FAILED_FINDING_CENTRAL_DIR, -+ MZ_ZIP_NOT_AN_ARCHIVE, -+ MZ_ZIP_INVALID_HEADER_OR_CORRUPTED, -+ MZ_ZIP_UNSUPPORTED_MULTIDISK, -+ MZ_ZIP_DECOMPRESSION_FAILED, -+ MZ_ZIP_COMPRESSION_FAILED, -+ MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE, -+ MZ_ZIP_CRC_CHECK_FAILED, -+ MZ_ZIP_UNSUPPORTED_CDIR_SIZE, -+ MZ_ZIP_ALLOC_FAILED, -+ MZ_ZIP_FILE_OPEN_FAILED, -+ MZ_ZIP_FILE_CREATE_FAILED, -+ MZ_ZIP_FILE_WRITE_FAILED, -+ MZ_ZIP_FILE_READ_FAILED, -+ MZ_ZIP_FILE_CLOSE_FAILED, -+ MZ_ZIP_FILE_SEEK_FAILED, -+ MZ_ZIP_FILE_STAT_FAILED, -+ MZ_ZIP_INVALID_PARAMETER, -+ MZ_ZIP_INVALID_FILENAME, -+ MZ_ZIP_BUF_TOO_SMALL, -+ MZ_ZIP_INTERNAL_ERROR, -+ MZ_ZIP_FILE_NOT_FOUND, -+ MZ_ZIP_ARCHIVE_TOO_LARGE, -+ MZ_ZIP_VALIDATION_FAILED, -+ MZ_ZIP_WRITE_CALLBACK_FAILED, -+ MZ_ZIP_TOTAL_ERRORS -+} mz_zip_error; -+ - // Method - #define MZ_DEFLATED 8 - -@@ -696,6 +736,7 @@ typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, - void *pBuf, size_t n); - typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, - const void *pBuf, size_t n); -+typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque); - - struct mz_zip_internal_state_tag; - typedef struct mz_zip_internal_state_tag mz_zip_internal_state; -@@ -707,13 +748,27 @@ typedef enum { - MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3 - } mz_zip_mode; - --typedef struct mz_zip_archive_tag { -+typedef enum { -+ MZ_ZIP_TYPE_INVALID = 0, -+ MZ_ZIP_TYPE_USER, -+ MZ_ZIP_TYPE_MEMORY, -+ MZ_ZIP_TYPE_HEAP, -+ MZ_ZIP_TYPE_FILE, -+ MZ_ZIP_TYPE_CFILE, -+ MZ_ZIP_TOTAL_TYPES -+} mz_zip_type; -+ -+typedef struct { - mz_uint64 m_archive_size; - mz_uint64 m_central_directory_file_ofs; -- mz_uint m_total_files; -+ -+ /* We only support up to UINT32_MAX files in zip64 mode. */ -+ mz_uint32 m_total_files; - mz_zip_mode m_zip_mode; -+ mz_zip_type m_zip_type; -+ mz_zip_error m_last_error; - -- mz_uint m_file_offset_alignment; -+ mz_uint64 m_file_offset_alignment; - - mz_alloc_func m_pAlloc; - mz_free_func m_pFree; -@@ -722,6 +777,7 @@ typedef struct mz_zip_archive_tag { - - mz_file_read_func m_pRead; - mz_file_write_func m_pWrite; -+ mz_file_needs_keepalive m_pNeeds_keepalive; - void *m_pIO_opaque; - - mz_zip_internal_state *m_pState; -@@ -1263,6 +1319,9 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, - int strategy); - #endif // #ifndef MINIZ_NO_ZLIB_APIS - -+#define MZ_UINT16_MAX (0xFFFFU) -+#define MZ_UINT32_MAX (0xFFFFFFFFU) -+ - #ifdef __cplusplus - } - #endif -@@ -1311,6 +1370,11 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1]; - ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) - #endif - -+#define MZ_READ_LE64(p) \ -+ (((mz_uint64)MZ_READ_LE32(p)) | \ -+ (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) \ -+ << 32U)) -+ - #ifdef _MSC_VER - #define MZ_FORCEINLINE __forceinline - #elif defined(__GNUC__) -@@ -4160,6 +4224,17 @@ enum { - MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30, - MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46, - MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22, -+ -+ /* ZIP64 archive identifier and record sizes */ -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20, -+ MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001, -+ MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50, -+ MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24, -+ MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16, -+ - // Central directory header record offsets - MZ_ZIP_CDH_SIG_OFS = 0, - MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4, -@@ -4199,6 +4274,31 @@ enum { - MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12, - MZ_ZIP_ECDH_CDIR_OFS_OFS = 16, - MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20, -+ -+ /* ZIP64 End of central directory locator offsets */ -+ MZ_ZIP64_ECDL_SIG_OFS = 0, /* 4 bytes */ -+ MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4, /* 4 bytes */ -+ MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8, /* 8 bytes */ -+ MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */ -+ -+ /* ZIP64 End of central directory header offsets */ -+ MZ_ZIP64_ECDH_SIG_OFS = 0, /* 4 bytes */ -+ MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4, /* 8 bytes */ -+ MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12, /* 2 bytes */ -+ MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14, /* 2 bytes */ -+ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16, /* 4 bytes */ -+ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20, /* 4 bytes */ -+ MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */ -+ MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32, /* 8 bytes */ -+ MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40, /* 8 bytes */ -+ MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48, /* 8 bytes */ -+ MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0, -+ MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192, -+ MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11 - }; - - typedef struct { -@@ -4211,7 +4311,24 @@ struct mz_zip_internal_state_tag { - mz_zip_array m_central_dir; - mz_zip_array m_central_dir_offsets; - mz_zip_array m_sorted_central_dir_offsets; -+ -+ /* The flags passed in when the archive is initially opened. */ -+ uint32_t m_init_flags; -+ -+ /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. -+ */ -+ mz_bool m_zip64; -+ -+ /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 -+ * will also be slammed to true too, even if we didn't find a zip64 end of -+ * central dir header, etc.) */ -+ mz_bool m_zip64_has_extended_info_fields; -+ -+ /* These fields are used by the file, FILE, memory, and memory/heap read/write -+ * helpers. */ - MZ_FILE *m_pFile; -+ mz_uint64 m_file_archive_start_ofs; -+ - void *m_pMem; - size_t m_mem_size; - size_t m_mem_capacity; -@@ -4363,6 +4480,13 @@ static mz_bool mz_zip_set_file_times(const char *pFilename, time_t access_time, - #endif /* #ifndef MINIZ_NO_STDIO */ - #endif /* #ifndef MINIZ_NO_TIME */ - -+static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, -+ mz_zip_error err_num) { -+ if (pZip) -+ pZip->m_last_error = err_num; -+ return MZ_FALSE; -+} -+ - static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, - mz_uint32 flags) { - (void)flags; -@@ -4480,127 +4604,346 @@ mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip) { - } - } - --static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, -- mz_uint32 flags) { -- mz_uint cdir_size, num_this_disk, cdir_disk_index; -- mz_uint64 cdir_ofs; -+static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, -+ mz_uint32 record_sig, -+ mz_uint32 record_size, -+ mz_int64 *pOfs) { - mz_int64 cur_file_ofs; -- const mz_uint8 *p; - mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; - mz_uint8 *pBuf = (mz_uint8 *)buf_u32; -- mz_bool sort_central_dir = -- ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); -- // Basic sanity checks - reject files which are too small, and check the first -- // 4 bytes of the file to make sure a local header is there. -- if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) -+ -+ /* Basic sanity checks - reject files which are too small */ -+ if (pZip->m_archive_size < record_size) - return MZ_FALSE; -- // Find the end of central directory record by scanning the file from the end -- // towards the beginning. -+ -+ /* Find the record by scanning the file from the end towards the beginning. */ - cur_file_ofs = - MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0); - for (;;) { - int i, - n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs); -+ - if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n) - return MZ_FALSE; -- for (i = n - 4; i >= 0; --i) -- if (MZ_READ_LE32(pBuf + i) == MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) -- break; -+ -+ for (i = n - 4; i >= 0; --i) { -+ mz_uint s = MZ_READ_LE32(pBuf + i); -+ if (s == record_sig) { -+ if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size) -+ break; -+ } -+ } -+ - if (i >= 0) { - cur_file_ofs += i; - break; - } -+ -+ /* Give up if we've searched the entire file, or we've gone back "too far" -+ * (~64kb) */ - if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= -- (0xFFFF + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE))) -+ (MZ_UINT16_MAX + record_size))) - return MZ_FALSE; -+ - cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0); - } -- // Read and verify the end of central directory record. -+ -+ *pOfs = cur_file_ofs; -+ return MZ_TRUE; -+} -+ -+static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, -+ mz_uint flags) { -+ mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, -+ cdir_disk_index = 0; -+ mz_uint64 cdir_ofs = 0; -+ mz_int64 cur_file_ofs = 0; -+ const mz_uint8 *p; -+ -+ mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; -+ mz_uint8 *pBuf = (mz_uint8 *)buf_u32; -+ mz_bool sort_central_dir = -+ ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0); -+ mz_uint32 zip64_end_of_central_dir_locator_u32 -+ [(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / -+ sizeof(mz_uint32)]; -+ mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32; -+ -+ mz_uint32 zip64_end_of_central_dir_header_u32 -+ [(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / -+ sizeof(mz_uint32)]; -+ mz_uint8 *pZip64_end_of_central_dir = -+ (mz_uint8 *)zip64_end_of_central_dir_header_u32; -+ -+ mz_uint64 zip64_end_of_central_dir_ofs = 0; -+ -+ /* Basic sanity checks - reject files which are too small, and check the first -+ * 4 bytes of the file to make sure a local header is there. */ -+ if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) -+ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); -+ -+ if (!mz_zip_reader_locate_header_sig( -+ pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, -+ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs)) -+ return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR); -+ -+ /* Read and verify the end of central directory record. */ - if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, - MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != - MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) -- return MZ_FALSE; -- if ((MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != -- MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) || -- ((pZip->m_total_files = -- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS)) != -- MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS))) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); -+ -+ if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != -+ MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG) -+ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); -+ -+ if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) { -+ if (pZip->m_pRead(pZip->m_pIO_opaque, -+ cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, -+ pZip64_locator, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) { -+ if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG) { -+ zip64_end_of_central_dir_ofs = MZ_READ_LE64( -+ pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS); -+ if (zip64_end_of_central_dir_ofs > -+ (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)) -+ return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE); -+ -+ if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, -+ pZip64_end_of_central_dir, -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) { -+ if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == -+ MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG) { -+ pZip->m_pState->m_zip64 = MZ_TRUE; -+ } -+ } -+ } -+ } -+ } - -+ pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS); -+ cdir_entries_on_this_disk = -+ MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); - num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS); - cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS); -+ cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS); -+ cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); -+ -+ if (pZip->m_pState->m_zip64) { -+ mz_uint32 zip64_total_num_of_disks = -+ MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS); -+ mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64( -+ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS); -+ mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64( -+ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS); -+ mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64( -+ pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS); -+ mz_uint64 zip64_size_of_central_directory = -+ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS); -+ -+ if (zip64_size_of_end_of_central_dir_record < -+ (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12)) -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ -+ if (zip64_total_num_of_disks != 1U) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); -+ -+ /* Check for miniz's practical limits */ -+ if (zip64_cdir_total_entries > MZ_UINT32_MAX) -+ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); -+ -+ pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries; -+ -+ if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX) -+ return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); -+ -+ cdir_entries_on_this_disk = -+ (mz_uint32)zip64_cdir_total_entries_on_this_disk; -+ -+ /* Check for miniz's current practical limits (sorry, this should be enough -+ * for millions of files) */ -+ if (zip64_size_of_central_directory > MZ_UINT32_MAX) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE); -+ -+ cdir_size = (mz_uint32)zip64_size_of_central_directory; -+ -+ num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + -+ MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS); -+ -+ cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + -+ MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS); -+ -+ cdir_ofs = -+ MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS); -+ } -+ -+ if (pZip->m_total_files != cdir_entries_on_this_disk) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); -+ - if (((num_this_disk | cdir_disk_index) != 0) && - ((num_this_disk != 1) || (cdir_disk_index != 1))) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); - -- if ((cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS)) < -- pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) -- return MZ_FALSE; -+ if (cdir_size < pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); - -- cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS); - if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); - - pZip->m_central_directory_file_ofs = cdir_ofs; - - if (pZip->m_total_files) { - mz_uint i, n; -- -- // Read the entire central directory into a heap block, and allocate another -- // heap block to hold the unsorted central dir file record offsets, and -- // another to hold the sorted indices. -+ /* Read the entire central directory into a heap block, and allocate another -+ * heap block to hold the unsorted central dir file record offsets, and -+ * possibly another to hold the sorted indices. */ - if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, - MZ_FALSE)) || - (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, - pZip->m_total_files, MZ_FALSE))) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); - - if (sort_central_dir) { - if (!mz_zip_array_resize(pZip, - &pZip->m_pState->m_sorted_central_dir_offsets, - pZip->m_total_files, MZ_FALSE)) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); - } - - if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, - pZip->m_pState->m_central_dir.m_p, - cdir_size) != cdir_size) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); - -- // Now create an index into the central directory file records, do some -- // basic sanity checking on each record, and check for zip64 entries (which -- // are not yet supported). -+ /* Now create an index into the central directory file records, do some -+ * basic sanity checking on each record */ - p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p; - for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i) { -- mz_uint total_header_size, comp_size, decomp_size, disk_index; -+ mz_uint total_header_size, disk_index, bit_flags, filename_size, -+ ext_data_size; -+ mz_uint64 comp_size, decomp_size, local_header_ofs; -+ - if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || - (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ - MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, - i) = - (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p); -+ - if (sort_central_dir) - MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, - mz_uint32, i) = i; -+ - comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS); - decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS); -- if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && -- (decomp_size != comp_size)) || -- (decomp_size && !comp_size) || (decomp_size == 0xFFFFFFFF) || -- (comp_size == 0xFFFFFFFF)) -- return MZ_FALSE; -+ local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS); -+ filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS); -+ ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS); -+ -+ if ((!pZip->m_pState->m_zip64_has_extended_info_fields) && -+ (ext_data_size) && -+ (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == -+ MZ_UINT32_MAX)) { -+ /* Attempt to find zip64 extended information field in the entry's extra -+ * data */ -+ mz_uint32 extra_size_remaining = ext_data_size; -+ -+ if (extra_size_remaining) { -+ const mz_uint8 *pExtra_data; -+ void *buf = NULL; -+ -+ if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > -+ n) { -+ buf = MZ_MALLOC(ext_data_size); -+ if (buf == NULL) -+ return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED); -+ -+ if (pZip->m_pRead(pZip->m_pIO_opaque, -+ cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + -+ filename_size, -+ buf, ext_data_size) != ext_data_size) { -+ MZ_FREE(buf); -+ return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED); -+ } -+ -+ pExtra_data = (mz_uint8 *)buf; -+ } else { -+ pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size; -+ } -+ -+ do { -+ mz_uint32 field_id; -+ mz_uint32 field_data_size; -+ -+ if (extra_size_remaining < (sizeof(mz_uint16) * 2)) { -+ MZ_FREE(buf); -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ } -+ -+ field_id = MZ_READ_LE16(pExtra_data); -+ field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16)); -+ -+ if ((field_data_size + sizeof(mz_uint16) * 2) > -+ extra_size_remaining) { -+ MZ_FREE(buf); -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ } -+ -+ if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID) { -+ /* Ok, the archive didn't have any zip64 headers but it uses a -+ * zip64 extended information field so mark it as zip64 anyway -+ * (this can occur with infozip's zip util when it reads -+ * compresses files from stdin). */ -+ pZip->m_pState->m_zip64 = MZ_TRUE; -+ pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE; -+ break; -+ } -+ -+ pExtra_data += sizeof(mz_uint16) * 2 + field_data_size; -+ extra_size_remaining = -+ extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size; -+ } while (extra_size_remaining); -+ -+ MZ_FREE(buf); -+ } -+ } -+ -+ /* I've seen archives that aren't marked as zip64 that uses zip64 ext -+ * data, argh */ -+ if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX)) { -+ if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && -+ (decomp_size != comp_size)) || -+ (decomp_size && !comp_size)) -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ } -+ - disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS); -- if ((disk_index != num_this_disk) && (disk_index != 1)) -- return MZ_FALSE; -- if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + -- MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) -- return MZ_FALSE; -+ if ((disk_index == MZ_UINT16_MAX) || -+ ((disk_index != num_this_disk) && (disk_index != 1))) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK); -+ -+ if (comp_size != MZ_UINT32_MAX) { -+ if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + -+ MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size) -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ } -+ -+ bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS); -+ if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED) -+ return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION); -+ - if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + - MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + - MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + - MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > - n) -- return MZ_FALSE; -+ return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED); -+ - n -= total_header_size; - p += total_header_size; - } -diff --git a/contrib/zip/src/zip.c b/contrib/zip/src/zip.c -index ff3a8fe1e6..1abcfd8fd1 100644 ---- a/contrib/zip/src/zip.c -+++ b/contrib/zip/src/zip.c -@@ -24,7 +24,6 @@ - ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) && \ - (P)[1] == ':') - #define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE(P) ? 2 : 0) --#define ISSLASH(C) ((C) == '/' || (C) == '\\') - - #else - -@@ -48,7 +47,7 @@ int symlink(const char *target, const char *linkpath); // needed on Linux - #endif - - #ifndef ISSLASH --#define ISSLASH(C) ((C) == '/') -+#define ISSLASH(C) ((C) == '/' || (C) == '\\') - #endif - - #define CLEANUP(ptr) \ -@@ -78,26 +77,34 @@ static const char *base_name(const char *name) { - return base; - } - --static int mkpath(const char *path) { -- char const *p; -+static int mkpath(char *path) { -+ char *p; - char npath[MAX_PATH + 1]; - int len = 0; - int has_device = HAS_DEVICE(path); - - memset(npath, 0, MAX_PATH + 1); -- --#ifdef _WIN32 -- // only on windows fix the path -- npath[0] = path[0]; -- npath[1] = path[1]; -- len = 2; --#endif // _WIN32 -- -+ if (has_device) { -+ // only on windows -+ npath[0] = path[0]; -+ npath[1] = path[1]; -+ len = 2; -+ } - for (p = path + len; *p && len < MAX_PATH; p++) { - if (ISSLASH(*p) && ((!has_device && len > 0) || (has_device && len > 2))) { -- if (MKDIR(npath) == -1) -- if (errno != EEXIST) -+#if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ -+ defined(__MINGW32__) -+#else -+ if ('\\' == *p) { -+ *p = '/'; -+ } -+#endif -+ -+ if (MKDIR(npath) == -1) { -+ if (errno != EEXIST) { - return -1; -+ } -+ } - } - npath[len++] = *p; - } -@@ -279,7 +286,14 @@ int zip_entry_open(struct zip_t *zip, const char *entryname) { - zip->entry.header_offset = zip->archive.m_archive_size; - memset(zip->entry.header, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE * sizeof(mz_uint8)); - zip->entry.method = 0; -+ -+ // UNIX or APPLE -+#if MZ_PLATFORM == 3 || MZ_PLATFORM == 19 -+ // regular file with rw-r--r-- persmissions -+ zip->entry.external_attr = (mz_uint32)(0100644) << 16; -+#else - zip->entry.external_attr = 0; -+#endif - - num_alignment_padding_bytes = - mz_zip_writer_compute_padding_needed_for_file_alignment(pzip); -@@ -660,7 +674,7 @@ ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize) { - } - - if (!mz_zip_reader_extract_to_mem_no_alloc(pzip, (mz_uint)zip->entry.index, -- buf, bufsize, 0, NULL, 0)) { -+ buf, bufsize, 0, NULL, 0)) { - return -1; - } - -@@ -670,10 +684,7 @@ ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize) { - int zip_entry_fread(struct zip_t *zip, const char *filename) { - mz_zip_archive *pzip = NULL; - mz_uint idx; --#if defined(_MSC_VER) --#else - mz_uint32 xattr = 0; --#endif - mz_zip_archive_file_stat info; - - if (!zip) { -@@ -875,12 +886,19 @@ int zip_extract(const char *zipname, const char *dir, - goto out; - } - -- if ((((info.m_version_made_by >> 8) == 3) || ((info.m_version_made_by >> 8) == 19)) // if zip is produced on Unix or macOS (3 and 19 from section 4.4.2.2 of zip standard) -- && info.m_external_attr & (0x20 << 24)) { // and has sym link attribute (0x80 is file, 0x40 is directory) -+ if ((((info.m_version_made_by >> 8) == 3) || -+ ((info.m_version_made_by >> 8) == -+ 19)) // if zip is produced on Unix or macOS (3 and 19 from -+ // section 4.4.2.2 of zip standard) -+ && info.m_external_attr & -+ (0x20 << 24)) { // and has sym link attribute (0x80 is file, 0x40 -+ // is directory) - #if defined(_WIN32) || defined(__WIN32__) || defined(_MSC_VER) || \ - defined(__MINGW32__) --#else -- if (info.m_uncomp_size > MAX_PATH || !mz_zip_reader_extract_to_mem_no_alloc(&zip_archive, i, symlink_to, MAX_PATH, 0, NULL, 0)) { -+#else -+ if (info.m_uncomp_size > MAX_PATH || -+ !mz_zip_reader_extract_to_mem_no_alloc(&zip_archive, i, symlink_to, -+ MAX_PATH, 0, NULL, 0)) { - goto out; - } - symlink_to[info.m_uncomp_size] = '\0'; -diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h -index 5f39df50ad..a48d64d6de 100644 ---- a/contrib/zip/src/zip.h -+++ b/contrib/zip/src/zip.h -@@ -20,241 +20,240 @@ extern "C" { - #endif - - #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ -- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) --#define _SSIZE_T -+ !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \ -+ !defined(_SSIZE_T) && !defined(_SSIZE_T_) -+ - // 64-bit Windows is the only mainstream platform - // where sizeof(long) != sizeof(void*) - #ifdef _WIN64 --typedef long long ssize_t; /* byte count or error */ -+typedef long long ssize_t; /* byte count or error */ - #else --typedef long ssize_t; /* byte count or error */ -+typedef long ssize_t; /* byte count or error */ - #endif -+ -+#define _SSIZE_T_DEFINED -+#define _SSIZE_T_DEFINED_ -+#define __DEFINED_ssize_t -+#define __ssize_t_defined -+#define _SSIZE_T -+#define _SSIZE_T_ -+ - #endif - - #ifndef MAX_PATH - #define MAX_PATH 32767 /* # chars in a path name including NULL */ - #endif - -+/** -+ * @mainpage -+ * -+ * Documenation for @ref zip. -+ */ -+ -+/** -+ * @addtogroup zip -+ * @{ -+ */ -+ -+/** -+ * Default zip compression level. -+ */ -+ - #define ZIP_DEFAULT_COMPRESSION_LEVEL 6 - --/* -- This data structure is used throughout the library to represent zip archive -- - forward declaration. --*/ -+/** -+ * @struct zip_t -+ * -+ * This data structure is used throughout the library to represent zip archive - -+ * forward declaration. -+ */ - struct zip_t; - --/* -- Opens zip archive with compression level using the given mode. -- -- Args: -- zipname: zip archive file name. -- level: compression level (0-9 are the standard zlib-style levels). -- mode: file access mode. -- 'r': opens a file for reading/extracting (the file must exists). -- 'w': creates an empty file for writing. -- 'a': appends to an existing archive. -- -- Returns: -- The zip archive handler or NULL on error --*/ -+/** -+ * Opens zip archive with compression level using the given mode. -+ * -+ * @param zipname zip archive file name. -+ * @param level compression level (0-9 are the standard zlib-style levels). -+ * @param mode file access mode. -+ * - 'r': opens a file for reading/extracting (the file must exists). -+ * - 'w': creates an empty file for writing. -+ * - 'a': appends to an existing archive. -+ * -+ * @return the zip archive handler or NULL on error -+ */ - extern struct zip_t *zip_open(const char *zipname, int level, char mode); - --/* -- Closes the zip archive, releases resources - always finalize. -- -- Args: -- zip: zip archive handler. --*/ -+/** -+ * Closes the zip archive, releases resources - always finalize. -+ * -+ * @param zip zip archive handler. -+ */ - extern void zip_close(struct zip_t *zip); - --/* -- Opens an entry by name in the zip archive. -- For zip archive opened in 'w' or 'a' mode the function will append -- a new entry. In readonly mode the function tries to locate the entry -- in global dictionary. -- -- Args: -- zip: zip archive handler. -- entryname: an entry name in local dictionary. -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Opens an entry by name in the zip archive. -+ * -+ * For zip archive opened in 'w' or 'a' mode the function will append -+ * a new entry. In readonly mode the function tries to locate the entry -+ * in global dictionary. -+ * -+ * @param zip zip archive handler. -+ * @param entryname an entry name in local dictionary. -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_entry_open(struct zip_t *zip, const char *entryname); - --/* -- Opens a new entry by index in the zip archive. -- This function is only valid if zip archive was opened in 'r' (readonly) mode. -- -- Args: -- zip: zip archive handler. -- index: index in local dictionary. -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Opens a new entry by index in the zip archive. -+ * -+ * This function is only valid if zip archive was opened in 'r' (readonly) mode. -+ * -+ * @param zip zip archive handler. -+ * @param index index in local dictionary. -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_entry_openbyindex(struct zip_t *zip, int index); - --/* -- Closes a zip entry, flushes buffer and releases resources. -- -- Args: -- zip: zip archive handler. -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Closes a zip entry, flushes buffer and releases resources. -+ * -+ * @param zip zip archive handler. -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_entry_close(struct zip_t *zip); - --/* -- Returns a local name of the current zip entry. -- The main difference between user's entry name and local entry name -- is optional relative path. -- Following .ZIP File Format Specification - the path stored MUST not contain -- a drive or device letter, or a leading slash. -- All slashes MUST be forward slashes '/' as opposed to backwards slashes '\' -- for compatibility with Amiga and UNIX file systems etc. -- -- Args: -- zip: zip archive handler. -- -- Returns: -- The pointer to the current zip entry name, or NULL on error. --*/ -+/** -+ * Returns a local name of the current zip entry. -+ * -+ * The main difference between user's entry name and local entry name -+ * is optional relative path. -+ * Following .ZIP File Format Specification - the path stored MUST not contain -+ * a drive or device letter, or a leading slash. -+ * All slashes MUST be forward slashes '/' as opposed to backwards slashes '\' -+ * for compatibility with Amiga and UNIX file systems etc. -+ * -+ * @param zip: zip archive handler. -+ * -+ * @return the pointer to the current zip entry name, or NULL on error. -+ */ - extern const char *zip_entry_name(struct zip_t *zip); - --/* -- Returns an index of the current zip entry. -- -- Args: -- zip: zip archive handler. -- -- Returns: -- The index on success, negative number (< 0) on error. --*/ -+/** -+ * Returns an index of the current zip entry. -+ * -+ * @param zip zip archive handler. -+ * -+ * @return the index on success, negative number (< 0) on error. -+ */ - extern int zip_entry_index(struct zip_t *zip); - --/* -- Determines if the current zip entry is a directory entry. -- -- Args: -- zip: zip archive handler. -- -- Returns: -- The return code - 1 (true), 0 (false), negative number (< 0) on error. --*/ -+/** -+ * Determines if the current zip entry is a directory entry. -+ * -+ * @param zip zip archive handler. -+ * -+ * @return the return code - 1 (true), 0 (false), negative number (< 0) on -+ * error. -+ */ - extern int zip_entry_isdir(struct zip_t *zip); - --/* -- Returns an uncompressed size of the current zip entry. -- -- Args: -- zip: zip archive handler. -- -- Returns: -- The uncompressed size in bytes. --*/ -+/** -+ * Returns an uncompressed size of the current zip entry. -+ * -+ * @param zip zip archive handler. -+ * -+ * @return the uncompressed size in bytes. -+ */ - extern unsigned long long zip_entry_size(struct zip_t *zip); - --/* -- Returns CRC-32 checksum of the current zip entry. -- -- Args: -- zip: zip archive handler. -- -- Returns: -- The CRC-32 checksum. --*/ -+/** -+ * Returns CRC-32 checksum of the current zip entry. -+ * -+ * @param zip zip archive handler. -+ * -+ * @return the CRC-32 checksum. -+ */ - extern unsigned int zip_entry_crc32(struct zip_t *zip); - --/* -- Compresses an input buffer for the current zip entry. -- -- Args: -- zip: zip archive handler. -- buf: input buffer. -- bufsize: input buffer size (in bytes). -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Compresses an input buffer for the current zip entry. -+ * -+ * @param zip zip archive handler. -+ * @param buf input buffer. -+ * @param bufsize input buffer size (in bytes). -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_entry_write(struct zip_t *zip, const void *buf, size_t bufsize); - --/* -- Compresses a file for the current zip entry. -- -- Args: -- zip: zip archive handler. -- filename: input file. -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Compresses a file for the current zip entry. -+ * -+ * @param zip zip archive handler. -+ * @param filename input file. -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_entry_fwrite(struct zip_t *zip, const char *filename); - --/* -- Extracts the current zip entry into output buffer. -- The function allocates sufficient memory for a output buffer. -- -- Args: -- zip: zip archive handler. -- buf: output buffer. -- bufsize: output buffer size (in bytes). -- -- Note: -- - remember to release memory allocated for a output buffer. -- - for large entries, please take a look at zip_entry_extract function. -- -- Returns: -- The return code - the number of bytes actually read on success. -- Otherwise a -1 on error. --*/ -+/** -+ * Extracts the current zip entry into output buffer. -+ * -+ * The function allocates sufficient memory for a output buffer. -+ * -+ * @param zip zip archive handler. -+ * @param buf output buffer. -+ * @param bufsize output buffer size (in bytes). -+ * -+ * @note remember to release memory allocated for a output buffer. -+ * for large entries, please take a look at zip_entry_extract function. -+ * -+ * @return the return code - the number of bytes actually read on success. -+ * Otherwise a -1 on error. -+ */ - extern ssize_t zip_entry_read(struct zip_t *zip, void **buf, size_t *bufsize); - --/* -- Extracts the current zip entry into a memory buffer using no memory -- allocation. -- -- Args: -- zip: zip archive handler. -- buf: preallocated output buffer. -- bufsize: output buffer size (in bytes). -- -- Note: -- - ensure supplied output buffer is large enough. -- - zip_entry_size function (returns uncompressed size for the current entry) -- can be handy to estimate how big buffer is needed. -- - for large entries, please take a look at zip_entry_extract function. -- -- Returns: -- The return code - the number of bytes actually read on success. -- Otherwise a -1 on error (e.g. bufsize is not large enough). --*/ --extern ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, size_t bufsize); -- --/* -- Extracts the current zip entry into output file. -- -- Args: -- zip: zip archive handler. -- filename: output file. -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Extracts the current zip entry into a memory buffer using no memory -+ * allocation. -+ * -+ * @param zip zip archive handler. -+ * @param buf preallocated output buffer. -+ * @param bufsize output buffer size (in bytes). -+ * -+ * @note ensure supplied output buffer is large enough. -+ * zip_entry_size function (returns uncompressed size for the current -+ * entry) can be handy to estimate how big buffer is needed. for large -+ * entries, please take a look at zip_entry_extract function. -+ * -+ * @return the return code - the number of bytes actually read on success. -+ * Otherwise a -1 on error (e.g. bufsize is not large enough). -+ */ -+extern ssize_t zip_entry_noallocread(struct zip_t *zip, void *buf, -+ size_t bufsize); -+ -+/** -+ * Extracts the current zip entry into output file. -+ * -+ * @param zip zip archive handler. -+ * @param filename output file. -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_entry_fread(struct zip_t *zip, const char *filename); - --/* -- Extracts the current zip entry using a callback function (on_extract). -- -- Args: -- zip: zip archive handler. -- on_extract: callback function. -- arg: opaque pointer (optional argument, -- which you can pass to the on_extract callback) -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. -+/** -+ * Extracts the current zip entry using a callback function (on_extract). -+ * -+ * @param zip zip archive handler. -+ * @param on_extract callback function. -+ * @param arg opaque pointer (optional argument, which you can pass to the -+ * on_extract callback) -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. - */ - extern int - zip_entry_extract(struct zip_t *zip, -@@ -262,53 +261,49 @@ zip_entry_extract(struct zip_t *zip, - const void *data, size_t size), - void *arg); - --/* -- Returns the number of all entries (files and directories) in the zip archive. -- -- Args: -- zip: zip archive handler. -- -- Returns: -- The return code - the number of entries on success, -- negative number (< 0) on error. --*/ -+/** -+ * Returns the number of all entries (files and directories) in the zip archive. -+ * -+ * @param zip zip archive handler. -+ * -+ * @return the return code - the number of entries on success, negative number -+ * (< 0) on error. -+ */ - extern int zip_total_entries(struct zip_t *zip); - --/* -- Creates a new archive and puts files into a single zip archive. -- -- Args: -- zipname: zip archive file. -- filenames: input files. -- len: number of input files. -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Creates a new archive and puts files into a single zip archive. -+ * -+ * @param zipname zip archive file. -+ * @param filenames input files. -+ * @param len: number of input files. -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_create(const char *zipname, const char *filenames[], size_t len); - --/* -- Extracts a zip archive file into directory. -- -- If on_extract_entry is not NULL, the callback will be called after -- successfully extracted each zip entry. -- Returning a negative value from the callback will cause abort and return an -- error. The last argument (void *arg) is optional, which you can use to pass -- data to the on_extract_entry callback. -- -- Args: -- zipname: zip archive file. -- dir: output directory. -- on_extract_entry: on extract callback. -- arg: opaque pointer. -- -- Returns: -- The return code - 0 on success, negative number (< 0) on error. --*/ -+/** -+ * Extracts a zip archive file into directory. -+ * -+ * If on_extract_entry is not NULL, the callback will be called after -+ * successfully extracted each zip entry. -+ * Returning a negative value from the callback will cause abort and return an -+ * error. The last argument (void *arg) is optional, which you can use to pass -+ * data to the on_extract_entry callback. -+ * -+ * @param zipname zip archive file. -+ * @param dir output directory. -+ * @param on_extract_entry on extract callback. -+ * @param arg opaque pointer. -+ * -+ * @return the return code - 0 on success, negative number (< 0) on error. -+ */ - extern int zip_extract(const char *zipname, const char *dir, - int (*on_extract_entry)(const char *filename, void *arg), - void *arg); - -+/** @} */ -+ - #ifdef __cplusplus - } - #endif -diff --git a/contrib/zip/test/CMakeLists.txt b/contrib/zip/test/CMakeLists.txt -index 9b2a8db106..cc060b00fe 100644 ---- a/contrib/zip/test/CMakeLists.txt -+++ b/contrib/zip/test/CMakeLists.txt -@@ -1,19 +1,16 @@ - cmake_minimum_required(VERSION 2.8) - --if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") -- if(ENABLE_COVERAGE) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g ") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") -- endif() --endif () -- - # test --include_directories(../src) --add_executable(test.exe test.c ../src/zip.c) --add_executable(test_miniz.exe test_miniz.c) -+set(test_out test.out) -+set(test_miniz_out test_miniz.out) -+ -+add_executable(${test_out} test.c) -+target_link_libraries(${test_out} zip) -+add_executable(${test_miniz_out} test_miniz.c) -+target_link_libraries(${test_miniz_out} zip) -+ -+add_test(NAME ${test_out} COMMAND ${test_out}) -+add_test(NAME ${test_miniz_out} COMMAND ${test_miniz_out}) - --add_test(NAME test COMMAND test.exe) --add_test(NAME test_miniz COMMAND test_miniz.exe) -+set(test_out ${test_out} PARENT_SCOPE) -+set(test_miniz_out ${test_miniz_out} PARENT_SCOPE) -diff --git a/contrib/zip/test/test.c b/contrib/zip/test/test.c -index 454430533a..a9b2ddab1e 100644 ---- a/contrib/zip/test/test.c -+++ b/contrib/zip/test/test.c -@@ -29,6 +29,8 @@ - #define XFILE "7.txt\0" - #define XMODE 0100777 - -+#define UNIXMODE 0100644 -+ - #define UNUSED(x) (void)x - - static int total_entries = 0; -@@ -102,7 +104,8 @@ static void test_read(void) { - assert(0 == zip_entry_close(zip)); - free(buf); - buf = NULL; -- -+ bufsize = 0; -+ - assert(0 == zip_entry_open(zip, "test/test-2.txt")); - assert(strlen(TESTDATA2) == zip_entry_size(zip)); - assert(CRC32DATA2 == zip_entry_crc32(zip)); -@@ -131,7 +134,8 @@ static void test_read(void) { - assert(0 == zip_entry_close(zip)); - free(buf); - buf = NULL; -- -+ bufsize = 0; -+ - buftmp = strlen(TESTDATA1); - buf = calloc(buftmp, sizeof(char)); - assert(0 == zip_entry_open(zip, "test/test-1.txt")); -@@ -433,6 +437,35 @@ static void test_mtime(void) { - remove(ZIPNAME); - } - -+static void test_unix_permissions(void) { -+#if defined(_WIN64) || defined(_WIN32) || defined(__WIN32__) -+#else -+ // UNIX or APPLE -+ struct MZ_FILE_STAT_STRUCT file_stats; -+ -+ remove(ZIPNAME); -+ -+ struct zip_t *zip = zip_open(ZIPNAME, ZIP_DEFAULT_COMPRESSION_LEVEL, 'w'); -+ assert(zip != NULL); -+ -+ assert(0 == zip_entry_open(zip, RFILE)); -+ assert(0 == zip_entry_write(zip, TESTDATA1, strlen(TESTDATA1))); -+ assert(0 == zip_entry_close(zip)); -+ -+ zip_close(zip); -+ -+ remove(RFILE); -+ -+ assert(0 == zip_extract(ZIPNAME, ".", NULL, NULL)); -+ -+ assert(0 == MZ_FILE_STAT(RFILE, &file_stats)); -+ assert(UNIXMODE == file_stats.st_mode); -+ -+ remove(RFILE); -+ remove(ZIPNAME); -+#endif -+} -+ - int main(int argc, char *argv[]) { - UNUSED(argc); - UNUSED(argv); -@@ -453,6 +486,7 @@ int main(int argc, char *argv[]) { - test_write_permissions(); - test_exe_permissions(); - test_mtime(); -+ test_unix_permissions(); - - remove(ZIPNAME); - return 0; -diff --git a/contrib/zip/test/test_miniz.c b/contrib/zip/test/test_miniz.c -index ebc0564dc3..babcaecdb6 100644 ---- a/contrib/zip/test/test_miniz.c -+++ b/contrib/zip/test/test_miniz.c -@@ -23,16 +23,39 @@ int main(int argc, char *argv[]) { - uint step = 0; - int cmp_status; - uLong src_len = (uLong)strlen(s_pStr); -- uLong cmp_len = compressBound(src_len); - uLong uncomp_len = src_len; -+ uLong cmp_len; - uint8 *pCmp, *pUncomp; -+ size_t sz; - uint total_succeeded = 0; - (void)argc, (void)argv; - - printf("miniz.c version: %s\n", MZ_VERSION); - - do { -+ pCmp = (uint8 *)tdefl_compress_mem_to_heap(s_pStr, src_len, &cmp_len, 0); -+ if (!pCmp) { -+ printf("tdefl_compress_mem_to_heap failed\n"); -+ return EXIT_FAILURE; -+ } -+ if (src_len <= cmp_len) { -+ printf("tdefl_compress_mem_to_heap failed: from %u to %u bytes\n", -+ (mz_uint32)uncomp_len, (mz_uint32)cmp_len); -+ free(pCmp); -+ return EXIT_FAILURE; -+ } -+ -+ sz = tdefl_compress_mem_to_mem(pCmp, cmp_len, s_pStr, src_len, 0); -+ if (sz != cmp_len) { -+ printf("tdefl_compress_mem_to_mem failed: expected %u, got %u\n", -+ (mz_uint32)cmp_len, (mz_uint32)sz); -+ free(pCmp); -+ return EXIT_FAILURE; -+ } -+ - // Allocate buffers to hold compressed and uncompressed data. -+ free(pCmp); -+ cmp_len = compressBound(src_len); - pCmp = (mz_uint8 *)malloc((size_t)cmp_len); - pUncomp = (mz_uint8 *)malloc((size_t)src_len); - if ((!pCmp) || (!pUncomp)) { diff --git a/package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch b/package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch deleted file mode 100644 index 9bd24630c5..0000000000 --- a/package/assimp/0003-closes-2954-upgrade-to-latest-greatest.patch +++ /dev/null @@ -1,243 +0,0 @@ -From bb3db0ebaffc6b76de256e597ec1d1e4d2a6663f Mon Sep 17 00:00:00 2001 -From: kimkulling -Date: Mon, 9 Mar 2020 10:51:26 +0100 -Subject: [PATCH] closes https://github.com/assimp/assimp/issues/2954: upgrade - to latest greatest. - -[Retrieved from: -https://github.com/assimp/assimp/commit/bb3db0ebaffc6b76de256e597ec1d1e4d2a6663f] -Signed-off-by: Fabrice Fontaine ---- - contrib/zip/CMakeLists.txt | 8 ++---- - contrib/zip/README.md | 51 +++++++++++++++++++++++++++++++-- - contrib/zip/src/zip.c | 17 ++++++++++- - contrib/zip/src/zip.h | 13 ++++++++- - contrib/zip/test/CMakeLists.txt | 5 ---- - contrib/zip/test/test.c | 4 ++- - 6 files changed, 81 insertions(+), 17 deletions(-) - -diff --git a/contrib/zip/CMakeLists.txt b/contrib/zip/CMakeLists.txt -index 77916d2e14..f194649ede 100644 ---- a/contrib/zip/CMakeLists.txt -+++ b/contrib/zip/CMakeLists.txt -@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) - - project(zip - LANGUAGES C -- VERSION "0.1.15") -+ VERSION "0.1.18") - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) - - option(CMAKE_DISABLE_TESTING "Disable test creation" OFF) -@@ -16,10 +16,6 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic") -- if(ENABLE_COVERAGE) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") -- endif() - endif (MSVC) - - # zip -@@ -35,7 +31,7 @@ if (NOT CMAKE_DISABLE_TESTING) - enable_testing() - add_subdirectory(test) - find_package(Sanitizers) -- add_sanitizers(${PROJECT_NAME} ${test_out} ${test_miniz_out}) -+ add_sanitizers(${PROJECT_NAME} ${test_out}) - endif() - - #### -diff --git a/contrib/zip/README.md b/contrib/zip/README.md -index 14eb9a34c8..bdd0822b67 100644 ---- a/contrib/zip/README.md -+++ b/contrib/zip/README.md -@@ -1,10 +1,8 @@ - ### A portable (OSX/Linux/Windows), simple zip library written in C - This is done by hacking awesome [miniz](https://code.google.com/p/miniz) library and layering functions on top of the miniz v1.15 API. - --[![Windows](https://ci.appveyor.com/api/projects/status/bph8dr3jacgmjv32/branch/master?svg=true&label=windows)](https://ci.appveyor.com/project/kuba--/zip) --[![Linux](https://travis-ci.org/kuba--/zip.svg?branch=master&label=linux%2fosx)](https://travis-ci.org/kuba--/zip) -+[![Build](https://github.com/kuba--/zip/workflows/build/badge.svg)](https://github.com/kuba--/zip/actions?query=workflow%3Abuild) - [![Version](https://badge.fury.io/gh/kuba--%2Fzip.svg)](https://github.com/kuba--/zip/releases) --[![Codecov](https://codecov.io/gh/kuba--/zip/branch/master/graph/badge.svg)](https://codecov.io/gh/kuba--/zip) - - - # The Idea -@@ -213,6 +211,53 @@ func main() { - } - ``` - -+### Rust (ffi) -+```rust -+extern crate libc; -+use std::ffi::CString; -+ -+#[repr(C)] -+pub struct Zip { -+ _private: [u8; 0], -+} -+ -+#[link(name = "zip")] -+extern "C" { -+ fn zip_open(path: *const libc::c_char, level: libc::c_int, mode: libc::c_char) -> *mut Zip; -+ fn zip_close(zip: *mut Zip) -> libc::c_void; -+ -+ fn zip_entry_open(zip: *mut Zip, entryname: *const libc::c_char) -> libc::c_int; -+ fn zip_entry_close(zip: *mut Zip) -> libc::c_int; -+ fn zip_entry_write( -+ zip: *mut Zip, -+ buf: *const libc::c_void, -+ bufsize: libc::size_t, -+ ) -> libc::c_int; -+} -+ -+fn main() { -+ let path = CString::new("/tmp/test.zip").unwrap(); -+ let mode: libc::c_char = 'w' as libc::c_char; -+ -+ let entryname = CString::new("test.txt").unwrap(); -+ let content = "test content\0"; -+ -+ unsafe { -+ let zip: *mut Zip = zip_open(path.as_ptr(), 5, mode); -+ { -+ zip_entry_open(zip, entryname.as_ptr()); -+ { -+ let buf = content.as_ptr() as *const libc::c_void; -+ let bufsize = content.len() as libc::size_t; -+ zip_entry_write(zip, buf, bufsize); -+ } -+ zip_entry_close(zip); -+ } -+ zip_close(zip); -+ } -+} -+``` -+ - ### Ruby (ffi) - Install _ffi_ gem. - ```shell -diff --git a/contrib/zip/src/zip.c b/contrib/zip/src/zip.c -index 1abcfd8fd1..3b2821e6a3 100644 ---- a/contrib/zip/src/zip.c -+++ b/contrib/zip/src/zip.c -@@ -222,6 +222,20 @@ void zip_close(struct zip_t *zip) { - } - } - -+int zip_is64(struct zip_t *zip) { -+ if (!zip) { -+ // zip_t handler is not initialized -+ return -1; -+ } -+ -+ if (!zip->archive.m_pState) { -+ // zip state is not initialized -+ return -1; -+ } -+ -+ return (int)zip->archive.m_pState->m_zip64; -+} -+ - int zip_entry_open(struct zip_t *zip, const char *entryname) { - size_t entrylen = 0; - mz_zip_archive *pzip = NULL; -@@ -794,7 +808,8 @@ int zip_create(const char *zipname, const char *filenames[], size_t len) { - - if (MZ_FILE_STAT(name, &file_stat) != 0) { - // problem getting information - check errno -- return -1; -+ status = -1; -+ break; - } - - if ((file_stat.st_mode & 0200) == 0) { -diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h -index a48d64d6de..cd3ab5cd00 100644 ---- a/contrib/zip/src/zip.h -+++ b/contrib/zip/src/zip.h -@@ -21,7 +21,7 @@ extern "C" { - - #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ - !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \ -- !defined(_SSIZE_T) && !defined(_SSIZE_T_) -+ !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(_SSIZE_T_DECLARED) - - // 64-bit Windows is the only mainstream platform - // where sizeof(long) != sizeof(void*) -@@ -37,6 +37,7 @@ typedef long ssize_t; /* byte count or error */ - #define __ssize_t_defined - #define _SSIZE_T - #define _SSIZE_T_ -+#define _SSIZE_T_DECLARED - - #endif - -@@ -90,6 +91,16 @@ extern struct zip_t *zip_open(const char *zipname, int level, char mode); - */ - extern void zip_close(struct zip_t *zip); - -+/** -+ * Determines if the archive has a zip64 end of central directory headers. -+ * -+ * @param zip zip archive handler. -+ * -+ * @return the return code - 1 (true), 0 (false), negative number (< 0) on -+ * error. -+ */ -+extern int zip_is64(struct zip_t *zip); -+ - /** - * Opens an entry by name in the zip archive. - * -diff --git a/contrib/zip/test/CMakeLists.txt b/contrib/zip/test/CMakeLists.txt -index cc060b00fe..1224115858 100644 ---- a/contrib/zip/test/CMakeLists.txt -+++ b/contrib/zip/test/CMakeLists.txt -@@ -2,15 +2,10 @@ cmake_minimum_required(VERSION 2.8) - - # test - set(test_out test.out) --set(test_miniz_out test_miniz.out) - - add_executable(${test_out} test.c) - target_link_libraries(${test_out} zip) --add_executable(${test_miniz_out} test_miniz.c) --target_link_libraries(${test_miniz_out} zip) - - add_test(NAME ${test_out} COMMAND ${test_out}) --add_test(NAME ${test_miniz_out} COMMAND ${test_miniz_out}) - - set(test_out ${test_out} PARENT_SCOPE) --set(test_miniz_out ${test_miniz_out} PARENT_SCOPE) -diff --git a/contrib/zip/test/test.c b/contrib/zip/test/test.c -index a9b2ddab1e..9cc2248ac0 100644 ---- a/contrib/zip/test/test.c -+++ b/contrib/zip/test/test.c -@@ -47,7 +47,7 @@ static void test_write(void) { - assert(CRC32DATA1 == zip_entry_crc32(zip)); - ++total_entries; - assert(0 == zip_entry_close(zip)); -- -+ assert(0 == zip_is64(zip)); - zip_close(zip); - } - -@@ -92,6 +92,7 @@ static void test_read(void) { - size_t buftmp; - struct zip_t *zip = zip_open(ZIPNAME, 0, 'r'); - assert(zip != NULL); -+ assert(0 == zip_is64(zip)); - - assert(0 == zip_entry_open(zip, "test\\test-1.txt")); - assert(strlen(TESTDATA1) == zip_entry_size(zip)); -@@ -310,6 +311,7 @@ static void test_fwrite(void) { - assert(0 == zip_entry_open(zip, WFILE)); - assert(0 == zip_entry_fwrite(zip, WFILE)); - assert(0 == zip_entry_close(zip)); -+ assert(0 == zip_is64(zip)); - - zip_close(zip); - remove(WFILE); diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index df5daa79c9..c61bf88b29 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc assimp-5.0.1.tar.gz -sha256 a26ccc3dbf2f58ea99c100945a8a126fa0f9f4d7fd2b49aa8bdb8e09355864d8 LICENSE +sha256 b96f609bca45cc4747bf8ea4b696816ada484aed2812e60ea4d16aae18360b0b assimp-5.1.0.tar.gz +sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index eddfbc48b0..919f7a0a8c 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASSIMP_VERSION = 5.0.1 +ASSIMP_VERSION = 5.1.0 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE From bbc52f3ff382e4c50baea2e1876a3f6ebf77a851 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Sat, 20 Nov 2021 11:47:29 +0000 Subject: [PATCH 105/176] package/makedumpfile: bump to version 1.7.0 Fixes: - https://release-monitoring.org/project/131396/ Signed-off-by: Alexander Egorenkov Signed-off-by: Thomas Petazzoni --- package/makedumpfile/makedumpfile.hash | 2 +- package/makedumpfile/makedumpfile.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index f85f334cbf..5eeb6387fa 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 393ea8f22393c059ad21de9b1c3f45d9d0d8dbeb0ccb1417815b835d03f7c350 makedumpfile-1.6.9.tar.gz +sha256 8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e makedumpfile-1.7.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 16271e2246..8399e4d063 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.6.9 +MAKEDUMPFILE_VERSION = 1.7.0 MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,$(MAKEDUMPFILE_VERSION)) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 From 724bc9b83d48d8fc6849aff1e4740404dadbf81b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 16:04:45 +0100 Subject: [PATCH 106/176] package/x265: bump version to 3.5 Rebased patch 0001 based on Gentoo patch https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/x265/files/arm-r1.patch Removed patch 0002, a different fix was applied upstream: https://bitbucket.org/multicoreware/x265_git/commits/ec7396adaa6afd2c8aab1918cfe4bb6e384740c3 Update project URL and _SITE. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x265/0001-fix-gcc-options.patch | 78 +++-- package/x265/0002-arm-asm-primitives.patch | 354 --------------------- package/x265/Config.in | 2 +- package/x265/x265.hash | 6 +- package/x265/x265.mk | 4 +- 5 files changed, 63 insertions(+), 381 deletions(-) delete mode 100644 package/x265/0002-arm-asm-primitives.patch diff --git a/package/x265/0001-fix-gcc-options.patch b/package/x265/0001-fix-gcc-options.patch index 81518212b4..0283da25ea 100644 --- a/package/x265/0001-fix-gcc-options.patch +++ b/package/x265/0001-fix-gcc-options.patch @@ -17,36 +17,72 @@ Backported from upstream pull request: https://bitbucket.org/multicoreware/x265/pull-requests/21 Signed-off-by: Bernd Kuhls +[Bernd: rebased for 3.5 based on + https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/x265/files/arm-r1.patch] diff -r 58dddcf01b7d source/CMakeLists.txt --- a/source/CMakeLists.txt Mon Jan 23 09:50:33 2017 +0530 +++ b/source/CMakeLists.txt Mon Jan 23 21:03:10 2017 +0100 -@@ -194,28 +194,6 @@ - if(NATIVE_BUILD) - if(INTEL_CXX) - add_definitions(-xhost) +@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ + # System architecture detection + string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) + set(X86_ALIASES x86 i386 i686 x86_64 amd64) +-set(ARM_ALIASES armv6l armv7l aarch64) ++set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64) + list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) + list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) + set(POWER_ALIASES ppc64 ppc64le) +@@ -239,11 +239,7 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- if(ARM64) +- set(ARM_ARGS -fPIC) - else() -- add_definitions(-march=native) +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) - endif() -- elseif(X86 AND NOT X64) -- string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos) -- if(marchPos LESS "0") -- add_definitions(-march=i686) -- if(WIN32 AND NOT INTEL_CXX AND NOT CLANG AND -- CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) -- add_definitions(-mpreferred-stack-boundary=2) -- endif() -- endif() -- endif() -- if(ARM AND CROSS_COMPILE_ARM) ++ set(ARM_ARGS -fPIC) + message(STATUS "cross compile arm") + elseif(ARM) + if(ARM64) +@@ -252,10 +248,10 @@ if(GCC) + else() + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + endif() +--- a/source/dynamicHDR10/CMakeLists.txt ++++ b/source/dynamicHDR10/CMakeLists.txt +@@ -43,14 +43,14 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) - set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -- elseif(ARM) -- find_package(Neon) -- if(CPU_HAS_NEON) ++ set(ARM_ARGS -fPIC) + elseif(ARM) + find_package(Neon) + if(CPU_HAS_NEON) - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -- add_definitions(-DHAVE_NEON) -- else() ++ set(ARM_ARGS -fPIC) + add_definitions(-DHAVE_NEON) + else() - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) endif() endif() add_definitions(${ARM_ARGS}) +@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") + option(ENABLE_SHARED "Build shared library" OFF) + + install(FILES hdr10plus.h DESTINATION include) +-endif() +\ No newline at end of file ++endif() + diff --git a/package/x265/0002-arm-asm-primitives.patch b/package/x265/0002-arm-asm-primitives.patch deleted file mode 100644 index e500443429..0000000000 --- a/package/x265/0002-arm-asm-primitives.patch +++ /dev/null @@ -1,354 +0,0 @@ -Fixes "arm assembly fail to compile on 1.8" - -Downloaded from upstream bug report: -https://bitbucket.org/multicoreware/x265/issues/406 - -Signed-off-by: Bernd Kuhls - ---- ./source/common/arm/asm-primitives.cpp.orig 2018-05-21 02:33:10.000000000 -0600 -+++ ./source/common/arm/asm-primitives.cpp 2018-05-28 20:38:37.302378303 -0600 -@@ -48,77 +48,77 @@ void setupAssemblyPrimitives(EncoderPrim - p.ssim_4x4x2_core = PFX(ssim_4x4x2_core_neon); - - // addAvg -- p.pu[LUMA_4x4].addAvg = PFX(addAvg_4x4_neon); -- p.pu[LUMA_4x8].addAvg = PFX(addAvg_4x8_neon); -- p.pu[LUMA_4x16].addAvg = PFX(addAvg_4x16_neon); -- p.pu[LUMA_8x4].addAvg = PFX(addAvg_8x4_neon); -- p.pu[LUMA_8x8].addAvg = PFX(addAvg_8x8_neon); -- p.pu[LUMA_8x16].addAvg = PFX(addAvg_8x16_neon); -- p.pu[LUMA_8x32].addAvg = PFX(addAvg_8x32_neon); -- p.pu[LUMA_12x16].addAvg = PFX(addAvg_12x16_neon); -- p.pu[LUMA_16x4].addAvg = PFX(addAvg_16x4_neon); -- p.pu[LUMA_16x8].addAvg = PFX(addAvg_16x8_neon); -- p.pu[LUMA_16x12].addAvg = PFX(addAvg_16x12_neon); -- p.pu[LUMA_16x16].addAvg = PFX(addAvg_16x16_neon); -- p.pu[LUMA_16x32].addAvg = PFX(addAvg_16x32_neon); -- p.pu[LUMA_16x64].addAvg = PFX(addAvg_16x64_neon); -- p.pu[LUMA_24x32].addAvg = PFX(addAvg_24x32_neon); -- p.pu[LUMA_32x8].addAvg = PFX(addAvg_32x8_neon); -- p.pu[LUMA_32x16].addAvg = PFX(addAvg_32x16_neon); -- p.pu[LUMA_32x24].addAvg = PFX(addAvg_32x24_neon); -- p.pu[LUMA_32x32].addAvg = PFX(addAvg_32x32_neon); -- p.pu[LUMA_32x64].addAvg = PFX(addAvg_32x64_neon); -- p.pu[LUMA_48x64].addAvg = PFX(addAvg_48x64_neon); -- p.pu[LUMA_64x16].addAvg = PFX(addAvg_64x16_neon); -- p.pu[LUMA_64x32].addAvg = PFX(addAvg_64x32_neon); -- p.pu[LUMA_64x48].addAvg = PFX(addAvg_64x48_neon); -- p.pu[LUMA_64x64].addAvg = PFX(addAvg_64x64_neon); -+ p.pu[LUMA_4x4].addAvg[ALIGNED] = PFX(addAvg_4x4_neon); -+ p.pu[LUMA_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); -+ p.pu[LUMA_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); -+ p.pu[LUMA_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); -+ p.pu[LUMA_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); -+ p.pu[LUMA_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); -+ p.pu[LUMA_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); -+ p.pu[LUMA_12x16].addAvg[ALIGNED] = PFX(addAvg_12x16_neon); -+ p.pu[LUMA_16x4].addAvg[ALIGNED] = PFX(addAvg_16x4_neon); -+ p.pu[LUMA_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); -+ p.pu[LUMA_16x12].addAvg[ALIGNED] = PFX(addAvg_16x12_neon); -+ p.pu[LUMA_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); -+ p.pu[LUMA_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); -+ p.pu[LUMA_16x64].addAvg[ALIGNED] = PFX(addAvg_16x64_neon); -+ p.pu[LUMA_24x32].addAvg[ALIGNED] = PFX(addAvg_24x32_neon); -+ p.pu[LUMA_32x8].addAvg[ALIGNED] = PFX(addAvg_32x8_neon); -+ p.pu[LUMA_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); -+ p.pu[LUMA_32x24].addAvg[ALIGNED] = PFX(addAvg_32x24_neon); -+ p.pu[LUMA_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); -+ p.pu[LUMA_32x64].addAvg[ALIGNED] = PFX(addAvg_32x64_neon); -+ p.pu[LUMA_48x64].addAvg[ALIGNED] = PFX(addAvg_48x64_neon); -+ p.pu[LUMA_64x16].addAvg[ALIGNED] = PFX(addAvg_64x16_neon); -+ p.pu[LUMA_64x32].addAvg[ALIGNED] = PFX(addAvg_64x32_neon); -+ p.pu[LUMA_64x48].addAvg[ALIGNED] = PFX(addAvg_64x48_neon); -+ p.pu[LUMA_64x64].addAvg[ALIGNED] = PFX(addAvg_64x64_neon); - - // chroma addAvg -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x2].addAvg = PFX(addAvg_4x2_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x4].addAvg = PFX(addAvg_4x4_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x8].addAvg = PFX(addAvg_4x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_4x16].addAvg = PFX(addAvg_4x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_6x8].addAvg = PFX(addAvg_6x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x2].addAvg = PFX(addAvg_8x2_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x4].addAvg = PFX(addAvg_8x4_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x6].addAvg = PFX(addAvg_8x6_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x8].addAvg = PFX(addAvg_8x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x16].addAvg = PFX(addAvg_8x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_8x32].addAvg = PFX(addAvg_8x32_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_12x16].addAvg = PFX(addAvg_12x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x4].addAvg = PFX(addAvg_16x4_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x8].addAvg = PFX(addAvg_16x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x12].addAvg = PFX(addAvg_16x12_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x16].addAvg = PFX(addAvg_16x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_16x32].addAvg = PFX(addAvg_16x32_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_24x32].addAvg = PFX(addAvg_24x32_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x8].addAvg = PFX(addAvg_32x8_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x16].addAvg = PFX(addAvg_32x16_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x24].addAvg = PFX(addAvg_32x24_neon); -- p.chroma[X265_CSP_I420].pu[CHROMA_420_32x32].addAvg = PFX(addAvg_32x32_neon); -- -- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x8].addAvg = PFX(addAvg_4x8_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x16].addAvg = PFX(addAvg_4x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_4x32].addAvg = PFX(addAvg_4x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_6x16].addAvg = PFX(addAvg_6x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x4].addAvg = PFX(addAvg_8x4_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x8].addAvg = PFX(addAvg_8x8_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x12].addAvg = PFX(addAvg_8x12_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x16].addAvg = PFX(addAvg_8x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x32].addAvg = PFX(addAvg_8x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_8x64].addAvg = PFX(addAvg_8x64_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_12x32].addAvg = PFX(addAvg_12x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x8].addAvg = PFX(addAvg_16x8_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x16].addAvg = PFX(addAvg_16x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x24].addAvg = PFX(addAvg_16x24_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x32].addAvg = PFX(addAvg_16x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_16x64].addAvg = PFX(addAvg_16x64_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_24x64].addAvg = PFX(addAvg_24x64_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x16].addAvg = PFX(addAvg_32x16_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x32].addAvg = PFX(addAvg_32x32_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x48].addAvg = PFX(addAvg_32x48_neon); -- p.chroma[X265_CSP_I422].pu[CHROMA_422_32x64].addAvg = PFX(addAvg_32x64_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x2].addAvg[ALIGNED] = PFX(addAvg_4x2_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x4].addAvg[ALIGNED] = PFX(addAvg_4x4_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_6x8].addAvg[ALIGNED] = PFX(addAvg_6x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x2].addAvg[ALIGNED] = PFX(addAvg_8x2_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x6].addAvg[ALIGNED] = PFX(addAvg_8x6_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_12x16].addAvg[ALIGNED] = PFX(addAvg_12x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x4].addAvg[ALIGNED] = PFX(addAvg_16x4_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x12].addAvg[ALIGNED] = PFX(addAvg_16x12_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_24x32].addAvg[ALIGNED] = PFX(addAvg_24x32_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x8].addAvg[ALIGNED] = PFX(addAvg_32x8_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x24].addAvg[ALIGNED] = PFX(addAvg_32x24_neon); -+ p.chroma[X265_CSP_I420].pu[CHROMA_420_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); -+ -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x8].addAvg[ALIGNED] = PFX(addAvg_4x8_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x16].addAvg[ALIGNED] = PFX(addAvg_4x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_4x32].addAvg[ALIGNED] = PFX(addAvg_4x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_6x16].addAvg[ALIGNED] = PFX(addAvg_6x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x4].addAvg[ALIGNED] = PFX(addAvg_8x4_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x8].addAvg[ALIGNED] = PFX(addAvg_8x8_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x12].addAvg[ALIGNED] = PFX(addAvg_8x12_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x16].addAvg[ALIGNED] = PFX(addAvg_8x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x32].addAvg[ALIGNED] = PFX(addAvg_8x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_8x64].addAvg[ALIGNED] = PFX(addAvg_8x64_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_12x32].addAvg[ALIGNED] = PFX(addAvg_12x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x8].addAvg[ALIGNED] = PFX(addAvg_16x8_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x16].addAvg[ALIGNED] = PFX(addAvg_16x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x24].addAvg[ALIGNED] = PFX(addAvg_16x24_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x32].addAvg[ALIGNED] = PFX(addAvg_16x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_16x64].addAvg[ALIGNED] = PFX(addAvg_16x64_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_24x64].addAvg[ALIGNED] = PFX(addAvg_24x64_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x16].addAvg[ALIGNED] = PFX(addAvg_32x16_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x32].addAvg[ALIGNED] = PFX(addAvg_32x32_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x48].addAvg[ALIGNED] = PFX(addAvg_32x48_neon); -+ p.chroma[X265_CSP_I422].pu[CHROMA_422_32x64].addAvg[ALIGNED] = PFX(addAvg_32x64_neon); - - // quant - p.quant = PFX(quant_neon); -@@ -402,7 +402,7 @@ void setupAssemblyPrimitives(EncoderPrim - p.scale2D_64to32 = PFX(scale2D_64to32_neon); - - // scale1D_128to64 -- p.scale1D_128to64 = PFX(scale1D_128to64_neon); -+ p.scale1D_128to64[ALIGNED] = PFX(scale1D_128to64_neon); - - // copy_count - p.cu[BLOCK_4x4].copy_cnt = PFX(copy_cnt_4_neon); -@@ -411,37 +411,37 @@ void setupAssemblyPrimitives(EncoderPrim - p.cu[BLOCK_32x32].copy_cnt = PFX(copy_cnt_32_neon); - - // filterPixelToShort -- p.pu[LUMA_4x4].convert_p2s = PFX(filterPixelToShort_4x4_neon); -- p.pu[LUMA_4x8].convert_p2s = PFX(filterPixelToShort_4x8_neon); -- p.pu[LUMA_4x16].convert_p2s = PFX(filterPixelToShort_4x16_neon); -- p.pu[LUMA_8x4].convert_p2s = PFX(filterPixelToShort_8x4_neon); -- p.pu[LUMA_8x8].convert_p2s = PFX(filterPixelToShort_8x8_neon); -- p.pu[LUMA_8x16].convert_p2s = PFX(filterPixelToShort_8x16_neon); -- p.pu[LUMA_8x32].convert_p2s = PFX(filterPixelToShort_8x32_neon); -- p.pu[LUMA_12x16].convert_p2s = PFX(filterPixelToShort_12x16_neon); -- p.pu[LUMA_16x4].convert_p2s = PFX(filterPixelToShort_16x4_neon); -- p.pu[LUMA_16x8].convert_p2s = PFX(filterPixelToShort_16x8_neon); -- p.pu[LUMA_16x12].convert_p2s = PFX(filterPixelToShort_16x12_neon); -- p.pu[LUMA_16x16].convert_p2s = PFX(filterPixelToShort_16x16_neon); -- p.pu[LUMA_16x32].convert_p2s = PFX(filterPixelToShort_16x32_neon); -- p.pu[LUMA_16x64].convert_p2s = PFX(filterPixelToShort_16x64_neon); -- p.pu[LUMA_24x32].convert_p2s = PFX(filterPixelToShort_24x32_neon); -- p.pu[LUMA_32x8].convert_p2s = PFX(filterPixelToShort_32x8_neon); -- p.pu[LUMA_32x16].convert_p2s = PFX(filterPixelToShort_32x16_neon); -- p.pu[LUMA_32x24].convert_p2s = PFX(filterPixelToShort_32x24_neon); -- p.pu[LUMA_32x32].convert_p2s = PFX(filterPixelToShort_32x32_neon); -- p.pu[LUMA_32x64].convert_p2s = PFX(filterPixelToShort_32x64_neon); -- p.pu[LUMA_48x64].convert_p2s = PFX(filterPixelToShort_48x64_neon); -- p.pu[LUMA_64x16].convert_p2s = PFX(filterPixelToShort_64x16_neon); -- p.pu[LUMA_64x32].convert_p2s = PFX(filterPixelToShort_64x32_neon); -- p.pu[LUMA_64x48].convert_p2s = PFX(filterPixelToShort_64x48_neon); -- p.pu[LUMA_64x64].convert_p2s = PFX(filterPixelToShort_64x64_neon); -+ p.pu[LUMA_4x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x4_neon); -+ p.pu[LUMA_4x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x8_neon); -+ p.pu[LUMA_4x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_4x16_neon); -+ p.pu[LUMA_8x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x4_neon); -+ p.pu[LUMA_8x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x8_neon); -+ p.pu[LUMA_8x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x16_neon); -+ p.pu[LUMA_8x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_8x32_neon); -+ p.pu[LUMA_12x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_12x16_neon); -+ p.pu[LUMA_16x4].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x4_neon); -+ p.pu[LUMA_16x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x8_neon); -+ p.pu[LUMA_16x12].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x12_neon); -+ p.pu[LUMA_16x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x16_neon); -+ p.pu[LUMA_16x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x32_neon); -+ p.pu[LUMA_16x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_16x64_neon); -+ p.pu[LUMA_24x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_24x32_neon); -+ p.pu[LUMA_32x8].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x8_neon); -+ p.pu[LUMA_32x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x16_neon); -+ p.pu[LUMA_32x24].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x24_neon); -+ p.pu[LUMA_32x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x32_neon); -+ p.pu[LUMA_32x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_32x64_neon); -+ p.pu[LUMA_48x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_48x64_neon); -+ p.pu[LUMA_64x16].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x16_neon); -+ p.pu[LUMA_64x32].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x32_neon); -+ p.pu[LUMA_64x48].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x48_neon); -+ p.pu[LUMA_64x64].convert_p2s[ALIGNED] = PFX(filterPixelToShort_64x64_neon); - - // Block_fill -- p.cu[BLOCK_4x4].blockfill_s = PFX(blockfill_s_4x4_neon); -- p.cu[BLOCK_8x8].blockfill_s = PFX(blockfill_s_8x8_neon); -- p.cu[BLOCK_16x16].blockfill_s = PFX(blockfill_s_16x16_neon); -- p.cu[BLOCK_32x32].blockfill_s = PFX(blockfill_s_32x32_neon); -+ p.cu[BLOCK_4x4].blockfill_s[ALIGNED] = PFX(blockfill_s_4x4_neon); -+ p.cu[BLOCK_8x8].blockfill_s[ALIGNED] = PFX(blockfill_s_8x8_neon); -+ p.cu[BLOCK_16x16].blockfill_s[ALIGNED] = PFX(blockfill_s_16x16_neon); -+ p.cu[BLOCK_32x32].blockfill_s[ALIGNED] = PFX(blockfill_s_32x32_neon); - - // Blockcopy_ss - p.cu[BLOCK_4x4].copy_ss = PFX(blockcopy_ss_4x4_neon); -@@ -495,21 +495,21 @@ void setupAssemblyPrimitives(EncoderPrim - p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].copy_sp = PFX(blockcopy_sp_32x64_neon); - - // pixel_add_ps -- p.cu[BLOCK_4x4].add_ps = PFX(pixel_add_ps_4x4_neon); -- p.cu[BLOCK_8x8].add_ps = PFX(pixel_add_ps_8x8_neon); -- p.cu[BLOCK_16x16].add_ps = PFX(pixel_add_ps_16x16_neon); -- p.cu[BLOCK_32x32].add_ps = PFX(pixel_add_ps_32x32_neon); -- p.cu[BLOCK_64x64].add_ps = PFX(pixel_add_ps_64x64_neon); -+ p.cu[BLOCK_4x4].add_ps[ALIGNED] = PFX(pixel_add_ps_4x4_neon); -+ p.cu[BLOCK_8x8].add_ps[ALIGNED] = PFX(pixel_add_ps_8x8_neon); -+ p.cu[BLOCK_16x16].add_ps[ALIGNED] = PFX(pixel_add_ps_16x16_neon); -+ p.cu[BLOCK_32x32].add_ps[ALIGNED] = PFX(pixel_add_ps_32x32_neon); -+ p.cu[BLOCK_64x64].add_ps[ALIGNED] = PFX(pixel_add_ps_64x64_neon); - - // chroma add_ps -- p.chroma[X265_CSP_I420].cu[BLOCK_420_4x4].add_ps = PFX(pixel_add_ps_4x4_neon); -- p.chroma[X265_CSP_I420].cu[BLOCK_420_8x8].add_ps = PFX(pixel_add_ps_8x8_neon); -- p.chroma[X265_CSP_I420].cu[BLOCK_420_16x16].add_ps = PFX(pixel_add_ps_16x16_neon); -- p.chroma[X265_CSP_I420].cu[BLOCK_420_32x32].add_ps = PFX(pixel_add_ps_32x32_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_4x8].add_ps = PFX(pixel_add_ps_4x8_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_8x16].add_ps = PFX(pixel_add_ps_8x16_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_16x32].add_ps = PFX(pixel_add_ps_16x32_neon); -- p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].add_ps = PFX(pixel_add_ps_32x64_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_4x4].add_ps[ALIGNED] = PFX(pixel_add_ps_4x4_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_8x8].add_ps[ALIGNED] = PFX(pixel_add_ps_8x8_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_16x16].add_ps[ALIGNED] = PFX(pixel_add_ps_16x16_neon); -+ p.chroma[X265_CSP_I420].cu[BLOCK_420_32x32].add_ps[ALIGNED] = PFX(pixel_add_ps_32x32_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_4x8].add_ps[ALIGNED] = PFX(pixel_add_ps_4x8_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_8x16].add_ps[ALIGNED] = PFX(pixel_add_ps_8x16_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_16x32].add_ps[ALIGNED] = PFX(pixel_add_ps_16x32_neon); -+ p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].add_ps[ALIGNED] = PFX(pixel_add_ps_32x64_neon); - - // cpy2Dto1D_shr - p.cu[BLOCK_4x4].cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_4x4_neon); -@@ -518,10 +518,10 @@ void setupAssemblyPrimitives(EncoderPrim - p.cu[BLOCK_32x32].cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_32x32_neon); - - // ssd_s -- p.cu[BLOCK_4x4].ssd_s = PFX(pixel_ssd_s_4x4_neon); -- p.cu[BLOCK_8x8].ssd_s = PFX(pixel_ssd_s_8x8_neon); -- p.cu[BLOCK_16x16].ssd_s = PFX(pixel_ssd_s_16x16_neon); -- p.cu[BLOCK_32x32].ssd_s = PFX(pixel_ssd_s_32x32_neon); -+ p.cu[BLOCK_4x4].ssd_s[ALIGNED] = PFX(pixel_ssd_s_4x4_neon); -+ p.cu[BLOCK_8x8].ssd_s[ALIGNED] = PFX(pixel_ssd_s_8x8_neon); -+ p.cu[BLOCK_16x16].ssd_s[ALIGNED] = PFX(pixel_ssd_s_16x16_neon); -+ p.cu[BLOCK_32x32].ssd_s[ALIGNED] = PFX(pixel_ssd_s_32x32_neon); - - // sse_ss - p.cu[BLOCK_4x4].sse_ss = PFX(pixel_sse_ss_4x4_neon); -@@ -548,10 +548,10 @@ void setupAssemblyPrimitives(EncoderPrim - p.chroma[X265_CSP_I422].cu[BLOCK_422_32x64].sub_ps = PFX(pixel_sub_ps_32x64_neon); - - // calc_Residual -- p.cu[BLOCK_4x4].calcresidual = PFX(getResidual4_neon); -- p.cu[BLOCK_8x8].calcresidual = PFX(getResidual8_neon); -- p.cu[BLOCK_16x16].calcresidual = PFX(getResidual16_neon); -- p.cu[BLOCK_32x32].calcresidual = PFX(getResidual32_neon); -+ p.cu[BLOCK_4x4].calcresidual[ALIGNED] = PFX(getResidual4_neon); -+ p.cu[BLOCK_8x8].calcresidual[ALIGNED] = PFX(getResidual8_neon); -+ p.cu[BLOCK_16x16].calcresidual[ALIGNED] = PFX(getResidual16_neon); -+ p.cu[BLOCK_32x32].calcresidual[ALIGNED] = PFX(getResidual32_neon); - - // sse_pp - p.cu[BLOCK_4x4].sse_pp = PFX(pixel_sse_pp_4x4_neon); -@@ -722,31 +722,31 @@ void setupAssemblyPrimitives(EncoderPrim - p.pu[LUMA_64x64].sad_x4 = PFX(sad_x4_64x64_neon); - - // pixel_avg_pp -- p.pu[LUMA_4x4].pixelavg_pp = PFX(pixel_avg_pp_4x4_neon); -- p.pu[LUMA_4x8].pixelavg_pp = PFX(pixel_avg_pp_4x8_neon); -- p.pu[LUMA_4x16].pixelavg_pp = PFX(pixel_avg_pp_4x16_neon); -- p.pu[LUMA_8x4].pixelavg_pp = PFX(pixel_avg_pp_8x4_neon); -- p.pu[LUMA_8x8].pixelavg_pp = PFX(pixel_avg_pp_8x8_neon); -- p.pu[LUMA_8x16].pixelavg_pp = PFX(pixel_avg_pp_8x16_neon); -- p.pu[LUMA_8x32].pixelavg_pp = PFX(pixel_avg_pp_8x32_neon); -- p.pu[LUMA_12x16].pixelavg_pp = PFX(pixel_avg_pp_12x16_neon); -- p.pu[LUMA_16x4].pixelavg_pp = PFX(pixel_avg_pp_16x4_neon); -- p.pu[LUMA_16x8].pixelavg_pp = PFX(pixel_avg_pp_16x8_neon); -- p.pu[LUMA_16x12].pixelavg_pp = PFX(pixel_avg_pp_16x12_neon); -- p.pu[LUMA_16x16].pixelavg_pp = PFX(pixel_avg_pp_16x16_neon); -- p.pu[LUMA_16x32].pixelavg_pp = PFX(pixel_avg_pp_16x32_neon); -- p.pu[LUMA_16x64].pixelavg_pp = PFX(pixel_avg_pp_16x64_neon); -- p.pu[LUMA_24x32].pixelavg_pp = PFX(pixel_avg_pp_24x32_neon); -- p.pu[LUMA_32x8].pixelavg_pp = PFX(pixel_avg_pp_32x8_neon); -- p.pu[LUMA_32x16].pixelavg_pp = PFX(pixel_avg_pp_32x16_neon); -- p.pu[LUMA_32x24].pixelavg_pp = PFX(pixel_avg_pp_32x24_neon); -- p.pu[LUMA_32x32].pixelavg_pp = PFX(pixel_avg_pp_32x32_neon); -- p.pu[LUMA_32x64].pixelavg_pp = PFX(pixel_avg_pp_32x64_neon); -- p.pu[LUMA_48x64].pixelavg_pp = PFX(pixel_avg_pp_48x64_neon); -- p.pu[LUMA_64x16].pixelavg_pp = PFX(pixel_avg_pp_64x16_neon); -- p.pu[LUMA_64x32].pixelavg_pp = PFX(pixel_avg_pp_64x32_neon); -- p.pu[LUMA_64x48].pixelavg_pp = PFX(pixel_avg_pp_64x48_neon); -- p.pu[LUMA_64x64].pixelavg_pp = PFX(pixel_avg_pp_64x64_neon); -+ p.pu[LUMA_4x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x4_neon); -+ p.pu[LUMA_4x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x8_neon); -+ p.pu[LUMA_4x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_4x16_neon); -+ p.pu[LUMA_8x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x4_neon); -+ p.pu[LUMA_8x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x8_neon); -+ p.pu[LUMA_8x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x16_neon); -+ p.pu[LUMA_8x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_8x32_neon); -+ p.pu[LUMA_12x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_12x16_neon); -+ p.pu[LUMA_16x4].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x4_neon); -+ p.pu[LUMA_16x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x8_neon); -+ p.pu[LUMA_16x12].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x12_neon); -+ p.pu[LUMA_16x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x16_neon); -+ p.pu[LUMA_16x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x32_neon); -+ p.pu[LUMA_16x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_16x64_neon); -+ p.pu[LUMA_24x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_24x32_neon); -+ p.pu[LUMA_32x8].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x8_neon); -+ p.pu[LUMA_32x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x16_neon); -+ p.pu[LUMA_32x24].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x24_neon); -+ p.pu[LUMA_32x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x32_neon); -+ p.pu[LUMA_32x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_32x64_neon); -+ p.pu[LUMA_48x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_48x64_neon); -+ p.pu[LUMA_64x16].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x16_neon); -+ p.pu[LUMA_64x32].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x32_neon); -+ p.pu[LUMA_64x48].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x48_neon); -+ p.pu[LUMA_64x64].pixelavg_pp[ALIGNED] = PFX(pixel_avg_pp_64x64_neon); - - // planecopy - p.planecopy_cp = PFX(pixel_planecopy_cp_neon); diff --git a/package/x265/Config.in b/package/x265/Config.in index 180931db66..1067505d31 100644 --- a/package/x265/Config.in +++ b/package/x265/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_X265 General Public License (GPL) 2 license or a commercial license, similar to the x264 project. - https://bitbucket.org/multicoreware/x265/wiki/Home + https://bitbucket.org/multicoreware/x265_git/wiki/Home if BR2_PACKAGE_X265 diff --git a/package/x265/x265.hash b/package/x265/x265.hash index 3d70ac0c67..fb9a5b5910 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,5 +1,5 @@ -# From https://mailman.videolan.org/pipermail/x265-devel/2020-February/012880.html -md5 0c8c747b59b5411dea8cf557554636c1 x265_3.3.tar.gz +# From https://mailman.videolan.org/pipermail/x265-devel/2021-March/013257.html +md5 deb5df5cb2ec17bdbae6ac6bbc3b1eef x265_3.5.tar.gz # Locally generated -sha256 f26e148ed1f4dfb33fd1eb3ff5e60e08078d1b2017e88bcbb045b3fb58300b9c x265_3.3.tar.gz +sha256 e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8 x265_3.5.tar.gz sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 872753eea8..85c4ade768 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -4,9 +4,9 @@ # ################################################################################ -X265_VERSION = 3.3 +X265_VERSION = 3.5 X265_SOURCE = x265_$(X265_VERSION).tar.gz -X265_SITE = https://bitbucket.org/multicoreware/x265/downloads +X265_SITE = https://bitbucket.org/multicoreware/x265_git/downloads X265_LICENSE = GPL-2.0+ X265_LICENSE_FILES = COPYING X265_CPE_ID_VENDOR = multicorewareinc From 7093957e9b52bb87a97249a276c0c4f86b7a410d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 20 Nov 2021 16:04:46 +0100 Subject: [PATCH 107/176] package/x265: enable parallel build Parallel builds were disabled in 2018: https://git.buildroot.net/buildroot/commit/?id=03bfbc5ab26c9aed0c0cfce55341a1d1f05deca3 Build-testing the version bump to 3.5 showed no errors with 32 threads. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x265/x265.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 85c4ade768..51c39df4cd 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -12,7 +12,6 @@ X265_LICENSE_FILES = COPYING X265_CPE_ID_VENDOR = multicorewareinc X265_SUBDIR = source X265_INSTALL_STAGING = YES -X265_MAKE = $(MAKE1) ifeq ($(BR2_i386)$(BR2_x86_64),y) X265_DEPENDENCIES += host-nasm From b6ab78b930a0b647d2c43b4b735f8359ca8d7518 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 21 Nov 2021 07:57:46 +0100 Subject: [PATCH 108/176] package/{mesa3d, mesa3d-headers}: bump version to 21.3.0 Add new crocus gallium driver: https://cgit.freedesktop.org/mesa/mesa/commit/?id=f3630548f1da904ec6c63b43ece7e68afdb8867e Added two patches to fix uClibc-related build errors. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/0006-fix-valist.patch | 37 +++++++++++++++++++ package/mesa3d/0007-fix-cpp-detection.patch | 40 +++++++++++++++++++++ package/mesa3d/Config.in | 7 ++++ package/mesa3d/mesa3d.hash | 6 ++-- package/mesa3d/mesa3d.mk | 3 +- 6 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 package/mesa3d/0006-fix-valist.patch create mode 100644 package/mesa3d/0007-fix-cpp-detection.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 233292ab0a..39797f61b7 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.1.8 +MESA3D_HEADERS_VERSION = 21.3.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0006-fix-valist.patch b/package/mesa3d/0006-fix-valist.patch new file mode 100644 index 0000000000..84a254cec5 --- /dev/null +++ b/package/mesa3d/0006-fix-valist.patch @@ -0,0 +1,37 @@ +From f6892df8eb115fa712fd69068432b48b028e1e54 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 20 Nov 2021 22:48:54 +0100 +Subject: [PATCH] util/u_printf.h: fix build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build error with uClibc and gcc-9.3.0: + +In file included from ../src/util/u_printf.cpp:24: +../src/util/u_printf.h:43:41: error: ‘va_list’ has not been declared + 43 | size_t u_printf_length(const char *fmt, va_list untouched_args); + +Patch sent upstream: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13897 + +Signed-off-by: Bernd Kuhls +--- + src/util/u_printf.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/u_printf.h b/src/util/u_printf.h +index 44dcce5529f..14f324de10c 100644 +--- a/src/util/u_printf.h ++++ b/src/util/u_printf.h +@@ -25,6 +25,7 @@ + #ifdef __cplusplus + + #include ++#include + + /* find next valid printf specifier in a C++ std::string */ + size_t util_printf_next_spec_pos(const std::string &s, size_t pos); +-- +GitLab + diff --git a/package/mesa3d/0007-fix-cpp-detection.patch b/package/mesa3d/0007-fix-cpp-detection.patch new file mode 100644 index 0000000000..2e097277de --- /dev/null +++ b/package/mesa3d/0007-fix-cpp-detection.patch @@ -0,0 +1,40 @@ +From ab5519971a090863f8c559907766e0b2382e0471 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 20 Nov 2021 23:02:18 +0100 +Subject: [PATCH] c11_compat.h: fix uClibc build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build error with uClibc and gcc-9.3.0: + +../src/egl/main/egldisplay.c: In function ‘_eglGetNativePlatformFromEnv’: +../src/egl/main/egldisplay.c:101:4: error: implicit declaration of function ‘static_assert’ [-Werror=implicit-function-declaration] + 101 | static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, + +CC: 21.3 + +Patch sent upstream: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 + +Signed-off-by: Bernd Kuhls +--- + include/c11_compat.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/c11_compat.h b/include/c11_compat.h +index d35740f47a4..cdcd3f1f52f 100644 +--- a/include/c11_compat.h ++++ b/include/c11_compat.h +@@ -8,8 +8,6 @@ + + #if defined(__cplusplus) + /* This is C++ code, not C */ +-#elif (__STDC_VERSION__ >= 201112L) +- /* Already C11 */ + #else + + +-- +GitLab + diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7da9ca4f5b..c84f48413f 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -97,6 +97,13 @@ config BR2_PACKAGE_MESA3D_NEEDS_X11 comment "Gallium drivers" +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS + bool "Gallium crocus driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + Mesa driver for gen4-7 Intel GPUs. + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 26176b85b7..6ada5aebc4 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-September/000644.html -sha256 5cd32f5d089dca75300578a3d771a656eaed652090573a2655fe4e7022d56bfc mesa-21.1.8.tar.xz -sha512 80fcf2b1d59b49e384e9aa1ae63a3ce709833059af1ffd8eb821054c1976709134098cfc79fac1578a2f08a003223f1c96b38e2e650c5be49821c6f2fe1047af mesa-21.1.8.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-November/000654.html +sha256 a2753c09deef0ba14d35ae8a2ceff3fe5cd13698928c7bb62c2ec8736eb09ce1 mesa-21.3.0.tar.xz +sha512 b27c0ccf2fc9b96bbece715612cec4f4e267ab25dc5386c3debd2346c385afa0146317c67a3d2eec198dbf5338fb182b458c5fe5567216b265153c0b7b560de1 mesa-21.3.0.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index e5cb65df36..617f1a8588 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.1.8 +MESA3D_VERSION = 21.3.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -85,6 +85,7 @@ endif # Drivers #Gallium Drivers +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS) += crocus MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO) += freedreno MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 From 9f33c5528f57100c673aa597a210ec69c1e09300 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 21 Nov 2021 08:00:10 +0100 Subject: [PATCH 109/176] package/kodi-pvr-hts: bump version to 19.0.3-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index 3e309d55a5..4ac0f3e785 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 9aaa8933a23bcdcdc4b4be6dd10adc19f5f27b8915fa5c39f58202c5d1399dc9 kodi-pvr-hts-19.0.2-Matrix.tar.gz +sha256 b97e48b70ab0c3769f0ab2c613ac3a0741a7751bb5bb20187bd47bc2a99d86d3 kodi-pvr-hts-19.0.3-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 eb331b8002..d1fc4d0ed2 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 19.0.2-Matrix +KODI_PVR_HTS_VERSION = 19.0.3-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 = LICENSE.md From d55b228cb39b34164de8026da0642f2c7079cb82 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 21 Nov 2021 10:01:35 +0100 Subject: [PATCH 110/176] package/smcroute: bump to version 2.5.5 Fixes parse error when calling 'smcrouted -N' with a config file that has 'mrdisc' disabled for one or more interfaces. Multicast router discovery (mrdisc) is enabled by default in Buildroot. See the ChangeLog, or release notes at GitHub, for more information: https://github.com/troglobit/smcroute/releases/tag/2.5.5 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/smcroute/smcroute.hash | 2 +- package/smcroute/smcroute.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash index ddc38eddd2..ea4c449c42 100644 --- a/package/smcroute/smcroute.hash +++ b/package/smcroute/smcroute.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 96b890fd6fbf8553010f62beda991742f7b4e7e8aea3e75335fb6048b15869da smcroute-2.5.4.tar.gz +sha256 2569cd97fa2047df14203a7144be53a1b32928cb460421a302bbcce381b42bc3 smcroute-2.5.5.tar.gz # Locally generated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index 81f540088a..1626c80a7c 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.5.4 +SMCROUTE_VERSION = 2.5.5 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING From a5cb09bf621e252091c5eba3982c568c3e4e5adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 18 Nov 2021 18:45:47 +0100 Subject: [PATCH 111/176] package/uboot-tools: add support for mkeficapsule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mkeficapsule U-Boot tool can be used to generate UEFI capsule binaries. Add an option to cross-build it and install it to the target filesystem. Also, build it and install it unconditionally to the host dir. Signed-off-by: Vincent Stehlé Cc: Matt Weber Signed-off-by: Thomas Petazzoni --- package/uboot-tools/Config.in | 8 ++++++++ package/uboot-tools/uboot-tools.mk | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in index 681f87b45f..e8bbf3a16e 100644 --- a/package/uboot-tools/Config.in +++ b/package/uboot-tools/Config.in @@ -66,6 +66,14 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE The mkimage tool from Das U-Boot bootloader, which allows generation of U-Boot images in various formats. +config BR2_PACKAGE_UBOOT_TOOLS_MKEFICAPSULE + bool "mkeficapsule" + help + Install the mkeficapsule tool on the target system + + The mkeficapsule tool from Das U-Boot bootloader, which allows + generation of UEFI capsule binaries. + config BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE bool "mkenvimage" help diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 81f60963ec..37e329a2af 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -22,6 +22,8 @@ define UBOOT_TOOLS_CONFIGURE_CMDS touch $(@D)/include/config/auto.conf mkdir -p $(@D)/include/generated touch $(@D)/include/generated/autoconf.h + mkdir -p $(@D)/include/asm + touch $(@D)/include/asm/linkage.h endef UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -40,6 +42,10 @@ UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x UBOOT_TOOLS_DEPENDENCIES += openssl host-pkgconf endif +ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKEFICAPSULE),y) +UBOOT_TOOLS_MAKE_OPTS += CONFIG_EFI_HAVE_CAPSULE_SUPPORT=y +endif + ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN),y) define UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN $(INSTALL) -m 0755 -D $(@D)/tools/fit_check_sign $(TARGET_DIR)/usr/bin/fit_check_sign @@ -59,6 +65,12 @@ define UBOOT_TOOLS_INSTALL_MKIMAGE endef endif +ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKEFICAPSULE),y) +define UBOOT_TOOLS_INSTALL_MKEFICAPSULE + $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(TARGET_DIR)/usr/bin/mkeficapsule +endef +endif + ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE),y) define UBOOT_TOOLS_INSTALL_MKENVIMAGE $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(TARGET_DIR)/usr/bin/mkenvimage @@ -85,6 +97,7 @@ endef define UBOOT_TOOLS_INSTALL_TARGET_CMDS $(UBOOT_TOOLS_INSTALL_MKIMAGE) + $(UBOOT_TOOLS_INSTALL_MKEFICAPSULE) $(UBOOT_TOOLS_INSTALL_MKENVIMAGE) $(UBOOT_TOOLS_INSTALL_FWPRINTENV) $(UBOOT_TOOLS_INSTALL_DUMPIMAGE) @@ -98,11 +111,14 @@ define HOST_UBOOT_TOOLS_CONFIGURE_CMDS touch $(@D)/include/config/auto.conf mkdir -p $(@D)/include/generated touch $(@D)/include/generated/autoconf.h + mkdir -p $(@D)/include/asm + touch $(@D)/include/asm/linkage.h endef HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \ HOSTCFLAGS="$(HOST_CFLAGS)" \ - HOSTLDFLAGS="$(HOST_LDFLAGS)" + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + CONFIG_EFI_HAVE_CAPSULE_SUPPORT=y ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),y) HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y CONFIG_MKIMAGE_DTC_PATH=dtc @@ -193,6 +209,7 @@ endef define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/bin/mkimage + $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) From a4e462b1aed5bcb5629a4a606190877cbb8b3eb3 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 17 Nov 2021 15:16:05 +0100 Subject: [PATCH 112/176] package/{python-}protobuf: bump to version 3.19.1 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 777f19d6b9..60e64f54d4 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 7308590dbb95e77066b99c5674eed855c8257e70658d2af586f4a81ff0eea2b1 protobuf-cpp-3.18.0.tar.gz +sha256 645192532f28254152b51c01868efdf9b766b1dbe49c77cccd6efcdb2d7c7bc2 protobuf-cpp-3.19.1.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index bb9c6bf37c..80764f0216 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.18.0 +PROTOBUF_VERSION = 3.19.1 PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/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 e9a5ac4904..2bfef96676 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4f792034070915819065c162a310142d66835333824e2e0a2ca26ed54b013408 protobuf-python-3.18.0.tar.gz +sha256 2286615a3ae3e24c3524d171b6728b77b72cd2f3aab905f6a8d3fcaf6209dd00 protobuf-python-3.19.1.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE From 3030189585a2eb6eab18cdf0b02f93e8c966aff8 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 17 Nov 2021 21:28:19 +0100 Subject: [PATCH 113/176] package/libabseil-cpp: bump to version 20211102.0 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/libabseil-cpp/libabseil-cpp.hash | 2 +- package/libabseil-cpp/libabseil-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 6429f5e9bf..2d6c598880 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f libabseil-cpp-20210324.2.tar.gz +sha256 dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 libabseil-cpp-20211102.0.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index 7646cf0ecd..738cd03c39 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20210324.2 +LIBABSEIL_CPP_VERSION = 20211102.0 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE From 07a9b860bed9bff7146b1889db046789b2f517f2 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 17 Nov 2021 15:39:23 +0100 Subject: [PATCH 114/176] package/re2: bump version to 2021-11-01 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 87fa095e35..a0a7d15938 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 cd8c950b528f413e02c12970dce62a7b6f37733d7f68807e73a2d9bc9db79bc8 re2-2021-08-01.tar.gz +sha256 8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669 re2-2021-11-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 29c141ea81..b562d5d7ef 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2021-08-01 +RE2_VERSION = 2021-11-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From 386cf00e6f32f3dd6d13ee38577d959dc4addc6f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 14 Nov 2021 17:19:50 +0100 Subject: [PATCH 115/176] configs/beagleboneai_defconfig: move to u-boot 2021.04 / mainline linux 5.10.79 This board is now supported by mainline u-boot and Linux. For U-Boot we unfortunately still need a patch as the available ( --- .../uboot/0001-BeagleBone-AI-support.patch | 1783 ----------------- .../patches/uboot/0001-am57xx_evm-fixes.patch | 839 ++++++++ configs/beagleboneai_defconfig | 11 +- 3 files changed, 845 insertions(+), 1788 deletions(-) delete mode 100644 board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch create mode 100644 board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch diff --git a/board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch b/board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch deleted file mode 100644 index 2d9accf954..0000000000 --- a/board/beagleboneai/patches/uboot/0001-BeagleBone-AI-support.patch +++ /dev/null @@ -1,1783 +0,0 @@ -From 989c27c791a453550ff6c1440b41c55c6e70615d Mon Sep 17 00:00:00 2001 -From: Jason Kridner -Date: Wed, 27 Mar 2019 14:06:24 -0400 -Subject: [PATCH] BeagleBone AI support - -Patch from: -https://github.com/beagleboard/beaglebone-ai/blob/master/SW/buildroot/local/patches/uboot/0001-BeagleBone-AI-support.patch - -Signed-off-by: Peter Korsgaard ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/am5729-beagleboneai.dts | 494 +++++++++++++++++++++++++++ - arch/arm/mach-omap2/omap5/hw_data.c | 3 +- - board/ti/am57xx/board.c | 134 +++++++- - board/ti/am57xx/mux_data.h | 390 +++++++++++++++++++++ - configs/am57xx_evm_defconfig | 10 +- - include/configs/am57xx_evm.h | 2 +- - include/configs/ti_armv7_common.h | 357 +++++++++++++++++++ - include/configs/ti_omap5_common.h | 5 + - include/environment/ti/boot.h | 49 +-- - include/environment/ti/mmc.h | 45 ++- - 11 files changed, 1447 insertions(+), 43 deletions(-) - create mode 100644 arch/arm/dts/am5729-beagleboneai.dts - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 2a040b20a5..6771d457a4 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -232,6 +232,7 @@ dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb \ - dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb \ - am57xx-beagle-x15-revb1.dtb \ - am57xx-beagle-x15-revc.dtb \ -+ am5729-beagleboneai.dtb \ - am574x-idk.dtb \ - am572x-idk.dtb \ - am571x-idk.dtb -diff --git a/arch/arm/dts/am5729-beagleboneai.dts b/arch/arm/dts/am5729-beagleboneai.dts -new file mode 100644 -index 0000000000..d1afe55751 ---- /dev/null -+++ b/arch/arm/dts/am5729-beagleboneai.dts -@@ -0,0 +1,494 @@ -+/* -+ * Copyright (C) 2014-2018 Texas Instruments Incorporated - http://www.ti.com/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+/dts-v1/; -+ -+#include "dra74x.dtsi" -+#include "am57xx-commercial-grade.dtsi" -+#include "dra74x-mmc-iodelay.dtsi" -+#include -+#include -+#include -+ -+/ { -+ model = "BeagleBoard.org BeagleBone AI"; -+ compatible = "beagleboard.org,am57xx-beagleboneai", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; -+ -+ chosen { -+ stdout-path = &uart1; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x80000000 0x0 0x40000000>; -+ }; -+ -+ vdd_5v: fixedregulator-vdd_5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "vdd_5v"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vtt_fixed: fixedregulator-vtt { -+ /* TPS51200 */ -+ compatible = "regulator-fixed"; -+ regulator-name = "vtt_fixed"; -+ vin-supply = <&vdd_3v3>; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ src_clk_x1: src_clk_x1 { -+ #clock-cells = <0>; -+ compatible = "fixed-clock"; -+ clock-frequency = <20000000>; -+ }; -+ -+ src_clk_osc1: src_clk_osc1 { -+ #clock-cells = <0>; -+ compatible = "fixed-clock"; -+ clock-frequency = <24000000>; -+ }; -+ -+ src_clk_osc4: src_clk_osc4 { -+ #clock-cells = <0>; -+ compatible = "fixed-clock"; -+ clock-frequency = <24000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ led0 { -+ label = "beaglebone:green:usr0"; -+ gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; -+ default-state = "off"; -+ }; -+ -+ led1 { -+ label = "beaglebone:green:usr1"; -+ gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc0"; -+ default-state = "off"; -+ }; -+ -+ led2 { -+ label = "beaglebone:green:usr2"; -+ gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "cpu"; -+ default-state = "off"; -+ }; -+ -+ led3 { -+ label = "beaglebone:green:usr3"; -+ gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc1"; -+ default-state = "off"; -+ }; -+ }; -+}; -+ -+&i2c1 { -+ status = "okay"; -+ clock-frequency = <400000>; -+ -+ tps659038: tps659038@58 { -+ compatible = "ti,tps659038"; -+ reg = <0x58>; -+ interrupts-extended = <&gpio6 16 IRQ_TYPE_LEVEL_HIGH -+ &dra7_pmx_core 0x418>; -+ -+ #interrupt-cells = <2>; -+ interrupt-controller; -+ -+ ti,system-power-controller; -+ ti,palmas-override-powerhold; -+ -+ tps659038_pmic { -+ compatible = "ti,tps659038-pmic"; -+ -+ smps12-in-supply = <&vdd_5v>; -+ smps3-in-supply = <&vdd_5v>; -+ smps45-in-supply = <&vdd_5v>; -+ smps6-in-supply = <&vdd_5v>; -+ smps7-in-supply = <&vdd_5v>; -+ mps3-in-supply = <&vdd_5v>; -+ smps8-in-supply = <&vdd_5v>; -+ smps9-in-supply = <&vdd_5v>; -+ ldo1-in-supply = <&vdd_5v>; -+ ldo2-in-supply = <&vdd_5v>; -+ ldo3-in-supply = <&vdd_5v>; -+ ldo4-in-supply = <&vdd_5v>; -+ ldo9-in-supply = <&vdd_5v>; -+ ldoln-in-supply = <&vdd_5v>; -+ ldousb-in-supply = <&vdd_5v>; -+ ldortc-in-supply = <&vdd_5v>; -+ -+ regulators { -+ vdd_mpu: smps12 { -+ /* VDD_MPU */ -+ regulator-name = "smps12"; -+ regulator-min-microvolt = <850000>; -+ regulator-max-microvolt = <1250000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_ddr: smps3 { -+ /* VDD_DDR EMIF1 EMIF2 */ -+ regulator-name = "smps3"; -+ regulator-min-microvolt = <1350000>; -+ regulator-max-microvolt = <1350000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_dspeve: smps45 { -+ /* VDD_DSPEVE on AM572 */ -+ /* VDD_IVA + VDD_DSP on AM571 */ -+ regulator-name = "smps45"; -+ regulator-min-microvolt = <850000>; -+ regulator-max-microvolt = <1250000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_gpu: smps6 { -+ /* VDD_GPU */ -+ regulator-name = "smps6"; -+ regulator-min-microvolt = <850000>; -+ regulator-max-microvolt = <1250000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_core: smps7 { -+ /* VDD_CORE */ -+ regulator-name = "smps7"; -+ regulator-min-microvolt = <850000>; /*** 1.15V */ -+ regulator-max-microvolt = <1150000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_iva: smps8 { -+ /* 5728 - VDD_IVAHD */ /*** 1.06V */ -+ /* 5718 - N.C. test point */ -+ regulator-name = "smps8"; -+ }; -+ -+ vdd_3v3: smps9 { -+ /* VDD_3V3 */ -+ regulator-name = "smps9"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_sd: ldo1 { -+ /* VDDSHV8 - VSDMMC */ -+ regulator-name = "ldo1"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ vdd_1v8: ldo2 { -+ /* VDDSH18V */ -+ regulator-name = "ldo2"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_1v8_phy_ldo3: ldo3 { -+ /* R1.3a 572x V1_8PHY_LDO3: USB, SATA */ -+ regulator-name = "ldo3"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_1v8_phy_ldo4: ldo4 { -+ /* R1.3a 572x V1_8PHY_LDO4: PCIE, HDMI*/ -+ regulator-name = "ldo4"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ /* LDO5-8 unused */ -+ -+ vdd_rtc: ldo9 { -+ /* VDD_RTC */ -+ regulator-name = "ldo9"; -+ regulator-min-microvolt = <840000>; -+ regulator-max-microvolt = <1160000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ vdd_1v8_pll: ldoln { -+ /* VDDA_1V8_PLL */ -+ regulator-name = "ldoln"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ ldousb_reg: ldousb { -+ /* VDDA_3V_USB: VDDA_USBHS33 */ -+ regulator-name = "ldousb"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ ldortc_reg: ldortc { -+ /* VDDA_RTC */ -+ regulator-name = "ldortc"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ regulator-boot-on; -+ }; -+ -+ regen1: regen1 { -+ /* VDD_3V3_ON */ -+ regulator-name = "regen1"; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ regen2: regen2 { -+ /* Needed for PMIC internal resource */ -+ regulator-name = "regen2"; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ }; -+ }; -+ -+ tps659038_rtc: tps659038_rtc { -+ compatible = "ti,palmas-rtc"; -+ interrupt-parent = <&tps659038>; -+ interrupts = <8 IRQ_TYPE_EDGE_FALLING>; -+ wakeup-source; -+ }; -+ -+ tps659038_pwr_button: tps659038_pwr_button { -+ compatible = "ti,palmas-pwrbutton"; -+ interrupt-parent = <&tps659038>; -+ interrupts = <1 IRQ_TYPE_EDGE_FALLING>; -+ wakeup-source; -+ ti,palmas-long-press-seconds = <12>; -+ }; -+ -+ tps659038_gpio: tps659038_gpio { -+ compatible = "ti,palmas-gpio"; -+ gpio-controller; -+ #gpio-cells = <2>; -+ }; -+ -+ extcon_usb2: tps659038_usb { -+ compatible = "ti,palmas-usb-vid"; -+ }; -+ -+ }; -+ -+ eeprom: eeprom@50 { -+ compatible = "atmel,24c32"; -+ reg = <0x50>; -+ }; -+}; -+ -+&i2c2 { -+ status = "okay"; -+ clock-frequency = <400000>; -+}; -+ -+&i2c3 { -+ status = "okay"; -+ clock-frequency = <400000>; -+}; -+ -+&i2c4 { -+ status = "okay"; -+ clock-frequency = <100000>; -+}; -+ -+&i2c5 { -+ status = "okay"; -+ clock-frequency = <100000>; -+}; -+ -+&cpu0 { -+ vdd-supply = <&vdd_mpu>; -+ voltage-tolerance = <1>; -+}; -+ -+&uart1 { -+ status = "okay"; -+ interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>, -+ <&dra7_pmx_core 0x3e0>; -+}; -+ -+&uart3 { -+ status = "okay"; -+ interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, -+ <&dra7_pmx_core 0x3f8>; -+}; -+ -+&davinci_mdio { -+ reset-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>; -+ reset-delay-us = <2>; -+ -+ phy0: ethernet-phy@1 { -+ reg = <4>; -+ }; -+}; -+ -+&mac { -+ slaves = <1>; -+ status = "okay"; -+ //dual_emac; -+}; -+ -+&cpsw_emac0 { -+ phy-handle = <&phy0>; -+ phy-mode = "rgmii"; -+ //dual_emac_res_vlan = <1>; -+}; -+ -+&mmc1 { -+ status = "okay"; -+ vmmc-supply = <&vdd_3v3>; -+ vmmc_aux-supply = <&vdd_sd>; -+ vqmmc-supply = <&vdd_sd>; /* IO Line Power */ -+ bus-width = <4>; -+ max-frequency = <24000000>; -+ cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */ -+ -+ pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; -+ pinctrl-0 = <&mmc1_pins_default>; -+ pinctrl-1 = <&mmc1_pins_hs>; -+ pinctrl-2 = <&mmc1_pins_sdr12>; -+ pinctrl-3 = <&mmc1_pins_sdr25>; -+ pinctrl-4 = <&mmc1_pins_sdr50>; -+ pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>; -+ pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; -+}; -+ -+&mmc2 { -+ status = "okay"; -+ vmmc-supply = <&vdd_3v3>; -+ //FUTURE: vqmmc-supply = <&vdd_3v3>; /* IO Line Power */ -+ bus-width = <8>; -+ ti,non-removable; -+ non-removable; -+ max-frequency = <96000000>; -+ no-1-8-v; -+ /delete-property/ mmc-hs200-1_8v; -+ -+ pinctrl-names = "default", "hs"; -+ pinctrl-0 = <&mmc2_pins_default>; -+ pinctrl-1 = <&mmc2_pins_hs>; -+}; -+ -+&usb2_phy1 { -+ phy-supply = <&ldousb_reg>; -+}; -+ -+&usb2_phy2 { -+ phy-supply = <&ldousb_reg>; -+}; -+ -+&usb1 { -+ dr_mode = "host"; -+}; -+ -+&omap_dwc3_2 { -+ extcon = <&extcon_usb2>; -+}; -+ -+&usb2 { -+ dr_mode = "peripheral"; -+}; -+ -+&cpu_trips { -+ cpu_alert1: cpu_alert1 { -+ temperature = <50000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "active"; -+ }; -+}; -+ -+&cpu_cooling_maps { -+ map1 { -+ trip = <&cpu_alert1>; -+ }; -+}; -+ -+&thermal_zones { -+ board_thermal: board_thermal { -+ polling-delay-passive = <1250>; /* milliseconds */ -+ polling-delay = <1500>; /* milliseconds */ -+ -+ board_trips: trips { -+ board_alert0: board_alert { -+ temperature = <40000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "active"; -+ }; -+ -+ board_crit: board_crit { -+ temperature = <105000>; /* millicelsius */ -+ hysteresis = <0>; /* millicelsius */ -+ type = "critical"; -+ }; -+ }; -+ -+ board_cooling_maps: cooling-maps { -+ map0 { -+ trip = <&board_alert0>; -+ }; -+ }; -+ }; -+}; -+ -+&mailbox5 { -+ status = "okay"; -+ mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { -+ status = "okay"; -+ }; -+ mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { -+ status = "okay"; -+ }; -+}; -+ -+&mailbox6 { -+ status = "okay"; -+ mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { -+ status = "okay"; -+ }; -+ mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { -+ status = "okay"; -+ }; -+}; -diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c -index c4a41db92a..57b23b93b5 100644 ---- a/arch/arm/mach-omap2/omap5/hw_data.c -+++ b/arch/arm/mach-omap2/omap5/hw_data.c -@@ -418,8 +418,10 @@ void enable_basic_clocks(void) - (*prcm)->cm_l3init_hsmmc2_clkctrl, - (*prcm)->cm_l4per_gptimer2_clkctrl, - (*prcm)->cm_wkup_wdtimer2_clkctrl, -+ (*prcm)->cm_l4per_uart1_clkctrl, - (*prcm)->cm_l4per_uart3_clkctrl, - (*prcm)->cm_l4per_i2c1_clkctrl, -+ (*prcm)->cm_l4per_i2c4_clkctrl, - #ifdef CONFIG_DRIVER_TI_CPSW - (*prcm)->cm_gmac_gmac_clkctrl, - #endif -@@ -493,7 +495,6 @@ void enable_basic_uboot_clocks(void) - (*prcm)->cm_l4per_mcspi1_clkctrl, - (*prcm)->cm_l4per_i2c2_clkctrl, - (*prcm)->cm_l4per_i2c3_clkctrl, -- (*prcm)->cm_l4per_i2c4_clkctrl, - #if defined(CONFIG_DRA7XX) - (*prcm)->cm_ipu_i2c5_clkctrl, - #else -diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c -index 7063345dcc..47a8391de8 100644 ---- a/board/ti/am57xx/board.c -+++ b/board/ti/am57xx/board.c -@@ -30,6 +30,8 @@ - #include - #include - #include -+#include -+#include - - #include "../common/board_detect.h" - #include "mux_data.h" -@@ -46,6 +48,7 @@ - #define board_is_am574x_idk() board_ti_is("AM574IDK") - #define board_is_am572x_idk() board_ti_is("AM572IDK") - #define board_is_am571x_idk() board_ti_is("AM571IDK") -+#define board_is_bbai() board_ti_is("BBBBAI__") //no EEPROM... - - #ifdef CONFIG_DRIVER_TI_CPSW - #include -@@ -75,6 +78,12 @@ DECLARE_GLOBAL_DATA_PTR; - #define TPS65903X_PRIMARY_SECONDARY_PAD2 0xFB - #define TPS65903X_PAD2_POWERHOLD_MASK 0x20 - -+#define CAPE_EEPROM_BUS_NUM 3 -+#define CAPE_EEPROM_ADDR0 0x54 -+#define CAPE_EEPROM_ADDR3 0x57 -+ -+#define CAPE_EEPROM_ADDR_LEN 0x10 -+ - const struct omap_sysinfo sysinfo = { - "Board: UNKNOWN(BeagleBoard X15?) REV UNKNOWN\n" - }; -@@ -84,6 +93,12 @@ static const struct dmm_lisa_map_regs beagle_x15_lisa_regs = { - .is_ma_present = 0x1 - }; - -+static const struct dmm_lisa_map_regs bbai_lisa_regs = { -+ ///FIXME: Document, where this magic number come from? -+ .dmm_lisa_map_3 = 0x80640100, -+ .is_ma_present = 0x1 -+}; -+ - static const struct dmm_lisa_map_regs am571x_idk_lisa_regs = { - .dmm_lisa_map_3 = 0x80640100, - .is_ma_present = 0x1 -@@ -101,6 +116,8 @@ void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs) - *dmm_lisa_regs = &am571x_idk_lisa_regs; - else if (board_is_am574x_idk()) - *dmm_lisa_regs = &am574x_idk_lisa_regs; -+ else if (board_is_bbai()) -+ *dmm_lisa_regs = &bbai_lisa_regs; - else - *dmm_lisa_regs = &beagle_x15_lisa_regs; - } -@@ -502,8 +519,30 @@ void do_board_detect(void) - - rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS, - CONFIG_EEPROM_CHIP_ADDRESS); -- if (rc) -+ if (rc) { - printf("ti_i2c_eeprom_init failed %d\n", rc); -+ ti_i2c_eeprom_am_set("BBBBAI__", "A"); -+ }; -+ -+ puts("in do_board_detect\n"); -+ printf("do_board_detect\n"); -+} -+ -+void write_hex (unsigned char i) -+{ -+ char cc; -+ -+ cc = i >> 4; -+ cc &= 0xf; -+ if (cc > 9) -+ serial_putc (cc + 55); -+ else -+ serial_putc (cc + 48); -+ cc = i & 0xf; -+ if (cc > 9) -+ serial_putc (cc + 55); -+ else -+ serial_putc (cc + 48); - } - - #else /* CONFIG_SPL_BUILD */ -@@ -521,6 +560,8 @@ void do_board_detect(void) - - if (board_is_x15()) - bname = "BeagleBoard X15"; -+ else if (board_is_bbai()) -+ bname = "BeagleBone AI"; - else if (board_is_am572x_evm()) - bname = "AM572x EVM"; - else if (board_is_am574x_idk()) -@@ -535,6 +576,23 @@ void do_board_detect(void) - "Board: %s REV %s\n", bname, board_ti_get_rev()); - } - -+void write_hex (unsigned char i) -+{ -+ char cc; -+ -+ cc = i >> 4; -+ cc &= 0xf; -+ if (cc > 9) -+ serial_putc (cc + 55); -+ else -+ serial_putc (cc + 48); -+ cc = i & 0xf; -+ if (cc > 9) -+ serial_putc (cc + 55); -+ else -+ serial_putc (cc + 48); -+} -+ - static void setup_board_eeprom_env(void) - { - char *name = "beagle_x15"; -@@ -557,6 +615,8 @@ static void setup_board_eeprom_env(void) - name = "am57xx_evm_reva3"; - else - name = "am57xx_evm"; -+ } else if (board_is_bbai()) { -+ name = "am5729_beagleboneai"; - } else if (board_is_am574x_idk()) { - name = "am574x_idk"; - } else if (board_is_am572x_idk()) { -@@ -626,7 +686,7 @@ void am57x_idk_lcd_detect(void) - struct udevice *dev; - - /* Only valid for IDKs */ -- if (board_is_x15() || board_is_am572x_evm()) -+ if (board_is_x15() || board_is_am572x_evm() || board_is_bbai()) - return; - - /* Only AM571x IDK has gpio control detect.. so check that */ -@@ -720,6 +780,28 @@ int board_late_init(void) - - am57x_idk_lcd_detect(); - -+ ///FIXME, too late!! But useful for testing function... -+ unsigned char addr; -+ struct udevice *dev; -+ int rc; -+ -+ for ( addr = CAPE_EEPROM_ADDR0; addr <= CAPE_EEPROM_ADDR3; addr++ ) { -+ puts("BeagleBone: cape eeprom: i2c_probe: 0x"); write_hex(addr); puts(":\n"); -+ rc = i2c_get_chip_for_busnum(CAPE_EEPROM_BUS_NUM, addr, 1, &dev); -+ if (rc) { -+ printf("failed to get device for EEPROM at address 0x%x\n", -+ addr); -+// goto out; -+ } -+// out: -+ } -+ -+ if (board_is_bbai()) { -+ env_set("console", "ttyS0,115200n8"); -+ } else { -+ env_set("console", "ttyO2,115200n8"); -+ } -+ - #if !defined(CONFIG_SPL_BUILD) - board_ti_set_ethaddr(2); - #endif -@@ -762,6 +844,13 @@ void recalibrate_iodelay(void) - pconf_sz = ARRAY_SIZE(core_padconf_array_essential_am571x_idk); - iod = iodelay_cfg_array_am571x_idk; - iod_sz = ARRAY_SIZE(iodelay_cfg_array_am571x_idk); -+ } else if (board_is_bbai()) { -+ /* Common for X15/GPEVM */ -+ pconf = core_padconf_array_essential_bbai; -+ pconf_sz = ARRAY_SIZE(core_padconf_array_essential_bbai); -+ /* Since full production should switch to SR2.0 */ -+ iod = iodelay_cfg_array_bbai; -+ iod_sz = ARRAY_SIZE(iodelay_cfg_array_bbai); - } else { - /* Common for X15/GPEVM */ - pconf = core_padconf_array_essential_x15; -@@ -863,12 +952,50 @@ const struct mmc_platform_fixups *platform_fixups_mmc(uint32_t addr) - #endif - - #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_OS_BOOT) -+ -+//static int eeprom_has_been_read; -+//static struct id_eeprom eeprom; -+ -+struct am335x_cape_eeprom_id { -+ unsigned int header; -+ char eeprom_rev[2]; -+ char board_name[32]; -+ char version[4]; -+ char manufacture[16]; -+ char part_number[16]; -+ char number_of_pins[2]; -+ char serial_number[12]; -+ char pin_usage[140]; -+ char vdd_3v3exp[ 2]; -+ char vdd_5v[ 2]; -+ char sys_5v[2]; -+ char dc_supplied[2]; -+}; -+ - int spl_start_uboot(void) - { - /* break into full u-boot on 'c' */ - if (serial_tstc() && serial_getc() == 'c') - return 1; - -+ //FIXME, i2c doesn't see to be up.. -+ puts("spl_start_uboot\n"); -+ unsigned char addr; -+ struct udevice *dev; -+ int rc; -+ -+ for ( addr = CAPE_EEPROM_ADDR0; addr <= CAPE_EEPROM_ADDR3; addr++ ) { -+ puts("BeagleBone: cape eeprom: i2c_probe: 0x"); write_hex(addr); puts(":\n"); -+ rc = i2c_get_chip_for_busnum(CAPE_EEPROM_BUS_NUM, addr, 1, &dev); -+ if (rc) { -+ printf("failed to get device for EEPROM at address 0x%x\n", -+ addr); -+// goto out; -+ } -+// out: -+ } -+ -+ - #ifdef CONFIG_SPL_ENV_SUPPORT - env_init(); - env_load(); -@@ -1084,6 +1211,9 @@ int board_fit_config_name_match(const char *name) - } else if (board_is_am572x_evm() && - !strcmp(name, "am57xx-beagle-x15")) { - return 0; -+ } else if (board_is_bbai() && -+ !strcmp(name, "am5729-beagleboneai")) { -+ return 0; - } else if (board_is_am572x_idk() && !strcmp(name, "am572x-idk")) { - return 0; - } else if (board_is_am574x_idk() && !strcmp(name, "am574x-idk")) { -diff --git a/board/ti/am57xx/mux_data.h b/board/ti/am57xx/mux_data.h -index d4a15ae93d..9b8ee944f8 100644 ---- a/board/ti/am57xx/mux_data.h -+++ b/board/ti/am57xx/mux_data.h -@@ -233,6 +233,272 @@ const struct pad_conf_entry core_padconf_array_essential_x15[] = { - {RSTOUTN, (M0 | PIN_OUTPUT)}, /* rstoutn.rstoutn */ - }; - -+const struct pad_conf_entry core_padconf_array_essential_bbai[] = { -+ {GPMC_AD0, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad0.vin3a_d0 */ -+ {GPMC_AD1, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad1.vin3a_d1 */ -+ {GPMC_AD2, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad2.vin3a_d2 */ -+ {GPMC_AD3, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad3.vin3a_d3 */ -+ {GPMC_AD4, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad4.vin3a_d4 */ -+ {GPMC_AD5, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad5.vin3a_d5 */ -+ {GPMC_AD6, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad6.vin3a_d6 */ -+ {GPMC_AD7, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad7.vin3a_d7 */ -+ {GPMC_AD8, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad8.vin3a_d8 */ -+ {GPMC_AD9, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad9.vin3a_d9 */ -+ {GPMC_AD10, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad10.vin3a_d10 */ -+ {GPMC_AD11, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad11.vin3a_d11 */ -+ {GPMC_AD12, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad12.vin3a_d12 */ -+ {GPMC_AD13, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad13.vin3a_d13 */ -+ {GPMC_AD14, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad14.vin3a_d14 */ -+ {GPMC_AD15, (M2 | PIN_INPUT | MANUAL_MODE)}, /* gpmc_ad15.vin3a_d15 */ -+ -+ /* Cape Bus i2c */ -+ {GPMC_A0, (M7 | PIN_INPUT_PULLUP)}, /* R6_GPIO7_3: gpmc_a0.i2c4_scl (Shared with F4_UART10_RTSN) */ -+ {GPMC_A1, (M7 | PIN_INPUT_PULLUP)}, /* T9_GPIO7_4: gpmc_a1.i2c4_sda (Shared with D2_UART10_CTSN) */ -+ -+ {GPMC_A2, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a2.vin3a_d18 */ -+ {GPMC_A3, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a3.vin3a_d19 */ -+ {GPMC_A4, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a4.vin3a_d20 */ -+ {GPMC_A5, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a5.vin3a_d21 */ -+ {GPMC_A6, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a6.vin3a_d22 */ -+ {GPMC_A7, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a7.vin3a_d23 */ -+ {GPMC_A8, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a8.vin3a_hsync0 */ -+ {GPMC_A9, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a9.vin3a_vsync0 */ -+ {GPMC_A10, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a10.vin3a_de0 */ -+ {GPMC_A11, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_a11.vin3a_fld0 */ -+ {GPMC_A12, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_a12.gpio2_2 */ -+ {GPMC_A13, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a13.gpio2_3 */ -+ {GPMC_A14, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_a14.gpio2_4 */ -+ {GPMC_A15, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a15.gpio2_5 */ -+ {GPMC_A16, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a16.gpio2_6 */ -+ {GPMC_A17, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_a17.gpio2_7 */ -+ {GPMC_A18, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_a18.gpio2_8 */ -+ -+ /* eMMC */ -+ {GPMC_A19, (M1 | PIN_INPUT_PULLUP)}, /* K7: gpmc_a19.mmc2_dat4 */ -+ {GPMC_A20, (M1 | PIN_INPUT_PULLUP)}, /* M7: gpmc_a20.mmc2_dat5 */ -+ {GPMC_A21, (M1 | PIN_INPUT_PULLUP)}, /* J5: gpmc_a21.mmc2_dat6 */ -+ {GPMC_A22, (M1 | PIN_INPUT_PULLUP)}, /* K6: gpmc_a22.mmc2_dat7 */ -+ {GPMC_A23, (M1 | PIN_INPUT_PULLUP)}, /* J7: gpmc_a23.mmc2_clk */ -+ {GPMC_A24, (M1 | PIN_INPUT_PULLUP)}, /* J4: gpmc_a24.mmc2_dat0 */ -+ {GPMC_A25, (M1 | PIN_INPUT_PULLUP)}, /* J6: gpmc_a25.mmc2_dat1 */ -+ {GPMC_A26, (M1 | PIN_INPUT_PULLUP)}, /* H4: gpmc_a26.mmc2_dat2 */ -+ {GPMC_A27, (M1 | PIN_INPUT_PULLUP)}, /* H5: gpmc_a27.mmc2_dat3 */ -+ {GPMC_CS1, (M1 | PIN_INPUT_PULLUP)}, /* H6: gpmc_cs1.mmc2_cmd */ -+ -+ {GPMC_CS0, (M14 | PIN_INPUT_PULLDOWN)}, /* gpmc_cs0.gpio2_19 */ -+ {GPMC_CS2, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_cs2.gpio2_20 */ -+ {GPMC_CS3, (M2 | PIN_INPUT_PULLDOWN | MANUAL_MODE)}, /* gpmc_cs3.vin3a_clk0 */ -+ {GPMC_CLK, (M9 | PIN_INPUT_PULLDOWN)}, /* gpmc_clk.dma_evt1 */ -+ {GPMC_ADVN_ALE, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_advn_ale.gpio2_23 */ -+ {GPMC_OEN_REN, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_oen_ren.gpio2_24 */ -+ {GPMC_WEN, (M14 | PIN_INPUT_PULLUP)}, /* gpmc_wen.gpio2_25 */ -+ {GPMC_BEN0, (M9 | PIN_INPUT_PULLDOWN)}, /* gpmc_ben0.dma_evt3 */ -+ {GPMC_BEN1, (M9 | PIN_INPUT_PULLDOWN)}, /* gpmc_ben1.dma_evt4 */ -+ {GPMC_WAIT0, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* gpmc_wait0.gpio2_28 */ -+ {VIN1A_CLK0, (M14 | PIN_INPUT)}, /* vin1a_clk0.gpio2_30 */ -+ {VIN1B_CLK1, (M14 | PIN_INPUT_SLEW)}, /* vin1b_clk1.gpio2_31 */ -+ {VIN1A_D2, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d2.gpio3_6 */ -+ {VIN1A_D3, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d3.gpio3_7 */ -+ {VIN1A_D4, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d4.gpio3_8 */ -+ {VIN1A_D5, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d5.gpio3_9 */ -+ {VIN1A_D6, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d6.gpio3_10 */ -+ {VIN1A_D7, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d7.gpio3_11 */ -+ {VIN1A_D8, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d8.gpio3_12 */ -+ {VIN1A_D10, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d10.gpio3_14 */ -+ {VIN1A_D11, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d11.gpio3_15 */ -+ {VIN1A_D12, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d12.gpio3_16 */ -+ {VIN1A_D14, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d14.gpio3_18 */ -+ {VIN1A_D16, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d16.gpio3_20 */ -+ {VIN1A_D19, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d19.gpio3_23 */ -+ {VIN1A_D20, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d20.gpio3_24 */ -+ {VIN1A_D22, (M14 | PIN_INPUT_PULLDOWN)}, /* vin1a_d22.gpio3_26 */ -+ {VIN2A_CLK0, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_clk0.gpio3_28 */ -+ {VIN2A_DE0, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_de0.gpio3_29 */ -+ {VIN2A_FLD0, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_fld0.gpio3_30 */ -+ {VIN2A_HSYNC0, (M11 | PIN_INPUT_PULLUP)}, /* vin2a_hsync0.pr1_uart0_cts_n */ -+ {VIN2A_VSYNC0, (M11 | PIN_OUTPUT_PULLUP)}, /* vin2a_vsync0.pr1_uart0_rts_n */ -+ {VIN2A_D0, (M11 | PIN_INPUT_PULLUP)}, /* vin2a_d0.pr1_uart0_rxd */ -+ {VIN2A_D1, (M11 | PIN_OUTPUT)}, /* vin2a_d1.pr1_uart0_txd */ -+ {VIN2A_D2, (M8 | PIN_INPUT_PULLUP)}, /* vin2a_d2.uart10_rxd */ -+ {VIN2A_D3, (M8 | PIN_OUTPUT)}, /* vin2a_d3.uart10_txd */ -+ -+ /* Cape Bus i2c (gpio shared) */ -+ {VIN2A_D4, (M15 | PIN_INPUT)}, /* D2_UART10_CTSN: vin2a_d4.uart10_ctsn (Shared with T9_GPIO7_4) */ -+ {VIN2A_D5, (M15 | PIN_INPUT)}, /* F4_UART10_RTSN: vin2a_d5.uart10_rtsn (Shared with R6_GPIO7_3) */ -+ -+ {VIN2A_D6, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d6.gpio4_7 */ -+ {VIN2A_D7, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d7.gpio4_8 */ -+ {VIN2A_D8, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d8.gpio4_9 */ -+ {VIN2A_D9, (M14 | PIN_INPUT_PULLDOWN)}, /* vin2a_d9.gpio4_10 */ -+ {VIN2A_D10, (M10 | PIN_OUTPUT_PULLDOWN)}, /* vin2a_d10.ehrpwm2B */ -+ {VIN2A_D11, (M10 | PIN_INPUT_PULLDOWN)}, /* vin2a_d11.ehrpwm2_tripzone_input */ -+ {VIN2A_D12, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d12.rgmii1_txc */ -+ {VIN2A_D13, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d13.rgmii1_txctl */ -+ {VIN2A_D14, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d14.rgmii1_txd3 */ -+ {VIN2A_D15, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d15.rgmii1_txd2 */ -+ {VIN2A_D16, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d16.rgmii1_txd1 */ -+ {VIN2A_D17, (M3 | PIN_OUTPUT | MANUAL_MODE)}, /* vin2a_d17.rgmii1_txd0 */ -+ {VIN2A_D18, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d18.rgmii1_rxc */ -+ {VIN2A_D19, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d19.rgmii1_rxctl */ -+ {VIN2A_D20, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d20.rgmii1_rxd3 */ -+ {VIN2A_D21, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d21.rgmii1_rxd2 */ -+ {VIN2A_D22, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d22.rgmii1_rxd1 */ -+ {VIN2A_D23, (M3 | PIN_INPUT | MANUAL_MODE)}, /* vin2a_d23.rgmii1_rxd0 */ -+ {VOUT1_CLK, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_clk.vout1_clk */ -+ {VOUT1_DE, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_de.vout1_de */ -+ {VOUT1_FLD, (M14 | PIN_INPUT)}, /* vout1_fld.gpio4_21 */ -+ {VOUT1_HSYNC, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_hsync.vout1_hsync */ -+ {VOUT1_VSYNC, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_vsync.vout1_vsync */ -+ {VOUT1_D0, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d0.vout1_d0 */ -+ {VOUT1_D1, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d1.vout1_d1 */ -+ {VOUT1_D2, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d2.vout1_d2 */ -+ {VOUT1_D3, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d3.vout1_d3 */ -+ {VOUT1_D4, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d4.vout1_d4 */ -+ {VOUT1_D5, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d5.vout1_d5 */ -+ {VOUT1_D6, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d6.vout1_d6 */ -+ {VOUT1_D7, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d7.vout1_d7 */ -+ {VOUT1_D8, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d8.vout1_d8 */ -+ {VOUT1_D9, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d9.vout1_d9 */ -+ {VOUT1_D10, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d10.vout1_d10 */ -+ {VOUT1_D11, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d11.vout1_d11 */ -+ {VOUT1_D12, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d12.vout1_d12 */ -+ {VOUT1_D13, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d13.vout1_d13 */ -+ {VOUT1_D14, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d14.vout1_d14 */ -+ {VOUT1_D15, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d15.vout1_d15 */ -+ {VOUT1_D16, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d16.vout1_d16 */ -+ {VOUT1_D17, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d17.vout1_d17 */ -+ {VOUT1_D18, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d18.vout1_d18 */ -+ {VOUT1_D19, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d19.vout1_d19 */ -+ {VOUT1_D20, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d20.vout1_d20 */ -+ {VOUT1_D21, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d21.vout1_d21 */ -+ {VOUT1_D22, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d22.vout1_d22 */ -+ {VOUT1_D23, (M0 | PIN_OUTPUT | SLEWCONTROL | MANUAL_MODE)}, /* vout1_d23.vout1_d23 */ -+ {MDIO_MCLK, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* mdio_mclk.mdio_mclk */ -+ {MDIO_D, (M0 | PIN_INPUT | SLEWCONTROL)}, /* mdio_d.mdio_d */ -+ {RMII_MHZ_50_CLK, (M14 | PIN_INPUT_PULLUP)}, /* RMII_MHZ_50_CLK.gpio5_17 */ -+ {UART3_RXD, (M14 | PIN_INPUT_SLEW)}, /* uart3_rxd.gpio5_18 */ -+ {UART3_TXD, (M14 | PIN_INPUT_SLEW)}, /* uart3_txd.gpio5_19 */ -+ {RGMII0_TXC, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txc.rgmii0_txc */ -+ {RGMII0_TXCTL, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txctl.rgmii0_txctl */ -+ {RGMII0_TXD3, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd3.rgmii0_txd3 */ -+ {RGMII0_TXD2, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd2.rgmii0_txd2 */ -+ {RGMII0_TXD1, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd1.rgmii0_txd1 */ -+ {RGMII0_TXD0, (M0 | PIN_OUTPUT | MANUAL_MODE)}, /* rgmii0_txd0.rgmii0_txd0 */ -+ {RGMII0_RXC, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxc.rgmii0_rxc */ -+ {RGMII0_RXCTL, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxctl.rgmii0_rxctl */ -+ {RGMII0_RXD3, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd3.rgmii0_rxd3 */ -+ {RGMII0_RXD2, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd2.rgmii0_rxd2 */ -+ {RGMII0_RXD1, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd1.rgmii0_rxd1 */ -+ {RGMII0_RXD0, (M0 | PIN_INPUT | MANUAL_MODE)}, /* rgmii0_rxd0.rgmii0_rxd0 */ -+ {USB1_DRVVBUS, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* usb1_drvvbus.usb1_drvvbus */ -+ {USB2_DRVVBUS, (M0 | PIN_OUTPUT_PULLDOWN | SLEWCONTROL)}, /* usb2_drvvbus.usb2_drvvbus */ -+ {GPIO6_14, (M10 | PIN_INPUT_PULLUP)}, /* gpio6_14.timer1 */ -+ {GPIO6_15, (M10 | PIN_INPUT_PULLUP)}, /* gpio6_15.timer2 */ -+ {GPIO6_16, (M10 | PIN_INPUT_PULLUP)}, /* gpio6_16.timer3 */ -+ {XREF_CLK0, (M9 | PIN_OUTPUT_PULLDOWN)}, /* xref_clk0.clkout2 */ -+ {XREF_CLK1, (M14 | PIN_INPUT_PULLDOWN)}, /* xref_clk1.gpio6_18 */ -+ {XREF_CLK2, (M14 | PIN_INPUT_PULLDOWN)}, /* xref_clk2.gpio6_19 */ -+ {XREF_CLK3, (M9 | PIN_OUTPUT_PULLDOWN)}, /* xref_clk3.clkout3 */ -+ {MCASP1_ACLKX, (M10 | PIN_INPUT_PULLUP)}, /* mcasp1_aclkx.i2c3_sda */ -+ {MCASP1_FSX, (M10 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_fsx.i2c3_scl */ -+ {MCASP1_ACLKR, (M10 | PIN_INPUT_PULLUP)}, /* mcasp1_aclkr.i2c4_sda */ -+ {MCASP1_FSR, (M10 | PIN_INPUT_PULLUP)}, /* mcasp1_fsr.i2c4_scl */ -+ {MCASP1_AXR0, (M10 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_axr0.i2c5_sda */ -+ {MCASP1_AXR1, (M10 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_axr1.i2c5_scl */ -+ {MCASP1_AXR2, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr2.gpio5_4 */ -+ {MCASP1_AXR3, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr3.gpio5_5 */ -+ {MCASP1_AXR4, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr4.gpio5_6 */ -+ {MCASP1_AXR5, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr5.gpio5_7 */ -+ {MCASP1_AXR6, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr6.gpio5_8 */ -+ {MCASP1_AXR7, (M14 | PIN_INPUT_PULLDOWN)}, /* mcasp1_axr7.gpio5_9 */ -+ {MCASP1_AXR8, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mcasp1_axr8.gpio5_10 */ -+ {MCASP1_AXR9, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mcasp1_axr9.gpio5_11 */ -+ {MCASP1_AXR10, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mcasp1_axr10.gpio5_12 */ -+ {MCASP1_AXR11, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* mcasp1_axr11.gpio4_17 */ -+ {MCASP1_AXR12, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr12.mcasp7_axr0 */ -+ {MCASP1_AXR13, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr13.mcasp7_axr1 */ -+ {MCASP1_AXR14, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr14.mcasp7_aclkx */ -+ {MCASP1_AXR15, (M1 | PIN_INPUT_SLEW | VIRTUAL_MODE10)}, /* mcasp1_axr15.mcasp7_fsx */ -+ {MCASP3_ACLKX, (M0 | PIN_INPUT_PULLDOWN)}, /* mcasp3_aclkx.mcasp3_aclkx */ -+ {MCASP3_FSX, (M0 | PIN_INPUT_SLEW)}, /* mcasp3_fsx.mcasp3_fsx */ -+ {MCASP3_AXR0, (M0 | PIN_INPUT_SLEW)}, /* mcasp3_axr0.mcasp3_axr0 */ -+ {MCASP3_AXR1, (M0 | PIN_INPUT_SLEW)}, /* mcasp3_axr1.mcasp3_axr1 */ -+ {MCASP4_ACLKX, (M3 | PIN_INPUT_PULLUP)}, /* mcasp4_aclkx.uart8_rxd */ -+ {MCASP4_FSX, (M3 | PIN_OUTPUT)}, /* mcasp4_fsx.uart8_txd */ -+ {MCASP4_AXR0, (M3 | PIN_INPUT_PULLUP)}, /* mcasp4_axr0.uart8_ctsn */ -+ {MCASP4_AXR1, (M3 | PIN_OUTPUT_PULLUP)}, /* mcasp4_axr1.uart8_rtsn */ -+ {MCASP5_ACLKX, (M3 | PIN_INPUT_PULLUP)}, /* mcasp5_aclkx.uart9_rxd */ -+ {MCASP5_FSX, (M3 | PIN_OUTPUT)}, /* mcasp5_fsx.uart9_txd */ -+ {MCASP5_AXR0, (M3 | PIN_INPUT_PULLUP)}, /* mcasp5_axr0.uart9_ctsn */ -+ {MCASP5_AXR1, (M3 | PIN_OUTPUT_PULLUP)}, /* mcasp5_axr1.uart9_rtsn */ -+ -+ /* microSD Socket */ -+ {MMC1_CLK, (M0 | PIN_INPUT_PULLUP)}, /* W6: mmc1_clk.mmc1_clk */ -+ {MMC1_CMD, (M0 | PIN_INPUT_PULLUP)}, /* Y6: mmc1_cmd.mmc1_cmd */ -+ {MMC1_DAT0, (M0 | PIN_INPUT_PULLUP)}, /* AA6: mmc1_dat0.mmc1_dat0 */ -+ {MMC1_DAT1, (M0 | PIN_INPUT_PULLUP)}, /* Y4: mmc1_dat1.mmc1_dat1 */ -+ {MMC1_DAT2, (M0 | PIN_INPUT_PULLUP)}, /* AA5: mmc1_dat2.mmc1_dat2 */ -+ {MMC1_DAT3, (M0 | PIN_INPUT_PULLUP)}, /* Y3: mmc1_dat3.mmc1_dat3 */ -+ {MMC1_SDCD, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* W7: mmc1_sdcd.gpio6_27 */ -+ -+ {GPIO6_10, (M10 | PIN_OUTPUT_PULLDOWN)}, /* gpio6_10.ehrpwm2A */ -+ {GPIO6_11, (M0 | PIN_INPUT_PULLUP)}, /* gpio6_11.gpio6_11 */ -+ {MMC3_CLK, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_clk.mmc3_clk */ -+ {MMC3_CMD, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_cmd.mmc3_cmd */ -+ {MMC3_DAT0, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat0.mmc3_dat0 */ -+ {MMC3_DAT1, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat1.mmc3_dat1 */ -+ {MMC3_DAT2, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat2.mmc3_dat2 */ -+ {MMC3_DAT3, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat3.mmc3_dat3 */ -+ {MMC3_DAT4, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat4.mmc3_dat4 */ -+ {MMC3_DAT5, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat5.mmc3_dat5 */ -+ {MMC3_DAT6, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat6.mmc3_dat6 */ -+ {MMC3_DAT7, (M0 | PIN_INPUT_PULLUP | MANUAL_MODE)}, /* mmc3_dat7.mmc3_dat7 */ -+ {SPI1_SCLK, (M14 | PIN_INPUT_PULLDOWN)}, /* spi1_sclk.gpio7_7 */ -+ {SPI1_D1, (M14 | PIN_INPUT_PULLDOWN)}, /* spi1_d1.gpio7_8 */ -+ {SPI1_D0, (M14 | PIN_INPUT_PULLDOWN)}, /* spi1_d0.gpio7_9 */ -+ {SPI1_CS0, (M14 | PIN_INPUT)}, /* spi1_cs0.gpio7_10 */ -+ {SPI1_CS1, (M14 | PIN_INPUT)}, /* spi1_cs1.gpio7_11 */ -+ {SPI1_CS2, (M14 | PIN_INPUT_SLEW)}, /* spi1_cs2.gpio7_12 */ -+ {SPI1_CS3, (M6 | PIN_INPUT | SLEWCONTROL)}, /* spi1_cs3.hdmi1_cec */ -+ {SPI2_SCLK, (M14 | PIN_INPUT_PULLDOWN)}, /* spi2_sclk.gpio7_14 */ -+ {SPI2_D1, (M14 | PIN_INPUT_SLEW)}, /* spi2_d1.gpio7_15 */ -+ {SPI2_D0, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* spi2_d0.gpio7_16 */ -+ {SPI2_CS0, (M14 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* spi2_cs0.gpio7_17 */ -+ {DCAN1_TX, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* dcan1_tx.dcan1_tx */ -+ {DCAN1_RX, (M0 | PIN_INPUT | SLEWCONTROL)}, /* dcan1_rx.dcan1_rx */ -+ -+ /* BeagleBone AI: Debug UART */ -+ {UART1_RXD, (M0 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* uart1_rxd.uart1_rxd */ -+ {UART1_TXD, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* uart1_txd.uart1_txd */ -+ -+ {UART1_CTSN, (M14 | PIN_INPUT_PULLDOWN)}, /* uart1_ctsn.gpio7_24 */ -+ {UART1_RTSN, (M14 | PIN_INPUT)}, /* uart1_rtsn.gpio7_25 */ -+ {UART2_RXD, (M14 | PIN_INPUT_PULLDOWN)}, /* uart2_rxd.gpio7_26 */ -+ {UART2_TXD, (M14 | PIN_INPUT_PULLDOWN)}, /* uart2_txd.gpio7_27 */ -+ {UART2_CTSN, (M2 | PIN_INPUT_PULLUP)}, /* uart2_ctsn.uart3_rxd */ -+ {UART2_RTSN, (M1 | PIN_OUTPUT)}, /* uart2_rtsn.uart3_txd */ -+ {I2C1_SDA, (M0 | PIN_INPUT_PULLUP)}, /* i2c1_sda.i2c1_sda */ -+ {I2C1_SCL, (M0 | PIN_INPUT_PULLUP)}, /* i2c1_scl.i2c1_scl */ -+ {I2C2_SDA, (M1 | PIN_INPUT_PULLUP)}, /* i2c2_sda.hdmi1_ddc_scl */ -+ {I2C2_SCL, (M1 | PIN_INPUT_PULLUP)}, /* i2c2_scl.hdmi1_ddc_sda */ -+ {WAKEUP0, (M0 | PIN_INPUT)}, /* Wakeup0.Wakeup0 */ -+ {WAKEUP1, (M0 | PIN_INPUT)}, /* Wakeup1.Wakeup1 */ -+ {WAKEUP2, (M0 | PIN_INPUT)}, /* Wakeup2.Wakeup2 */ -+ {WAKEUP3, (M0 | PIN_INPUT)}, /* Wakeup3.Wakeup3 */ -+ {ON_OFF, (M0 | PIN_OUTPUT)}, /* on_off.on_off */ -+ {RTC_PORZ, (M0 | PIN_INPUT)}, /* rtc_porz.rtc_porz */ -+ {TMS, (M0 | PIN_INPUT_PULLUP)}, /* tms.tms */ -+ {TDI, (M0 | PIN_INPUT_PULLUP | SLEWCONTROL)}, /* tdi.tdi */ -+ {TDO, (M0 | PIN_OUTPUT)}, /* tdo.tdo */ -+ {TCLK, (M0 | PIN_INPUT_PULLDOWN)}, /* tclk.tclk */ -+ {TRSTN, (M0 | PIN_INPUT)}, /* trstn.trstn */ -+ {RTCK, (M0 | PIN_OUTPUT)}, /* rtck.rtck */ -+ {EMU0, (M0 | PIN_INPUT)}, /* emu0.emu0 */ -+ {EMU1, (M0 | PIN_INPUT)}, /* emu1.emu1 */ -+ {NMIN_DSP, (M0 | PIN_INPUT)}, /* nmin_dsp.nmin_dsp */ -+ {RSTOUTN, (M0 | PIN_OUTPUT)}, /* rstoutn.rstoutn */ -+}; -+ - const struct pad_conf_entry core_padconf_array_delta_x15_sr1_1[] = { - {MMC1_SDWP, (M14 | PIN_INPUT | SLEWCONTROL)}, /* mmc1_sdwp.gpio6_28 */ - {VOUT1_CLK, (M0 | PIN_OUTPUT | SLEWCONTROL)}, /* vout1_clk.vout1_clk */ -@@ -998,6 +1264,17 @@ const struct pad_conf_entry early_padconf[] = { - {UART2_RTSN, (M1 | PIN_INPUT_SLEW)}, /* uart2_rtsn.uart3_txd */ - {I2C1_SDA, (PIN_INPUT_PULLUP | M0)}, /* I2C1_SDA */ - {I2C1_SCL, (PIN_INPUT_PULLUP | M0)}, /* I2C1_SCL */ -+ -+ /* BeagleBone AI: Debug UART */ -+ {UART1_RXD, (M0 | PIN_INPUT_SLEW)}, /* UART1_RXD */ -+ {UART1_TXD, (M0 | PIN_INPUT_SLEW)}, /* UART1_TXD */ -+ -+ /* Cape Bus i2c */ -+ {GPMC_A0, (M7 | PIN_INPUT_PULLUP)}, /* R6_GPIO7_3: gpmc_a0.i2c4_scl (Shared with F4_UART10_RTSN) */ -+ {GPMC_A1, (M7 | PIN_INPUT_PULLUP)}, /* T9_GPIO7_4: gpmc_a1.i2c4_sda (Shared with D2_UART10_CTSN) */ -+ /* Cape Bus i2c (gpio shared) */ -+ {VIN2A_D4, (M14 | PIN_INPUT_PULLUP)}, /* D2_UART10_CTSN: vin2a_d4.uart10_ctsn (Shared with T9_GPIO7_4) */ -+ {VIN2A_D5, (M14 | PIN_INPUT_PULLUP)}, /* F4_UART10_RTSN: vin2a_d5.uart10_rtsn (Shared with R6_GPIO7_3) */ - }; - - #ifdef CONFIG_IODELAY_RECALIBRATION -@@ -1199,6 +1476,119 @@ const struct iodelay_cfg_entry iodelay_cfg_array_x15_sr2_0[] = { - {0x0CEC, 2739, 0}, /* CFG_VOUT1_VSYNC_OUT */ - }; - -+const struct iodelay_cfg_entry iodelay_cfg_array_bbai[] = { -+ {0x0114, 2519, 702}, /* CFG_GPMC_A0_IN */ -+ {0x0120, 2435, 411}, /* CFG_GPMC_A10_IN */ -+ {0x012C, 2379, 755}, /* CFG_GPMC_A11_IN */ -+ {0x0198, 2384, 778}, /* CFG_GPMC_A1_IN */ -+ {0x0204, 2499, 1127}, /* CFG_GPMC_A2_IN */ -+ {0x0210, 2455, 1181}, /* CFG_GPMC_A3_IN */ -+ {0x021C, 2486, 1039}, /* CFG_GPMC_A4_IN */ -+ {0x0228, 2456, 938}, /* CFG_GPMC_A5_IN */ -+ {0x0234, 2463, 573}, /* CFG_GPMC_A6_IN */ -+ {0x0240, 2608, 783}, /* CFG_GPMC_A7_IN */ -+ {0x024C, 2430, 656}, /* CFG_GPMC_A8_IN */ -+ {0x0258, 2465, 850}, /* CFG_GPMC_A9_IN */ -+ {0x0264, 2316, 301}, /* CFG_GPMC_AD0_IN */ -+ {0x0270, 2324, 406}, /* CFG_GPMC_AD10_IN */ -+ {0x027C, 2278, 352}, /* CFG_GPMC_AD11_IN */ -+ {0x0288, 2297, 160}, /* CFG_GPMC_AD12_IN */ -+ {0x0294, 2278, 108}, /* CFG_GPMC_AD13_IN */ -+ {0x02A0, 2035, 0}, /* CFG_GPMC_AD14_IN */ -+ {0x02AC, 2279, 378}, /* CFG_GPMC_AD15_IN */ -+ {0x02B8, 2440, 70}, /* CFG_GPMC_AD1_IN */ -+ {0x02C4, 2404, 446}, /* CFG_GPMC_AD2_IN */ -+ {0x02D0, 2343, 212}, /* CFG_GPMC_AD3_IN */ -+ {0x02DC, 2355, 322}, /* CFG_GPMC_AD4_IN */ -+ {0x02E8, 2337, 192}, /* CFG_GPMC_AD5_IN */ -+ {0x02F4, 2270, 314}, /* CFG_GPMC_AD6_IN */ -+ {0x0300, 2339, 259}, /* CFG_GPMC_AD7_IN */ -+ {0x030C, 2308, 577}, /* CFG_GPMC_AD8_IN */ -+ {0x0318, 2334, 166}, /* CFG_GPMC_AD9_IN */ -+ {0x0378, 0, 0}, /* CFG_GPMC_CS3_IN */ -+ {0x0678, 0, 386}, /* CFG_MMC3_CLK_IN */ -+ {0x0680, 605, 0}, /* CFG_MMC3_CLK_OUT */ -+ {0x0684, 0, 0}, /* CFG_MMC3_CMD_IN */ -+ {0x0688, 0, 0}, /* CFG_MMC3_CMD_OEN */ -+ {0x068C, 0, 0}, /* CFG_MMC3_CMD_OUT */ -+ {0x0690, 171, 0}, /* CFG_MMC3_DAT0_IN */ -+ {0x0694, 0, 0}, /* CFG_MMC3_DAT0_OEN */ -+ {0x0698, 0, 0}, /* CFG_MMC3_DAT0_OUT */ -+ {0x069C, 221, 0}, /* CFG_MMC3_DAT1_IN */ -+ {0x06A0, 0, 0}, /* CFG_MMC3_DAT1_OEN */ -+ {0x06A4, 0, 0}, /* CFG_MMC3_DAT1_OUT */ -+ {0x06A8, 0, 0}, /* CFG_MMC3_DAT2_IN */ -+ {0x06AC, 0, 0}, /* CFG_MMC3_DAT2_OEN */ -+ {0x06B0, 0, 0}, /* CFG_MMC3_DAT2_OUT */ -+ {0x06B4, 474, 0}, /* CFG_MMC3_DAT3_IN */ -+ {0x06B8, 0, 0}, /* CFG_MMC3_DAT3_OEN */ -+ {0x06BC, 0, 0}, /* CFG_MMC3_DAT3_OUT */ -+ {0x06C0, 792, 0}, /* CFG_MMC3_DAT4_IN */ -+ {0x06C4, 0, 0}, /* CFG_MMC3_DAT4_OEN */ -+ {0x06C8, 0, 0}, /* CFG_MMC3_DAT4_OUT */ -+ {0x06CC, 782, 0}, /* CFG_MMC3_DAT5_IN */ -+ {0x06D0, 0, 0}, /* CFG_MMC3_DAT5_OEN */ -+ {0x06D4, 0, 0}, /* CFG_MMC3_DAT5_OUT */ -+ {0x06D8, 942, 0}, /* CFG_MMC3_DAT6_IN */ -+ {0x06DC, 0, 0}, /* CFG_MMC3_DAT6_OEN */ -+ {0x06E0, 0, 0}, /* CFG_MMC3_DAT6_OUT */ -+ {0x06E4, 636, 0}, /* CFG_MMC3_DAT7_IN */ -+ {0x06E8, 0, 0}, /* CFG_MMC3_DAT7_OEN */ -+ {0x06EC, 0, 0}, /* CFG_MMC3_DAT7_OUT */ -+ {0x06F0, 260, 0}, /* CFG_RGMII0_RXC_IN */ -+ {0x06FC, 0, 1412}, /* CFG_RGMII0_RXCTL_IN */ -+ {0x0708, 123, 1047}, /* CFG_RGMII0_RXD0_IN */ -+ {0x0714, 139, 1081}, /* CFG_RGMII0_RXD1_IN */ -+ {0x0720, 195, 1100}, /* CFG_RGMII0_RXD2_IN */ -+ {0x072C, 239, 1216}, /* CFG_RGMII0_RXD3_IN */ -+ {0x0740, 89, 0}, /* CFG_RGMII0_TXC_OUT */ -+ {0x074C, 15, 125}, /* CFG_RGMII0_TXCTL_OUT */ -+ {0x0758, 339, 162}, /* CFG_RGMII0_TXD0_OUT */ -+ {0x0764, 146, 94}, /* CFG_RGMII0_TXD1_OUT */ -+ {0x0770, 0, 27}, /* CFG_RGMII0_TXD2_OUT */ -+ {0x077C, 291, 205}, /* CFG_RGMII0_TXD3_OUT */ -+ {0x0A70, 0, 0}, /* CFG_VIN2A_D12_OUT */ -+ {0x0A7C, 219, 101}, /* CFG_VIN2A_D13_OUT */ -+ {0x0A88, 92, 58}, /* CFG_VIN2A_D14_OUT */ -+ {0x0A94, 135, 100}, /* CFG_VIN2A_D15_OUT */ -+ {0x0AA0, 154, 101}, /* CFG_VIN2A_D16_OUT */ -+ {0x0AAC, 78, 27}, /* CFG_VIN2A_D17_OUT */ -+ {0x0AB0, 411, 0}, /* CFG_VIN2A_D18_IN */ -+ {0x0ABC, 0, 382}, /* CFG_VIN2A_D19_IN */ -+ {0x0AD4, 320, 750}, /* CFG_VIN2A_D20_IN */ -+ {0x0AE0, 192, 836}, /* CFG_VIN2A_D21_IN */ -+ {0x0AEC, 294, 669}, /* CFG_VIN2A_D22_IN */ -+ {0x0AF8, 50, 700}, /* CFG_VIN2A_D23_IN */ -+ {0x0B9C, 0, 706}, /* CFG_VOUT1_CLK_OUT */ -+ {0x0BA8, 2313, 0}, /* CFG_VOUT1_D0_OUT */ -+ {0x0BB4, 2199, 0}, /* CFG_VOUT1_D10_OUT */ -+ {0x0BC0, 2266, 0}, /* CFG_VOUT1_D11_OUT */ -+ {0x0BCC, 3159, 0}, /* CFG_VOUT1_D12_OUT */ -+ {0x0BD8, 2100, 0}, /* CFG_VOUT1_D13_OUT */ -+ {0x0BE4, 2229, 0}, /* CFG_VOUT1_D14_OUT */ -+ {0x0BF0, 2202, 0}, /* CFG_VOUT1_D15_OUT */ -+ {0x0BFC, 2084, 0}, /* CFG_VOUT1_D16_OUT */ -+ {0x0C08, 2195, 0}, /* CFG_VOUT1_D17_OUT */ -+ {0x0C14, 2342, 0}, /* CFG_VOUT1_D18_OUT */ -+ {0x0C20, 2463, 0}, /* CFG_VOUT1_D19_OUT */ -+ {0x0C2C, 2439, 0}, /* CFG_VOUT1_D1_OUT */ -+ {0x0C38, 2304, 0}, /* CFG_VOUT1_D20_OUT */ -+ {0x0C44, 2103, 0}, /* CFG_VOUT1_D21_OUT */ -+ {0x0C50, 2145, 0}, /* CFG_VOUT1_D22_OUT */ -+ {0x0C5C, 1932, 0}, /* CFG_VOUT1_D23_OUT */ -+ {0x0C68, 2200, 0}, /* CFG_VOUT1_D2_OUT */ -+ {0x0C74, 2355, 0}, /* CFG_VOUT1_D3_OUT */ -+ {0x0C80, 3215, 0}, /* CFG_VOUT1_D4_OUT */ -+ {0x0C8C, 2314, 0}, /* CFG_VOUT1_D5_OUT */ -+ {0x0C98, 2238, 0}, /* CFG_VOUT1_D6_OUT */ -+ {0x0CA4, 2381, 0}, /* CFG_VOUT1_D7_OUT */ -+ {0x0CB0, 2138, 0}, /* CFG_VOUT1_D8_OUT */ -+ {0x0CBC, 2383, 0}, /* CFG_VOUT1_D9_OUT */ -+ {0x0CC8, 1984, 0}, /* CFG_VOUT1_DE_OUT */ -+ {0x0CE0, 1947, 0}, /* CFG_VOUT1_HSYNC_OUT */ -+ {0x0CEC, 2739, 0}, /* CFG_VOUT1_VSYNC_OUT */ -+}; -+ - const struct iodelay_cfg_entry iodelay_cfg_array_am574x_idk[] = { - {0x0114, 2199, 621}, /* CFG_GPMC_A0_IN */ - {0x0120, 0, 0}, /* CFG_GPMC_A10_IN */ -diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig -index 3e2c166e0d..b1e2960a9f 100644 ---- a/configs/am57xx_evm_defconfig -+++ b/configs/am57xx_evm_defconfig -@@ -27,14 +27,20 @@ CONFIG_SPL_DMA_SUPPORT=y - CONFIG_SPL_OS_BOOT=y - CONFIG_SPL_SPI_LOAD=y - CONFIG_SPL_YMODEM_SUPPORT=y -+CONFIG_AUTOBOOT_KEYED=y -+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -+CONFIG_AUTOBOOT_DELAY_STR="d" -+CONFIG_AUTOBOOT_STOP_STR=" " - CONFIG_CMD_SPL=y - # CONFIG_CMD_FLASH is not set - # CONFIG_CMD_SETEXPR is not set - # CONFIG_CMD_PMIC is not set -+CONFIG_CMD_BTRFS=y - CONFIG_OF_CONTROL=y - CONFIG_SPL_OF_CONTROL=y --CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" --CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am572x-idk am571x-idk am574x-idk" -+CONFIG_DEFAULT_DEVICE_TREE="am5729-beagleboneai" -+CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am5729-beagleboneai am572x-idk am571x-idk am574x-idk" -+# CONFIG_ENV_IS_IN_FAT is not set - CONFIG_ENV_IS_IN_MMC=y - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y - CONFIG_DM=y -diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h -index 70aa425060..fcc6ac7f8f 100644 ---- a/include/configs/am57xx_evm.h -+++ b/include/configs/am57xx_evm.h -@@ -24,7 +24,7 @@ - #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) - #define CONFIG_SYS_REDUNDAND_ENVIRONMENT - --#define CONSOLEDEV "ttyO2" -+//#define CONSOLEDEV "ttyO2" - #define CONFIG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */ - #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ - #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ -diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index 1e2a62dd6f..47f641165d 100644 ---- a/include/configs/ti_armv7_common.h -+++ b/include/configs/ti_armv7_common.h -@@ -80,6 +80,363 @@ - #define CONFIG_SYS_I2C - #endif - -+#define EEPROM_PROGRAMMING \ -+ "eeprom_dump=i2c dev 0; " \ -+ "i2c md 0x50 0x00.2 20; " \ -+ "\0" \ -+ "eeprom_blank=i2c dev 0; " \ -+ "i2c mw 0x50 0x00.2 ff; " \ -+ "i2c mw 0x50 0x01.2 ff; " \ -+ "i2c mw 0x50 0x02.2 ff; " \ -+ "i2c mw 0x50 0x03.2 ff; " \ -+ "i2c mw 0x50 0x04.2 ff; " \ -+ "i2c mw 0x50 0x05.2 ff; " \ -+ "i2c mw 0x50 0x06.2 ff; " \ -+ "i2c mw 0x50 0x07.2 ff; " \ -+ "i2c mw 0x50 0x08.2 ff; " \ -+ "i2c mw 0x50 0x09.2 ff; " \ -+ "i2c mw 0x50 0x0a.2 ff; " \ -+ "i2c mw 0x50 0x0b.2 ff; " \ -+ "i2c mw 0x50 0x0c.2 ff; " \ -+ "i2c mw 0x50 0x0d.2 ff; " \ -+ "i2c mw 0x50 0x0e.2 ff; " \ -+ "i2c mw 0x50 0x0f.2 ff; " \ -+ "i2c mw 0x50 0x10.2 ff; " \ -+ "i2c mw 0x50 0x11.2 ff; " \ -+ "i2c mw 0x50 0x12.2 ff; " \ -+ "i2c mw 0x50 0x13.2 ff; " \ -+ "i2c mw 0x50 0x14.2 ff; " \ -+ "i2c mw 0x50 0x15.2 ff; " \ -+ "i2c mw 0x50 0x16.2 ff; " \ -+ "i2c mw 0x50 0x17.2 ff; " \ -+ "i2c mw 0x50 0x18.2 ff; " \ -+ "i2c mw 0x50 0x19.2 ff; " \ -+ "i2c mw 0x50 0x1a.2 ff; " \ -+ "i2c mw 0x50 0x1b.2 ff; " \ -+ "i2c mw 0x50 0x1c.2 ff; " \ -+ "i2c mw 0x50 0x1d.2 ff; " \ -+ "i2c mw 0x50 0x1e.2 ff; " \ -+ "i2c mw 0x50 0x1f.2 ff; " \ -+ "i2c md 0x50 0x00.2 20; " \ -+ "\0" \ -+ "eeprom_x15_b1=i2c dev 0; " \ -+ "i2c mw 0x50 0x00.2 aa; " \ -+ "i2c mw 0x50 0x01.2 55; " \ -+ "i2c mw 0x50 0x02.2 33; " \ -+ "i2c mw 0x50 0x03.2 ee; " \ -+ "i2c mw 0x50 0x04.2 42; " \ -+ "i2c mw 0x50 0x05.2 42; " \ -+ "i2c mw 0x50 0x06.2 52; " \ -+ "i2c mw 0x50 0x07.2 44; " \ -+ "i2c mw 0x50 0x08.2 58; " \ -+ "i2c mw 0x50 0x09.2 31; " \ -+ "i2c mw 0x50 0x0a.2 35; " \ -+ "i2c mw 0x50 0x0b.2 5f; " \ -+ "i2c mw 0x50 0x0c.2 42; " \ -+ "i2c mw 0x50 0x0d.2 2e; " \ -+ "i2c mw 0x50 0x0e.2 31; " \ -+ "i2c mw 0x50 0x0f.2 30; " \ -+ "i2c mw 0x50 0x10.2 57; " \ -+ "i2c mw 0x50 0x11.2 57; " \ -+ "i2c mw 0x50 0x12.2 59; " \ -+ "i2c mw 0x50 0x13.2 59; " \ -+ "i2c mw 0x50 0x14.2 34; " \ -+ "i2c mw 0x50 0x15.2 50; " \ -+ "i2c mw 0x50 0x16.2 35; " \ -+ "i2c mw 0x50 0x17.2 35; " \ -+ "i2c mw 0x50 0x18.2 30; " \ -+ "i2c mw 0x50 0x19.2 30; " \ -+ "i2c mw 0x50 0x1a.2 30; " \ -+ "i2c mw 0x50 0x1b.2 30; " \ -+ "i2c mw 0x50 0x1c.2 ff; " \ -+ "i2c mw 0x50 0x1d.2 ff; " \ -+ "i2c mw 0x50 0x1e.2 ff; " \ -+ "i2c mw 0x50 0x1f.2 ff; " \ -+ "i2c md 0x50 0x00.2 20; " \ -+ "\0" \ -+ "eeprom_x15_c=i2c dev 0; " \ -+ "i2c mw 0x50 0x00.2 aa; " \ -+ "i2c mw 0x50 0x01.2 55; " \ -+ "i2c mw 0x50 0x02.2 33; " \ -+ "i2c mw 0x50 0x03.2 ee; " \ -+ "i2c mw 0x50 0x04.2 42; " \ -+ "i2c mw 0x50 0x05.2 42; " \ -+ "i2c mw 0x50 0x06.2 52; " \ -+ "i2c mw 0x50 0x07.2 44; " \ -+ "i2c mw 0x50 0x08.2 58; " \ -+ "i2c mw 0x50 0x09.2 31; " \ -+ "i2c mw 0x50 0x0a.2 35; " \ -+ "i2c mw 0x50 0x0b.2 5f; " \ -+ "i2c mw 0x50 0x0c.2 43; " \ -+ "i2c mw 0x50 0x0d.2 2e; " \ -+ "i2c mw 0x50 0x0e.2 30; " \ -+ "i2c mw 0x50 0x0f.2 30; " \ -+ "i2c mw 0x50 0x10.2 79; " \ -+ "i2c mw 0x50 0x11.2 79; " \ -+ "i2c mw 0x50 0x12.2 77; " \ -+ "i2c mw 0x50 0x13.2 77; " \ -+ "i2c mw 0x50 0x14.2 50; " \ -+ "i2c mw 0x50 0x15.2 58; " \ -+ "i2c mw 0x50 0x16.2 31; " \ -+ "i2c mw 0x50 0x17.2 35; " \ -+ "i2c mw 0x50 0x18.2 6e; " \ -+ "i2c mw 0x50 0x19.2 6e; " \ -+ "i2c mw 0x50 0x1a.2 6e; " \ -+ "i2c mw 0x50 0x1b.2 6e; " \ -+ "i2c mw 0x50 0x1c.2 ff; " \ -+ "i2c mw 0x50 0x1d.2 ff; " \ -+ "i2c mw 0x50 0x1e.2 ff; " \ -+ "i2c mw 0x50 0x1f.2 ff; " \ -+ "i2c md 0x50 0x00.2 20; " \ -+ "\0" \ -+ -+#define EEWIKI_MMC_BOOT \ -+ "mmc_boot=${devtype} dev ${mmcdev}; ${devtype} part; " \ -+ "if ${devtype} rescan; then " \ -+ "echo Scanning ${devtype} device ${mmcdev};" \ -+ "setenv bootpart ${mmcdev}:1; " \ -+ "echo Checking for: /uEnv.txt ...;" \ -+ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from /uEnv.txt;" \ -+ "echo Checking if uenvcmd is set ...;" \ -+ "if test -n ${uenvcmd}; then " \ -+ "echo Running uenvcmd ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "fi; " \ -+ "echo Checking for: /boot/uEnv.txt ...;" \ -+ "for i in 1 2 3 4 5 6 7 ; do " \ -+ "setenv mmcpart ${i};" \ -+ "setenv bootpart ${mmcdev}:${mmcpart};" \ -+ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from /boot/uEnv.txt;" \ -+ "if test -n ${dtb}; then " \ -+ "setenv fdtfile ${dtb};" \ -+ "echo debug: [dtb=${fdtfile}] ...;" \ -+ "fi;" \ -+ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ -+ "if test -n ${uname_r}; then " \ -+ "echo debug: [uname_r=${uname_r}] ...;" \ -+ "setenv oldroot /dev/mmcblk${mmcdev}p${mmcpart};" \ -+ "run uname_boot;" \ -+ "fi;" \ -+ "fi;" \ -+ "done;" \ -+ "fi;\0" \ -+ -+#define EEWIKI_SCSI_BOOT \ -+ "scsi_boot=${devtype} reset ; " \ -+ "if ${devtype} dev ${mmcdev}; then " \ -+ "echo Scanning ${devtype} device ${mmcdev};" \ -+ "setenv bootpart ${mmcdev}:1; " \ -+ "echo Checking for: /uEnv.txt ...;" \ -+ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from /uEnv.txt;" \ -+ "echo Checking if uenvcmd is set ...;" \ -+ "if test -n ${uenvcmd}; then " \ -+ "echo Running uenvcmd ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "fi; " \ -+ "echo Checking for: /boot/uEnv.txt ...;" \ -+ "for i in 1 2 3 4 ; do " \ -+ "setenv mmcpart ${i};" \ -+ "setenv bootpart ${mmcdev}:${mmcpart};" \ -+ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from /boot/uEnv.txt;" \ -+ "if test -n ${dtb}; then " \ -+ "setenv fdtfile ${dtb};" \ -+ "echo debug: [dtb=${fdtfile}] ...;" \ -+ "fi;" \ -+ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ -+ "if test -n ${uname_r}; then " \ -+ "echo debug: [uname_r=${uname_r}] ...;" \ -+ "setenv oldroot /dev/sda${mmcpart};" \ -+ "run uname_boot;" \ -+ "fi;" \ -+ "fi;" \ -+ "done;" \ -+ "fi;\0" \ -+ -+#define EEWIKI_USB_BOOT \ -+ "usb_boot=${devtype} reset ; " \ -+ "if ${devtype} dev ${mmcdev}; then " \ -+ "echo Scanning ${devtype} device ${mmcdev};" \ -+ "setenv bootpart ${mmcdev}:1; " \ -+ "echo Checking for: /uEnv.txt ...;" \ -+ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from /uEnv.txt;" \ -+ "echo Checking if uenvcmd is set in /uEnv.txt ...;" \ -+ "if test -n ${uenvcmd}; then " \ -+ "echo Running uenvcmd ...;" \ -+ "run uenvcmd;" \ -+ "fi;" \ -+ "fi; " \ -+ "echo Checking for: /boot/uEnv.txt ...;" \ -+ "for i in 1 2 3 4 ; do " \ -+ "setenv mmcpart ${i};" \ -+ "setenv bootpart ${mmcdev}:${mmcpart};" \ -+ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ -+ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ -+ "env import -t ${loadaddr} ${filesize};" \ -+ "echo Loaded environment from /boot/uEnv.txt;" \ -+ "if test -n ${dtb}; then " \ -+ "setenv fdtfile ${dtb};" \ -+ "echo debug: [dtb=${fdtfile}] ...;" \ -+ "fi;" \ -+ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ -+ "if test -n ${uname_r}; then " \ -+ "echo debug: [uname_r=${uname_r}] ...;" \ -+ "setenv oldroot /dev/sda${mmcpart};" \ -+ "run uname_boot;" \ -+ "fi;" \ -+ "fi;" \ -+ "done;" \ -+ "fi;\0" \ -+ -+#define EEWIKI_UNAME_BOOT \ -+ "uname_boot="\ -+ "setenv bootdir /boot; " \ -+ "setenv bootfile vmlinuz-${uname_r}; " \ -+ "if test -e ${devtype} ${bootpart} ${bootdir}/${bootfile}; then " \ -+ "echo loading ${bootdir}/${bootfile} ...; "\ -+ "run loadimage;" \ -+ "setenv fdtdir /boot/dtbs/${uname_r}; " \ -+ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ -+ "run loadfdt;" \ -+ "else " \ -+ "setenv fdtdir /usr/lib/linux-image-${uname_r}; " \ -+ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ -+ "run loadfdt;" \ -+ "else " \ -+ "setenv fdtdir /lib/firmware/${uname_r}/device-tree; " \ -+ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ -+ "run loadfdt;" \ -+ "else " \ -+ "setenv fdtdir /boot/dtb-${uname_r}; " \ -+ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ -+ "run loadfdt;" \ -+ "else " \ -+ "setenv fdtdir /boot/dtbs; " \ -+ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ -+ "run loadfdt;" \ -+ "else " \ -+ "setenv fdtdir /boot/dtb; " \ -+ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ -+ "run loadfdt;" \ -+ "else " \ -+ "setenv fdtdir /boot; " \ -+ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ -+ "run loadfdt;" \ -+ "else " \ -+ "echo; echo unable to find ${fdtfile} ...; echo booting legacy ...;"\ -+ "run args_mmc;" \ -+ "echo debug: [${bootargs}] ... ;" \ -+ "echo debug: [bootz ${loadaddr}] ... ;" \ -+ "bootz ${loadaddr}; " \ -+ "fi;" \ -+ "fi;" \ -+ "fi;" \ -+ "fi;" \ -+ "fi;" \ -+ "fi;" \ -+ "fi; " \ -+ "if test -n ${enable_uboot_overlays}; then " \ -+ "setenv fdt_buffer 0x60000;" \ -+ "if test -n ${uboot_fdt_buffer}; then " \ -+ "setenv fdt_buffer ${uboot_fdt_buffer};" \ -+ "fi;" \ -+ "echo uboot_overlays: [fdt_buffer=${fdt_buffer}] ... ;" \ -+ "if test -n ${uboot_overlay_addr0}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr0}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_addr1}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr1}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_addr2}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr2}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_addr3}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr3}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_addr4}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr4}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_addr5}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr5}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_addr6}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr6}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_addr7}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_addr7}; " \ -+ "run capeloadoverlay;" \ -+ "fi;" \ -+ "if test -n ${uboot_overlay_pru}; then " \ -+ "setenv uboot_overlay ${uboot_overlay_pru}; " \ -+ "run virtualloadoverlay;" \ -+ "fi;" \ -+ "else " \ -+ "echo uboot_overlays: add [enable_uboot_overlays=1] to /boot/uEnv.txt to enable...;" \ -+ "fi;" \ -+ "setenv rdfile initrd.img-${uname_r}; " \ -+ "if test -e ${devtype} ${bootpart} ${bootdir}/${rdfile}; then " \ -+ "echo loading ${bootdir}/${rdfile} ...; "\ -+ "run loadrd;" \ -+ "if test -n ${netinstall_enable}; then " \ -+ "run args_netinstall; run message;" \ -+ "echo debug: [${bootargs}] ... ;" \ -+ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ -+ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ -+ "fi;" \ -+ "if test -n ${uenv_root}; then " \ -+ "run args_uenv_root;" \ -+ "echo debug: [${bootargs}] ... ;" \ -+ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ -+ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ -+ "fi;" \ -+ "if test -n ${uuid}; then " \ -+ "run args_mmc_uuid;" \ -+ "echo debug: [${bootargs}] ... ;" \ -+ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ -+ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ -+ "else " \ -+ "run args_mmc_old;" \ -+ "echo debug: [${bootargs}] ... ;" \ -+ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ -+ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ -+ "fi;" \ -+ "else " \ -+ "if test -n ${uenv_root}; then " \ -+ "run args_uenv_root;" \ -+ "echo debug: [${bootargs}] ... ;" \ -+ "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ -+ "bootz ${loadaddr} - ${fdtaddr}; " \ -+ "fi;" \ -+ "run args_mmc_old;" \ -+ "echo debug: [${bootargs}] ... ;" \ -+ "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ -+ "bootz ${loadaddr} - ${fdtaddr}; " \ -+ "fi;" \ -+ "fi;\0" \ -+ - /* - * The following are general good-enough settings for U-Boot. We set a - * large malloc pool as we generally have a lot of DDR, and we opt for -diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h -index ba57c40182..93368cdc51 100644 ---- a/include/configs/ti_omap5_common.h -+++ b/include/configs/ti_omap5_common.h -@@ -63,6 +63,11 @@ - DEFAULT_FIT_TI_ARGS \ - DEFAULT_COMMON_BOOT_TI_ARGS \ - DEFAULT_FDT_TI_ARGS \ -+ EEWIKI_USB_BOOT \ -+ EEWIKI_SCSI_BOOT \ -+ EEWIKI_MMC_BOOT \ -+ EEWIKI_UNAME_BOOT \ -+ EEPROM_PROGRAMMING \ - DFUARGS \ - NETARGS \ - -diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h -index 05bdbbc23e..b0254b064a 100644 ---- a/include/environment/ti/boot.h -+++ b/include/environment/ti/boot.h -@@ -64,32 +64,18 @@ - "bootpart=0:2\0" \ - "bootdir=/boot\0" \ - "bootfile=zImage\0" \ -+ "board_eeprom_header=undefined\0" \ - "usbtty=cdc_acm\0" \ - "vram=16M\0" \ - AVB_VERIFY_CMD \ - "partitions=" PARTS_DEFAULT "\0" \ - "optargs=\0" \ - "dofastboot=0\0" \ -- "emmc_linux_boot=" \ -- "echo Trying to boot Linux from eMMC ...; " \ -- "setenv mmcdev 1; " \ -- "setenv bootpart 1:2; " \ -- "setenv mmcroot /dev/mmcblk0p2 rw; " \ -- "run mmcboot;\0" \ -- "emmc_android_boot=" \ -- "echo Trying to boot Android from eMMC ...; " \ -- "run update_to_fit; " \ -- "setenv eval_bootargs setenv bootargs $bootargs; " \ -- "run eval_bootargs; " \ -- "setenv mmcdev 1; " \ -- "setenv machid fe6; " \ -- "mmc dev $mmcdev; " \ -- "mmc rescan; " \ -- AVB_VERIFY_CHECK \ -- "part start mmc ${mmcdev} boot boot_start; " \ -- "part size mmc ${mmcdev} boot boot_size; " \ -- "mmc read ${loadaddr} ${boot_start} ${boot_size}; " \ -- "bootm ${loadaddr}#${fdtfile};\0 " -+ "read_board_eeprom="\ -+ "if test $board_eeprom_header = beagle_x15_revb1_blank; then " \ -+ "run eeprom_dump; run eeprom_x15_b1; reset; fi; " \ -+ "if test $board_eeprom_header = beagle_x15_revc_blank; then " \ -+ "run eeprom_dump; run eeprom_x15_c; reset; fi; \0 " - - #ifdef CONFIG_OMAP54XX - -@@ -127,20 +113,17 @@ - "echo WARNING: Could not determine device tree to use; fi; \0" - - #define CONFIG_BOOTCOMMAND \ -- "if test ${dofastboot} -eq 1; then " \ -- "echo Boot fastboot requested, resetting dofastboot ...;" \ -- "setenv dofastboot 0; saveenv;" \ -- "echo Booting into fastboot ...; " \ -- "fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \ -- "fi;" \ -- "if test ${boot_fit} -eq 1; then " \ -- "run update_to_fit;" \ -- "fi;" \ -+ "run read_board_eeprom; " \ - "run findfdt; " \ -- "run envboot; " \ -- "run mmcboot;" \ -- "run emmc_linux_boot; " \ -- "run emmc_android_boot; " \ -+ "setenv mmcdev 0; " \ -+ "setenv devtype usb; " \ -+ "echo usb_boot is currently disabled;" \ -+ "setenv devtype scsi; " \ -+ "echo scsi_boot is currently disabled;" \ -+ "setenv devtype mmc; " \ -+ "run mmc_boot;" \ -+ "setenv mmcdev 1; " \ -+ "run mmc_boot;" \ - "" - - #endif /* CONFIG_OMAP54XX */ -diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h -index 785fc15345..6481682fc7 100644 ---- a/include/environment/ti/mmc.h -+++ b/include/environment/ti/mmc.h -@@ -11,11 +11,33 @@ - #define DEFAULT_MMC_TI_ARGS \ - "mmcdev=0\0" \ - "mmcrootfstype=ext4 rootwait\0" \ -- "finduuid=part uuid mmc ${bootpart} uuid\0" \ -+ "finduuid=part uuid ${devtype} ${bootpart} uuid\0" \ - "args_mmc=run finduuid;setenv bootargs console=${console} " \ - "${optargs} " \ -- "root=PARTUUID=${uuid} rw " \ -- "rootfstype=${mmcrootfstype}\0" \ -+ "root=PARTUUID=${uuid} ro " \ -+ "rootfstype=${mmcrootfstype} " \ -+ "${cmdline}\0" \ -+ "args_mmc_old=setenv bootargs console=${console} " \ -+ "${optargs} " \ -+ "root=${oldroot} ro " \ -+ "rootfstype=${mmcrootfstype} " \ -+ "${cmdline}\0" \ -+ "args_mmc_uuid=setenv bootargs console=${console} " \ -+ "${optargs} " \ -+ "root=UUID=${uuid} ro " \ -+ "rootfstype=${mmcrootfstype} " \ -+ "${cmdline}\0" \ -+ "args_uenv_root=setenv bootargs console=${console} " \ -+ "${optargs} " \ -+ "root=${uenv_root} ro " \ -+ "rootfstype=${mmcrootfstype} " \ -+ "${musb} ${cmdline}\0" \ -+ "args_netinstall=setenv bootargs ${netinstall_bootargs} " \ -+ "${optargs} " \ -+ "${cape_disable} " \ -+ "${cape_enable} " \ -+ "root=/dev/ram rw " \ -+ "${cmdline}\0" \ - "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ - "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ - "source ${loadaddr}\0" \ -@@ -24,7 +46,22 @@ - "env import -t ${loadaddr} ${filesize}\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \ - "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ -- "loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ -+ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}; setenv rdsize ${filesize}\0" \ -+ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ -+ "loadoverlay=echo uboot_overlays: loading ${uboot_overlay} ...; " \ -+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay}; " \ -+ "fdt addr ${fdtaddr}; fdt resize ${fdt_buffer}; " \ -+ "fdt apply ${rdaddr}; fdt resize ${fdt_buffer};\0" \ -+ "virtualloadoverlay=if test -e ${devtype} ${bootpart} ${uboot_overlay}; then " \ -+ "run loadoverlay;" \ -+ "else " \ -+ "echo uboot_overlays: unable to find [${devtype} ${bootpart} ${uboot_overlay}]...;" \ -+ "fi;\0" \ -+ "capeloadoverlay=if test -e ${devtype} ${bootpart} ${uboot_overlay}; then " \ -+ "run loadoverlay;" \ -+ "else " \ -+ "echo uboot_overlays: unable to find [${devtype} ${bootpart} ${uboot_overlay}]...;" \ -+ "fi;\0" \ - "envboot=mmc dev ${mmcdev}; " \ - "if mmc rescan; then " \ - "echo SD/MMC found on device ${mmcdev};" \ --- -2.17.1 - diff --git a/board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch b/board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch new file mode 100644 index 0000000000..9c7b12be84 --- /dev/null +++ b/board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch @@ -0,0 +1,839 @@ +From 702ea30b462ba06f4fbee3393f0e6c19531f1e5f Mon Sep 17 00:00:00 2001 +From: Robert Nelson +Date: Fri, 25 Jun 2021 11:33:25 -0500 +Subject: [PATCH] am57xx_evm-fixes + +Signed-off-by: Robert Nelson +[Patch from https://github.com/beagleboard/u-boot/commit/702ea30b462ba06f4fbee3393f0e6c19531f1e5f] +Signed-off-by: Peter Korsgaard +--- + arch/arm/mach-omap2/omap5/hw_data.c | 1 + + board/ti/am57xx/board.c | 167 +++++++++++- + configs/am57xx_evm_defconfig | 15 +- + include/configs/ti_armv7_common.h | 407 ++++++++++++++++++++++++++++ + include/configs/ti_omap5_common.h | 5 + + include/environment/ti/boot.h | 32 ++- + include/environment/ti/mmc.h | 49 +++- + 7 files changed, 651 insertions(+), 25 deletions(-) + +diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c +index fa4e27063c..d5192b1671 100644 +--- a/arch/arm/mach-omap2/omap5/hw_data.c ++++ b/arch/arm/mach-omap2/omap5/hw_data.c +@@ -421,6 +421,7 @@ void enable_basic_clocks(void) + (*prcm)->cm_l4per_uart1_clkctrl, + (*prcm)->cm_l4per_uart3_clkctrl, + (*prcm)->cm_l4per_i2c1_clkctrl, ++ (*prcm)->cm_l4per_i2c4_clkctrl, + #ifdef CONFIG_DRIVER_TI_CPSW + (*prcm)->cm_gmac_gmac_clkctrl, + #endif +diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c +index 73063faee6..ad05c41f22 100644 +--- a/board/ti/am57xx/board.c ++++ b/board/ti/am57xx/board.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include "../common/board_detect.h" + #include "mux_data.h" +@@ -528,8 +529,10 @@ void do_board_detect(void) + + rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS, + CONFIG_EEPROM_CHIP_ADDRESS); +- if (rc) ++ if (rc) { + printf("ti_i2c_eeprom_init failed %d\n", rc); ++ ti_i2c_eeprom_am_set("BBONE-AI", "A"); ++ }; + + #ifdef CONFIG_SUPPORT_EMMC_BOOT + rc = board_bootmode_has_emmc(); +@@ -579,6 +582,164 @@ void do_board_detect(void) + "Board: %s REV %s\n", bname, board_ti_get_rev()); + } + ++struct am335x_cape_eeprom_id { ++ unsigned int header; ++ char eeprom_rev[2]; ++ char board_name[32]; ++ char version[4]; ++ char manufacture[16]; ++ char part_number[16]; ++ char number_of_pins[2]; ++ char serial_number[12]; ++ char pin_usage[140]; ++ char vdd_3v3exp[ 2]; ++ char vdd_5v[ 2]; ++ char sys_5v[2]; ++ char dc_supplied[2]; ++}; ++ ++#define CAPE_EEPROM_BUS_NUM 3 ++#define CAPE_EEPROM_ADDR0 0x54 ++#define CAPE_EEPROM_ADDR1 0x55 ++#define CAPE_EEPROM_ADDR2 0x56 ++#define CAPE_EEPROM_ADDR3 0x57 ++ ++#define CAPE_EEPROM_ADDR_LEN 0x10 ++ ++static int probe_cape_eeprom(struct am335x_cape_eeprom_id *cape_header) ++{ ++ int ret; ++ struct udevice *dev; ++ unsigned char addr; ++ /* /lib/firmware/BB-CAPE-DISP-CT4-00A0.dtbo */ ++ /* 14 + 16 + 1 + 4 + 5 = 40 */ ++ char hash_cape_overlay[40]; ++ char cape_overlay[26]; ++ char process_cape_part_number[16]; ++ char process_cape_version[4]; ++ char end_part_number; ++ char cape_overlay_pass_to_kernel[18]; ++ ++ strlcpy(cape_overlay_pass_to_kernel, "", 1); ++ ++ for ( addr = CAPE_EEPROM_ADDR0; addr <= CAPE_EEPROM_ADDR3; addr++ ) { ++ ret = i2c_get_chip_for_busnum(CAPE_EEPROM_BUS_NUM, addr, 1, &dev); ++ if (ret) { ++ printf("BeagleBone Cape EEPROM: no EEPROM at address: 0x%x\n", addr); ++ } else { ++ printf("BeagleBone Cape EEPROM: found EEPROM at address: 0x%x\n", addr); ++ ++ ret = i2c_set_chip_offset_len(dev, 2); ++ if (ret) { ++ printf("BeagleBone Cape EEPROM: i2c_set_chip_offset_len failure\n"); ++ } ++ ++ ret = dm_i2c_read(dev, 0, (uchar *)cape_header, sizeof(struct am335x_cape_eeprom_id)); ++ if (ret) { ++ printf("BeagleBone Cape EEPROM: Cannot read eeprom params\n"); ++ } ++ ++ if (cape_header->header == 0xEE3355AA) { ++ strlcpy(hash_cape_overlay, "/lib/firmware/", 14 + 1); ++ strlcpy(cape_overlay, "", 2); ++ strlcpy(cape_overlay_pass_to_kernel, "", 2); ++ strlcpy(process_cape_part_number, "...............", 16 + 1); ++ strlcpy(process_cape_version, "...", 4 + 1); ++ ++ strlcpy(process_cape_part_number, cape_header->part_number, 16 + 1); ++ printf("BeagleBone Cape EEPROM: debug part_number field:[%s]\n", process_cape_part_number); ++ ++ //FIXME: some capes end with '.' ++ if ( process_cape_part_number[15] == 0x2E ) { ++ puts("debug: fixup, extra . in eeprom field\n"); ++ process_cape_part_number[15] = 0x00; ++ if ( process_cape_part_number[14] == 0x2E ) { ++ process_cape_part_number[14] = 0x00; ++ } ++ } ++ ++ //Find ending 0x00 or 0xFF ++ puts("BeagleBone Cape EEPROM: debug part_number field HEX:["); ++ end_part_number=16; ++ for ( int i=0; i <= 16; i++ ) { ++ if (( process_cape_part_number[i] == 0x00 ) || ( process_cape_part_number[i] == 0xFF )) { ++ end_part_number=i; ++ i=17; ++ } else { ++ printf("%x", process_cape_part_number[i]); ++ } ++ } ++ puts("]\n"); ++ ++ strncat(cape_overlay_pass_to_kernel, process_cape_part_number, end_part_number); ++ strncat(cape_overlay_pass_to_kernel, ",", 1); ++ //printf("debug: %s\n", cape_overlay_pass_to_kernel); ++ ++ strncat(hash_cape_overlay, process_cape_part_number, end_part_number); ++ strncat(cape_overlay, process_cape_part_number, end_part_number); ++ //printf("debug: %s %s\n", hash_cape_overlay, cape_overlay); ++ ++ strncat(hash_cape_overlay, "-", 1); ++ strncat(cape_overlay, "-", 1); ++ //printf("debug: %s %s\n", hash_cape_overlay, cape_overlay); ++ ++ strlcpy(process_cape_version, cape_header->version, 4 + 1); ++ //printf("debug: version field:[%s]\n", process_cape_version); ++ ++ //Find invalid 0xFF -> 0x30 BBAI FAN Cape... ++ puts("BeagleBone Cape EEPROM: debug version field HEX:["); ++ for ( int i=0; i <= 3; i++ ) { ++ printf("%x", process_cape_version[i]); ++ if ( process_cape_version[i] == 0xFF ) { ++ process_cape_version[i] = 0x30; ++ } ++ } ++ puts("]\n"); ++ ++ strncat(hash_cape_overlay, process_cape_version, 4); ++ strncat(cape_overlay, process_cape_version, 4); ++ //printf("debug: %s %s\n", hash_cape_overlay, cape_overlay); ++ ++ strncat(hash_cape_overlay, ".dtbo", 5); ++ strncat(cape_overlay, ".dtbo", 5); ++ //printf("debug: %s %s\n", hash_cape_overlay, cape_overlay); ++ ++ printf("BeagleBone Cape EEPROM: 0x%x %s\n", addr, cape_overlay); ++ ++ switch(addr) { ++ case CAPE_EEPROM_ADDR0: ++ env_set("uboot_overlay_addr0", cape_overlay); ++ env_set("uboot_detected_capes_addr0", cape_overlay_pass_to_kernel); ++ break; ++ case CAPE_EEPROM_ADDR1: ++ env_set("uboot_overlay_addr1", cape_overlay); ++ env_set("uboot_detected_capes_addr1", cape_overlay_pass_to_kernel); ++ break; ++ case CAPE_EEPROM_ADDR2: ++ env_set("uboot_overlay_addr2", cape_overlay); ++ env_set("uboot_detected_capes_addr2", cape_overlay_pass_to_kernel); ++ break; ++ case CAPE_EEPROM_ADDR3: ++ env_set("uboot_overlay_addr3", cape_overlay); ++ env_set("uboot_detected_capes_addr3", cape_overlay_pass_to_kernel); ++ break; ++ } ++ env_set("uboot_detected_capes", "1"); ++ } else { ++ printf("BeagleBone Cape EEPROM: EEPROM contents not valid (or blank) on address: 0x%x\n", addr); ++ } ++ } ++ } ++ return 0; ++} ++ ++void do_cape_detect(void) ++{ ++ struct am335x_cape_eeprom_id cape_header; ++ ++ probe_cape_eeprom(&cape_header); ++} ++ + static void setup_board_eeprom_env(void) + { + char *name = "beagle_x15"; +@@ -782,8 +943,10 @@ int board_late_init(void) + /* Just probe the potentially supported cdce913 device */ + uclass_get_device(UCLASS_CLK, 0, &dev); + +- if (board_is_bbai()) ++ if (board_is_bbai()) { + env_set("console", "ttyS0,115200n8"); ++ do_cape_detect(); ++ } + + #if !defined(CONFIG_SPL_BUILD) + board_ti_set_ethaddr(2); +diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig +index 4da4aaa1c7..ed5b8aec16 100644 +--- a/configs/am57xx_evm_defconfig ++++ b/configs/am57xx_evm_defconfig +@@ -10,16 +10,20 @@ CONFIG_SPL_TEXT_BASE=0x40300000 + CONFIG_OMAP54XX=y + CONFIG_TARGET_AM57XX_EVM=y + CONFIG_SPL=y +-CONFIG_ENV_OFFSET_REDUND=0x280000 + CONFIG_SPL_SPI_FLASH_SUPPORT=y + CONFIG_SPL_SPI_SUPPORT=y + CONFIG_ARMV7_LPAE=y +-CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" ++CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15-revc" + CONFIG_AHCI=y + CONFIG_DISTRO_DEFAULTS=y + CONFIG_SPL_LOAD_FIT=y + # CONFIG_USE_SPL_FIT_GENERATOR is not set + CONFIG_OF_BOARD_SETUP=y ++CONFIG_BOOTDELAY=1 ++CONFIG_AUTOBOOT_KEYED=y ++CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" ++CONFIG_AUTOBOOT_DELAY_STR="d" ++CONFIG_AUTOBOOT_STOP_STR=" " + CONFIG_USE_BOOTARGS=y + CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=beagle_x15board" + # CONFIG_USE_BOOTCOMMAND is not set +@@ -48,13 +52,12 @@ CONFIG_BOOTP_DNS2=y + CONFIG_CMD_AVB=y + CONFIG_OF_CONTROL=y + CONFIG_SPL_OF_CONTROL=y +-CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am5729-beagleboneai am572x-idk am571x-idk am574x-idk" ++CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am5729-beagleboneai" + CONFIG_ENV_OVERWRITE=y +-CONFIG_ENV_IS_IN_MMC=y +-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++# CONFIG_ENV_IS_IN_FAT is not set + CONFIG_SYS_RELOC_GD_ENV_ADDR=y +-CONFIG_SYS_MMC_ENV_DEV=1 + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y ++# CONFIG_SPL_ENV_IS_NOWHERE is not set + CONFIG_VERSION_VARIABLE=y + CONFIG_BOOTP_SEND_HOSTNAME=y + CONFIG_DM=y +diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h +index f13e9e5264..eabd03e27d 100644 +--- a/include/configs/ti_armv7_common.h ++++ b/include/configs/ti_armv7_common.h +@@ -92,6 +92,413 @@ + #define CONFIG_SYS_I2C + #endif + ++#define EEPROM_PROGRAMMING \ ++ "eeprom_dump=i2c dev 0; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ "eeprom_blank=i2c dev 0; " \ ++ "i2c mw 0x50 0x00.2 ff; " \ ++ "i2c mw 0x50 0x01.2 ff; " \ ++ "i2c mw 0x50 0x02.2 ff; " \ ++ "i2c mw 0x50 0x03.2 ff; " \ ++ "i2c mw 0x50 0x04.2 ff; " \ ++ "i2c mw 0x50 0x05.2 ff; " \ ++ "i2c mw 0x50 0x06.2 ff; " \ ++ "i2c mw 0x50 0x07.2 ff; " \ ++ "i2c mw 0x50 0x08.2 ff; " \ ++ "i2c mw 0x50 0x09.2 ff; " \ ++ "i2c mw 0x50 0x0a.2 ff; " \ ++ "i2c mw 0x50 0x0b.2 ff; " \ ++ "i2c mw 0x50 0x0c.2 ff; " \ ++ "i2c mw 0x50 0x0d.2 ff; " \ ++ "i2c mw 0x50 0x0e.2 ff; " \ ++ "i2c mw 0x50 0x0f.2 ff; " \ ++ "i2c mw 0x50 0x10.2 ff; " \ ++ "i2c mw 0x50 0x11.2 ff; " \ ++ "i2c mw 0x50 0x12.2 ff; " \ ++ "i2c mw 0x50 0x13.2 ff; " \ ++ "i2c mw 0x50 0x14.2 ff; " \ ++ "i2c mw 0x50 0x15.2 ff; " \ ++ "i2c mw 0x50 0x16.2 ff; " \ ++ "i2c mw 0x50 0x17.2 ff; " \ ++ "i2c mw 0x50 0x18.2 ff; " \ ++ "i2c mw 0x50 0x19.2 ff; " \ ++ "i2c mw 0x50 0x1a.2 ff; " \ ++ "i2c mw 0x50 0x1b.2 ff; " \ ++ "i2c mw 0x50 0x1c.2 ff; " \ ++ "i2c mw 0x50 0x1d.2 ff; " \ ++ "i2c mw 0x50 0x1e.2 ff; " \ ++ "i2c mw 0x50 0x1f.2 ff; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ "eeprom_x15_b1=i2c dev 0; " \ ++ "i2c mw 0x50 0x00.2 aa; " \ ++ "i2c mw 0x50 0x01.2 55; " \ ++ "i2c mw 0x50 0x02.2 33; " \ ++ "i2c mw 0x50 0x03.2 ee; " \ ++ "i2c mw 0x50 0x04.2 42; " \ ++ "i2c mw 0x50 0x05.2 42; " \ ++ "i2c mw 0x50 0x06.2 52; " \ ++ "i2c mw 0x50 0x07.2 44; " \ ++ "i2c mw 0x50 0x08.2 58; " \ ++ "i2c mw 0x50 0x09.2 31; " \ ++ "i2c mw 0x50 0x0a.2 35; " \ ++ "i2c mw 0x50 0x0b.2 5f; " \ ++ "i2c mw 0x50 0x0c.2 42; " \ ++ "i2c mw 0x50 0x0d.2 2e; " \ ++ "i2c mw 0x50 0x0e.2 31; " \ ++ "i2c mw 0x50 0x0f.2 30; " \ ++ "i2c mw 0x50 0x10.2 57; " \ ++ "i2c mw 0x50 0x11.2 57; " \ ++ "i2c mw 0x50 0x12.2 59; " \ ++ "i2c mw 0x50 0x13.2 59; " \ ++ "i2c mw 0x50 0x14.2 34; " \ ++ "i2c mw 0x50 0x15.2 50; " \ ++ "i2c mw 0x50 0x16.2 35; " \ ++ "i2c mw 0x50 0x17.2 35; " \ ++ "i2c mw 0x50 0x18.2 30; " \ ++ "i2c mw 0x50 0x19.2 30; " \ ++ "i2c mw 0x50 0x1a.2 30; " \ ++ "i2c mw 0x50 0x1b.2 30; " \ ++ "i2c mw 0x50 0x1c.2 ff; " \ ++ "i2c mw 0x50 0x1d.2 ff; " \ ++ "i2c mw 0x50 0x1e.2 ff; " \ ++ "i2c mw 0x50 0x1f.2 ff; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ "eeprom_x15_c=i2c dev 0; " \ ++ "i2c mw 0x50 0x00.2 aa; " \ ++ "i2c mw 0x50 0x01.2 55; " \ ++ "i2c mw 0x50 0x02.2 33; " \ ++ "i2c mw 0x50 0x03.2 ee; " \ ++ "i2c mw 0x50 0x04.2 42; " \ ++ "i2c mw 0x50 0x05.2 42; " \ ++ "i2c mw 0x50 0x06.2 52; " \ ++ "i2c mw 0x50 0x07.2 44; " \ ++ "i2c mw 0x50 0x08.2 58; " \ ++ "i2c mw 0x50 0x09.2 31; " \ ++ "i2c mw 0x50 0x0a.2 35; " \ ++ "i2c mw 0x50 0x0b.2 5f; " \ ++ "i2c mw 0x50 0x0c.2 43; " \ ++ "i2c mw 0x50 0x0d.2 2e; " \ ++ "i2c mw 0x50 0x0e.2 30; " \ ++ "i2c mw 0x50 0x0f.2 30; " \ ++ "i2c mw 0x50 0x10.2 79; " \ ++ "i2c mw 0x50 0x11.2 79; " \ ++ "i2c mw 0x50 0x12.2 77; " \ ++ "i2c mw 0x50 0x13.2 77; " \ ++ "i2c mw 0x50 0x14.2 50; " \ ++ "i2c mw 0x50 0x15.2 58; " \ ++ "i2c mw 0x50 0x16.2 31; " \ ++ "i2c mw 0x50 0x17.2 35; " \ ++ "i2c mw 0x50 0x18.2 6e; " \ ++ "i2c mw 0x50 0x19.2 6e; " \ ++ "i2c mw 0x50 0x1a.2 6e; " \ ++ "i2c mw 0x50 0x1b.2 6e; " \ ++ "i2c mw 0x50 0x1c.2 ff; " \ ++ "i2c mw 0x50 0x1d.2 ff; " \ ++ "i2c mw 0x50 0x1e.2 ff; " \ ++ "i2c mw 0x50 0x1f.2 ff; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "eeprom_bbai_a2=i2c dev 0; " \ ++ "i2c mw 0x50 0x00.2 aa; " \ ++ "i2c mw 0x50 0x01.2 55; " \ ++ "i2c mw 0x50 0x02.2 33; " \ ++ "i2c mw 0x50 0x03.2 ee; " \ ++ "i2c mw 0x50 0x04.2 42; " \ ++ "i2c mw 0x50 0x05.2 42; " \ ++ "i2c mw 0x50 0x06.2 4F; " \ ++ "i2c mw 0x50 0x07.2 4E; " \ ++ "i2c mw 0x50 0x08.2 45; " \ ++ "i2c mw 0x50 0x09.2 2D; " \ ++ "i2c mw 0x50 0x0a.2 41; " \ ++ "i2c mw 0x50 0x0b.2 49; " \ ++ "i2c mw 0x50 0x0c.2 30; " \ ++ "i2c mw 0x50 0x0d.2 30; " \ ++ "i2c mw 0x50 0x0e.2 41; " \ ++ "i2c mw 0x50 0x0f.2 32; " \ ++ "i2c mw 0x50 0x10.2 57; " \ ++ "i2c mw 0x50 0x11.2 57; " \ ++ "i2c mw 0x50 0x12.2 59; " \ ++ "i2c mw 0x50 0x13.2 59; " \ ++ "i2c mw 0x50 0x14.2 53; " \ ++ "i2c mw 0x50 0x15.2 42; " \ ++ "i2c mw 0x50 0x16.2 41; " \ ++ "i2c mw 0x50 0x17.2 49; " \ ++ "i2c mw 0x50 0x18.2 30; " \ ++ "i2c mw 0x50 0x19.2 30; " \ ++ "i2c mw 0x50 0x1a.2 30; " \ ++ "i2c mw 0x50 0x1b.2 30; " \ ++ "i2c mw 0x50 0x1c.2 30; " \ ++ "i2c mw 0x50 0x1d.2 30; " \ ++ "i2c mw 0x50 0x1e.2 ff; " \ ++ "i2c mw 0x50 0x1f.2 ff; " \ ++ "i2c md 0x50 0x00.2 20; " \ ++ "\0" \ ++ ++#define EEWIKI_MMC_BOOT \ ++ "mmc_boot=${devtype} dev ${mmcdev}; ${devtype} part; " \ ++ "if ${devtype} rescan; then " \ ++ "echo Scanning ${devtype} device ${mmcdev};" \ ++ "setenv bootpart ${mmcdev}:1; " \ ++ "echo Checking for: /uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi; " \ ++ "echo Checking for: /boot/uEnv.txt ...;" \ ++ "for i in 1 2 3 4 5 6 7 ; do " \ ++ "setenv mmcpart ${i};" \ ++ "setenv bootpart ${mmcdev}:${mmcpart};" \ ++ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /boot/uEnv.txt;" \ ++ "if test -n ${dtb}; then " \ ++ "setenv fdtfile ${dtb};" \ ++ "echo debug: [dtb=${fdtfile}] ...;" \ ++ "fi;" \ ++ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ ++ "if test -n ${uname_r}; then " \ ++ "echo debug: [uname_r=${uname_r}] ...;" \ ++ "setenv oldroot /dev/mmcblk${mmcdev}p${mmcpart};" \ ++ "run uname_boot;" \ ++ "fi;" \ ++ "fi;" \ ++ "done;" \ ++ "fi;\0" \ ++ ++#define EEWIKI_SCSI_BOOT \ ++ "scsi_boot=${devtype} reset ; " \ ++ "if ${devtype} dev ${mmcdev}; then " \ ++ "echo Scanning ${devtype} device ${mmcdev};" \ ++ "setenv bootpart ${mmcdev}:1; " \ ++ "echo Checking for: /uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi; " \ ++ "echo Checking for: /boot/uEnv.txt ...;" \ ++ "for i in 1 2 3 4 ; do " \ ++ "setenv mmcpart ${i};" \ ++ "setenv bootpart ${mmcdev}:${mmcpart};" \ ++ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /boot/uEnv.txt;" \ ++ "if test -n ${dtb}; then " \ ++ "setenv fdtfile ${dtb};" \ ++ "echo debug: [dtb=${fdtfile}] ...;" \ ++ "fi;" \ ++ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ ++ "if test -n ${uname_r}; then " \ ++ "echo debug: [uname_r=${uname_r}] ...;" \ ++ "setenv oldroot /dev/sda${mmcpart};" \ ++ "run uname_boot;" \ ++ "fi;" \ ++ "fi;" \ ++ "done;" \ ++ "fi;\0" \ ++ ++#define EEWIKI_USB_BOOT \ ++ "usb_boot=${devtype} reset ; " \ ++ "if ${devtype} dev ${mmcdev}; then " \ ++ "echo Scanning ${devtype} device ${mmcdev};" \ ++ "setenv bootpart ${mmcdev}:1; " \ ++ "echo Checking for: /uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} /uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /uEnv.txt;" \ ++ "echo Checking if uenvcmd is set in /uEnv.txt ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi; " \ ++ "echo Checking for: /boot/uEnv.txt ...;" \ ++ "for i in 1 2 3 4 ; do " \ ++ "setenv mmcpart ${i};" \ ++ "setenv bootpart ${mmcdev}:${mmcpart};" \ ++ "if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from /boot/uEnv.txt;" \ ++ "if test -n ${dtb}; then " \ ++ "setenv fdtfile ${dtb};" \ ++ "echo debug: [dtb=${fdtfile}] ...;" \ ++ "fi;" \ ++ "echo Checking if uname_r is set in /boot/uEnv.txt ...;" \ ++ "if test -n ${uname_r}; then " \ ++ "echo debug: [uname_r=${uname_r}] ...;" \ ++ "setenv oldroot /dev/sda${mmcpart};" \ ++ "run uname_boot;" \ ++ "fi;" \ ++ "fi;" \ ++ "done;" \ ++ "fi;\0" \ ++ ++#define EEWIKI_UNAME_BOOT \ ++ "uname_boot="\ ++ "setenv bootdir /boot; " \ ++ "setenv bootfile vmlinuz-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/${bootfile}; then " \ ++ "echo loading ${bootdir}/${bootfile} ...; "\ ++ "run loadimage;" \ ++ "setenv fdtdir /boot/dtbs/${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /usr/lib/linux-image-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /lib/firmware/${uname_r}/device-tree; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot/dtb-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot/dtbs; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot/dtb; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "setenv fdtdir /boot; " \ ++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \ ++ "run loadfdt;" \ ++ "else " \ ++ "echo; echo unable to find ${fdtfile} ...; echo booting legacy ...;"\ ++ "run args_mmc;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr}] ... ;" \ ++ "bootz ${loadaddr}; " \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi; " \ ++ "if test -n ${enable_uboot_overlays}; then " \ ++ "setenv fdt_buffer 0x60000;" \ ++ "if test -n ${uboot_fdt_buffer}; then " \ ++ "setenv fdt_buffer ${uboot_fdt_buffer};" \ ++ "fi;" \ ++ "echo uboot_overlays: [fdt_buffer=${fdt_buffer}] ... ;" \ ++ "if test -n ${uboot_overlay_addr0}; then " \ ++ "if test -n ${disable_uboot_overlay_addr0}; then " \ ++ "echo uboot_overlays: uboot loading of [${uboot_overlay_addr0}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr0=1]...;" \ ++ "else " \ ++ "setenv uboot_overlay ${uboot_overlay_addr0}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr1}; then " \ ++ "if test -n ${disable_uboot_overlay_addr1}; then " \ ++ "echo uboot_overlays: uboot loading of [${uboot_overlay_addr1}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr1=1]...;" \ ++ "else " \ ++ "setenv uboot_overlay ${uboot_overlay_addr1}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr2}; then " \ ++ "if test -n ${disable_uboot_overlay_addr2}; then " \ ++ "echo uboot_overlays: uboot loading of [${uboot_overlay_addr2}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr2=1]...;" \ ++ "else " \ ++ "setenv uboot_overlay ${uboot_overlay_addr2}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr3}; then " \ ++ "if test -n ${disable_uboot_overlay_addr3}; then " \ ++ "echo uboot_overlays: uboot loading of [${uboot_overlay_addr3}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr3=1]...;" \ ++ "else " \ ++ "setenv uboot_overlay ${uboot_overlay_addr3}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr4}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr4}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr5}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr5}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr6}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr6}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_addr7}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_addr7}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "if test -n ${uboot_overlay_pru}; then " \ ++ "setenv uboot_overlay ${uboot_overlay_pru}; " \ ++ "run virtualloadoverlay;" \ ++ "fi;" \ ++ "else " \ ++ "echo uboot_overlays: add [enable_uboot_overlays=1] to /boot/uEnv.txt to enable...;" \ ++ "fi;" \ ++ "setenv rdfile initrd.img-${uname_r}; " \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/${rdfile}; then " \ ++ "echo loading ${bootdir}/${rdfile} ...; "\ ++ "run loadrd;" \ ++ "if test -n ${netinstall_enable}; then " \ ++ "run args_netinstall; run message;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "fi;" \ ++ "if test -n ${uenv_root}; then " \ ++ "run args_uenv_root;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "fi;" \ ++ "if test -n ${uuid}; then " \ ++ "run args_mmc_uuid;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "else " \ ++ "run args_mmc_old;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \ ++ "fi;" \ ++ "else " \ ++ "if test -n ${uenv_root}; then " \ ++ "run args_uenv_root;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} - ${fdtaddr}; " \ ++ "fi;" \ ++ "run args_mmc_old;" \ ++ "echo debug: [${bootargs}] ... ;" \ ++ "echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \ ++ "bootz ${loadaddr} - ${fdtaddr}; " \ ++ "fi;" \ ++ "fi;\0" \ ++ + /* + * The following are general good-enough settings for U-Boot. We set a + * large malloc pool as we generally have a lot of DDR, and we opt for +diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h +index de0a6af2fd..0cd2ccea03 100644 +--- a/include/configs/ti_omap5_common.h ++++ b/include/configs/ti_omap5_common.h +@@ -64,6 +64,11 @@ + DEFAULT_FIT_TI_ARGS \ + DEFAULT_COMMON_BOOT_TI_ARGS \ + DEFAULT_FDT_TI_ARGS \ ++ EEWIKI_USB_BOOT \ ++ EEWIKI_SCSI_BOOT \ ++ EEWIKI_MMC_BOOT \ ++ EEWIKI_UNAME_BOOT \ ++ EEPROM_PROGRAMMING \ + DFUARGS \ + NETARGS \ + NANDARGS \ +diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h +index a9d8f28d46..1480b6e3df 100644 +--- a/include/environment/ti/boot.h ++++ b/include/environment/ti/boot.h +@@ -132,6 +132,7 @@ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ + "bootfile=zImage\0" \ ++ "board_eeprom_header=undefined\0" \ + "usbtty=cdc_acm\0" \ + "vram=16M\0" \ + AVB_VERIFY_CMD \ +@@ -183,7 +184,14 @@ + "else " \ + "echo $apart partition not found; " \ + "exit; " \ +- "fi;\0" ++ "fi;\0 " \ ++ "read_board_eeprom=" \ ++ "if test $board_eeprom_header = beagle_x15_revb1_blank; then " \ ++ "run eeprom_dump; run eeprom_x15_b1; reset; fi; " \ ++ "if test $board_eeprom_header = beagle_x15_revc_blank; then " \ ++ "run eeprom_dump; run eeprom_x15_c; reset; fi; " \ ++ "if test $board_eeprom_header = bbai_a2_blank; then " \ ++ "run eeprom_dump; run eeprom_bbai_a2; reset; fi; \0 " + + #ifdef CONFIG_OMAP54XX + +@@ -223,19 +231,17 @@ + "echo WARNING: Could not determine device tree to use; fi; \0" + + #define CONFIG_BOOTCOMMAND \ +- "if test ${dofastboot} -eq 1; then " \ +- "echo Boot fastboot requested, resetting dofastboot ...;" \ +- "setenv dofastboot 0; saveenv;" \ +- FASTBOOT_CMD \ +- "fi;" \ +- "if test ${boot_fit} -eq 1; then " \ +- "run update_to_fit;" \ +- "fi;" \ ++ "run read_board_eeprom; " \ + "run findfdt; " \ +- "run envboot; " \ +- "run mmcboot;" \ +- "run emmc_linux_boot; " \ +- "run emmc_android_boot; " \ ++ "setenv mmcdev 0; " \ ++ "setenv devtype usb; " \ ++ "echo usb_boot is currently disabled;" \ ++ "setenv devtype scsi; " \ ++ "echo scsi_boot is currently disabled;" \ ++ "setenv devtype mmc; " \ ++ "run mmc_boot;" \ ++ "setenv mmcdev 1; " \ ++ "run mmc_boot;" \ + "" + + #endif /* CONFIG_OMAP54XX */ +diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h +index b86c8dc7a4..0ec09f279a 100644 +--- a/include/environment/ti/mmc.h ++++ b/include/environment/ti/mmc.h +@@ -11,11 +11,31 @@ + #define DEFAULT_MMC_TI_ARGS \ + "mmcdev=0\0" \ + "mmcrootfstype=ext4 rootwait\0" \ +- "finduuid=part uuid mmc ${bootpart} uuid\0" \ ++ "finduuid=part uuid ${devtype} ${bootpart} uuid\0" \ + "args_mmc=run finduuid;setenv bootargs console=${console} " \ + "${optargs} " \ +- "root=PARTUUID=${uuid} rw " \ +- "rootfstype=${mmcrootfstype}\0" \ ++ "root=PARTUUID=${uuid} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${cmdline}\0" \ ++ "args_mmc_old=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${oldroot} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${cmdline}\0" \ ++ "args_mmc_uuid=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=UUID=${uuid} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${cmdline}\0" \ ++ "args_uenv_root=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${uenv_root} ro " \ ++ "rootfstype=${mmcrootfstype} " \ ++ "${musb} ${cmdline}\0" \ ++ "args_netinstall=setenv bootargs ${netinstall_bootargs} " \ ++ "${optargs} " \ ++ "root=/dev/ram rw " \ ++ "${cmdline}\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ +@@ -24,7 +44,28 @@ + "env import -t ${loadaddr} ${filesize}\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \ + "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ +- "loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ ++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}; setenv rdsize ${filesize}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ ++ "loadoverlay=echo uboot_overlays: loading ${actual_uboot_overlay} ...; " \ ++ "load ${devtype} ${bootpart} ${rdaddr} ${actual_uboot_overlay}; " \ ++ "fdt addr ${fdtaddr}; fdt resize ${fdt_buffer}; " \ ++ "fdt apply ${rdaddr}; fdt resize ${fdt_buffer};\0" \ ++ "virtualloadoverlay=if test -e ${devtype} ${bootpart} ${fdtdir}/overlays/${uboot_overlay}; then " \ ++ "setenv actual_uboot_overlay ${fdtdir}/overlays/${uboot_overlay}; " \ ++ "run loadoverlay;" \ ++ "else " \ ++ "if test -e ${devtype} ${bootpart} /lib/firmware/${uboot_overlay}; then " \ ++ "setenv actual_uboot_overlay /lib/firmware/${uboot_overlay}; " \ ++ "run loadoverlay;" \ ++ "else " \ ++ "if test -e ${devtype} ${bootpart} ${uboot_overlay}; then " \ ++ "setenv actual_uboot_overlay ${uboot_overlay}; " \ ++ "run loadoverlay;" \ ++ "else " \ ++ "echo uboot_overlays: unable to find [${devtype} ${bootpart} ${uboot_overlay}]...;" \ ++ "fi;" \ ++ "fi;" \ ++ "fi;\0" \ + "envboot=mmc dev ${mmcdev}; " \ + "if mmc rescan; then " \ + "echo SD/MMC found on device ${mmcdev};" \ +-- +2.20.1 + diff --git a/configs/beagleboneai_defconfig b/configs/beagleboneai_defconfig index 745bb0794a..586a75317e 100644 --- a/configs/beagleboneai_defconfig +++ b/configs/beagleboneai_defconfig @@ -1,23 +1,24 @@ BR2_arm=y BR2_cortex_a15=y BR2_GLOBAL_PATCH_DIR="board/beagleboneai/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/beagleboneai/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboneai/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.14.108-ti-r143)/linux-4.14.108-ti-r143.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="bb.org" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.79" +BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am5729-beagleboneai" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y 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="2019.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set From 2dd2f3751ff2aa60df7de5453e65aa148f64645d Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 22 Nov 2021 13:16:33 +0300 Subject: [PATCH 116/176] package/libgeos: bump version to 3.10.1 Changelog: https://github.com/libgeos/geos/blob/3.10.1/NEWS Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 3508ba9077..d2c27955ac 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a geos-3.9.1.tar.bz2 +sha256 a8148eec9636814c8ab0f8f5266ce6f9b914ed65b0d083fc43bb0bbb01f83648 geos-3.10.1.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 097ad54d03..745eb32256 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.9.1 +LIBGEOS_VERSION = 3.10.1 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From 6379da58bf74612822c2e8c505cbe7402ba458b7 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 3 Nov 2021 17:36:04 -0700 Subject: [PATCH 117/176] package/gcr/gcr.mk: enable gtk backend for wayland gcr has supported wayland since commit 685e1da9642b7a3fb0dbe1afda482f7bd5b05f33. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gcr/gcr.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk index d51e853f3f..ef253b4ef9 100644 --- a/package/gcr/gcr.mk +++ b/package/gcr/gcr.mk @@ -30,10 +30,12 @@ else GCR_CONF_OPTS += -Dintrospection=false endif -# Only the X11 backend is supported for the simple GUI ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) GCR_DEPENDENCIES += libgtk3 GCR_CONF_OPTS += -Dgtk=true +else ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) +GCR_DEPENDENCIES += libgtk3 +GCR_CONF_OPTS += -Dgtk=true else GCR_CONF_OPTS += -Dgtk=false endif From b134c8a2409aca6921a94e2e12c8062ad483c08e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 3 Nov 2021 17:36:05 -0700 Subject: [PATCH 118/176] package/webkitgtk: add gobject-introspection optional dependency Enable introspection when GObject Introspection is enabled. Midori 9.0 requires webkitgtk built with gobject-introspection support. Signed-off-by: Adam Duskett Reviewed-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/webkitgtk/webkitgtk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index a3db249ae6..4d5d0b89e2 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -21,7 +21,6 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_GAMEPAD=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GTKDOC=OFF \ - -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ -DPORT=GTK \ @@ -59,6 +58,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON +WEBKITGTK_DEPENDENCIES += gobject-introspection +else +WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF +endif + # Only one target platform can be built, assume X11 > Wayland # GTK3-X11 target gives OpenGL from newer libgtk3 versions From 351dbaef4e9c5bc94a67b8a92a92f6e101cf6bf6 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 3 Nov 2021 17:36:06 -0700 Subject: [PATCH 119/176] package/libpeas: new package midori 9.0 requires libpeas. Lua and python loaders are disabled since they have not been tested. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/libpeas/Config.in | 45 ++++++++++++++++++++++++++++++++++++ package/libpeas/libpeas.hash | 4 ++++ package/libpeas/libpeas.mk | 41 ++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+) create mode 100644 package/libpeas/Config.in create mode 100644 package/libpeas/libpeas.hash create mode 100644 package/libpeas/libpeas.mk diff --git a/package/Config.in b/package/Config.in index e355ab1987..4dc7bca443 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1959,6 +1959,7 @@ menu "Other" source "package/libnpth/Config.in" source "package/libnspr/Config.in" source "package/libosmium/Config.in" + source "package/libpeas/Config.in" source "package/libpfm4/Config.in" source "package/libplatform/Config.in" source "package/libplist/Config.in" diff --git a/package/libpeas/Config.in b/package/libpeas/Config.in new file mode 100644 index 0000000000..430e668ee7 --- /dev/null +++ b/package/libpeas/Config.in @@ -0,0 +1,45 @@ +config BR2_PACKAGE_LIBPEAS + bool "libpeas" + depends on BR2_USE_MMU # gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu + depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection + depends on BR2_PACKAGE_PYTHON3 # gobject-introspection + select BR2_PACKAGE_GOBJECT_INTROSPECTION + select BR2_PACKAGE_LIBGLIB2 + help + libpeas is a gobject-based plugins engine, and is targetted at + giving every application the chance to assume its own + extensibility. It also has a set of features including, but + not limited to: + - multiple extension points + - On demand (lazy) programming language support for C, + Python and Lua + - Simplicity of the API + + https://wiki.gnome.org/Projects/Libpeas + +if BR2_PACKAGE_LIBPEAS + +config BR2_PACKAGE_LIBPEAS_WIDGETS + bool "widgets" + depends on BR2_PACKAGE_LIBGTK3 + help + Build GTK+ widgetry + +comment "widget support needs libgtk3" + depends on !BR2_PACKAGE_LIBGTK3 + +endif + +comment "libpeas needs python3" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_PYTHON3 + +comment "libpeas needs a glibc toolchain, gcc >= 4.9, host gcc >= 8" + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_8 diff --git a/package/libpeas/libpeas.hash b/package/libpeas/libpeas.hash new file mode 100644 index 0000000000..2b030c01c5 --- /dev/null +++ b/package/libpeas/libpeas.hash @@ -0,0 +1,4 @@ +# From https://ftp.gnome.org/pub/GNOME/sources/libpeas/1.30/libpeas-1.30.0.sha256sum +sha256 0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3 libpeas-1.30.0.tar.xz +# Locally calculated +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libpeas/libpeas.mk b/package/libpeas/libpeas.mk new file mode 100644 index 0000000000..097cc860eb --- /dev/null +++ b/package/libpeas/libpeas.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# libpeas +# +################################################################################ + +LIBPEAS_VERSION_MAJOR = 1.30 +LIBPEAS_VERSION = $(LIBPEAS_VERSION_MAJOR).0 +LIBPEAS_SOURCE = libpeas-$(LIBPEAS_VERSION).tar.xz +LIBPEAS_SITE = http://ftp.gnome.org/pub/gnome/sources/libpeas/$(LIBPEAS_VERSION_MAJOR) +LIBPEAS_LICENSE = LGPL-2.1+ +LIBPEAS_LICENSE_FILES = COPYING +LIBPEAS_CPE_ID_VENDOR = gnome +LIBPEAS_INSTALL_STAGING = YES +LIBPEAS_DEPENDENCIES = \ + host-libglib2 \ + host-pkgconf \ + gobject-introspection \ + libglib2 \ + $(TARGET_NLS_DEPENDENCIES) + +LIBPEAS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +LIBPEAS_CONF_OPTS = \ + -Ddemos=false \ + -Dglade_catalog=false \ + -Dgtk_doc=false \ + -Dintrospection=true \ + -Dlua51=false \ + -Dpython2=false \ + -Dpython3=false \ + -Dvapi=false + +ifeq ($(BR2_PACKAGE_LIBPEAS_WIDGETS),y) +LIBPEAS_DEPENDENCIES += libgtk3 +LIBPEAS_CONF_OPTS += -Dwidgetry=true +else +LIBPEAS_CONF_OPTS += -Dwidgetry=false +endif + +$(eval $(meson-package)) From 42f19d49fb2da891be9266a2f843292d24847f18 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 3 Nov 2021 17:36:07 -0700 Subject: [PATCH 120/176] package/midori: bump to version 9.0 This is a substantial update as the last time the midori version was bumped was on Fri Apr 29 2016 commit 54bbd88b1f0c4de25688dae1d0c30d222722feb4. Changes: package/Config.in: Move midori out of the "X applications" submenu and into the "Graphic applications" submenu, as it is not dependent on X. - Drop the two existing patches as they no longer apply. - 0001-disable-vala-fatal-warnings.patch: new patch. This patch fixes errors when building midori in a buildroot source repository that is also a git project. - 0002-add-option-to-specify-path-to-g-ir-compiler.patchL new patch. This patch introduces a new option that allows the make system to specify a path to the g-ir-compiler, or else the host path's g-ir-compiler is used which results in failed builds. - Change the site to the github repository, as that is where the latest releases are published. - New dependencies: gobject-introspection, json-glib, libarchive, and libpeas. - gcr is no longer an optional dependency. - host-python3 is now a mandatory dependency. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 2 +- .../0001-disable-vala-fatal-warnings.patch | 30 ++++++++++++ package/midori/0001-fix-bug-1492932.patch | 44 ------------------ ...ion-to-specify-path-to-g-ir-compiler.patch | 37 +++++++++++++++ package/midori/0002-gcr-for-x11-only.patch | 32 ------------- package/midori/Config.in | 46 ++++++++++++++----- package/midori/midori.hash | 4 +- package/midori/midori.mk | 19 ++++---- 8 files changed, 112 insertions(+), 102 deletions(-) create mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch delete mode 100644 package/midori/0001-fix-bug-1492932.patch create mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch delete mode 100644 package/midori/0002-gcr-for-x11-only.patch diff --git a/package/Config.in b/package/Config.in index 4dc7bca443..311004db2c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -307,6 +307,7 @@ comment "Graphic applications" source "package/kmscube/Config.in" source "package/libva-utils/Config.in" source "package/mesa3d-demos/Config.in" + source "package/midori/Config.in" source "package/netsurf/Config.in" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" @@ -377,7 +378,6 @@ comment "X applications" source "package/gmpc/Config.in" source "package/gtkperf/Config.in" source "package/leafpad/Config.in" - source "package/midori/Config.in" source "package/mupdf/Config.in" source "package/nodm/Config.in" source "package/pcmanfm/Config.in" diff --git a/package/midori/0001-disable-vala-fatal-warnings.patch b/package/midori/0001-disable-vala-fatal-warnings.patch new file mode 100644 index 0000000000..c3f245f141 --- /dev/null +++ b/package/midori/0001-disable-vala-fatal-warnings.patch @@ -0,0 +1,30 @@ +From be91b1260d3215119e4ab5b19012ab80d6ff788d Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 11 Oct 2021 16:58:34 -0700 +Subject: [PATCH] disable vala fatal warnings + +When building midori in a buildroot directory cloned from git, the git +descript --tags command return tags from buildroot, which in turn sets +the --fatal-warnings flag. Disable --fatal-warnings unconditionally. + +Signed-off-by: Adam Duskett +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e72f08..39941e2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ execute_process(COMMAND "git" "describe" "--tags" + if (REVISION) + set(CORE_VERSION "${REVISION}") + # All warnings are errors in development builds +- set(VALAFLAGS ${VALAFLAGS} --fatal-warnings) ++ set(VALAFLAGS ${VALAFLAGS} --disable-assert) + else () + # No runtime type checks + set(VALAFLAGS ${VALAFLAGS} --disable-assert) +-- +2.30.2 + diff --git a/package/midori/0001-fix-bug-1492932.patch b/package/midori/0001-fix-bug-1492932.patch deleted file mode 100644 index 27ad283a58..0000000000 --- a/package/midori/0001-fix-bug-1492932.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix for https://bugs.launchpad.net/midori/+bug/1492932 -Patch status: upstream - -Signed-off-by: Gustavo Zacarias - ---- a/midori/midori-browser.c 2015-07-11 16:03:43 +0000 -+++ b/midori/midori-browser.c 2015-09-25 21:30:31 +0000 -@@ -5953,11 +5953,6 @@ - G_CALLBACK (midori_browser_destroy_cb), NULL); - gtk_window_set_role (GTK_WINDOW (browser), "browser"); - gtk_window_set_icon_name (GTK_WINDOW (browser), MIDORI_STOCK_WEB_BROWSER); -- #if GTK_CHECK_VERSION (3, 4, 0) -- #ifndef HAVE_GRANITE -- gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE); -- #endif -- #endif - vbox = gtk_vbox_new (FALSE, 0); - /* gtk_container_add (GTK_CONTAINER (browser), vbox); - gtk_widget_show (vbox); */ - ---- a/midori/midori-view.c 2015-07-06 21:26:46 +0000 -+++ b/midori/midori-view.c 2015-09-25 21:30:31 +0000 -@@ -3495,9 +3495,6 @@ - } - else - gtk_window_set_icon_name (GTK_WINDOW (window), icon_name); -- #if GTK_CHECK_VERSION (3, 4, 0) -- gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE); -- #endif - gtk_widget_set_size_request (GTK_WIDGET (inspector_view), 700, 100); - #if GTK_CHECK_VERSION (3, 0, 0) - scrolled = gtk_scrolled_window_new (NULL, NULL); - ---- a/midori/midori-window.vala 2015-08-16 00:14:26 +0000 -+++ b/midori/midori-window.vala 2015-09-25 21:30:31 +0000 -@@ -28,7 +28,6 @@ - toolbar.show_arrow = true; - #if HAVE_GTK3 - toolbar.get_style_context ().add_class ("primary-toolbar"); -- hide_titlebar_when_maximized = true; - #endif - toolbar.popup_context_menu.connect ((x, y, button) => { - return button == 3 && context_menu (toolbar); }); - diff --git a/package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch b/package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch new file mode 100644 index 0000000000..4bbcbaaf12 --- /dev/null +++ b/package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch @@ -0,0 +1,37 @@ +From 118ac24b2c488f490ee8814336291a58eae45395 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Tue, 12 Oct 2021 13:21:19 -0700 +Subject: [PATCH] add option to specify path to g-ir-compiler + +By default, find_program (GIR_COMPILER_BIN g-ir-compiler) returns the host path +to g-ir-compiler, which is undesirable in a cross-compile environment. + +Add an option to manually specify a path to the g-ir-compiler. + +Signed-off-by: Adam Duskett +--- + core/CMakeLists.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index c4982de..6584229 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -66,7 +66,13 @@ set_target_properties("${LIBCORE}" PROPERTIES + VERSION ${LIBCORE_VERSION} + ) + +-find_program (GIR_COMPILER_BIN g-ir-compiler) ++option(GIR_COMPILER_PATH "Specify a path to g-ir-compiler" OFF) ++if(GIR_COMPILER_PATH) ++ set(GIR_COMPILER_BIN "${GIR_COMPILER_PATH}") ++else() ++ find_program (GIR_COMPILER_BIN g-ir-compiler) ++endif(GIR_COMPILER_PATH) ++ + add_custom_target(${LIBCORE_GIR}.typelib ALL + COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir + --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib +-- +2.30.2 + diff --git a/package/midori/0002-gcr-for-x11-only.patch b/package/midori/0002-gcr-for-x11-only.patch deleted file mode 100644 index 85e769765f..0000000000 --- a/package/midori/0002-gcr-for-x11-only.patch +++ /dev/null @@ -1,32 +0,0 @@ -GCR support only works/is useful with X11 support. - -Reported upstream: https://bugs.launchpad.net/midori/+bug/1515985 - -Signed-off-by: Gustavo Zacarias - -diff -Nura midori-0.5.11.orig/CMakeLists.txt midori-0.5.11/CMakeLists.txt ---- midori-0.5.11.orig/CMakeLists.txt 2015-11-12 13:41:02.045898814 -0300 -+++ midori-0.5.11/CMakeLists.txt 2015-11-12 14:00:09.765545018 -0300 -@@ -175,18 +175,14 @@ - set(PKGS ${PKGS} zeitgeist-2.0) - endif() - --if (WIN32) -- add_definitions("-DGCR_VERSION=\"No\"") --else () -- if (USE_GTK3) -- pkg_check_modules(GCR REQUIRED gcr-3>=2.32) -- else () -- pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32) -- endif () -+if (USE_GTK3 AND X11) -+ pkg_check_modules(GCR REQUIRED gcr-3>=2.32) - add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"") - add_definitions("-DHAVE_GCR") - set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS}) - set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES}) -+else () -+ add_definitions("-DGCR_VERSION=\"No\"") - endif () - - if (HALF_BRO_INCOM_WEBKIT2) diff --git a/package/midori/Config.in b/package/midori/Config.in index e2cc2ac612..d98d7cb161 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -1,31 +1,53 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9" +config BR2_PACKAGE_MIDORI_ARCH_SUPPORTS + bool + default y + depends on BR2_USE_MMU depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \ + depends on !BR2_BINFMT_FLAT # webkitgtk -> icu + +comment "midori needs a glibc toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 8" + depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_USES_GLIBC + !BR2_HOST_GCC_AT_LEAST_8 || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_USE_WCHAR + +comment "midori needs libgtk3 w/ X11 or wayland backend" + depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS + depends on !BR2_PACKAGE_LIBGTK3_X11 && \ + !BR2_PACKAGE_LIBGTK3_WAYLAND config BR2_PACKAGE_MIDORI bool "midori" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2 - depends on BR2_PACKAGE_LIBGTK3 - depends on BR2_HOST_GCC_AT_LEAST_4_9 # webkitgtk + depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # webkitgtk depends on BR2_INSTALL_LIBSTDCPP # webkitgtk + depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - # GCR can only be used with the X11 backend - select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 + depends on BR2_USE_WCHAR # granite, gcr, libsoup, libpeas, gobject-introspection + depends on BR2_PACKAGE_LIBGTK3 + depends on BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND + select BR2_PACKAGE_GCR select BR2_PACKAGE_GRANITE + select BR2_PACKAGE_JSON_GLIB + select BR2_PACKAGE_LIBARCHIVE + select BR2_PACKAGE_LIBPEAS + select BR2_PACKAGE_LIBPEAS_WIDGETS select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBSOUP_GNOME select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_PYTHON3 # gobject-introspection select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Midori is a lightweight web browser based on WebKit - http://www.midori-browser.org/ + https://github.com/midori-browser/core diff --git a/package/midori/midori.hash b/package/midori/midori.hash index d8fd1b7a26..d0be396a5a 100644 --- a/package/midori/midori.hash +++ b/package/midori/midori.hash @@ -1,5 +1,3 @@ -# From download link @ http://midori-browser.org/download/source/ -sha1 64c86935028feb5f89d799c2acacaad67764da6f midori_0.5.11_all_.tar.bz2 - # Locally computed +sha256 913a7cba95ddcc3dc5f6b12d861e765d6fa990fe7d4efc3768d3a3567ea460db midori-9.0.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/midori/midori.mk b/package/midori/midori.mk index eebec815c0..693507dbb3 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -4,9 +4,8 @@ # ################################################################################ -MIDORI_VERSION = 0.5.11 -MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2 -MIDORI_SITE = http://midori-browser.org/downloads +MIDORI_VERSION = 9.0 +MIDORI_SITE = $(call github,midori-browser,core,v$(MIDORI_VERSION)) MIDORI_LICENSE = LGPL-2.1+ MIDORI_LICENSE_FILES = COPYING MIDORI_CPE_ID_VENDOR = midori-browser @@ -15,10 +14,14 @@ MIDORI_DEPENDENCIES = \ host-librsvg \ host-pkgconf \ host-vala \ - host-python \ - $(if $(BR2_PACKAGE_LIBGTK3_X11),gcr) \ + host-python3 \ + gcr \ + gobject-introspection \ granite \ + json-glib \ + libarchive \ libgtk3 \ + libpeas \ libsoup \ libxml2 \ sqlite \ @@ -26,10 +29,6 @@ MIDORI_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) -MIDORI_CONF_OPTS = \ - -DHALF_BRO_INCOM_WEBKIT2=ON \ - -DUSE_GRANITE=ON \ - -DUSE_GTK3=ON \ - -DUSE_ZEITGEIST=OFF +MIDORI_CONF_OPTS += -DGIR_COMPILER_PATH=$(STAGING_DIR)/usr/bin/g-ir-compiler $(eval $(cmake-package)) From c0d0961d29e2ca4332a9b1f456a4c24696c57809 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Sun, 28 Nov 2021 14:18:42 +0100 Subject: [PATCH 121/176] package/genimage: bump to version 15 This includes the following changes: aa76b22 release version 15 dd49fec util: Fix warn_unused_result build warnings 6ba2b4d image-hd: more error output when bootloaders overlap with the partition table 90b83ba allow specifying 'holes' in the partition section 09fde2e [ci skip] typo "used used fill" -> "used to fill" b0d794c image-flash: don't ignore truncate errors except ENOENT 93d1f26 .github: replace ubuntu-16.04 with ubuntu-18.04 1e9b9be util: systemp(): don't use shell defined in SHELL, but GENIMAGE_SHELL 1c53012 util: systemp(): use shell defined in SHELL rather than /bin/sh 89490b9 image-android-sparse: use off_t instead of int for lseek return values f1cab39 test: add tests for --includepath 9e7f23a README.rst: reflow paragraph 0778817 add --includepath option e210857 config.c: remove redundant helper add_opt() 18b3cfd config.c: allow hiding specific command line options from --help 65548f6 config.c: remove unused member cmdlineopt f606a33 util: remove unused pad_file function 62e1d4f image-flash: use insert_image instead of pad_file 8c0fe58 image-ext2: use insert_image instead of pad_file 7d0003b util: insert_image: allow specifying the fill value b847f3e image-hd: resize the image to the final size at the begining 8e3bf8b test: hdimage: check the disk usage of the second image as well e2bd4c3 test: handle new genext2fs and e2fsprogs versions 06ac16e insert_image: fix read/write loop 17e2c3c test: filter 'rauc info' output for newer distros 1d72d80 image-hd: stricter option handling d912549 image-hd.c: make GPT backup handling a little less special 69f6644 add test for partitions out of order 9190a2b image-hd.c: correct computation of first_usable_lba 8505aed image-hd.c: switch to insert_image() instead of pad_file() 5cc31c6 image-hd.c: truncate output file before looping over partitions 2194e31 image-hd.c: replace use of pad_file() with extend_file() 5638a9e util.c: add insert_image() helper 8eef854 test: add tests for "bootloader with holes allowing some overlap" a72ca69 image-hd.c: take image holes into consideration when checking for overlap 564e359 document "file" image type and "hole" syntax in particular 998a118 image-file.c: allow specifying "don't care" regions 7f8f19d image-hd.c: fix missing check for overlap with GPT table e91c8e2 image-hd.c: check all partitions for overlap 44d5346 image-hd.c: allow partitions to appear out-of-order cd3ceac image-hd.c: ensure an autoresize partition has a size consistent with its alignment 0a61f64 README.rst: add description of how default align/size/offset are computed efaae46 test: fix copy/paste error in the test refactoring 086380a config: don't try to access non-existent section fe74ea1 image-vfat: drop '-b' from mcopy 7ef351d test: factor out some test data generation 94af174 image-hd.c: fix extended partition with offset 649602b image-hd.c: prepare for fake partitions cc13e78 image-hd.c: don't sanity check partition_type_uuid for !part->in_partition_table 5f53df3 image-hd.c: move overlap check below partition size determination b77f38b image-hd.c: allow specifying minimum size for auto-resize partitions 5f07c1c image-hd.c: do not require the autoresize partition to be specified last 8269fa7 image-hd.c: enforce proper alignment of all partitions 5bd7283 image-hd.c: ignore in-partition-table when the image has no partition table 3e2b616 image-hd.c: always sanity check child->size v part->size fa619fb image-hd.c: separate computation of part->offset from the sanity checks 030e7a3 allow each partition to have its own align value cf192fd image-hd.c: fix computation of autoresize size d6c477c image-hd.c: don't lazily initialize now 6cbbf86 README.rst: document default value of in-partition-table option e43e02e test: add some tests for overlap of GPT 11f3528 image-hd.c: refactor updating chs values 8c74183 image-hd.c: add and use "struct mbr_tail" 9ffd5e0 add macro for compile-time assertions 9e59a27 change insert_data() to take const void* instead of const char* bcd7fa6 util: strtoul_suffix: allow s suffix for sector size (512 bytes) 41d77c4 image-hd.c: fix copy-pasto access of random memory 5dc2e22 list.h: drop prefetch() be29822 image-rauc: add intermediate option 344416f util: add save string concat with formated string 351d50e image-rauc: ensure clean-up on rauc_generate() exit 5cba95c image-rauc: free keyringargs after use 23adab0 image-ext: ensure size is always interpreted as kilobytes 8014c7e .github: run apt-get update to update package cache 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 9f60261b53..80065d53b1 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d1d53b33309fe24ea367ea057eb689bdb8ea33cb99d796de31127ca44ccf44c genimage-14.tar.xz +sha256 9bca24bf883310b30ee4511cbc3a580e40ad4540826e5ed3992c595ce72d003e genimage-15.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 1934223b23..44963b48fb 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 14 +GENIMAGE_VERSION = 15 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 1094f574d39238d6f5d79a6e7f7388543c181469 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 2 Dec 2021 02:39:01 +0100 Subject: [PATCH 122/176] package/watchdogd: bump to version 3.5 This addresses the autobuilder failure for master as per 2021-11-27. The root cause was a name clash in a dependency, the libite library, clashing with the DirectFB LiTE library header files. Hence, this update alone does not fix [1], libite also needs to be updated. To provide a smooth transition though, watchdogd should be updated first. [1]: http://autobuild.buildroot.net/results/185c753af2aa159b494b13f78b0826dddbe4aed6 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/watchdogd/watchdogd.hash | 2 +- package/watchdogd/watchdogd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash index 7c1acf0820..09a34d6b47 100644 --- a/package/watchdogd/watchdogd.hash +++ b/package/watchdogd/watchdogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 f36fdea9b323534a704c4c23d9af8050480bca4bdad89cdb50d26fcac316d172 watchdogd-3.4.tar.gz +sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz # Locally calculated sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk index 34b17aa169..b666b56433 100644 --- a/package/watchdogd/watchdogd.mk +++ b/package/watchdogd/watchdogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -WATCHDOGD_VERSION = 3.4 +WATCHDOGD_VERSION = 3.5 WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION) WATCHDOGD_LICENSE = ISC WATCHDOGD_LICENSE_FILES = LICENSE From 626c7c7912bf0f5bf4fd96a31afb6cc767dfd045 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 2 Dec 2021 02:39:02 +0100 Subject: [PATCH 123/176] package/libite: bump to version 2.5.1 This bump is mainly to fix the header file nameclash problem with LiTE, in package/lite. See the libite project's README for how to adapt to this change, and the ChangeLog for details. In short, libite now use the /usr/include/libite/*.h prefix. Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/libite/libite.hash | 2 +- package/libite/libite.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libite/libite.hash b/package/libite/libite.hash index 6f461f9b76..1dec65bd6b 100644 --- a/package/libite/libite.hash +++ b/package/libite/libite.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 8fad6b8a1e7e0d6b546863104dfe25dfe0bb2d2a9b98ec8e155d23392ef58514 libite-2.4.1.tar.xz +sha256 5278fa0ca933727c78f4e05082cea58256d9302afac30bad0c3760cf2a18ef8f libite-2.5.1.tar.xz # Locally calculated sha256 20db0601195f708d68ff7907907b3cd3b25808efa8332e064b11f00c839a5d2f LICENSE diff --git a/package/libite/libite.mk b/package/libite/libite.mk index 7ccf642e50..185ffe77de 100644 --- a/package/libite/libite.mk +++ b/package/libite/libite.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBITE_VERSION = 2.4.1 +LIBITE_VERSION = 2.5.1 LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause LIBITE_LICENSE_FILES = LICENSE src/chomp.c src/pidfile.c LIBITE_INSTALL_STAGING = YES +LIBITE_CONF_OPTS = --without-symlink $(eval $(autotools-package)) From c63fe7955482ab418a37b8e9d2c22108880adcd2 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Sat, 4 Dec 2021 06:59:43 +0100 Subject: [PATCH 124/176] package/openfpgaloader: bump to version 0.6.1 - Update version to latest release - change license type and hash - add zlib dependency Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/openfpgaloader/Config.in | 1 + package/openfpgaloader/openfpgaloader.hash | 4 ++-- package/openfpgaloader/openfpgaloader.mk | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index f1b34ef5dd..c998369bed 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_OPENFPGALOADER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libftdi1 -> libusb depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBFTDI1 + select BR2_PACKAGE_ZLIB help Universal utility for programming FPGA diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 990149cded..6c9d8a2b91 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ef3ed60297ab560f15cd4362d61b7da86c44b84e18937e0411023f8d1cf6a606 openfpgaloader-381c67de00a3102cf6e9bb20ca84030a71c7a0f2.tar.gz -sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE +sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 1bb3de37fb..73117cb994 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,11 +4,11 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 381c67de00a3102cf6e9bb20ca84030a71c7a0f2 -OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,$(OPENFPGALOADER_VERSION)) -OPENFPGALOADER_LICENSE = AGPL-3.0 +OPENFPGALOADER_VERSION = 0.6.1 +OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) +OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE -OPENFPGALOADER_DEPENDENCIES = libftdi1 +OPENFPGALOADER_DEPENDENCIES = libftdi1 zlib ifeq ($(BR2_PACKAGE_HAS_UDEV),y) OPENFPGALOADER_DEPENDENCIES += udev From 737d4092f93a08d749697099daca57414a3a9961 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 1 Dec 2021 18:19:18 -0700 Subject: [PATCH 125/176] package/ell: bump to version 0.46 - Changelog (since 0.45, from [1]): ver 0.46: Fix issue with DHCP server when OPTION_ROUTER is not configured. Fix issue with DHCP obtained lease to retrieve it properly. [1] https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 4bb2688c48..20b568dde4 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7 ell-0.45.tar.xz +sha256 f4fc647eff32f622e21f8851ed0c8b7270f4800149c91be601754e22d82cbb4d ell-0.46.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 963fad4bae..4fad6e8d1b 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.45 +ELL_VERSION = 0.46 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From 250d36c86f0e104fd978f60e1e004d976a00159a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 1 Dec 2021 18:19:19 -0700 Subject: [PATCH 126/176] package/iwd: bump to version 1.20 - Changelog (since 1.19, from [1]): ver 1.20: Fix issue with handling Hotspot 2.0 requirements. Add support for evict_nocarrier setting during roaming. Add support for experimental NetworkConfigurationAgent API. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 008a2db011..58224170e6 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 dd65a8795f6127fb1b9e29f2092686b0590a0d3738c2b90c792ccd320deaf966 iwd-1.19.tar.xz +sha256 7d51e2ccabe7c500e44061ac725dbd4f6b0fb518b5e3de1681063d0f15d3050f iwd-1.20.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index afa6e3bdeb..7b122811c5 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.19 +IWD_VERSION = 1.20 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From d925c1260f14cebff0b479a2abff8e95a8da222d Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 2 Dec 2021 03:11:17 +0100 Subject: [PATCH 127/176] package/sysklogd: bump to version 2.3.0 This patch updates syskogd to v2.3.0 and drops the redundant .md5 hash. The upstream sha256 should be sufficient. Major features and fixes relevant to Buildroot include: - UNIX 2038 assert fixes for 32-bit time_t systems - logger support for logging to kernel ring buffer - Persistent DNS lookup failure for remote syslog servers For details, see the ChangeLog or the GitHub releases page: https://github.com/troglobit/sysklogd/releases/tag/v2.3.0 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/sysklogd/sysklogd.hash | 5 ++--- package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 6d3ba8f960..19405a9877 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,6 +1,5 @@ -# Upstream .md5 and .sha256 from GitHub -md5 2c6749c49f52b8c5dad18e9a9315e7dd sysklogd-2.2.3.tar.gz -sha256 e7ea09c15511a63c430e84f65ce3bf55a0386ee419ab52e9341c4a9fabae59ad sysklogd-2.2.3.tar.gz +# Upstream .sha256 from GitHub +sha256 9a410b484713d9600c820d8113f2d80cb14708328c908b1a28e8b7b31fd54f57 sysklogd-2.3.0.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 7c5de95743..20ce9d60e3 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.2.3 +SYSKLOGD_VERSION = 2.3.0 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE From 7b5271ecfd64e6cc2562c5911266f107236cef22 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 2 Dec 2021 23:57:26 +0300 Subject: [PATCH 128/176] package/libgeos: add threads dependency In Buildroot commit 2dd2f3751ff2aa60df7de5453e65aa148f64645d, the libgeos package was bumped from 3.9.1 to 3.10.1. Since version 3.10.0, libgeos uses mutex since (commit https://github.com/libgeos/geos/commit/3fcbd1e0c52843c2ae0b4809c9f89f74ce529afe#diff-38d1bc63228770a179e474aef4fd26b1a2ab5f5758a5d98d07ac556498dd1f3d) Toolchains without threads support fails to build: /home/giuliobenetti/autobuild/run/instance-1/output-1/build/libgeos-3.10.1/include/geos/index/strtree/TemplateSTRtree.h:376:10: error: 'mutex' in namespace 'std' does not name a type 376 | std::mutex lock_; | ^~~~~ So it needs threads. Fixes: http://autobuild.buildroot.net/results/2d5fe2866dfa24f5747fbc826fea1108a2a6cb47/ Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/libgeos/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 86a1cddcf3..5e861ab010 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGEOS bool "libgeos" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help @@ -13,7 +14,8 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, not binutils bug 21464, 27597" +comment "libgeos needs a toolchain w/ C++, wchar, threads not binutils bug 21464, 27597" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 From 5ca414c07dc83862eca679767cb72e0233a2de24 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Thu, 2 Dec 2021 23:57:27 +0300 Subject: [PATCH 129/176] package/postgis: adjust libgeos dependency coments Since 3.10.0 libgeos needs toolchain with threads support. So add it to BR2_TOOLCHAIN_HAS_THREADS comment list. libgeos depends on BR2_INSTALL_LIBSTDCPP, so add it to BR2_INSTALL_LIBSTDCPP comment list. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/postgis/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 04705f7e16..2642115026 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_POSTGIS bool "postgis" depends on BR2_PACKAGE_POSTGRESQL_FULL depends on !BR2_microblazeel && !BR2_microblazebe # ICE - depends on BR2_INSTALL_LIBSTDCPP # proj + depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj - depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_21464 # libgeos depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos From 5a5859df8a8dfc00fd952ed9f323dd9e298c1d50 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 29 Nov 2021 17:50:00 +0100 Subject: [PATCH 130/176] package/gnuradio: force python3-six host-python-six needs host-python (aka python2) but since commit e9df5b0fc3f6e8bb36deedefb392bbc968116ee7 python-mako is python3 only. python-six is build using python2 and python-mako with python3 and gnuradio build fails with: -- Python checking for python >= 2.7 -- Python checking for python >= 2.7 - found Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 2272a1162a..5616039559 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -22,7 +22,7 @@ endif GNURADIO_DEPENDENCIES = \ host-python3 \ host-python-mako \ - host-python-six \ + host-python3-six \ host-swig \ boost \ log4cpp \ From e0b5ee9f18e79fdf2eb5e7073e32c702bc917c4e Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 29 Nov 2021 17:50:01 +0100 Subject: [PATCH 131/176] package/gnuradio: fix host python name $(HOST_DIR)/bin/python symlink is only created when BR2_PACKAGE_PYTHON3 is set. When only host-python3 is used this symlink is not present and build fails with: -- User set python executable buildroot/output/host/bin/python -- Found PythonInterp: buildroot/output/host/bin/python (Required is at least version "2.7.6") CMake Error at cmake/Modules/GrPython.cmake:40 (if): if given arguments: "VERSION_EQUAL" "3" Unknown arguments specified Call Stack (most recent call first): CMakeLists.txt:368 (include) -- Configuring incomplete, errors occurred! This patch set explicitly PYTHON_EXECUTABLE to $(HOST_DIR)/bin/python3 Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 5616039559..658357398d 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -29,7 +29,7 @@ GNURADIO_DEPENDENCIES = \ gmp GNURADIO_CONF_OPTS = \ - -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \ -DENABLE_GNURADIO_RUNTIME=ON \ From 8736da7cbae5852946f4e14d3952f527d1e835c4 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 29 Nov 2021 16:53:18 +0100 Subject: [PATCH 132/176] package/uhd: fix python module detection $(HOST_DIR)/bin/python symlink is only created when BR2_PACKAGE_PYTHON3 is set. When only host-python3 is used this symlink is not present and build fails with: -- Python checking for Python version 2.7 or greater -- Python checking for Python version 2.7 or greater - unknown error -- -- Python checking for Mako templates 0.4.2 or greater -- Python checking for Mako templates 0.4.2 or greater - unknown error -- -- Python checking for requests 2.0 or greater -- Python checking for requests 2.0 or greater - unknown error -- -- Python checking for numpy 1.7 or greater -- Python checking for numpy 1.7 or greater - unknown error -- -- Configuring LibUHD support... -- Dependency Boost_FOUND = TRUE -- Dependency HAVE_PYTHON_PLAT_MIN_VERSION = FALSE -- Dependency HAVE_PYTHON_MODULE_MAKO = FALSE This patch set explicitly PYTHON_EXECUTABLE to $(HOST_DIR)/bin/python3 This is a fallout from e9df5b0fc3f6e8bb36deedefb392bbc968116ee7, which changed uhd to always use host-python3. Fixes: - http://autobuild.buildroot.net/results/35c0b9597c75dade241a3b3786fae30551c48008 - http://autobuild.buildroot.net/results/89069102bf8785ce8a9ec3b4c6fa32749c2e3586 Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/uhd/uhd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uhd/uhd.mk b/package/uhd/uhd.mk index 5da1697925..e8f197f9dd 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -19,7 +19,7 @@ UHD_DEPENDENCIES = \ host-python-mako UHD_CONF_OPTS = \ - -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ -DRUNTIME_PYTHON_EXECUTABLE=/usr/bin/python \ -DENABLE_C_API=ON \ -DENABLE_DOXYGEN=OFF \ From b017b8d3499fa1c86f5d23b084731a7ac104444d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 29 Nov 2021 19:23:52 +0100 Subject: [PATCH 133/176] package/kodi-pvr-waipu: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-waipu/Config.in | 7 +++++++ package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 3 +++ package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 13 +++++++++++++ package/kodi/Config.in | 1 + 4 files changed, 24 insertions(+) create mode 100644 package/kodi-pvr-waipu/Config.in create mode 100644 package/kodi-pvr-waipu/kodi-pvr-waipu.hash create mode 100644 package/kodi-pvr-waipu/kodi-pvr-waipu.mk diff --git a/package/kodi-pvr-waipu/Config.in b/package/kodi-pvr-waipu/Config.in new file mode 100644 index 0000000000..ee0cc2bdad --- /dev/null +++ b/package/kodi-pvr-waipu/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_KODI_PVR_WAIPU + bool "kodi-pvr-waipu" + select BR2_PACKAGE_RAPIDJSON + help + Waipu.tv PVR Plugin for Kodi + + https://github.com/flubshi/pvr.waipu diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash new file mode 100644 index 0000000000..7ec107c1e0 --- /dev/null +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 19e7a9b1d332d18e7e539062d0de1ef35d78c9beadb67f1ac9b95ab204aa5bce kodi-pvr-waipu-19.0.1-Matrix.tar.gz +sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk new file mode 100644 index 0000000000..8ab7ca6985 --- /dev/null +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-pvr-waipu +# +################################################################################ + +KODI_PVR_WAIPU_VERSION = 19.0.1-Matrix +KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) +KODI_PVR_WAIPU_LICENSE = GPL-2.0+ +KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt +KODI_PVR_WAIPU_DEPENDENCIES = kodi rapidjson + +$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index e594219418..38c14555ab 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -309,6 +309,7 @@ menu "PVR addons" source "package/kodi-pvr-vbox/Config.in" source "package/kodi-pvr-vdr-vnsi/Config.in" source "package/kodi-pvr-vuplus/Config.in" + source "package/kodi-pvr-waipu/Config.in" source "package/kodi-pvr-wmc/Config.in" source "package/kodi-pvr-zattoo/Config.in" endmenu From ebc0d88434174b58f32183d7f74dbd9149170eb7 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 27 Nov 2021 20:33:41 -0500 Subject: [PATCH 134/176] package/fwup: bump to v1.9.0 Also update download site to point to new location. Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/fwup/fwup.hash | 2 +- package/fwup/fwup.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fwup/fwup.hash b/package/fwup/fwup.hash index 87263192e4..2e5b2b1f6c 100644 --- a/package/fwup/fwup.hash +++ b/package/fwup/fwup.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9890f0328796f4315e6c1188df5c103855c530fbc14fbc8c12f4b24066c975f1 fwup-1.8.0.tar.gz +sha256 18ae6753145cef2fd5f5fc83e29c2d883e570668d8aa064ee6c94d4c5e44d73d fwup-1.9.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk index 77eaa528f3..62016d94e3 100644 --- a/package/fwup/fwup.mk +++ b/package/fwup/fwup.mk @@ -4,8 +4,8 @@ # ################################################################################ -FWUP_VERSION = 1.8.0 -FWUP_SITE = $(call github,fhunleth,fwup,v$(FWUP_VERSION)) +FWUP_VERSION = 1.9.0 +FWUP_SITE = $(call github,fwup-home,fwup,v$(FWUP_VERSION)) FWUP_LICENSE = Apache-2.0 FWUP_LICENSE_FILES = LICENSE FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive From 6861933d22006fbe8c961a41506beac826881f33 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 27 Nov 2021 19:23:06 +0100 Subject: [PATCH 135/176] package/harfbuzz: bump to version 3.1.2 Bump to version 3.1.2 by: - requiring BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 instead of _4_8 in this package taking care of reverse dependencies, since now harfbuzz requires gcc 4.9 to be built successfully. - local patch is still necessary since upstream harfbuzz points the problem to meson itself. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/cwiid/Config.in | 2 +- package/enlightenment/Config.in | 6 +++--- package/gstreamer1/gst1-plugins-bad/Config.in | 12 ++++++------ package/gstreamer1/gst1-plugins-base/Config.in | 6 +++--- package/harfbuzz/Config.in | 6 +++--- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/libass/Config.in | 6 +++--- package/libfm/Config.in | 6 +++--- package/libgtk2/Config.in | 6 +++--- package/libgtk3/Config.in | 6 +++--- package/librsvg/Config.in | 6 +++--- package/mupdf/Config.in | 6 +++--- package/openbox/Config.in | 6 +++--- package/pango/Config.in | 6 +++--- package/pcmanfm/Config.in | 6 +++--- package/pinentry/Config.in | 6 +++--- package/python-pymupdf/Config.in | 6 +++--- package/qt5/qt5base/Config.in | 2 +- package/rrdtool/Config.in | 6 +++--- package/supertuxkart/Config.in | 2 +- package/xscreensaver/Config.in | 6 +++--- 22 files changed, 59 insertions(+), 59 deletions(-) diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index e03248c722..6ae2ac9405 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -18,7 +18,7 @@ if BR2_PACKAGE_CWIID config BR2_PACKAGE_CWIID_WMGUI bool "wmgui" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz depends on BR2_PACKAGE_XORG7 # libgtk2 depends on BR2_USE_WCHAR # libgtk2 -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 91cdd896f6..cd2b8cfe54 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_ENLIGHTENMENT depends on BR2_PACKAGE_XORG7 # libevas-generic-loaders-svg -> librsvg -> pango -> harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start @@ -29,10 +29,10 @@ config BR2_PACKAGE_ENLIGHTENMENT http://www.enlightenment.org/ -comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.8" +comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1204a65681..d678e7eb14 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -328,13 +328,13 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER bool "assrender" depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libass -> harfbuzz select BR2_PACKAGE_LIBASS -comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8" +comment "assrender plugin needs a toolchain w/ C++, gcc => 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ bool "bluez" @@ -563,15 +563,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # librsvg -> pango -> harfbuzz select BR2_PACKAGE_LIBRSVG help RSVG plugin library -comment "rsvg plugin needs a toolchain w/ C++, gcc >= 4.8" +comment "rsvg plugin needs a toolchain w/ C++, gcc >= 4.9" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_SYNC_4 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index ceed55890c..7ca94d7dc4 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -293,14 +293,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO bool "pango font renderer" depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_PANGO help Pango-based text rendering and overlay -comment "pango plugin needs a toolchain w/ C++, gcc >= 4.8" +comment "pango plugin needs a toolchain w/ C++, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_SYNC_4 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA diff --git a/package/harfbuzz/Config.in b/package/harfbuzz/Config.in index 8bc88f4284..2e4219ee22 100644 --- a/package/harfbuzz/Config.in +++ b/package/harfbuzz/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_HARFBUZZ bool "harfbuzz" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help HarfBuzz is an OpenType text shaping engine @@ -11,7 +11,7 @@ config BR2_PACKAGE_HARFBUZZ Harfbuzz can make optional use of cairo, freetype, glib2 and icu packages if they are selected. -comment "harfbuzz needs a toolchain w/ C++, gcc >= 4.8" +comment "harfbuzz needs a toolchain w/ C++, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 97fc5a2c5f..d5a376830a 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 036b0ee118451539783ec7864148bb4106be42a2eb964df4e83e6703ec46f3d9 harfbuzz-3.0.0.tar.xz +sha256 4056b1541dd8bbd8ec29207fe30e568805c0705515632d7fec53a94399bc7945 harfbuzz-3.1.2.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 4534d166ef..97b28ce236 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.0.0 +HARFBUZZ_VERSION = 3.1.2 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) diff --git a/package/libass/Config.in b/package/libass/Config.in index 803f6b4438..d7725d5e1b 100644 --- a/package/libass/Config.in +++ b/package/libass/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBASS bool "libass" depends on BR2_INSTALL_LIBSTDCPP # harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_LIBFRIBIDI @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBASS https://github.com/libass/libass -comment "libass needs a toolchain w/ C++, gcc >= 4.8" +comment "libass needs a toolchain w/ C++, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libfm/Config.in b/package/libfm/Config.in index 16676fbf25..e78bc99b76 100644 --- a/package/libfm/Config.in +++ b/package/libfm/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBFM depends on BR2_USE_MMU # libglib2 depends on BR2_INSTALL_LIBSTDCPP # libgtk2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11 @@ -22,9 +22,9 @@ config BR2_PACKAGE_LIBFM http://wiki.lxde.org/en/Libfm -comment "libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_XORG7 diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index 7c5762a585..c75c37fb63 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_ATK select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS @@ -34,10 +34,10 @@ config BR2_PACKAGE_LIBGTK2_DEMO endif -comment "libgtk2 needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "libgtk2 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_XORG7 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 093aacac51..bc8cacd9f5 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -1,9 +1,9 @@ -comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend" @@ -20,7 +20,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_ATK diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 3272ecd773..270b524b37 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_CAIRO_SCRIPT @@ -21,10 +21,10 @@ config BR2_PACKAGE_LIBRSVG https://wiki.gnome.org/Projects/LibRsvg -comment "librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "librsvg needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_INSTALL_LIBSTDCPP diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in index ff176f4b99..cf97711160 100644 --- a/package/mupdf/Config.in +++ b/package/mupdf/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MUPDF bool "mupdf" depends on BR2_INSTALL_LIBSTDCPP # harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GUMBO_PARSER @@ -18,7 +18,7 @@ config BR2_PACKAGE_MUPDF https://www.mupdf.com/index.html -comment "mupdf needs a toolchain w/ C++, gcc >= 4.8" +comment "mupdf needs a toolchain w/ C++, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/openbox/Config.in b/package/openbox/Config.in index fe6e886865..e042ed2b48 100644 --- a/package/openbox/Config.in +++ b/package/openbox/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_OPENBOX depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 @@ -20,10 +20,10 @@ config BR2_PACKAGE_OPENBOX http://openbox.org -comment "openbox needs a toolchain w/ C++, threads, wchar, gcc >= 4.8" +comment "openbox needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_XORG7 diff --git a/package/pango/Config.in b/package/pango/Config.in index cf5170c8f3..e2b2e7fe2b 100644 --- a/package/pango/Config.in +++ b/package/pango/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_PANGO depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # freetype support depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBFRIBIDI select BR2_PACKAGE_EXPAT @@ -24,9 +24,9 @@ config BR2_PACKAGE_PANGO https://pango.gnome.org/ -comment "pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_INSTALL_LIBSTDCPP diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in index f281599637..73b8c7c04c 100644 --- a/package/pcmanfm/Config.in +++ b/package/pcmanfm/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_PCMANFM depends on BR2_USE_MMU # libglib2 depends on BR2_INSTALL_LIBSTDCPP # libgtk2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_LIBFM select BR2_PACKAGE_MENU_CACHE select BR2_PACKAGE_LIBGLIB2 @@ -18,10 +18,10 @@ config BR2_PACKAGE_PCMANFM http://wiki.lxde.org/en/PCManFM -comment "pcmanfm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "pcmanfm needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_XORG7 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in index 684e4eed4a..3f005f8c58 100644 --- a/package/pinentry/Config.in +++ b/package/pinentry/Config.in @@ -54,17 +54,17 @@ config BR2_PACKAGE_PINENTRY_GTK2 depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help The pinentry-gtk2 tool -comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++, gcc >= 4.8" +comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_PINENTRY_QT5 diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index 65221d3e51..0ecb288922 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF bool "python-pymupdf" depends on BR2_INSTALL_LIBSTDCPP # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # mupdf -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_FREETYPE @@ -18,8 +18,8 @@ comment "python-pymupdf needs Xorg" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_PACKAGE_XORG7 -comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.8" +comment "python-pymupdf needs a toolchain w/ C++, gcc >= 4.9" depends on BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index e93b2dec38..a328190a98 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -237,7 +237,7 @@ config BR2_PACKAGE_QT5BASE_HARFBUZZ bool "harfbuzz support" select BR2_PACKAGE_HARFBUZZ if \ BR2_TOOLCHAIN_HAS_SYNC_4 && \ - BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help This option enables HarfBuzz support (either system harfbuzz if the toolchain supports __sync for 4 bytes, or the qt diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5451353140..5ffdc92618 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH bool "rrd_graph" default y depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PDF @@ -28,9 +28,9 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH This enables the graphing capabilities ('rrdgraph'). Without this it will only act as a database backend. -comment "rrd_graph support needs a toolchain w/ C++, gcc >= 4.8" +comment "rrd_graph support needs a toolchain w/ C++, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_SYNC_4 endif diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 8af006d632..a18b9c1a0a 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_SUPERTUXKART depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # openal - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # openal + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz, openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS # openal depends on BR2_PACKAGE_HAS_LIBGL diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index d773c69913..787c3130ae 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_USE_MMU # gdk-pixbuf, libgtk2 -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libgtk2 -> pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBGTK2 @@ -25,10 +25,10 @@ config BR2_PACKAGE_XSCREENSAVER http://www.jwz.org/xscreensaver/ -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.8" +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_USE_WCHAR From e27b38bf3c429144bbc1e0155654dbc157fe86c2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Nov 2021 04:37:29 -0700 Subject: [PATCH 136/176] package/python-tinycss2: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-tinycss2/Config.in | 6 ++++++ package/python-tinycss2/python-tinycss2.hash | 5 +++++ package/python-tinycss2/python-tinycss2.mk | 14 ++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 package/python-tinycss2/Config.in create mode 100644 package/python-tinycss2/python-tinycss2.hash create mode 100644 package/python-tinycss2/python-tinycss2.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6f812eb564..a1565f375a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1267,6 +1267,7 @@ F: package/python-pycares/ F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ +F: package/python-tinycss2/ F: package/python-yarl/ N: James Knight diff --git a/package/Config.in b/package/Config.in index 311004db2c..de03cd7375 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1240,6 +1240,7 @@ menu "External python modules" source "package/python-terminaltables/Config.in" source "package/python-texttable/Config.in" source "package/python-thrift/Config.in" + source "package/python-tinycss2/Config.in" source "package/python-tinyrpc/Config.in" source "package/python-tomako/Config.in" source "package/python-toml/Config.in" diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in new file mode 100644 index 0000000000..e6c992b8c5 --- /dev/null +++ b/package/python-tinycss2/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TINYCSS2 + bool "python-tinycss2" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime + help + A tiny CSS parser. diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash new file mode 100644 index 0000000000..eeb3754752 --- /dev/null +++ b/package/python-tinycss2/python-tinycss2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tinycss2/json +md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz +sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +# Locally computed sha256 checksums +sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk new file mode 100644 index 0000000000..4bf5b97766 --- /dev/null +++ b/package/python-tinycss2/python-tinycss2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tinycss2 +# +################################################################################ + +PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 +PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_LICENSE = BSD-3-Clause +PYTHON_TINYCSS2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 3e7eb3ce3d1b3338d5b7d105be688485b9a6aa2d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Nov 2021 04:37:30 -0700 Subject: [PATCH 137/176] package/python-cssselect2: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-cssselect2/Config.in | 9 +++++++++ package/python-cssselect2/python-cssselect2.hash | 5 +++++ package/python-cssselect2/python-cssselect2.mk | 14 ++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/python-cssselect2/Config.in create mode 100644 package/python-cssselect2/python-cssselect2.hash create mode 100644 package/python-cssselect2/python-cssselect2.mk diff --git a/DEVELOPERS b/DEVELOPERS index a1565f375a..19a2b0986f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1257,6 +1257,7 @@ F: package/python-brotli/ F: package/python-cbor2/ F: package/python-cchardet/ F: package/python-charset-normalizer/ +F: package/python-cssselect2/ F: package/python-flatbuffers/ F: package/python-frozenlist/ F: package/python-greenlet/ diff --git a/package/Config.in b/package/Config.in index de03cd7375..ed17bd3b5d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -970,6 +970,7 @@ menu "External python modules" source "package/python-crossbar/Config.in" source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" + source "package/python-cssselect2/Config.in" source "package/python-cssutils/Config.in" source "package/python-cycler/Config.in" source "package/python-daemon/Config.in" diff --git a/package/python-cssselect2/Config.in b/package/python-cssselect2/Config.in new file mode 100644 index 0000000000..0196471253 --- /dev/null +++ b/package/python-cssselect2/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_CSSSELECT2 + bool "python-cssselect2" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TINYCSS2 # runtime + select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime + help + CSS selectors for Python ElementTree. + + https://doc.courtbouillon.org/cssselect2/ diff --git a/package/python-cssselect2/python-cssselect2.hash b/package/python-cssselect2/python-cssselect2.hash new file mode 100644 index 0000000000..ed5b863302 --- /dev/null +++ b/package/python-cssselect2/python-cssselect2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/cssselect2/json +md5 6dfd5963c8a5d85f2634d1650b1ddfe1 cssselect2-0.4.1.tar.gz +sha256 93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8 cssselect2-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 6fd97229a1d1b0f6a8b41e109f413426dbc0874b1e03746d66cc33282601c2c2 LICENSE diff --git a/package/python-cssselect2/python-cssselect2.mk b/package/python-cssselect2/python-cssselect2.mk new file mode 100644 index 0000000000..18e0fba839 --- /dev/null +++ b/package/python-cssselect2/python-cssselect2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cssselect2 +# +################################################################################ + +PYTHON_CSSSELECT2_VERSION = 0.4.1 +PYTHON_CSSSELECT2_SOURCE = cssselect2-$(PYTHON_CSSSELECT2_VERSION).tar.gz +PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ad/3d/fb764303deb34cbc1a32fcecdfd239367cb16323920c88390b2f5ad751f0 +PYTHON_CSSSELECT2_SETUP_TYPE = distutils +PYTHON_CSSSELECT2_LICENSE = BSD-3-Clause +PYTHON_CSSSELECT2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 3f5f8abd415fbe1fadc8d1358179af684a08f29c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Nov 2021 04:37:31 -0700 Subject: [PATCH 138/176] package/python-pyphen: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-pyphen/Config.in | 7 +++++++ package/python-pyphen/python-pyphen.hash | 8 ++++++++ package/python-pyphen/python-pyphen.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/python-pyphen/Config.in create mode 100644 package/python-pyphen/python-pyphen.hash create mode 100644 package/python-pyphen/python-pyphen.mk diff --git a/DEVELOPERS b/DEVELOPERS index 19a2b0986f..35218fecfd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1265,6 +1265,7 @@ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ F: package/python-pycares/ +F: package/python-pyphen/ F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ diff --git a/package/Config.in b/package/Config.in index ed17bd3b5d..d5107f3be2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1161,6 +1161,7 @@ menu "External python modules" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" source "package/python-pypcap/Config.in" + source "package/python-pyphen/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" diff --git a/package/python-pyphen/Config.in b/package/python-pyphen/Config.in new file mode 100644 index 0000000000..30ccafcda4 --- /dev/null +++ b/package/python-pyphen/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYPHEN + bool "python-pyphen" + depends on BR2_PACKAGE_PYTHON3 + help + Pure Python module to hyphenate text. + + https://www.courtbouillon.org/pyphen diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash new file mode 100644 index 0000000000..75ee909351 --- /dev/null +++ b/package/python-pyphen/python-pyphen.hash @@ -0,0 +1,8 @@ +# md5, sha256 from https://pypi.org/pypi/Pyphen/json +md5 f8ec095e4fe30dc2b518a918788b33ed pyphen-0.11.0.tar.gz +sha256 e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8 pyphen-0.11.0.tar.gz +# Locally computed sha256 checksums +sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE +sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LGPL +sha256 ad192a67649aa23ac9681939840f4f241643a98da9cd8aec8de28c3b8c6ee854 COPYING.MPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk new file mode 100644 index 0000000000..80f67c77c7 --- /dev/null +++ b/package/python-pyphen/python-pyphen.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyphen +# +################################################################################ + +PYTHON_PYPHEN_VERSION = 0.11.0 +PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/f8/af869a4983c1b3159945479510260985714265d48baf27d61f72b1ec8cbf +PYTHON_PYPHEN_SETUP_TYPE = distutils +PYTHON_PYPHEN_LICENSE = LGPL-2.1+, MPL-1.1, GPL-2.0+ +PYTHON_PYPHEN_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LGPL COPYING.MPL + +$(eval $(python-package)) From a2663af3409f8b45ddf6e6935ed9369ca49a3c52 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Nov 2021 04:37:32 -0700 Subject: [PATCH 139/176] package/python-fonttools: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-fonttools/Config.in | 7 ++++++ .../python-fonttools/python-fonttools.hash | 5 +++++ package/python-fonttools/python-fonttools.mk | 22 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/python-fonttools/Config.in create mode 100644 package/python-fonttools/python-fonttools.hash create mode 100644 package/python-fonttools/python-fonttools.mk diff --git a/DEVELOPERS b/DEVELOPERS index 35218fecfd..3b31b89568 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1259,6 +1259,7 @@ F: package/python-cchardet/ F: package/python-charset-normalizer/ F: package/python-cssselect2/ F: package/python-flatbuffers/ +F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ F: package/python-janus/ diff --git a/package/Config.in b/package/Config.in index d5107f3be2..b9c2765830 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1013,6 +1013,7 @@ menu "External python modules" source "package/python-flask-wtf/Config.in" source "package/python-flatbuffers/Config.in" source "package/python-flup/Config.in" + source "package/python-fonttools/Config.in" source "package/python-frozenlist/Config.in" source "package/python-functools32/Config.in" source "package/python-future/Config.in" diff --git a/package/python-fonttools/Config.in b/package/python-fonttools/Config.in new file mode 100644 index 0000000000..714f547430 --- /dev/null +++ b/package/python-fonttools/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_FONTTOOLS + bool "python-fonttools" + depends on BR2_PACKAGE_PYTHON3 + help + Tools to manipulate font files. + + https://github.com/fonttools/fonttools diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash new file mode 100644 index 0000000000..2e79861e2c --- /dev/null +++ b/package/python-fonttools/python-fonttools.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/fonttools/json +md5 fcf1425460855b5892c990027b5396c8 fonttools-4.28.2.zip +sha256 dca694331af74c8ad47acc5171e57f6b78fac5692bf050f2ab572964577ac0dd fonttools-4.28.2.zip +# Locally computed sha256 checksums +sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk new file mode 100644 index 0000000000..9ec369d550 --- /dev/null +++ b/package/python-fonttools/python-fonttools.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# python-fonttools +# +################################################################################ + +PYTHON_FONTTOOLS_VERSION = 4.28.2 +PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/3c/d5/f722e0d1aed0d547383913c6bc3c4ff35772952057b8e2b8fe3be8df4216 +PYTHON_FONTTOOLS_SETUP_TYPE = setuptools +PYTHON_FONTTOOLS_LICENSE = MIT +PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE +PYTHON_FONTTOOLS_DEPENDENCIES = host-python3-cython +PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1 + +define PYTHON_FONTTOOLS_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(PYTHON_FONTTOOLS_DL_DIR)/$(PYTHON_FONTTOOLS_SOURCE) + mv $(@D)/fonttools-$(PYTHON_FONTTOOLS_VERSION)/* $(@D) + $(RM) -r $(@D)/fonttools-$(PYTHON_FONTTOOLS_VERSION) +endef + +$(eval $(python-package)) From 53972c82964dd1337dff4ccbcdd484d243aef0ba Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Nov 2021 04:37:33 -0700 Subject: [PATCH 140/176] package/python-zopfli: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-zopfli/Config.in | 7 +++++++ package/python-zopfli/python-zopfli.hash | 5 +++++ package/python-zopfli/python-zopfli.mk | 21 +++++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/python-zopfli/Config.in create mode 100644 package/python-zopfli/python-zopfli.hash create mode 100644 package/python-zopfli/python-zopfli.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3b31b89568..82853cdc18 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1272,6 +1272,7 @@ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ F: package/python-yarl/ +F: package/python-zopfli/ N: James Knight F: package/atkmm/ diff --git a/package/Config.in b/package/Config.in index b9c2765830..e90d30e81c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1296,6 +1296,7 @@ menu "External python modules" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" source "package/python-zope-interface/Config.in" + source "package/python-zopfli/Config.in" endmenu endif source "package/quickjs/Config.in" diff --git a/package/python-zopfli/Config.in b/package/python-zopfli/Config.in new file mode 100644 index 0000000000..69d4b8b514 --- /dev/null +++ b/package/python-zopfli/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ZOPFLI + bool "python-zopfli" + depends on BR2_PACKAGE_PYTHON3 + help + Zopfli module for python. + + https://github.com/fonttools/py-zopfli diff --git a/package/python-zopfli/python-zopfli.hash b/package/python-zopfli/python-zopfli.hash new file mode 100644 index 0000000000..92b51bdf18 --- /dev/null +++ b/package/python-zopfli/python-zopfli.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/zopfli/json +md5 f66b6f4132533b9b0ab8b0af757237bf zopfli-0.1.9.zip +sha256 78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b zopfli-0.1.9.zip +# Locally computed sha256 checksums +sha256 018b1cb87efdf7a04c2fcc13d57ed63f62149113fb207b27ea13430d64f13513 COPYING diff --git a/package/python-zopfli/python-zopfli.mk b/package/python-zopfli/python-zopfli.mk new file mode 100644 index 0000000000..95a0067b05 --- /dev/null +++ b/package/python-zopfli/python-zopfli.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# python-zopfli +# +################################################################################ + +PYTHON_ZOPFLI_VERSION = 0.1.9 +PYTHON_ZOPFLI_SOURCE = zopfli-$(PYTHON_ZOPFLI_VERSION).zip +PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/10/7d/278fd896401b0ef76e06cd42c3ce1541572d83b1c713b6786795c60a1bbe +PYTHON_ZOPFLI_SETUP_TYPE = setuptools +PYTHON_ZOPFLI_LICENSE = Apache-2.0 +PYTHON_ZOPFLI_LICENSE_FILES = COPYING +PYTHON_ZOPFLI_DEPENDENCIES = host-python-setuptools-scm + +define PYTHON_ZOPFLI_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(PYTHON_ZOPFLI_DL_DIR)/$(PYTHON_ZOPFLI_SOURCE) + mv $(@D)/zopfli-$(PYTHON_ZOPFLI_VERSION)/* $(@D) + $(RM) -r $(@D)/zopfli-$(PYTHON_ZOPFLI_VERSION) +endef + +$(eval $(python-package)) From ee80fbcc791c47a3b722f59eccea5dfec1d0c8c1 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Nov 2021 04:37:34 -0700 Subject: [PATCH 141/176] package/python-pydyf: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-pydyf/Config.in | 7 +++++++ package/python-pydyf/python-pydyf.hash | 5 +++++ package/python-pydyf/python-pydyf.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-pydyf/Config.in create mode 100644 package/python-pydyf/python-pydyf.hash create mode 100644 package/python-pydyf/python-pydyf.mk diff --git a/DEVELOPERS b/DEVELOPERS index 82853cdc18..6fc6c6286f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1266,6 +1266,7 @@ F: package/python-janus/ F: package/python-logstash/ F: package/python-multidict/ F: package/python-pycares/ +F: package/python-pydyf/ F: package/python-pyphen/ F: package/python-snappy/ F: package/python-sockjs/ diff --git a/package/Config.in b/package/Config.in index e90d30e81c..871295e66f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1143,6 +1143,7 @@ menu "External python modules" source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" + source "package/python-pydyf/Config.in" source "package/python-pyelftools/Config.in" source "package/python-pyftpdlib/Config.in" source "package/python-pygame/Config.in" diff --git a/package/python-pydyf/Config.in b/package/python-pydyf/Config.in new file mode 100644 index 0000000000..f283a6d6aa --- /dev/null +++ b/package/python-pydyf/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYDYF + bool "python-pydyf" + depends on BR2_PACKAGE_PYTHON3 + help + A low-level PDF generator. + + https://www.courtbouillon.org/pydyf diff --git a/package/python-pydyf/python-pydyf.hash b/package/python-pydyf/python-pydyf.hash new file mode 100644 index 0000000000..90774457a1 --- /dev/null +++ b/package/python-pydyf/python-pydyf.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pydyf/json +md5 f78ee205b0637c92197f5d584d60cb8e pydyf-0.1.2.tar.gz +sha256 1e2f5de48174f505de025a7d1e7cf01bbdd9422ca8ab9451782bf00ee178602c pydyf-0.1.2.tar.gz +# Locally computed sha256 checksums +sha256 75461e438973e1ba0f93a7de9e3fe5b2f49e1ab49251d392878a9cdae8ce7e47 LICENSE diff --git a/package/python-pydyf/python-pydyf.mk b/package/python-pydyf/python-pydyf.mk new file mode 100644 index 0000000000..7cc0df2643 --- /dev/null +++ b/package/python-pydyf/python-pydyf.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pydyf +# +################################################################################ + +PYTHON_PYDYF_VERSION = 0.1.2 +PYTHON_PYDYF_SOURCE = pydyf-$(PYTHON_PYDYF_VERSION).tar.gz +PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/78/ed/2ccc153d50d21a56916fd5c9d367cad798d4ca8a450cef03e7faa3b920c4 +PYTHON_PYDYF_SETUP_TYPE = distutils +PYTHON_PYDYF_LICENSE = BSD-3-Clause +PYTHON_PYDYF_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From b33e39e3ea5078cc80d9658e8af63049189bd475 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 27 Nov 2021 04:37:35 -0700 Subject: [PATCH 142/176] package/python-weasyprint: new package Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-weasyprint/Config.in | 17 +++++++++++++++++ .../python-weasyprint/python-weasyprint.hash | 5 +++++ package/python-weasyprint/python-weasyprint.mk | 14 ++++++++++++++ 5 files changed, 38 insertions(+) create mode 100644 package/python-weasyprint/Config.in create mode 100644 package/python-weasyprint/python-weasyprint.hash create mode 100644 package/python-weasyprint/python-weasyprint.mk diff --git a/DEVELOPERS b/DEVELOPERS index 6fc6c6286f..fd3ee964b2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1272,6 +1272,7 @@ F: package/python-snappy/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ +F: package/python-weasyprint/ F: package/python-yarl/ F: package/python-zopfli/ diff --git a/package/Config.in b/package/Config.in index 871295e66f..006d3cf284 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1271,6 +1271,7 @@ menu "External python modules" source "package/python-visitor/Config.in" source "package/python-watchdog/Config.in" source "package/python-wcwidth/Config.in" + source "package/python-weasyprint/Config.in" source "package/python-web2py/Config.in" source "package/python-webencodings/Config.in" source "package/python-webob/Config.in" diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in new file mode 100644 index 0000000000..de68fe2f5b --- /dev/null +++ b/package/python-weasyprint/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_PYTHON_WEASYPRINT + bool "python-weasyprint" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_BROTLI # runtime + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime + select BR2_PACKAGE_PYTHON_FONTTOOLS # runtime + select BR2_PACKAGE_PYTHON_HTML5LIB # runtime + select BR2_PACKAGE_PYTHON_PILLOW # runtime + select BR2_PACKAGE_PYTHON_PYDYF # runtime + select BR2_PACKAGE_PYTHON_PYPHEN # runtime + select BR2_PACKAGE_PYTHON_TINYCSS2 # runtime + select BR2_PACKAGE_PYTHON_ZOPFLI # runtime + help + The Awesome Document Factory. + + https://www.courtbouillon.org/weasyprint diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash new file mode 100644 index 0000000000..8d231c50ba --- /dev/null +++ b/package/python-weasyprint/python-weasyprint.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/weasyprint/json +md5 a90fd2d5a581a0e218943af3a8b64a31 weasyprint-53.4.tar.gz +sha256 10ccb17d55c73096bdf1edd3efe58cb855b07e4c307d9bad4ebc9a3f13ff4580 weasyprint-53.4.tar.gz +# Locally computed sha256 checksums +sha256 bfd14eccfa6100575460e685556b183399d4bd335904e3c9521b0116d21c54da LICENSE diff --git a/package/python-weasyprint/python-weasyprint.mk b/package/python-weasyprint/python-weasyprint.mk new file mode 100644 index 0000000000..0a944825bb --- /dev/null +++ b/package/python-weasyprint/python-weasyprint.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-weasyprint +# +################################################################################ + +PYTHON_WEASYPRINT_VERSION = 53.4 +PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 +PYTHON_WEASYPRINT_SETUP_TYPE = distutils +PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause +PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 2a3edc5e00b38f4f927894d0911990c9060e4415 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 25 Nov 2021 13:55:57 +0100 Subject: [PATCH 143/176] package/libyang: bump verstion to 2.0.112 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/Config.in | 3 +-- package/libyang/libyang.hash | 4 ++-- package/libyang/libyang.mk | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/libyang/Config.in b/package/libyang/Config.in index fec1160a6f..54df061b58 100644 --- a/package/libyang/Config.in +++ b/package/libyang/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_LIBYANG bool "libyang" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_UCP + select BR2_PACKAGE_PCRE2 help Libyang is YANG data modeling language parser and toolkit written (and providing API) in C. diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index 755ecf390a..c129896a63 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8576cad398b451b1c622b0652a2030fcf83ee1d9a39e6cd93d17b0a5a43118d6 libyang-1.0.240.tar.gz -sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE +sha256 184dd67c66c1ad968a2ee4d0950fb6b103834917b04b17af9c7bca80967636ee libyang-2.0.112.tar.gz +sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index f784367ea3..7de9531bff 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,15 +4,15 @@ # ################################################################################ -LIBYANG_VERSION = 1.0.240 +LIBYANG_VERSION = 2.0.112 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE LIBYANG_INSTALL_STAGING = YES LIBYANG_CPE_ID_VENDOR = cesnet LIBYANG_SUPPORTS_IN_SOURCE_BUILD = NO -LIBYANG_DEPENDENCIES = pcre -HOST_LIBYANG_DEPENDENCIES = host-pcre +LIBYANG_DEPENDENCIES = pcre2 +HOST_LIBYANG_DEPENDENCIES = host-pcre2 LIBYANG_CONF_OPTS = \ -DENABLE_VALGRIND_TESTS=OFF \ From 721f05420cb5908aa19eef47f96418aa6cd04398 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 25 Nov 2021 13:55:59 +0100 Subject: [PATCH 144/176] package/libnetconf2: bump version to 2.0.24 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...IX-netopeer2-build-fails-when-buildi.patch | 34 +++++++++++++++++++ package/libnetconf2/libnetconf2.hash | 2 +- package/libnetconf2/libnetconf2.mk | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 package/libnetconf2/0001-libnetconf2-BUGFIX-netopeer2-build-fails-when-buildi.patch diff --git a/package/libnetconf2/0001-libnetconf2-BUGFIX-netopeer2-build-fails-when-buildi.patch b/package/libnetconf2/0001-libnetconf2-BUGFIX-netopeer2-build-fails-when-buildi.patch new file mode 100644 index 0000000000..c03fdc9999 --- /dev/null +++ b/package/libnetconf2/0001-libnetconf2-BUGFIX-netopeer2-build-fails-when-buildi.patch @@ -0,0 +1,34 @@ +From e06f291cc36c9e9a3c9c224e23109ac6dad4eb1c Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Thu, 25 Nov 2021 12:29:47 +0100 +Subject: [PATCH] libnetconf2 BUGFIX netopeer2 build fails when building with + musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +/home/hthiery/sources/mainline/buildroot/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/libnetconf2/session_server.h:439:55: error: unknown type name ‘mode_t’ + 439 | int nc_server_endpt_set_perms(const char *endpt_name, mode_t mode, uid_t uid, gid_t gid); + +For musl libc the include "sys/types.h" is required. + +Signed-off-by: Heiko Thiery +--- + src/session_server.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/session_server.h b/src/session_server.h +index 4507eea..4779119 100644 +--- a/src/session_server.h ++++ b/src/session_server.h +@@ -19,6 +19,7 @@ + extern "C" { + #endif + ++#include + #include + #include + +-- +2.30.2 + diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 24cc3a5557..2dee93cc4c 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 66139fc9e68aa89c82235f4135dba9e44f5db663541279c14c74131e22b7f571 libnetconf2-1.1.43.tar.gz +sha256 78ffa0bd85823abd321a1dbb09c1ead36612f2a12049638a14bb081567f86ade libnetconf2-2.0.24.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 40fa935bb1..33e1fadf76 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 1.1.43 +LIBNETCONF2_VERSION = 2.0.24 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From 1b21d7e4fb7a8f96476a221a277ca436871267b4 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 25 Nov 2021 13:56:01 +0100 Subject: [PATCH 145/176] package/sysrepo: bump version to 2.0.53 The license changed from Apache-2.0 to BSD-3-Clause Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...uild-with-musl-libc-fails-due-to-unk.patch | 42 +++++++++++++++++++ package/sysrepo/Config.in | 3 +- package/sysrepo/sysrepo.hash | 4 +- package/sysrepo/sysrepo.mk | 8 ++-- 4 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 package/sysrepo/0001-sysrepo-BUGFIX-build-with-musl-libc-fails-due-to-unk.patch diff --git a/package/sysrepo/0001-sysrepo-BUGFIX-build-with-musl-libc-fails-due-to-unk.patch b/package/sysrepo/0001-sysrepo-BUGFIX-build-with-musl-libc-fails-due-to-unk.patch new file mode 100644 index 0000000000..784cfb1445 --- /dev/null +++ b/package/sysrepo/0001-sysrepo-BUGFIX-build-with-musl-libc-fails-due-to-unk.patch @@ -0,0 +1,42 @@ +From 896dc6aee38898fe1c6822ee6a4a4989d21c650b Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Thu, 25 Nov 2021 12:18:06 +0100 +Subject: [PATCH] sysrepo BUGFIX build with musl libc fails due to unknown type + name 'mode_t' + +When building against the musl libc the build will fail due to the +missing sys/type.h include. + +Signed-off-by: Heiko Thiery +--- + src/plugins_datastore.h | 1 + + src/plugins_notification.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/plugins_datastore.h b/src/plugins_datastore.h +index a64e4131..d577e929 100644 +--- a/src/plugins_datastore.h ++++ b/src/plugins_datastore.h +@@ -18,6 +18,7 @@ + #define _SYSREPO_PLUGINS_DATASTORE_H + + #include ++#include + + #include + +diff --git a/src/plugins_notification.h b/src/plugins_notification.h +index 2099db62..f410e8d9 100644 +--- a/src/plugins_notification.h ++++ b/src/plugins_notification.h +@@ -18,6 +18,7 @@ + #define _SYSREPO_PLUGINS_NOTIFICATION_H + + #include ++#include + + #include + +-- +2.30.2 + diff --git a/package/sysrepo/Config.in b/package/sysrepo/Config.in index 8de141efc2..52df1bc4c3 100644 --- a/package/sysrepo/Config.in +++ b/package/sysrepo/Config.in @@ -6,8 +6,7 @@ config BR2_PACKAGE_SYSREPO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_UCP + select BR2_PACKAGE_PCRE2 help Sysrepo is an YANG-based configuration and operational state data store for Unix/Linux applications. diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 693a2bbf7d..b382c16036 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2cc7537a03f48dc3c955436e1e0ed077bc3b31a755d6979d24ca42e1187fce01 sysrepo-1.4.122.tar.gz -sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE +sha256 fe09da5f40fb53e3fb97268a134cc0ed3003f0018d0d117c73e81e1553a11f30 sysrepo-2.0.53.tar.gz +sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index c0db05e52c..acb3052023 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,13 +4,13 @@ # ################################################################################ -SYSREPO_VERSION = 1.4.122 +SYSREPO_VERSION = 2.0.53 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES -SYSREPO_LICENSE = Apache-2.0 +SYSREPO_LICENSE = BSD-3-Clause SYSREPO_LICENSE_FILES = LICENSE -SYSREPO_DEPENDENCIES = libyang pcre host-sysrepo -HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre +SYSREPO_DEPENDENCIES = libyang pcre2 host-sysrepo +HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre2 SYSREPO_CONF_OPTS = \ -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ From 13d4856b916d797c3c771669edd3eb883336766f Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 25 Nov 2021 13:56:03 +0100 Subject: [PATCH 146/176] package/netopeer2: bump version to 2.0.35 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index 4386e5661c..2895bc51d0 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7fc1a3520ee4bb488112f502e34cea465464dc933d2a5742a72eb32a6dfe3b3f netopeer2-1.1.70.tar.gz +sha256 dedae40419cfddd09c1be7bb536b3a762ec8dcd568c2bfe803c0f6789a5ca834 netopeer2-2.0.35.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index c9fa097606..c8b6763313 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 1.1.70 +NETOPEER2_VERSION = 2.0.35 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause From fe0e1020a3ec1c00fd1c8615bace962c720e0e46 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 30 Nov 2021 19:16:25 +0100 Subject: [PATCH 147/176] package/kodi-pvr-plutotv: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-plutotv/Config.in | 7 +++++++ package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash | 3 +++ package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk | 13 +++++++++++++ package/kodi/Config.in | 1 + 4 files changed, 24 insertions(+) create mode 100644 package/kodi-pvr-plutotv/Config.in create mode 100644 package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash create mode 100644 package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk diff --git a/package/kodi-pvr-plutotv/Config.in b/package/kodi-pvr-plutotv/Config.in new file mode 100644 index 0000000000..37441283ce --- /dev/null +++ b/package/kodi-pvr-plutotv/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_KODI_PVR_PLUTOTV + bool "kodi-pvr-plutotv" + select BR2_PACKAGE_RAPIDJSON + help + Pluto.tv PVR Client for Kodi + + https://github.com/kodi-pvr/pvr.plutotv diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash new file mode 100644 index 0000000000..3ad0d4e875 --- /dev/null +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 0b85c5c9583239bcecccccc2c43fc6d604bf5a4e4304238c8635410823ab8ae3 kodi-pvr-plutotv-19.0.0-Matrix.tar.gz +sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk new file mode 100644 index 0000000000..15c7135880 --- /dev/null +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# kodi-pvr-plutotv +# +################################################################################ + +KODI_PVR_PLUTOTV_VERSION = 19.0.0-Matrix +KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) +KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ +KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md +KODI_PVR_PLUTOTV_DEPENDENCIES = kodi rapidjson + +$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 38c14555ab..f436a444d3 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -305,6 +305,7 @@ menu "PVR addons" source "package/kodi-pvr-njoy/Config.in" source "package/kodi-pvr-octonet/Config.in" source "package/kodi-pvr-pctv/Config.in" + source "package/kodi-pvr-plutotv/Config.in" source "package/kodi-pvr-stalker/Config.in" source "package/kodi-pvr-vbox/Config.in" source "package/kodi-pvr-vdr-vnsi/Config.in" From 2db0ec06924d7f337755b9b920f5dd4c28f95e7f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 25 Nov 2021 23:30:43 +0100 Subject: [PATCH 148/176] package/azmq: bump to version 1.0.3 - Drop patch and use AZMQ_NO_TESTS which is available since https://github.com/zeromq/azmq/commit/3548638b9b3452a0526a1acb340ca7a92acf4f7c - boost log (and so NPTL) is not a dependency since https://github.com/zeromq/azmq/commit/3548638b9b3452a0526a1acb340ca7a92acf4f7c - boost regex is not a dependency since https://github.com/zeromq/azmq/commit/209ccdc318bee195c92eaf86ed2fcc4acf08be1e - Update indentation in hash file (two spaces) https://github.com/zeromq/azmq/releases/tag/v1.0.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...tionally-disable-test-and-doc-builds.patch | 43 ------------------- package/azmq/Config.in | 8 ++-- package/azmq/azmq.hash | 5 +-- package/azmq/azmq.mk | 4 +- 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch diff --git a/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch b/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch deleted file mode 100644 index 98975d27ed..0000000000 --- a/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d960f93fb52e373f76cfedbee5f4fb0c5276856a Mon Sep 17 00:00:00 2001 -From: RJ Ascani -Date: Thu, 20 Jul 2017 15:53:40 -0700 -Subject: [PATCH] Conditionally disable test and doc builds - -Signed-off-by: RJ Ascani ---- - CMakeLists.txt | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b5b9cc..97006a4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,9 @@ include_directories(${Boost_INCLUDE_DIRS} - ${ZeroMQ_INCLUDE_DIRS} - ${PROJECT_SOURCE_DIR}) - --enable_testing() -+if (BUILD_TESTING) -+ enable_testing() -+endif() - - macro(add_catch_test name) - if (TEST_REPORT_FORMAT) -@@ -59,8 +61,12 @@ macro(add_catch_test name) - endif() - endmacro() - --add_subdirectory(test) --add_subdirectory(doc) -+if (BUILD_TESTING) -+ add_subdirectory(test) -+endif() -+if (BUILD_DOC) -+ add_subdirectory(doc) -+endif() - - install(DIRECTORY ${PROJECT_SOURCE_DIR}/azmq - DESTINATION include) --- -2.13.3 - diff --git a/package/azmq/Config.in b/package/azmq/Config.in index 37131a260a..7bdd07ebf8 100644 --- a/package/azmq/Config.in +++ b/package/azmq/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_AZMQ bool "azmq" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # boost-log + depends on BR2_TOOLCHAIN_HAS_THREADS # boost, zeromq depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread @@ -11,9 +11,7 @@ config BR2_PACKAGE_AZMQ select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_DATE_TIME - select BR2_PACKAGE_BOOST_LOG select BR2_PACKAGE_BOOST_RANDOM - select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD help @@ -21,10 +19,10 @@ config BR2_PACKAGE_AZMQ https://github.com/zeromq/azmq -comment "azmq needs a toolchain w/ C++11, wchar and NPTL" +comment "azmq needs a toolchain w/ C++11, wchar and threads" depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL) + && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) comment "azmq needs exception_ptr" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/azmq/azmq.hash b/package/azmq/azmq.hash index f5d24e79ce..6caf53582a 100644 --- a/package/azmq/azmq.hash +++ b/package/azmq/azmq.hash @@ -1,4 +1,3 @@ # Locally calculated -# https://github.com/zeromq/azmq/archive/v1.0.2.tar.gz -sha256 25fa8b07756cffae95e25a55c7ea42efe02e8cd797552201aa771dd69cfc8fbf azmq-1.0.2.tar.gz -sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE-BOOST_1_0 +sha256 80cfb951c5614b8c2e55a59ea2e5723a18ebed08da80e5420e525d6bf273771a azmq-1.0.3.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE-BOOST_1_0 diff --git a/package/azmq/azmq.mk b/package/azmq/azmq.mk index 918c6e1a36..a72b155664 100644 --- a/package/azmq/azmq.mk +++ b/package/azmq/azmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZMQ_VERSION = 1.0.2 +AZMQ_VERSION = 1.0.3 AZMQ_SITE = $(call github,zeromq,azmq,v$(AZMQ_VERSION)) AZMQ_DEPENDENCIES = boost zeromq AZMQ_LICENSE = BSL-1.0 @@ -15,4 +15,6 @@ AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0 AZMQ_INSTALL_STAGING = YES AZMQ_INSTALL_TARGET = NO +AZMQ_CONF_OPTS = -DAZMQ_NO_TESTS=ON + $(eval $(cmake-package)) From 3fbc731441225c45dd2c8badfec3ec63c1226828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Fri, 26 Nov 2021 20:17:42 +0100 Subject: [PATCH 149/176] package/fwts: bump to version 21.11.00 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, update the hash of the copyright file, which has changed (by one character). Signed-off-by: Vincent Stehlé Cc: Erico Nunes Signed-off-by: Thomas Petazzoni --- package/fwts/fwts.hash | 4 ++-- package/fwts/fwts.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index fc79a0b812..8634980e03 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 e2d6e8b0704eba859a567fb8764e5dc5385793fc26bd00ecc70e7af03fd2568d fwts-V21.05.00.tar.gz +sha256 17d1f0b9639e0f9b092ed8233be2d63d6c44ea8d2a76be0fb5902cc867961374 fwts-V21.11.00.tar.gz # Hash for license file -sha256 2003f5c8a1e40d7882f1499bd7adb7bc748c9656851abb28647a3d297c2e8e23 debian/copyright +sha256 fbbea748555635dd8c7e6e2f99cddd778f5ee3f9e3510775183bf9799076e5e5 debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 402a9e0b8f..6634cdc40e 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 21.05.00 +FWTS_VERSION = 21.11.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = http://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 From eaa442089072ba431e606d4a8332fe414bec4327 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 26 Nov 2021 22:09:21 +0100 Subject: [PATCH 150/176] package/libdrm: bump version to 2.4.109 Release notes: https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html Changed _LICENSE_FILES to data/meson.build as it receives less updates than xf86drm.c and therefore requires less changes of its hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 8 ++++---- package/libdrm/libdrm.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index ee14d4c124..ca7332dd76 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/330279.html -sha256 a1d7948cbc536763fde14b4beb5e4da7867607966d4cf46301087e8b8fe3d6a0 libdrm-2.4.108.tar.xz -sha512 6a841dc3eb8eae7d75e1d35d23a14d51aff758e5a251dbcf6fc8c28d973d935a4a2f6751b405e956b2777d93c651721199ac80c3cd14b87d021668120d6bc974 libdrm-2.4.108.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html +sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz +sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz # Hash for license file -sha256 e64a695d0f18bfba26071afdfe19dd6ff4030d0dc1c47304059b724b23955ddb xf86drm.c +sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 0e4029fed2..9b614bf421 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.108 +LIBDRM_VERSION = 2.4.109 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT -LIBDRM_LICENSE_FILES = xf86drm.c +LIBDRM_LICENSE_FILES = data/meson.build LIBDRM_INSTALL_STAGING = YES LIBDRM_DEPENDENCIES = \ From d3904da8ba3d620700f39867f6a1c4c391624b9e Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Tue, 23 Nov 2021 21:30:13 +0100 Subject: [PATCH 151/176] boot/barebox: bump version to 2021.11.0 Signed-off-by: Bartosz Bilas Signed-off-by: Thomas Petazzoni --- 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 dd7985381f..01d66dce70 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 "2021.10.0" + bool "2021.11.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.10.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2021.11.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 ebd81cf18d..371bf15029 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2021.10.0.tar.bz2.md5 -md5 7d79102fd8d45bf3756b4f3a569654a8 barebox-2021.10.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2021.11.0.tar.bz2.md5 +md5 e7f7629701e9e8b9566b6799b422de5e barebox-2021.11.0.tar.bz2 # Locally calculated -sha256 4bb077b54d03743b3e8c20751d318dcc3ef03b20abe1a64a79c413ea03de3632 barebox-2021.10.0.tar.bz2 +sha256 34fbd33e17d052a7d8d64918183170675008768fe7618c31c16b9f5c92803c6a barebox-2021.11.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From 570b6deff906c24e6609c46ce69e00d9e8be04fc Mon Sep 17 00:00:00 2001 From: Eugen Hristev Date: Wed, 24 Nov 2021 15:23:11 +0200 Subject: [PATCH 152/176] package/fswebcam: bump to release 20200725 Bump to latest release. Signed-off-by: Eugen Hristev Signed-off-by: Thomas Petazzoni --- package/fswebcam/fswebcam.hash | 2 +- package/fswebcam/fswebcam.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fswebcam/fswebcam.hash b/package/fswebcam/fswebcam.hash index bac1626785..6ecb0d9794 100644 --- a/package/fswebcam/fswebcam.hash +++ b/package/fswebcam/fswebcam.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5702771cee6e3fa0f2bbbb72ecf3e5a253ff458c1f648f7e7c0d477e39f0ec80 fswebcam-e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33.tar.gz +sha256 d5439b2bf49bb634100d7e42ed9854f84bfd355c1d40bc3d4d81593eeadd8aee fswebcam-20200725.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/fswebcam/fswebcam.mk b/package/fswebcam/fswebcam.mk index 3a5b8c9eef..12e7860e7b 100644 --- a/package/fswebcam/fswebcam.mk +++ b/package/fswebcam/fswebcam.mk @@ -4,7 +4,7 @@ # ################################################################################ -FSWEBCAM_VERSION = e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33 +FSWEBCAM_VERSION = 20200725 FSWEBCAM_SITE = $(call github,fsphil,fswebcam,$(FSWEBCAM_VERSION)) FSWEBCAM_LICENSE = GPL-2.0 FSWEBCAM_LICENSE_FILES = LICENSE From abd6f2d69b4cc5a7e9bca79638cfc2f7977ec518 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Nov 2021 19:23:36 +0100 Subject: [PATCH 153/176] package/easyframes: bump to version 0.4 - Drop patches (already in version) - Update indentation in hash file (two spaces) https://github.com/microchip-ung/easyframes/releases/tag/v0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...Lists.txt-fix-static-build-with-pcap.patch | 57 ------------ .../0002-Fix-different-compiling-issues.patch | 91 ------------------- package/easyframes/easyframes.hash | 4 +- package/easyframes/easyframes.mk | 2 +- 4 files changed, 3 insertions(+), 151 deletions(-) delete mode 100644 package/easyframes/0001-CMakesLists.txt-fix-static-build-with-pcap.patch delete mode 100644 package/easyframes/0002-Fix-different-compiling-issues.patch diff --git a/package/easyframes/0001-CMakesLists.txt-fix-static-build-with-pcap.patch b/package/easyframes/0001-CMakesLists.txt-fix-static-build-with-pcap.patch deleted file mode 100644 index 3f13613e9d..0000000000 --- a/package/easyframes/0001-CMakesLists.txt-fix-static-build-with-pcap.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 89ad9c143825b13d028c2f1713d55e83135d5c0f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 5 Sep 2020 15:38:33 +0200 -Subject: [PATCH] CMakesLists.txt: fix static build with pcap - -Use pkg-config to find the dependencies of pcap such as libnl otherwise -a static-only build will fail on: - -[100%] Linking C executable ef -/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /srv/storage/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libpcap.a(pcap-linux.o): in function `nl80211_init': -pcap-linux.c:(.text+0x460): undefined reference to `nl_socket_alloc' -/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: pcap-linux.c:(.text+0x498): undefined reference to `genl_connect' - -Fixes: - - http://autobuild.buildroot.org/results/99062bfc8c21c32bc835acae675aede7c9cf0c90 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/microchip-ung/easyframes/pull/2] ---- - CMakeLists.txt | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a62a950..5be128c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,13 +7,21 @@ include_directories(src) - - - set(_LIBPCAP "") --FIND_PATH(PCAP_INCLUDE_DIR NAMES pcap/pcap.h) --FIND_LIBRARY(PCAP_LIBRARY NAMES pcap) -- --if (PCAP_LIBRARY) -+find_package(PkgConfig) -+pkg_check_modules(PCAP libpcap) -+if (PCAP_FOUND) - add_definitions(-DHAS_LIBPCAP) -- include_directories(${PCAP_INCLUDE_DIR}) -- set(_LIBPCAP ${PCAP_LIBRARY}) -+ include_directories(${PCAP_INCLUDE_DIRS}) -+ set(_LIBPCAP ${PCAP_LIBRARIES}) -+else() -+ FIND_PATH(PCAP_INCLUDE_DIR NAMES pcap/pcap.h) -+ FIND_LIBRARY(PCAP_LIBRARY NAMES pcap) -+ -+ if (PCAP_LIBRARY) -+ add_definitions(-DHAS_LIBPCAP) -+ include_directories(${PCAP_INCLUDE_DIR}) -+ set(_LIBPCAP ${PCAP_LIBRARY}) -+ endif() - endif() - - add_library(libef STATIC --- -2.28.0 - diff --git a/package/easyframes/0002-Fix-different-compiling-issues.patch b/package/easyframes/0002-Fix-different-compiling-issues.patch deleted file mode 100644 index e4d16a73a5..0000000000 --- a/package/easyframes/0002-Fix-different-compiling-issues.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d3d179c3c39ec10ec636b325325ad8e18ae9542f Mon Sep 17 00:00:00 2001 -From: Horatiu Vultur -Date: Tue, 1 Sep 2020 13:03:47 +0200 -Subject: [PATCH] Fix different compiling issues - -[Retrieved from: -https://github.com/microchip-ung/easyframes/commit/d3d179c3c39ec10ec636b325325ad8e18ae9542f] -Signed-off-by: Fabrice Fontaine ---- - src/ef-exec.c | 4 ++-- - src/ef-parse-bytes.c | 8 ++++++-- - src/ef.h | 4 ++-- - 3 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/src/ef-exec.c b/src/ef-exec.c -index 3d184a0..824164e 100644 ---- a/src/ef-exec.c -+++ b/src/ef-exec.c -@@ -108,7 +108,7 @@ int ring_wait_for_init(tpacket_ring *ring) { - - - int raw_socket(cmd_socket_t *cmd_socket) { -- int s, res, val, ifidx; -+ int s, res, val, ifidx, i; - struct sockaddr_ll sa = {}; - struct packet_mreq mr = {}; - -@@ -194,7 +194,7 @@ int raw_socket(cmd_socket_t *cmd_socket) { - // - // TODO: This does not seem to be needed, if we uses a RX ring buffer - // instead (atleast that seems to work for libpcap) -- for (int i = 0; i < 10000; ++i) { -+ for (i = 0; i < 10000; ++i) { - struct msghdr msg = { 0 }; - int res = recvmsg(s, &msg, MSG_DONTWAIT); - if (res < 0) -diff --git a/src/ef-parse-bytes.c b/src/ef-parse-bytes.c -index 1dd590f..1785f45 100644 ---- a/src/ef-parse-bytes.c -+++ b/src/ef-parse-bytes.c -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - - struct start_with { -@@ -212,7 +213,9 @@ buf_t *parse_bytes(const char *s, int bytes) { - for (s = data_begin; *s; ++s) { - int match_found = 0; - for (i = 0; i < sizeof(has_chars)/sizeof(has_chars[0]); ++i) { -- for (const char *set_i = has_chars[i].char_set; *set_i; ++set_i) { -+ const char *set_i; -+ -+ for (set_i = has_chars[i].char_set; *set_i; ++set_i) { - if (*s == *set_i) { - has_mask |= has_chars[i].mask; - match_found = 1; -@@ -313,6 +316,7 @@ buf_t *parse_bytes(const char *s, int bytes) { - ((has_mask & ~(HAS_HEX_COL)) == 0) && (has_mask & HAS_COLON)) { - // This will be treated as a mac-address - uint8_t m[6] = {}; -+ const char *x; - - // We want to be able to write something like this (like we RFC2373 - // specifies for IPv6): -@@ -334,7 +338,7 @@ buf_t *parse_bytes(const char *s, int bytes) { - - //po("line: %d data_begin: %s\n", __LINE__, data_begin); - -- for (const char *x = data_begin; *x; ++x) { -+ for (x = data_begin; *x; ++x) { - int colon = 0; - int val = 0; - -diff --git a/src/ef.h b/src/ef.h -index 8926c25..f4c1629 100644 ---- a/src/ef.h -+++ b/src/ef.h -@@ -59,8 +59,8 @@ void bl_check(buf_list_t *b); - void bl_reset(buf_list_t *b); - void bset_value(buf_t *b, uint8_t v); - --inline void bl_init(buf_list_t *b) { bl_reset(b); } --inline void bl_destroy(buf_list_t *b) { bl_reset(b); } -+static inline void bl_init(buf_list_t *b) { bl_reset(b); } -+static inline void bl_destroy(buf_list_t *b) { bl_reset(b); } - - int bl_printf_append(buf_list_t *b, const char *format, ...) - __attribute__ ((format (printf, 2, 3))); diff --git a/package/easyframes/easyframes.hash b/package/easyframes/easyframes.hash index 0f16e0caa1..d9a804aad0 100644 --- a/package/easyframes/easyframes.hash +++ b/package/easyframes/easyframes.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 3c0449b3129c29b5ecf67b689f1a75ffc65fde3c5f62811e2f0439ce4f4af392 easyframes-0.3.tar.gz -sha256 24f37598e822a1411fb7164ce7eb3ef120aea8279016399abc282c2381ce3f57 COPYING +sha256 0b8f4af8c41b0b1de2529d500aef6b9be7609f25b28e6a863129578a66806e5d easyframes-0.4.tar.gz +sha256 24f37598e822a1411fb7164ce7eb3ef120aea8279016399abc282c2381ce3f57 COPYING diff --git a/package/easyframes/easyframes.mk b/package/easyframes/easyframes.mk index 1821ce703c..10e1561232 100644 --- a/package/easyframes/easyframes.mk +++ b/package/easyframes/easyframes.mk @@ -4,7 +4,7 @@ # ################################################################################ -EASYFRAMES_VERSION = 0.3 +EASYFRAMES_VERSION = 0.4 EASYFRAMES_SITE = $(call github,microchip-ung,easyframes,v$(EASYFRAMES_VERSION)) EASYFRAMES_DEPENDENCIES = host-pkgconf libpcap EASYFRAMES_LICENSE = MIT From 5d8a611540c4818f046ccb5224cc2205a2c333e7 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 23 Nov 2021 19:27:04 +0100 Subject: [PATCH 154/176] package/lighttpd: switch to meson build system Switch to meson build system (alternative solution to autoreconf to fix C standard detection/compile flags, see [1]). - remove unneeded pcre-config (only used by the autoconf build) [1] http://lists.busybox.net/pipermail/buildroot/2021-November/629075.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/lighttpd/lighttpd.mk | 63 ++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 9c18a6038e..7ca71e356a 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -13,64 +13,85 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf LIGHTTPD_CONF_OPTS = \ - --without-wolfssl \ - --libdir=/usr/lib/lighttpd \ - --libexecdir=/usr/lib + -Dwith_brotli=false \ + -Dwith_dbi=false \ + -Dwith_fam=false \ + -Dwith_gdbm=false \ + -Dwith_geoip=false \ + -Dwith_gnutls=false \ + -Dwith_krb5=false \ + -Dwith_ldap=false \ + -Dwith_libev=false \ + -Dwith_libunwind=false \ + -Dwith_maxminddb=false \ + -Dwith_mbedtls=false \ + -Dwith_memcached=false \ + -Dwith_mysql=false \ + -Dwith_nettle=false \ + -Dwith_nss=false \ + -Dwith_pgsql=false \ + -Dwith_sasl=false \ + -Dwith_wolfssl=false \ + -Dwith_xattr=false \ + -Dwith_xxhash=false \ + -Dwith_zstd=false \ + -Dbuild_extra_warnings=false \ + -Dbuild_static=false \ + -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) LIGHTTPD_DEPENDENCIES += openssl -LIGHTTPD_CONF_OPTS += --with-openssl +LIGHTTPD_CONF_OPTS += -Dwith_openssl=true else -LIGHTTPD_CONF_OPTS += --without-openssl +LIGHTTPD_CONF_OPTS += -Dwith_openssl=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += --with-pam +LIGHTTPD_CONF_OPTS += -Dwith_pam=true else -LIGHTTPD_CONF_OPTS += --without-pam +LIGHTTPD_CONF_OPTS += -Dwith_pam=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += --with-zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=true else -LIGHTTPD_CONF_OPTS += --without-zlib +LIGHTTPD_CONF_OPTS += -Dwith_zlib=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += --with-bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=true else -LIGHTTPD_CONF_OPTS += --without-bzip2 +LIGHTTPD_CONF_OPTS += -Dwith_bzip=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) -LIGHTTPD_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config LIGHTTPD_DEPENDENCIES += pcre -LIGHTTPD_CONF_OPTS += --with-pcre +LIGHTTPD_CONF_OPTS += -Dwith_pcre=true else -LIGHTTPD_CONF_OPTS += --without-pcre +LIGHTTPD_CONF_OPTS += -Dwith_pcre=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += --with-webdav-props +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += --with-webdav-locks +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += --without-webdav-locks +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false endif else -LIGHTTPD_CONF_OPTS += --without-webdav-props --without-webdav-locks +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += --with-lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=true else -LIGHTTPD_CONF_OPTS += --without-lua +LIGHTTPD_CONF_OPTS += -Dwith_lua=false endif define LIGHTTPD_INSTALL_CONFIG @@ -104,4 +125,4 @@ define LIGHTTPD_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/tmpfiles.d/lighttpd.conf endef -$(eval $(autotools-package)) +$(eval $(meson-package)) From f525e0e78fd806a9307c8b41996e37fb727b9bd4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Nov 2021 21:08:56 +0100 Subject: [PATCH 155/176] package/libnetfilter_log: bump to version 1.0.2 - Drop patches (already in version) and so autoreconf - libmnl is needed since https://git.netfilter.org/libnetfilter_log/commit/?id=d3333c14bf32ceba24aca41c9b272f204b475183 - Update indentation in hash file (two spaces) https://netfilter.org/pub/libnetfilter_log/changes-libnetfilter_log-1.0.2.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libnetfilter_log/0001-uclinux.patch | 26 - ...e-needed-for-integer-type-definition.patch | 27 - ...0003-src-Use-stdint-types-everywhere.patch | 489 ------------------ ...ude-Sync-with-current-kernel-headers.patch | 112 ---- package/libnetfilter_log/Config.in | 1 + .../libnetfilter_log/libnetfilter_log.hash | 7 +- package/libnetfilter_log/libnetfilter_log.mk | 5 +- 7 files changed, 6 insertions(+), 661 deletions(-) delete mode 100644 package/libnetfilter_log/0001-uclinux.patch delete mode 100644 package/libnetfilter_log/0002-Add-include-needed-for-integer-type-definition.patch delete mode 100644 package/libnetfilter_log/0003-src-Use-stdint-types-everywhere.patch delete mode 100644 package/libnetfilter_log/0004-include-Sync-with-current-kernel-headers.patch diff --git a/package/libnetfilter_log/0001-uclinux.patch b/package/libnetfilter_log/0001-uclinux.patch deleted file mode 100644 index 75d4a1e9d1..0000000000 --- a/package/libnetfilter_log/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e36a2377e7ec50f6f675eb41f79edcda6ddebe5c Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 15:48:50 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e6e1317..189a753 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,7 +20,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/libnetfilter_log/0002-Add-include-needed-for-integer-type-definition.patch b/package/libnetfilter_log/0002-Add-include-needed-for-integer-type-definition.patch deleted file mode 100644 index bc8bbb2239..0000000000 --- a/package/libnetfilter_log/0002-Add-include-needed-for-integer-type-definition.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001 -From: Eric Leblond -Date: Sun, 4 Nov 2012 09:29:44 +0100 -Subject: Add include needed for integer type definition. - -[Retrieved from: -https://git.netfilter.org/libnetfilter_log/commit/?id=7529487f70e244cd31ef84b037b1c32749c134a7] -Signed-off-by: Fabrice Fontaine ---- - include/libnetfilter_log/libnetfilter_log.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h -index 6b0d3b0..a1331de 100644 ---- a/include/libnetfilter_log/libnetfilter_log.h -+++ b/include/libnetfilter_log/libnetfilter_log.h -@@ -9,6 +9,7 @@ - #ifndef __LIBNETFILTER_LOG_H - #define __LIBNETFILTER_LOG_H - -+#include - #include - - struct nflog_handle; --- -cgit v1.2.3 - diff --git a/package/libnetfilter_log/0003-src-Use-stdint-types-everywhere.patch b/package/libnetfilter_log/0003-src-Use-stdint-types-everywhere.patch deleted file mode 100644 index dfc59483a5..0000000000 --- a/package/libnetfilter_log/0003-src-Use-stdint-types-everywhere.patch +++ /dev/null @@ -1,489 +0,0 @@ -From 42878e88e5b72d3120434564942417cae3723385 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 14:01:00 +0200 -Subject: src: Use stdint types everywhere - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso - -[Retrieved from: -https://git.netfilter.org/libnetfilter_log/commit/?id=42878e88e5b72d3120434564942417cae3723385] -Signed-off-by: Fabrice Fontaine ---- - include/libnetfilter_log/libipulog.h | 5 +- - include/libnetfilter_log/libnetfilter_log.h | 39 ++++++------ - src/libipulog_compat.c | 10 ++-- - src/libnetfilter_log.c | 92 ++++++++++++++--------------- - utils/nfulnl_test.c | 6 +- - 5 files changed, 77 insertions(+), 75 deletions(-) - -diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h -index 1093bdd..ee7890a 100644 ---- a/include/libnetfilter_log/libipulog.h -+++ b/include/libnetfilter_log/libipulog.h -@@ -2,6 +2,7 @@ - #define _LIBIPULOG_H - - #include -+#include - #include - #include - #include -@@ -33,9 +34,9 @@ typedef struct ulog_packet_msg { - struct ipulog_handle; - extern int ipulog_errno; - --u_int32_t ipulog_group2gmask(u_int32_t group); -+uint32_t ipulog_group2gmask(uint32_t group); - --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, uint32_t rmem); - - void ipulog_destroy_handle(struct ipulog_handle *h); - -diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h -index a1331de..7812877 100644 ---- a/include/libnetfilter_log/libnetfilter_log.h -+++ b/include/libnetfilter_log/libnetfilter_log.h -@@ -9,6 +9,7 @@ - #ifndef __LIBNETFILTER_LOG_H - #define __LIBNETFILTER_LOG_H - -+#include - #include - #include - -@@ -29,19 +30,19 @@ extern struct nflog_handle *nflog_open(void); - extern struct nflog_handle *nflog_open_nfnl(struct nfnl_handle *nfnlh); - extern int nflog_close(struct nflog_handle *h); - --extern int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf); --extern int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf); -+extern int nflog_bind_pf(struct nflog_handle *h, uint16_t pf); -+extern int nflog_unbind_pf(struct nflog_handle *h, uint16_t pf); - - extern struct nflog_g_handle *nflog_bind_group(struct nflog_handle *h, -- u_int16_t num); -+ uint16_t num); - extern int nflog_unbind_group(struct nflog_g_handle *gh); - - extern int nflog_set_mode(struct nflog_g_handle *gh, -- u_int8_t mode, unsigned int len); --extern int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout); --extern int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags); --extern int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh); --extern int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz); -+ uint8_t mode, unsigned int len); -+extern int nflog_set_timeout(struct nflog_g_handle *gh, uint32_t timeout); -+extern int nflog_set_flags(struct nflog_g_handle *gh, uint16_t flags); -+extern int nflog_set_qthresh(struct nflog_g_handle *gh, uint32_t qthresh); -+extern int nflog_set_nlbufsiz(struct nflog_g_handle *gh, uint32_t nlbufsiz); - - extern int nflog_callback_register(struct nflog_g_handle *gh, - nflog_callback *cb, void *data); -@@ -50,23 +51,23 @@ extern int nflog_handle_packet(struct nflog_handle *h, char *buf, int len); - - extern struct nfulnl_msg_packet_hdr *nflog_get_msg_packet_hdr(struct nflog_data *nfad); - --extern u_int16_t nflog_get_hwtype(struct nflog_data *nfad); --extern u_int16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad); -+extern uint16_t nflog_get_hwtype(struct nflog_data *nfad); -+extern uint16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad); - extern char *nflog_get_msg_packet_hwhdr(struct nflog_data *nfad); - --extern u_int32_t nflog_get_nfmark(struct nflog_data *nfad); -+extern uint32_t nflog_get_nfmark(struct nflog_data *nfad); - extern int nflog_get_timestamp(struct nflog_data *nfad, struct timeval *tv); --extern u_int32_t nflog_get_indev(struct nflog_data *nfad); --extern u_int32_t nflog_get_physindev(struct nflog_data *nfad); --extern u_int32_t nflog_get_outdev(struct nflog_data *nfad); --extern u_int32_t nflog_get_physoutdev(struct nflog_data *nfad); -+extern uint32_t nflog_get_indev(struct nflog_data *nfad); -+extern uint32_t nflog_get_physindev(struct nflog_data *nfad); -+extern uint32_t nflog_get_outdev(struct nflog_data *nfad); -+extern uint32_t nflog_get_physoutdev(struct nflog_data *nfad); - extern struct nfulnl_msg_packet_hw *nflog_get_packet_hw(struct nflog_data *nfad); - extern int nflog_get_payload(struct nflog_data *nfad, char **data); - extern char *nflog_get_prefix(struct nflog_data *nfad); --extern int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid); --extern int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid); --extern int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq); --extern int nflog_get_seq_global(struct nflog_data *nfad, u_int32_t *seq); -+extern int nflog_get_uid(struct nflog_data *nfad, uint32_t *uid); -+extern int nflog_get_gid(struct nflog_data *nfad, uint32_t *gid); -+extern int nflog_get_seq(struct nflog_data *nfad, uint32_t *seq); -+extern int nflog_get_seq_global(struct nflog_data *nfad, uint32_t *seq); - - enum { - NFLOG_XML_PREFIX = (1 << 0), -diff --git a/src/libipulog_compat.c b/src/libipulog_compat.c -index 64ca7f3..2d5b23a 100644 ---- a/src/libipulog_compat.c -+++ b/src/libipulog_compat.c -@@ -20,7 +20,7 @@ struct ipulog_handle - struct nlmsghdr *last_nlh; - #if 0 - int fd; -- u_int8_t blocking; -+ uint8_t blocking; - struct sockaddr_nl local; - struct sockaddr_nl peer; - #endif -@@ -72,7 +72,7 @@ const char *ipulog_strerror(int errcode) - } - - /* convert a netlink group (1-32) to a group_mask suitable for create_handle */ --u_int32_t ipulog_group2gmask(u_int32_t group) -+uint32_t ipulog_group2gmask(uint32_t group) - { - if (group < 1 || group > 32) - { -@@ -83,8 +83,8 @@ u_int32_t ipulog_group2gmask(u_int32_t group) - } - - /* create a ipulog handle for the reception of packets sent to gmask */ --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, -- u_int32_t rcvbufsize) -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, -+ uint32_t rcvbufsize) - { - int rv; - struct ipulog_handle *h; -@@ -155,7 +155,7 @@ next_msg: printf("next\n"); - h->upmsg.hook = hdr->hook; - - if (tb[NFULA_MARK-1]) -- h->upmsg.mark = ntohl(*(u_int32_t *)NFA_DATA(tb[NFULA_MARK-1])); -+ h->upmsg.mark = ntohl(*(uint32_t *)NFA_DATA(tb[NFULA_MARK-1])); - else - h->upmsg.mark = 0; - -diff --git a/src/libnetfilter_log.c b/src/libnetfilter_log.c -index 76ed436..e92576b 100644 ---- a/src/libnetfilter_log.c -+++ b/src/libnetfilter_log.c -@@ -72,7 +72,7 @@ struct nflog_g_handle - { - struct nflog_g_handle *next; - struct nflog_handle *h; -- u_int16_t id; -+ uint16_t id; - - nflog_callback *cb; - void *data; -@@ -111,7 +111,7 @@ static void add_gh(struct nflog_g_handle *gh) - gh->h->gh_list = gh; - } - --static struct nflog_g_handle *find_gh(struct nflog_handle *h, u_int16_t group) -+static struct nflog_g_handle *find_gh(struct nflog_handle *h, uint16_t group) - { - struct nflog_g_handle *gh; - -@@ -124,8 +124,8 @@ static struct nflog_g_handle *find_gh(struct nflog_handle *h, u_int16_t group) - - /* build a NFULNL_MSG_CONFIG message */ - static int --__build_send_cfg_msg(struct nflog_handle *h, u_int8_t command, -- u_int16_t groupnum, u_int8_t pf) -+__build_send_cfg_msg(struct nflog_handle *h, uint8_t command, -+ uint16_t groupnum, uint8_t pf) - { - union { - char buf[NFNL_HEADER_LEN -@@ -148,7 +148,7 @@ static int __nflog_rcv_pkt(struct nlmsghdr *nlh, struct nfattr *nfa[], - { - struct nfgenmsg *nfmsg = NLMSG_DATA(nlh); - struct nflog_handle *h = data; -- u_int16_t group = ntohs(nfmsg->res_id); -+ uint16_t group = ntohs(nfmsg->res_id); - struct nflog_g_handle *gh = find_gh(h, group); - struct nflog_data nfldata; - -@@ -359,7 +359,7 @@ int nflog_close(struct nflog_handle *h) - * - * \return integer inferior to 0 in case of failure - */ --int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf) -+int nflog_bind_pf(struct nflog_handle *h, uint16_t pf) - { - return __build_send_cfg_msg(h, NFULNL_CFG_CMD_PF_BIND, 0, pf); - } -@@ -373,7 +373,7 @@ int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf) - * Unbinds the given nflog handle from processing packets belonging - * to the given protocol family. - */ --int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf) -+int nflog_unbind_pf(struct nflog_handle *h, uint16_t pf) - { - return __build_send_cfg_msg(h, NFULNL_CFG_CMD_PF_UNBIND, 0, pf); - } -@@ -395,7 +395,7 @@ int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf) - * \return a nflog_g_handle pointing to the newly created group - */ - struct nflog_g_handle * --nflog_bind_group(struct nflog_handle *h, u_int16_t num) -+nflog_bind_group(struct nflog_handle *h, uint16_t num) - { - struct nflog_g_handle *gh; - -@@ -461,7 +461,7 @@ int nflog_unbind_group(struct nflog_g_handle *gh) - * \return -1 on error; >= otherwise. - */ - int nflog_set_mode(struct nflog_g_handle *gh, -- u_int8_t mode, u_int32_t range) -+ uint8_t mode, uint32_t range) - { - union { - char buf[NFNL_HEADER_LEN -@@ -493,10 +493,10 @@ int nflog_set_mode(struct nflog_g_handle *gh, - * - * \return -1 in case of error and errno is explicity set. - */ --int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout) -+int nflog_set_timeout(struct nflog_g_handle *gh, uint32_t timeout) - { - union { -- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int32_t))]; -+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint32_t))]; - struct nlmsghdr nmh; - } u; - -@@ -518,10 +518,10 @@ int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout) - * - * \return -1 in case of error and errno is explicity set. - */ --int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh) -+int nflog_set_qthresh(struct nflog_g_handle *gh, uint32_t qthresh) - { - union { -- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int32_t))]; -+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint32_t))]; - struct nlmsghdr nmh; - } u; - -@@ -547,10 +547,10 @@ int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh) - * - * \return -1 in case of error and errno is explicity set. - */ --int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz) -+int nflog_set_nlbufsiz(struct nflog_g_handle *gh, uint32_t nlbufsiz) - { - union { -- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int32_t))]; -+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint32_t))]; - struct nlmsghdr nmh; - } u; - int status; -@@ -581,10 +581,10 @@ int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz) - * - * \return -1 in case of error and errno is explicity set. - */ --int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags) -+int nflog_set_flags(struct nflog_g_handle *gh, uint16_t flags) - { - union { -- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int16_t))]; -+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint16_t))]; - struct nlmsghdr nmh; - } u; - -@@ -616,9 +616,9 @@ int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags) - * The nfulnl_msg_packet_hdr structure is defined in libnetfilter_log.h as: - *\verbatim - struct nfulnl_msg_packet_hdr { -- u_int16_t hw_protocol; // hw protocol (network order) -- u_int8_t hook; // netfilter hook -- u_int8_t _pad; -+ uint16_t hw_protocol; // hw protocol (network order) -+ uint8_t hook; // netfilter hook -+ uint8_t _pad; - } __attribute__ ((packed)); - \endverbatim - */ -@@ -634,9 +634,9 @@ struct nfulnl_msg_packet_hdr *nflog_get_msg_packet_hdr(struct nflog_data *nfad) - * - * \return the hardware link layer type. - */ --u_int16_t nflog_get_hwtype(struct nflog_data *nfad) -+uint16_t nflog_get_hwtype(struct nflog_data *nfad) - { -- return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWTYPE, u_int16_t)); -+ return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWTYPE, uint16_t)); - } - - /** -@@ -645,9 +645,9 @@ u_int16_t nflog_get_hwtype(struct nflog_data *nfad) - * - * \return the size of the hardware link layer header - */ --u_int16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad) -+uint16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad) - { -- return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWLEN, u_int16_t)); -+ return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWLEN, uint16_t)); - } - - /** -@@ -667,9 +667,9 @@ char *nflog_get_msg_packet_hwhdr(struct nflog_data *nfad) - * - * \return the netfilter mark currently assigned to the logged packet. - */ --u_int32_t nflog_get_nfmark(struct nflog_data *nfad) -+uint32_t nflog_get_nfmark(struct nflog_data *nfad) - { -- return ntohl(nfnl_get_data(nfad->nfa, NFULA_MARK, u_int32_t)); -+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_MARK, uint32_t)); - } - - /** -@@ -707,9 +707,9 @@ int nflog_get_timestamp(struct nflog_data *nfad, struct timeval *tv) - * \warning all nflog_get_dev() functions return 0 if not set, since linux - * only allows ifindex >= 1, see net/core/dev.c:2600 (in 2.6.13.1) - */ --u_int32_t nflog_get_indev(struct nflog_data *nfad) -+uint32_t nflog_get_indev(struct nflog_data *nfad) - { -- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_INDEV, u_int32_t)); -+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_INDEV, uint32_t)); - } - - /** -@@ -720,9 +720,9 @@ u_int32_t nflog_get_indev(struct nflog_data *nfad) - * If the returned index is 0, the packet was locally generated or the - * physical input interface is no longer known (ie. POSTROUTING?). - */ --u_int32_t nflog_get_physindev(struct nflog_data *nfad) -+uint32_t nflog_get_physindev(struct nflog_data *nfad) - { -- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSINDEV, u_int32_t)); -+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSINDEV, uint32_t)); - } - - /** -@@ -733,9 +733,9 @@ u_int32_t nflog_get_physindev(struct nflog_data *nfad) - * returned index is 0, the packet is destined for localhost or the output - * interface is not yet known (ie. PREROUTING?). - */ --u_int32_t nflog_get_outdev(struct nflog_data *nfad) -+uint32_t nflog_get_outdev(struct nflog_data *nfad) - { -- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_OUTDEV, u_int32_t)); -+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_OUTDEV, uint32_t)); - } - - /** -@@ -749,9 +749,9 @@ u_int32_t nflog_get_outdev(struct nflog_data *nfad) - * \return The index of physical interface that the packet output will be - * routed out. - */ --u_int32_t nflog_get_physoutdev(struct nflog_data *nfad) -+uint32_t nflog_get_physoutdev(struct nflog_data *nfad) - { -- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSOUTDEV, u_int32_t)); -+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSOUTDEV, uint32_t)); - } - - /** -@@ -767,9 +767,9 @@ u_int32_t nflog_get_physoutdev(struct nflog_data *nfad) - * The nfulnl_msg_packet_hw structure is defined in libnetfilter_log.h as: - * \verbatim - struct nfulnl_msg_packet_hw { -- u_int16_t hw_addrlen; -- u_int16_t _pad; -- u_int8_t hw_addr[8]; -+ uint16_t hw_addrlen; -+ uint16_t _pad; -+ uint8_t hw_addr[8]; - } __attribute__ ((packed)); - \endverbatim - */ -@@ -817,12 +817,12 @@ char *nflog_get_prefix(struct nflog_data *nfad) - * - * \return the UID of the user that has genered the packet, if any. - */ --int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid) -+int nflog_get_uid(struct nflog_data *nfad, uint32_t *uid) - { - if (!nfnl_attr_present(nfad->nfa, NFULA_UID)) - return -1; - -- *uid = ntohl(nfnl_get_data(nfad->nfa, NFULA_UID, u_int32_t)); -+ *uid = ntohl(nfnl_get_data(nfad->nfa, NFULA_UID, uint32_t)); - return 0; - } - -@@ -832,12 +832,12 @@ int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid) - * - * \return the GID of the user that has genered the packet, if any. - */ --int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid) -+int nflog_get_gid(struct nflog_data *nfad, uint32_t *gid) - { - if (!nfnl_attr_present(nfad->nfa, NFULA_GID)) - return -1; - -- *gid = ntohl(nfnl_get_data(nfad->nfa, NFULA_GID, u_int32_t)); -+ *gid = ntohl(nfnl_get_data(nfad->nfa, NFULA_GID, uint32_t)); - return 0; - } - -@@ -849,12 +849,12 @@ int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid) - * - * \return the local nflog sequence number. - */ --int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq) -+int nflog_get_seq(struct nflog_data *nfad, uint32_t *seq) - { - if (!nfnl_attr_present(nfad->nfa, NFULA_SEQ)) - return -1; - -- *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ, u_int32_t)); -+ *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ, uint32_t)); - return 0; - } - -@@ -866,12 +866,12 @@ int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq) - * - * \return the global nflog sequence number. - */ --int nflog_get_seq_global(struct nflog_data *nfad, u_int32_t *seq) -+int nflog_get_seq_global(struct nflog_data *nfad, uint32_t *seq) - { - if (!nfnl_attr_present(nfad->nfa, NFULA_SEQ_GLOBAL)) - return -1; - -- *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ_GLOBAL, u_int32_t)); -+ *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ_GLOBAL, uint32_t)); - return 0; - } - -@@ -923,7 +923,7 @@ int nflog_snprintf_xml(char *buf, size_t rem, struct nflog_data *tb, int flags) - { - struct nfulnl_msg_packet_hdr *ph; - struct nfulnl_msg_packet_hw *hwph; -- u_int32_t mark, ifi; -+ uint32_t mark, ifi; - int size, offset = 0, len = 0, ret; - char *data; - -diff --git a/utils/nfulnl_test.c b/utils/nfulnl_test.c -index ae5da79..dd3091b 100644 ---- a/utils/nfulnl_test.c -+++ b/utils/nfulnl_test.c -@@ -9,9 +9,9 @@ - static int print_pkt(struct nflog_data *ldata) - { - struct nfulnl_msg_packet_hdr *ph = nflog_get_msg_packet_hdr(ldata); -- u_int32_t mark = nflog_get_nfmark(ldata); -- u_int32_t indev = nflog_get_indev(ldata); -- u_int32_t outdev = nflog_get_outdev(ldata); -+ uint32_t mark = nflog_get_nfmark(ldata); -+ uint32_t indev = nflog_get_indev(ldata); -+ uint32_t outdev = nflog_get_outdev(ldata); - char *prefix = nflog_get_prefix(ldata); - char *payload; - int payload_len = nflog_get_payload(ldata, &payload); --- -cgit v1.2.3 - diff --git a/package/libnetfilter_log/0004-include-Sync-with-current-kernel-headers.patch b/package/libnetfilter_log/0004-include-Sync-with-current-kernel-headers.patch deleted file mode 100644 index bb62411ec4..0000000000 --- a/package/libnetfilter_log/0004-include-Sync-with-current-kernel-headers.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 614d8b6cfb969c6102ef320de22b1eb199efce2a Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 13:37:53 +0200 -Subject: include: Sync with current kernel headers - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso - -[Retrieved from: -https://git.netfilter.org/libnetfilter_log/commit/?id=614d8b6cfb969c6102ef320de22b1eb199efce2a] -Signed-off-by: Fabrice Fontaine ---- - include/libnetfilter_log/linux_nfnetlink_log.h | 51 +++++++++++++------------- - 1 file changed, 25 insertions(+), 26 deletions(-) - -diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h -index 4c802c8..9f38277 100644 ---- a/include/libnetfilter_log/linux_nfnetlink_log.h -+++ b/include/libnetfilter_log/linux_nfnetlink_log.h -@@ -20,33 +20,31 @@ enum nfulnl_msg_types { - }; - - struct nfulnl_msg_packet_hdr { -- u_int16_t hw_protocol; /* hw protocol (network order) */ -- u_int8_t hook; /* netfilter hook */ -- u_int8_t _pad; --} __attribute__ ((packed)); -+ __be16 hw_protocol; /* hw protocol (network order) */ -+ __u8 hook; /* netfilter hook */ -+ __u8 _pad; -+}; - - struct nfulnl_msg_packet_hw { -- u_int16_t hw_addrlen; -- u_int16_t _pad; -- u_int8_t hw_addr[8]; --} __attribute__ ((packed)); -+ __be16 hw_addrlen; -+ __u16 _pad; -+ __u8 hw_addr[8]; -+}; - - struct nfulnl_msg_packet_timestamp { -- aligned_u64 sec; -- aligned_u64 usec; --} __attribute__ ((packed)); -- --#define NFULNL_PREFIXLEN 30 /* just like old log target */ -+ __aligned_be64 sec; -+ __aligned_be64 usec; -+}; - - enum nfulnl_attr_type { - NFULA_UNSPEC, - NFULA_PACKET_HDR, -- NFULA_MARK, /* u_int32_t nfmark */ -+ NFULA_MARK, /* __u32 nfmark */ - NFULA_TIMESTAMP, /* nfulnl_msg_packet_timestamp */ -- NFULA_IFINDEX_INDEV, /* u_int32_t ifindex */ -- NFULA_IFINDEX_OUTDEV, /* u_int32_t ifindex */ -- NFULA_IFINDEX_PHYSINDEV, /* u_int32_t ifindex */ -- NFULA_IFINDEX_PHYSOUTDEV, /* u_int32_t ifindex */ -+ NFULA_IFINDEX_INDEV, /* __u32 ifindex */ -+ NFULA_IFINDEX_OUTDEV, /* __u32 ifindex */ -+ NFULA_IFINDEX_PHYSINDEV, /* __u32 ifindex */ -+ NFULA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */ - NFULA_HWADDR, /* nfulnl_msg_packet_hw */ - NFULA_PAYLOAD, /* opaque data payload */ - NFULA_PREFIX, /* string prefix */ -@@ -71,23 +69,23 @@ enum nfulnl_msg_config_cmds { - }; - - struct nfulnl_msg_config_cmd { -- u_int8_t command; /* nfulnl_msg_config_cmds */ -+ __u8 command; /* nfulnl_msg_config_cmds */ - } __attribute__ ((packed)); - - struct nfulnl_msg_config_mode { -- u_int32_t copy_range; -- u_int8_t copy_mode; -- u_int8_t _pad; -+ __be32 copy_range; -+ __u8 copy_mode; -+ __u8 _pad; - } __attribute__ ((packed)); - - enum nfulnl_attr_config { - NFULA_CFG_UNSPEC, - NFULA_CFG_CMD, /* nfulnl_msg_config_cmd */ - NFULA_CFG_MODE, /* nfulnl_msg_config_mode */ -- NFULA_CFG_NLBUFSIZ, /* u_int32_t buffer size */ -- NFULA_CFG_TIMEOUT, /* u_int32_t in 1/100 s */ -- NFULA_CFG_QTHRESH, /* u_int32_t */ -- NFULA_CFG_FLAGS, /* u_int16_t */ -+ NFULA_CFG_NLBUFSIZ, /* __u32 buffer size */ -+ NFULA_CFG_TIMEOUT, /* __u32 in 1/100 s */ -+ NFULA_CFG_QTHRESH, /* __u32 */ -+ NFULA_CFG_FLAGS, /* __u16 */ - __NFULA_CFG_MAX - }; - #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1) -@@ -95,6 +93,7 @@ enum nfulnl_attr_config { - #define NFULNL_COPY_NONE 0x00 - #define NFULNL_COPY_META 0x01 - #define NFULNL_COPY_PACKET 0x02 -+/* 0xff is reserved, don't use it for new copy modes. */ - - #define NFULNL_CFG_F_SEQ 0x0001 - #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002 --- -cgit v1.2.3 - diff --git a/package/libnetfilter_log/Config.in b/package/libnetfilter_log/Config.in index 927cd0aae1..b244e8a8e9 100644 --- a/package/libnetfilter_log/Config.in +++ b/package/libnetfilter_log/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBNETFILTER_LOG bool "libnetfilter_log" + select BR2_PACKAGE_LIBMNL select BR2_PACKAGE_LIBNFNETLINK help libnetfilter_log is a userspace library providing interface diff --git a/package/libnetfilter_log/libnetfilter_log.hash b/package/libnetfilter_log/libnetfilter_log.hash index 292538db5d..7589284f40 100644 --- a/package/libnetfilter_log/libnetfilter_log.hash +++ b/package/libnetfilter_log/libnetfilter_log.hash @@ -1,6 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.1.tar.bz2.{md5sum,sha1sum} -md5 2a4bb0654ae675a52d2e8d1c06090b94 libnetfilter_log-1.0.1.tar.bz2 -sha1 0b95bcb1ad15eea906fa3607cd6c2290bd48d5bd libnetfilter_log-1.0.1.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.2.tar.bz2.sha256sum +sha256 e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea libnetfilter_log-1.0.2.tar.bz2 # Hash for license file: -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_log/libnetfilter_log.mk b/package/libnetfilter_log/libnetfilter_log.mk index bcf755e0d0..01f94aac41 100644 --- a/package/libnetfilter_log/libnetfilter_log.mk +++ b/package/libnetfilter_log/libnetfilter_log.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBNETFILTER_LOG_VERSION = 1.0.1 +LIBNETFILTER_LOG_VERSION = 1.0.2 LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2 LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files LIBNETFILTER_LOG_INSTALL_STAGING = YES -LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink -LIBNETFILTER_LOG_AUTORECONF = YES +LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libmnl libnfnetlink LIBNETFILTER_LOG_LICENSE = GPL-2.0+ LIBNETFILTER_LOG_LICENSE_FILES = COPYING From b4bdf704fea59db81433bbc07585e4c4db258d9a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Nov 2021 21:28:47 +0100 Subject: [PATCH 156/176] package/taglib: bump to version 1.12 - Drop patches (already in version) - Update indentation in hash file (two spaces) https://github.com/taglib/taglib/releases/tag/v1.12 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-config-file-for-cross-compiling-906.patch | 66 ------------------- ...-instance-of-TextIdentificationFrame.patch | 33 ---------- ...d-when-loading-invalid-ogg-flac-file.patch | 45 ------------- package/taglib/taglib.hash | 6 +- package/taglib/taglib.mk | 8 +-- 5 files changed, 4 insertions(+), 154 deletions(-) delete mode 100644 package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch delete mode 100644 package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch delete mode 100644 package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch diff --git a/package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch b/package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch deleted file mode 100644 index 2c6ebd74db..0000000000 --- a/package/taglib/0001-fix-taglib-config-file-for-cross-compiling-906.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7470f92a67375d00e53b3785a88fa7b26ad6f1da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 17 May 2019 13:13:35 +0200 -Subject: [PATCH] fix taglib-config file for cross compiling (#906) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The current taglib-config program does not work for cross-compiling as it only -returns the paths to the host, which breaks building programs which uses -`taglib-config` to link against taglib. - -Fix this by passing sysroot to the `prefix` and `exec_prefix` fields. - -Backported from: 7470f92a67375d00e53b3785a88fa7b26ad6f1da - -Signed-off-by: Jörg Krause ---- - CMakeLists.txt | 2 +- - taglib-config.cmake | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2de06324..1a0302c4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,7 +105,7 @@ math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}") - include(ConfigureChecks.cmake) - - if(NOT WIN32) -- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config") -+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" @ONLY) - install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${BIN_INSTALL_DIR}") - endif() - -diff --git a/taglib-config.cmake b/taglib-config.cmake -index 2bc2811a..96ef6883 100644 ---- a/taglib-config.cmake -+++ b/taglib-config.cmake -@@ -14,10 +14,10 @@ EOH - exit 1; - } - --prefix=${CMAKE_INSTALL_PREFIX} --exec_prefix=${CMAKE_INSTALL_PREFIX} --libdir=${LIB_INSTALL_DIR} --includedir=${INCLUDE_INSTALL_DIR} -+prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@ -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include - - flags="" - -@@ -35,7 +35,7 @@ do - flags="$flags -I$includedir/taglib" - ;; - --version) -- echo ${TAGLIB_LIB_VERSION_STRING} -+ echo @TAGLIB_LIB_VERSION_STRING@ - ;; - --prefix) - echo $prefix --- -2.22.0 - diff --git a/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch b/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch deleted file mode 100644 index c7ca9500d2..0000000000 --- a/package/taglib/0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch +++ /dev/null @@ -1,33 +0,0 @@ -From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001 -From: "Stephen F. Booth" -Date: Sun, 23 Jul 2017 10:11:09 -0400 -Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame - -If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame -which causes problems in rebuildAggregateFrames() when it is assumed -that TDRC is a TextIdentificationFrame -[Retrieved from: -https://github.com/taglib/taglib/pull/831/commits/eb9ded1206f18f2c319157337edea2533a40bea6] -Signed-off-by: Fabrice Fontaine ---- - taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp -index 759a9b7be..9347ab869 100644 ---- a/taglib/mpeg/id3v2/id3v2framefactory.cpp -+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp -@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const - tag->frameList("TDAT").size() == 1) - { - TextIdentificationFrame *tdrc = -- static_cast(tag->frameList("TDRC").front()); -+ dynamic_cast(tag->frameList("TDRC").front()); - UnknownFrame *tdat = static_cast(tag->frameList("TDAT").front()); - -- if(tdrc->fieldList().size() == 1 && -+ if(tdrc && -+ tdrc->fieldList().size() == 1 && - tdrc->fieldList().front().size() == 4 && - tdat->data().size() >= 5) - { diff --git a/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch b/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch deleted file mode 100644 index b245659c20..0000000000 --- a/package/taglib/0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2c4ae870ec086f2ddd21a47861a3709c36faac45 Mon Sep 17 00:00:00 2001 -From: Scott Gayou -Date: Tue, 9 Oct 2018 18:46:55 -0500 -Subject: [PATCH] Fixed OOB read when loading invalid ogg flac file. (#868) - (#869) - -CVE-2018-11439 is caused by a failure to check the minimum length -of a ogg flac header. This header is detailed in full at: -https://xiph.org/flac/ogg_mapping.html. Added more strict checking -for entire header. -[Retrieved from: -https://github.com/taglib/taglib/commit/2c4ae870ec086f2ddd21a47861a3709c36faac45] -Signed-off-by: Fabrice Fontaine ---- - taglib/ogg/flac/oggflacfile.cpp | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/taglib/ogg/flac/oggflacfile.cpp b/taglib/ogg/flac/oggflacfile.cpp -index 53d04508a..07ea9dccc 100644 ---- a/taglib/ogg/flac/oggflacfile.cpp -+++ b/taglib/ogg/flac/oggflacfile.cpp -@@ -231,11 +231,21 @@ void Ogg::FLAC::File::scan() - - if(!metadataHeader.startsWith("fLaC")) { - // FLAC 1.1.2+ -+ // See https://xiph.org/flac/ogg_mapping.html for the header specification. -+ if(metadataHeader.size() < 13) -+ return; -+ -+ if(metadataHeader[0] != 0x7f) -+ return; -+ - if(metadataHeader.mid(1, 4) != "FLAC") - return; - -- if(metadataHeader[5] != 1) -- return; // not version 1 -+ if(metadataHeader[5] != 1 && metadataHeader[6] != 0) -+ return; // not version 1.0 -+ -+ if(metadataHeader.mid(9, 4) != "fLaC") -+ return; - - metadataHeader = metadataHeader.mid(13); - } diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index 4b99e86d68..38a44b41a5 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b taglib-1.11.1.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL +sha256 7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703 taglib-1.12.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index f31f1046a5..9513e0d0e1 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,19 +4,13 @@ # ################################################################################ -TAGLIB_VERSION = 1.11.1 +TAGLIB_VERSION = 1.12 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL TAGLIB_CPE_ID_VENDOR = taglib -# 0002-Don-t-assume-TDRC-is-an-instance-of-TextIdentificationFrame.patch -TAGLIB_IGNORE_CVES += CVE-2017-12678 - -# 0003-Fixed-OOB-read-when-loading-invalid-ogg-flac-file.patch -TAGLIB_IGNORE_CVES += CVE-2018-11439 - ifeq ($(BR2_PACKAGE_ZLIB),y) TAGLIB_DEPENDENCIES += zlib endif From acbbe87a865c9d6cdd6311ecf0c3a5063b6d821d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 Nov 2021 08:14:02 +0100 Subject: [PATCH 157/176] package/kodi-audioencoder-flac: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash | 2 +- package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash index fb75bdbf15..5784c2585b 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 9ee5ace606749d7d89b0fadf73432f900e4b51f83531f952b193a235e06d1e73 kodi-audioencoder-flac-19.0.0-Matrix.tar.gz +sha256 fdc70c68b10e28469c8d20f5a0dcc1c24fdddda81afe98dd031bff58c8e184e8 kodi-audioencoder-flac-19.0.1-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 8d875630eb..65d5ff4aee 100644 --- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_FLAC_VERSION = 19.0.0-Matrix +KODI_AUDIOENCODER_FLAC_VERSION = 19.0.1-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 = LICENSE.md From 53d7dc7bc29c38c758c517be6a5073838a1e83c9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 Nov 2021 08:14:03 +0100 Subject: [PATCH 158/176] package/kodi-audioencoder-lame: bump version to 19.1.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash | 2 +- package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash index 080bef06d2..f39b1f7a82 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 054593ea6572cd1e6ea771758bd759c630f47abef1ad2eeb332d453fc6c03e0b kodi-audioencoder-lame-19.1.0-Matrix.tar.gz +sha256 eb75e1cb069e977887003d3f11cc73a1ecf885c7fb9c03950cd5c918dc64820a kodi-audioencoder-lame-19.1.1-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 d2c2750022..9048d4d730 100644 --- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_LAME_VERSION = 19.1.0-Matrix +KODI_AUDIOENCODER_LAME_VERSION = 19.1.1-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 = LICENSE.md From caff5ea409aa4544847c32e7e01355faa803ae25 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 Nov 2021 08:14:04 +0100 Subject: [PATCH 159/176] package/kodi-audioencoder-vorbis: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash | 2 +- package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash index 5a10a66794..02e976f2d4 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 e7c1f05a921cb2da21a49a1c8d4392b4e9337548481beee9f1f70c07806b1bd6 kodi-audioencoder-vorbis-19.0.0-Matrix.tar.gz +sha256 26f5b3e60ec3d3e17ea81a009fc91886159335fb8eec56e874e357901c90deeb kodi-audioencoder-vorbis-19.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 f1a7a67811..66faba19f3 100644 --- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_VORBIS_VERSION = 19.0.0-Matrix +KODI_AUDIOENCODER_VORBIS_VERSION = 19.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 = LICENSE.md From 500bc8bde085ab1cbbe091ea60ac79554262ce85 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 Nov 2021 08:14:05 +0100 Subject: [PATCH 160/176] package/kodi-audioencoder-wav: bump version to 19.0.1-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash | 2 +- package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash index e4932f3bbc..f616d76992 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 a0c5799e5010e560247517c1b8c847cb08f78e73f6d6144778a73a1836b534a9 kodi-audioencoder-wav-19.0.0-Matrix.tar.gz +sha256 32069979efb02daaa79b8ce09e060eed73f3fa73a4614b6c67e50ee33f1b096f kodi-audioencoder-wav-19.0.1-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 ac4125fac5..d8c7b1a694 100644 --- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_AUDIOENCODER_WAV_VERSION = 19.0.0-Matrix +KODI_AUDIOENCODER_WAV_VERSION = 19.0.1-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 = LICENSE.md From e53e43da1277dfdd7bef564c179b918320757e51 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 22 Nov 2021 03:08:00 +0100 Subject: [PATCH 161/176] package/inadyn: bump to version 2.9.0 Upstream changing to .tar.gz, prepare by dropping INADYN_SOURCE, as suggested by utils/check-package. See the ChangeLog, or release notes at GitHub, for full details: https://github.com/troglobit/inadyn/releases/tag/v2.9.0 Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/inadyn/inadyn.hash | 4 ++-- package/inadyn/inadyn.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash index 638f92d119..801400b2f5 100644 --- a/package/inadyn/inadyn.hash +++ b/package/inadyn/inadyn.hash @@ -1,5 +1,5 @@ -# From https://github.com/troglobit/inadyn/releases/download/v2.8.1/inadyn-2.8.1.tar.xz.sha256 -sha256 1185a9fb165bfc5f5b5f66f0dd8a695c9bd78d4b20cd162273eeea77f2d2e685 inadyn-2.8.1.tar.xz +# Upstream .sha256 from GitHub +sha256 b90c02a4f1964d8c1f3e178b6ef22eb29c689cd9e09669af17a8fd998c87dab5 inadyn-2.9.0.tar.gz # Locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index c115e8926d..fc04fd5f25 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,9 +4,8 @@ # ################################################################################ -INADYN_VERSION = 2.8.1 +INADYN_VERSION = 2.9.0 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) -INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz INADYN_LICENSE = GPL-2.0+ INADYN_LICENSE_FILES = COPYING INADYN_DEPENDENCIES = host-pkgconf libconfuse From 3ee7c86c8dde6baadf746ee74e81eb31f1f25a66 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 22 Nov 2021 03:08:02 +0100 Subject: [PATCH 162/176] package/inadyn: replace local systemd unit file with upstream If systemd is available at configure time, the inadyn configure script detects it and generates the unit file. Also, the local unit file had the wrong absolute path to the binary. Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/inadyn/inadyn.mk | 2 +- package/inadyn/inadyn.service | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 package/inadyn/inadyn.service diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index fc04fd5f25..9ccb16ddfe 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -31,7 +31,7 @@ define INADYN_INSTALL_INIT_SYSV endef define INADYN_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/inadyn/inadyn.service \ + $(INSTALL) -D -m 644 $(@D)/inadyn.service \ $(TARGET_DIR)/usr/lib/systemd/system/inadyn.service endef diff --git a/package/inadyn/inadyn.service b/package/inadyn/inadyn.service deleted file mode 100644 index abc0a1e401..0000000000 --- a/package/inadyn/inadyn.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=DDNS client -After=syslog.target network.target - -[Service] -ExecStart=/usr/bin/inadyn -Restart=always - -[Install] -WantedBy=multi-user.target From f979ab5eca6aecfc034302b6d37e784e9bbc0250 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 4 Dec 2021 17:54:06 -0700 Subject: [PATCH 163/176] package/network-manager: bump to version 1.32.12 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index c9d4826a0b..b007a6e88e 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.2.sha256sum -sha256 701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873 NetworkManager-1.32.2.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.32/NetworkManager-1.32.12.sha256sum +sha256 a8ab36a0a502fe73cd8e3bacb6585f97fbb94ebef79e276cdbaf11c33ff8f54b NetworkManager-1.32.12.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 453d1fc617..ea47e0797e 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -5,7 +5,7 @@ ################################################################################ NETWORK_MANAGER_VERSION_MAJOR = 1.32 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).12 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES From f3fb04609a88ded77034c7fa47ef19bdcafd6653 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 4 Dec 2021 17:54:07 -0700 Subject: [PATCH 164/176] package/network-manager: add optional iwd support Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index ea47e0797e..856b225985 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -42,6 +42,13 @@ else NETWORK_MANAGER_CONF_OPTS += --without-ofono endif +ifeq ($(BR2_PACKAGE_IWD),y) +NETWORK_MANAGER_DEPENDENCIES += iwd +NETWORK_MANAGER_CONF_OPTS += --with-iwd +else +NETWORK_MANAGER_CONF_OPTS += --without-iwd +endif + ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl NETWORK_MANAGER_CONF_OPTS += --enable-concheck From b69e3020f5de5d6f3b306abba1317045ae72b7b5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 4 Dec 2021 17:54:08 -0700 Subject: [PATCH 165/176] package/network-manager: add optional libaudit support Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 856b225985..e102e29b34 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -49,6 +49,13 @@ else NETWORK_MANAGER_CONF_OPTS += --without-iwd endif +ifeq ($(BR2_PACKAGE_AUDIT),y) +NETWORK_MANAGER_DEPENDENCIES += audit +NETWORK_MANAGER_CONF_OPTS += --with-libaudit +else +NETWORK_MANAGER_CONF_OPTS += --without-libaudit +endif + ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl NETWORK_MANAGER_CONF_OPTS += --enable-concheck From 096418ec4a973124d5b06029c5e841fe6a640fa5 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 4 Dec 2021 17:54:09 -0700 Subject: [PATCH 166/176] package/network-manager: add optional libpsl support Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index e102e29b34..a74441163d 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -63,6 +63,13 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-concheck endif +ifeq ($(BR2_PACKAGE_LIBPSL),y) +NETWORK_MANAGER_DEPENDENCIES += libpsl +NETWORK_MANAGER_CONF_OPTS += --with-libpsl +else +NETWORK_MANAGER_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_CONF_OPTS += --with-nmcli=yes From 066b9a232fdd76c9761fbe128d059796af6c7522 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 4 Dec 2021 17:54:10 -0700 Subject: [PATCH 167/176] package/network-manager: add optional selinux support Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a74441163d..91bc6479b8 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -70,6 +70,13 @@ else NETWORK_MANAGER_CONF_OPTS += --without-libpsl endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +NETWORK_MANAGER_DEPENDENCIES += libselinux +NETWORK_MANAGER_CONF_OPTS += --with-selinux +else +NETWORK_MANAGER_CONF_OPTS += --without-selinux +endif + ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_CONF_OPTS += --with-nmcli=yes From f4d2d927fddb59e0648442b03ccac234742f1d42 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 4 Dec 2021 17:54:11 -0700 Subject: [PATCH 168/176] package/network-manager: add optional polkit support Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 91bc6479b8..7213b69e15 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -105,6 +105,13 @@ else NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 endif +ifeq ($(BR2_PACKAGE_POLKIT),y) +NETWORK_MANAGER_DEPENDENCIES += polkit +NETWORK_MANAGER_CONF_OPTS += --enable-polkit +else +NETWORK_MANAGER_CONF_OPTS += --disable-polkit +endif + ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient endif From 33ad16bea96f3068c27c7282d8aaa7a03c42bc15 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 5 Dec 2021 11:02:31 +0100 Subject: [PATCH 169/176] package/network-manager: use with/without instead of with=yes/with=no This is more consistent with what is done in Buildroot packages. Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 7213b69e15..40da992089 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -79,16 +79,16 @@ endif ifeq ($(BR2_PACKAGE_READLINE),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli=yes +NETWORK_MANAGER_CONF_OPTS += --with-nmcli else -NETWORK_MANAGER_CONF_OPTS += --with-nmcli=no +NETWORK_MANAGER_CONF_OPTS += --without-nmcli endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes +NETWORK_MANAGER_CONF_OPTS += --with-nmtui else -NETWORK_MANAGER_CONF_OPTS += --with-nmtui=no +NETWORK_MANAGER_CONF_OPTS += --without-nmtui endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) From 4d0caefb9c83b106f2bb038926861670df128fff Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 5 Dec 2021 11:05:00 +0100 Subject: [PATCH 170/176] package/network-manager: alphabetically order conditional blocks No functional changes, code is just moved around. Ordering is based on the name of the Buildroot option being tested. Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 70 +++++++++++----------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 40da992089..a787c25c00 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -35,11 +35,19 @@ NETWORK_MANAGER_CONF_OPTS = \ --disable-ifupdown \ --without-nm-cloud-setup -ifeq ($(BR2_PACKAGE_OFONO),y) -NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +ifeq ($(BR2_PACKAGE_AUDIT),y) +NETWORK_MANAGER_DEPENDENCIES += audit +NETWORK_MANAGER_CONF_OPTS += --with-libaudit else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += --without-libaudit +endif + +ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) +NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +endif + +ifeq ($(BR2_PACKAGE_DHCPCD),y) +NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) @@ -49,13 +57,6 @@ else NETWORK_MANAGER_CONF_OPTS += --without-iwd endif -ifeq ($(BR2_PACKAGE_AUDIT),y) -NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit -else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit -endif - ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl NETWORK_MANAGER_CONF_OPTS += --enable-concheck @@ -77,18 +78,18 @@ else NETWORK_MANAGER_CONF_OPTS += --without-selinux endif -ifeq ($(BR2_PACKAGE_READLINE),y) -NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) +NETWORK_MANAGER_DEPENDENCIES += modem-manager +NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 endif -ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) -NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) +NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += --disable-ovs endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) @@ -98,11 +99,18 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-ppp endif -ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) +NETWORK_MANAGER_DEPENDENCIES += newt +NETWORK_MANAGER_CONF_OPTS += --with-nmtui else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += --without-nmtui +endif + +ifeq ($(BR2_PACKAGE_OFONO),y) +NETWORK_MANAGER_DEPENDENCIES += ofono +NETWORK_MANAGER_CONF_OPTS += --with-ofono +else +NETWORK_MANAGER_CONF_OPTS += --without-ofono endif ifeq ($(BR2_PACKAGE_POLKIT),y) @@ -112,19 +120,11 @@ else NETWORK_MANAGER_CONF_OPTS += --disable-polkit endif -ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient -endif - -ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd -endif - -ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs -NETWORK_MANAGER_DEPENDENCIES += jansson +ifeq ($(BR2_PACKAGE_READLINE),y) +NETWORK_MANAGER_DEPENDENCIES += readline +NETWORK_MANAGER_CONF_OPTS += --with-nmcli else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += --without-nmcli endif define NETWORK_MANAGER_INSTALL_INIT_SYSV From fa27346fc8723fde88e4ff255cf2744cc7f5f483 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 5 Dec 2021 08:29:01 +0100 Subject: [PATCH 171/176] package/linux-pam: bump version to 1.5.2 Removed patches which were applied upstream. Release notes: https://github.com/linux-pam/linux-pam/releases/tag/v1.5.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...0001-configure-test-a-o-is-not-POSIX.patch | 75 --------- ...002-Remove-support-for-legacy-xcrypt.patch | 149 ------------------ ...x-build-with-libxcrypt-and-uclibc-ng.patch | 47 ------ ...o-search-libcrypt-through-pkg-config.patch | 55 ------- package/linux-pam/linux-pam.hash | 4 +- package/linux-pam/linux-pam.mk | 4 +- 6 files changed, 3 insertions(+), 331 deletions(-) delete mode 100644 package/linux-pam/0001-configure-test-a-o-is-not-POSIX.patch delete mode 100644 package/linux-pam/0002-Remove-support-for-legacy-xcrypt.patch delete mode 100644 package/linux-pam/0003-configure.ac-fix-build-with-libxcrypt-and-uclibc-ng.patch delete mode 100644 package/linux-pam/0004-configure.ac-also-search-libcrypt-through-pkg-config.patch diff --git a/package/linux-pam/0001-configure-test-a-o-is-not-POSIX.patch b/package/linux-pam/0001-configure-test-a-o-is-not-POSIX.patch deleted file mode 100644 index ac16455956..0000000000 --- a/package/linux-pam/0001-configure-test-a-o-is-not-POSIX.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7c54428db5b639f05093459b1ba3b77456c5a548 Mon Sep 17 00:00:00 2001 -From: "Issam E. Maghni" -Date: Wed, 16 Dec 2020 18:48:28 -0500 -Subject: [PATCH] configure: test -a|o is not POSIX - -Fixes `test: too many arguments` when building Linux-PAM using sbase. -This is due to a non-POSIX syntax test ... -a ... and test ... -o .... - -> The XSI extensions specifying the -a and -o binary primaries and the -> '(' and ')' operators have been marked obsolescent. - -See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html - -[Retrieved from: -https://github.com/linux-pam/linux-pam/commit/7c54428db5b639f05093459b1ba3b77456c5a548] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5eade7cd3..e325bdd3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -346,7 +346,7 @@ if test x"$WITH_LIBAUDIT" != xno ; then - [HAVE_AUDIT_TTY_STATUS=""], - [#include ])] - ) -- if test -n "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then -+ if test -n "$LIBAUDIT" && test "$ac_cv_header_libaudit_h" != "no" ; then - AC_DEFINE([HAVE_LIBAUDIT], 1, [Define to 1 if audit support should be compiled in.]) - fi - if test -n "$HAVE_AUDIT_TTY_STATUS" ; then -@@ -373,12 +373,12 @@ esac - AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) --if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then -+if test "$LIBCRYPT" = "-lxcrypt" && test "$ac_cv_header_xcrypt_h" = "yes" ; then - AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.]) - fi - - AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes|no)],[use specified random device instead of /dev/urandom or 'no' to disable]), opt_randomdev=$withval) --if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then -+if test "$opt_randomdev" = yes || test -z "$opt_randomdev"; then - opt_randomdev="/dev/urandom" - elif test "$opt_randomdev" = no; then - opt_randomdev= -@@ -395,7 +395,7 @@ AC_ARG_ENABLE([db], - AC_ARG_WITH([db-uniquename], - AS_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.])) - if test x"$WITH_DB" != xno ; then -- if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then -+ if test x"$WITH_DB" = xyes || test x"$WITH_DB" = xdb ; then - old_libs=$LIBS - LIBS="$LIBS -ldb$with_db_uniquename" - AC_CHECK_FUNCS([db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store], -@@ -572,7 +572,7 @@ fi - - AC_PATH_PROG([FO2PDF], [fop]) - --AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno -a x$enable_doc != xno) -+AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno && test x$enable_doc != xno) - AM_CONDITIONAL(ENABLE_GENERATE_PDF, test -n "$FO2PDF") - - -@@ -625,7 +625,7 @@ esac - AM_CONDITIONAL([COND_BUILD_PAM_KEYINIT], [test "$have_key_syscalls" = 1]) - AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes]) - AM_CONDITIONAL([COND_BUILD_PAM_NAMESPACE], [test "$ac_cv_func_unshare" = yes]) --AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) -+AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes || test "$ac_cv_func_ruserok" = yes]) - AM_CONDITIONAL([COND_BUILD_PAM_SELINUX], [test -n "$LIBSELINUX"]) - AM_CONDITIONAL([COND_BUILD_PAM_SEPERMIT], [test -n "$LIBSELINUX"]) - AM_CONDITIONAL([COND_BUILD_PAM_SETQUOTA], [test "$ac_cv_func_quotactl" = yes]) diff --git a/package/linux-pam/0002-Remove-support-for-legacy-xcrypt.patch b/package/linux-pam/0002-Remove-support-for-legacy-xcrypt.patch deleted file mode 100644 index 9f4e8bcde0..0000000000 --- a/package/linux-pam/0002-Remove-support-for-legacy-xcrypt.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 530c9f9e2d746e1d168c6b17863debda7664ac7c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Fri, 28 Feb 2020 15:47:52 +0100 -Subject: [PATCH] Remove support for legacy xcrypt - -Since many distributions are shipping a version of libxcrypt >= 4.0.0 -as a replacement for glibc's libcrypt now, older versions of xcrypt, -which could be installed in parallel, are not relevant anymore. - -* configure.ac (AC_CHECK_HEADERS): Remove xcrypt.h. -(AC_SEARCH_LIBS): Remove xcrypt. -(AC_CHECK_FUNCS): Remove crypt_gensalt_r. -(AC_DEFINE): Remove HAVE_LIBXCRYPT. -* modules/pam_pwhistory/opasswd.c [HAVE_LIBXCRYPT]: Remove. -* modules/pam_unix/bigcrypt.c [HAVE_LIBXCRYPT]: Likewise. -* modules/pam_userdb/pam_userdb.c [HAVE_LIBXCRYPT]: Likewise. -* modules/pam_unix/passverify.c [HAVE_LIBXCRYPT]: Likewise. -(create_password_hash) [HAVE_LIBXCRYPT]: Likewise. - -[Retrieved from: -https://github.com/linux-pam/linux-pam/commit/530c9f9e2d746e1d168c6b17863debda7664ac7c] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 12 +++--------- - modules/pam_pwhistory/opasswd.c | 4 +--- - modules/pam_unix/bigcrypt.c | 4 +--- - modules/pam_unix/passverify.c | 24 +++++------------------- - modules/pam_userdb/pam_userdb.c | 4 +--- - 5 files changed, 11 insertions(+), 37 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8e5d0ff7c..100565552 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -359,23 +359,17 @@ else - fi - AC_SUBST(LIBAUDIT) - --AC_CHECK_HEADERS(xcrypt.h crypt.h) --AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], -- [crypt_libs="xcrypt crypt"], -- [crypt_libs="crypt"]) -+AC_CHECK_HEADERS(crypt.h) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[$crypt_libs]) -+AC_SEARCH_LIBS([crypt],[crypt]) - case "$ac_cv_search_crypt" in - -l*) LIBCRYPT="$ac_cv_search_crypt" ;; - *) LIBCRYPT="" ;; - esac --AC_CHECK_FUNCS(crypt_r crypt_gensalt_r) -+AC_CHECK_FUNCS([crypt_r]) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) --if test "$LIBCRYPT" = "-lxcrypt" && test "$ac_cv_header_xcrypt_h" = "yes" ; then -- AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.]) --fi - - AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes|no)],[use specified random device instead of /dev/urandom or 'no' to disable]), opt_randomdev=$withval) - if test "$opt_randomdev" = yes || test -z "$opt_randomdev"; then -diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c -index 40296d590..a6cd3d2a3 100644 ---- a/modules/pam_pwhistory/opasswd.c -+++ b/modules/pam_pwhistory/opasswd.c -@@ -54,9 +54,7 @@ - #endif - #include - --#if defined HAVE_LIBXCRYPT --#include --#elif defined (HAVE_CRYPT_H) -+#ifdef HAVE_CRYPT_H - #include - #endif - -diff --git a/modules/pam_unix/bigcrypt.c b/modules/pam_unix/bigcrypt.c -index 31be2f7b0..d8d61a4b0 100644 ---- a/modules/pam_unix/bigcrypt.c -+++ b/modules/pam_unix/bigcrypt.c -@@ -29,9 +29,7 @@ - #include - #include - #include --#ifdef HAVE_LIBXCRYPT --#include --#elif defined(HAVE_CRYPT_H) -+#ifdef HAVE_CRYPT_H - #include - #endif - -diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c -index 5a19ed856..e833402c1 100644 ---- a/modules/pam_unix/passverify.c -+++ b/modules/pam_unix/passverify.c -@@ -19,9 +19,7 @@ - #include - #include - #include --#ifdef HAVE_LIBXCRYPT --#include --#elif defined(HAVE_CRYPT_H) -+#ifdef HAVE_CRYPT_H - #include - #endif - -@@ -467,23 +465,11 @@ PAMH_ARG_DECL(char * create_password_hash, - */ - sp = crypt_gensalt_rn(algoid, rounds, NULL, 0, salt, sizeof(salt)); - #else --#ifdef HAVE_CRYPT_GENSALT_R -- if (on(UNIX_BLOWFISH_PASS, ctrl)) { -- char entropy[17]; -- crypt_make_salt(entropy, sizeof(entropy) - 1); -- sp = crypt_gensalt_r (algoid, rounds, -- entropy, sizeof(entropy), -- salt, sizeof(salt)); -- } else { --#endif -- sp = stpcpy(salt, algoid); -- if (on(UNIX_ALGO_ROUNDS, ctrl)) { -- sp += snprintf(sp, sizeof(salt) - (16 + 1 + (sp - salt)), "rounds=%u$", rounds); -- } -- crypt_make_salt(sp, 16); --#ifdef HAVE_CRYPT_GENSALT_R -+ sp = stpcpy(salt, algoid); -+ if (on(UNIX_ALGO_ROUNDS, ctrl)) { -+ sp += snprintf(sp, sizeof(salt) - (16 + 1 + (sp - salt)), "rounds=%u$", rounds); - } --#endif -+ crypt_make_salt(sp, 16); - #endif /* CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY */ - #ifdef HAVE_CRYPT_R - sp = NULL; -diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c -index d59801bfd..f467ea4c8 100644 ---- a/modules/pam_userdb/pam_userdb.c -+++ b/modules/pam_userdb/pam_userdb.c -@@ -17,9 +17,7 @@ - #include - #include - #include --#ifdef HAVE_LIBXCRYPT --#include --#elif defined(HAVE_CRYPT_H) -+#ifdef HAVE_CRYPT_H - #include - #endif - diff --git a/package/linux-pam/0003-configure.ac-fix-build-with-libxcrypt-and-uclibc-ng.patch b/package/linux-pam/0003-configure.ac-fix-build-with-libxcrypt-and-uclibc-ng.patch deleted file mode 100644 index d452aed34d..0000000000 --- a/package/linux-pam/0003-configure.ac-fix-build-with-libxcrypt-and-uclibc-ng.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fe1307512fb8892b5ceb3d884c793af8dbd4c16a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 15 Jun 2021 07:13:56 +0200 -Subject: [PATCH] configure.ac: fix build with libxcrypt and uclibc-ng - -Fix the following build failure with libxcrypt and uclibc-ng: - -ld: unix_chkpwd-passverify.o: in function `verify_pwd_hash': -passverify.c:(.text+0xab4): undefined reference to `crypt_checksalt' - -Fixes: - - http://autobuild.buildroot.org/results/65d68b7c9c7de1c7cb0f941ff9982f93a49a56f8 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/linux-pam/linux-pam/commit/fe1307512fb8892b5ceb3d884c793af8dbd4c16a] ---- - configure.ac | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7a4b2e86..e9c57345 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -362,10 +362,18 @@ AC_SUBST(LIBAUDIT) - AC_CHECK_HEADERS(crypt.h) - - BACKUP_LIBS=$LIBS --AC_SEARCH_LIBS([crypt],[crypt]) --case "$ac_cv_search_crypt" in -- -l*) LIBCRYPT="$ac_cv_search_crypt" ;; -- *) LIBCRYPT="" ;; -+LIBCRYPT="" -+AC_SEARCH_LIBS([crypt_gensalt_rn],[crypt]) -+case "$ac_cv_search_crypt_gensalt_rn" in -+ -l*) LIBCRYPT="$ac_cv_search_crypt_gensalt_rn" ;; -+ no) AC_SEARCH_LIBS([crypt_r],[crypt]) -+ case "$ac_cv_search_crypt_r" in -+ -l*) LIBCRYPT="$ac_cv_search_crypt_r" ;; -+ no ) AC_SEARCH_LIBS([crypt],[crypt]) -+ case "$ac_cv_search_crypt" in -+ -l*) LIBCRYPT="$ac_cv_search_crypt" ;; -+ esac ;; -+ esac ;; - esac - AC_CHECK_FUNCS([crypt_r]) - LIBS=$BACKUP_LIBS diff --git a/package/linux-pam/0004-configure.ac-also-search-libcrypt-through-pkg-config.patch b/package/linux-pam/0004-configure.ac-also-search-libcrypt-through-pkg-config.patch deleted file mode 100644 index 09b86902bb..0000000000 --- a/package/linux-pam/0004-configure.ac-also-search-libcrypt-through-pkg-config.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 49e3ffcbe267691dfbf24c91417aa296e7412146 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 29 Aug 2021 21:15:57 +0200 -Subject: [PATCH] configure.ac: also search libcrypt through pkg-config - -libxcrypt provides a libcrypt.pc file so use it if available as this -will allow to retrieve the library path (e.g. --L/home/buildroot/output/host//riscv64-buildroot-linux-musl/sysroot/usr/lib) -which is useful when cross-compiling and will avoid the following build -failure on buildroot: - -/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.2.0/../../../../riscv64-buildroot-linux-musl/bin/ld: .libs/passverify.o: in function `.L30': -passverify.c:(.text+0x368): undefined reference to `crypt_checksalt' - -Fixes: - - http://autobuild.buildroot.org/results/20b14e222b35c2d1269960075832b784ba81aa1a - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/linux-pam/linux-pam/commit/49e3ffcbe267691dfbf24c91417aa296e7412146] ---- - configure.ac | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d464884c..c06bc7dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -363,8 +363,14 @@ AC_CHECK_HEADERS(crypt.h) - - BACKUP_LIBS=$LIBS - LIBCRYPT="" --AC_SEARCH_LIBS([crypt_gensalt_rn],[crypt]) --case "$ac_cv_search_crypt_gensalt_rn" in -+PKG_CHECK_MODULES([CRYPT], [libcrypt], [ -+ CFLAGS="$CFLAGS $CRYPT_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $CRYPT_CFLAGS" -+ LIBS="$LIBS $CRYPT_LIBS" -+ LIBCRYPT="$CRYPT_LIBS" -+], [ -+ AC_SEARCH_LIBS([crypt_gensalt_rn],[crypt]) -+ case "$ac_cv_search_crypt_gensalt_rn" in - -l*) LIBCRYPT="$ac_cv_search_crypt_gensalt_rn" ;; - no) AC_SEARCH_LIBS([crypt_r],[crypt]) - case "$ac_cv_search_crypt_r" in -@@ -374,7 +380,8 @@ case "$ac_cv_search_crypt_gensalt_rn" in - -l*) LIBCRYPT="$ac_cv_search_crypt" ;; - esac ;; - esac ;; --esac -+ esac -+]) - AC_CHECK_FUNCS([crypt_r]) - LIBS=$BACKUP_LIBS - AC_SUBST(LIBCRYPT) diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index be7cabf6dc..0be3433687 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.5.0/Linux-PAM-1.5.1.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc Linux-PAM-1.5.1.tar.xz +sha256 e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d Linux-PAM-1.5.2.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 389d32a9a8..e309f6a5a4 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.5.1 +LINUX_PAM_VERSION = 1.5.2 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES @@ -23,8 +23,6 @@ LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE_FILES = Copyright LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) LINUX_PAM_CPE_ID_VENDOR = linux-pam -# We're patching configure.ac -LINUX_PAM_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBSELINUX),y) LINUX_PAM_CONF_OPTS += --enable-selinux From 736932c71552adc4dfa95c5236d1064860900e8a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Nov 2021 18:29:13 +0100 Subject: [PATCH 172/176] package/dmalloc: bump to version 5.6.5 - Drop second to fifth patches (already in version) - License is ISC since version 5.6.2 and https://github.com/j256/dmalloc/commit/eda734a8ba3ab4c03b3593636186dc3fc777b09d - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dmalloc/0001-mips.patch | 18 ++++---- package/dmalloc/0002-fix-parallel-build.patch | 18 -------- package/dmalloc/0003-fix-shlibs.patch | 46 ------------------- package/dmalloc/0004-fix-strdup.patch | 24 ---------- package/dmalloc/0005-fix-strndup.patch | 24 ---------- package/dmalloc/dmalloc.hash | 4 +- package/dmalloc/dmalloc.mk | 7 ++- 7 files changed, 15 insertions(+), 126 deletions(-) delete mode 100644 package/dmalloc/0002-fix-parallel-build.patch delete mode 100644 package/dmalloc/0003-fix-shlibs.patch delete mode 100644 package/dmalloc/0004-fix-strdup.patch delete mode 100644 package/dmalloc/0005-fix-strndup.patch diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch index 3e6b00e361..3150d030ec 100644 --- a/package/dmalloc/0001-mips.patch +++ b/package/dmalloc/0001-mips.patch @@ -1,14 +1,16 @@ +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine --- a/configure +++ b/configure @@ -7107,7 +7107,7 @@ - echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6 - if test "$cross_compiling" = yes; then - cat >>confdefs.h <<\_ACEOF --#define RETURN_MACROS_WORK 0 -+#define RETURN_MACROS_WORK 1 - _ACEOF - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + --- a/return.h +++ b/return.h @@ -106,26 +106,16 @@ diff --git a/package/dmalloc/0002-fix-parallel-build.patch b/package/dmalloc/0002-fix-parallel-build.patch deleted file mode 100644 index c521a114bb..0000000000 --- a/package/dmalloc/0002-fix-parallel-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix parallel build issue - -Missing dmallocc.o <- dmalloc.h dependency may break parallel builds. -dmalloc.h is generated,and may not be around by the time gcc starts -parsing dmallocc.cc. - -Signed-off-by: Alex Suykov - ---- a/Makefile.in -+++ b/Makefile.in -@@ -401,6 +401,7 @@ - compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h - dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error_val.h version.h -+dmallocc.o: dmallocc.cc dmalloc.h return.h conf.h settings.h - dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ - dmalloc_argv_loc.h compat.h - dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ diff --git a/package/dmalloc/0003-fix-shlibs.patch b/package/dmalloc/0003-fix-shlibs.patch deleted file mode 100644 index a99d926daf..0000000000 --- a/package/dmalloc/0003-fix-shlibs.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix shared library rules - -dmalloc uses ld -shared --whole-archive -o lib.so lib.a, -but for some reason lists regular objects in addition -to the archive, ending up with two copies of each symbol. - -Signed-off-by: Alex Suykov - ---- a/Makefile.in -+++ b/Makefile.in -@@ -257,7 +257,7 @@ shlib : $(BUILD_SL) - # via: http://256.com/gray/email.html - $(LIB_SL) : $(LIBRARY) - rm -f $@ $@.t -- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) -+ @shlinkargs@ $(LIBRARY) - mv $@.t $@ - - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) -@@ -270,7 +270,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) - - $(LIB_TH_SL) : $(LIB_TH) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) -+ @shlinkargs@ $(LIB_TH) - mv $@.t $@ - - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -@@ -279,7 +279,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) - - $(LIB_CXX_SL) : $(LIB_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_CXX) - mv $@.t $@ - - $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -@@ -288,7 +288,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) - - $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_TH_CXX) - mv $@.t $@ - - threadssl : $(LIB_TH_SL) diff --git a/package/dmalloc/0004-fix-strdup.patch b/package/dmalloc/0004-fix-strdup.patch deleted file mode 100644 index 5884df6a89..0000000000 --- a/package/dmalloc/0004-fix-strdup.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 59d73a473f1c1a31bcba90d314f956d0bcc3de95 Mon Sep 17 00:00:00 2001 -From: Siana Gearz -Date: Sat, 8 Sep 2012 22:55:17 +0200 -Subject: [PATCH] Fix strdup - -[Retrieved from: -https://github.com/siana/dmalloc/commit/59d73a473f1c1a31bcba90d314f956d0bcc3de95] -Signed-off-by: Fabrice Fontaine ---- - dmalloc.h.3 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dmalloc.h.3 b/dmalloc.h.3 -index d3d1c13..3fc573a 100644 ---- a/dmalloc.h.3 -+++ b/dmalloc.h.3 -@@ -459,6 +459,7 @@ DMALLOC_PNT valloc(DMALLOC_SIZE size); - * - * string -> String we are duplicating. - */ -+#undef strdup - extern - char *strdup(const char *string); - #endif /* ifndef DMALLOC_STRDUP_MACRO */ diff --git a/package/dmalloc/0005-fix-strndup.patch b/package/dmalloc/0005-fix-strndup.patch deleted file mode 100644 index a1865acb85..0000000000 --- a/package/dmalloc/0005-fix-strndup.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 005d92c2cebbde5c8623daa29725f7a62b18df7c Mon Sep 17 00:00:00 2001 -From: Siana Gearz -Date: Sat, 8 Sep 2012 22:44:35 +0200 -Subject: [PATCH] Fix strndup - -[Retrieved from: -https://github.com/siana/dmalloc/commit/005d92c2cebbde5c8623daa29725f7a62b18df7c] -Signed-off-by: Fabrice Fontaine ---- - dmalloc.h.3 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dmalloc.h.3 b/dmalloc.h.3 -index 8bda997..fb538a8 100644 ---- a/dmalloc.h.3 -+++ b/dmalloc.h.3 -@@ -429,6 +429,7 @@ char *strdup(const char *string); - * - * len -> Length of the string to duplicate. - */ -+#undef strndup - extern - char *strndup(const char *string, const DMALLOC_SIZE len); - diff --git a/package/dmalloc/dmalloc.hash b/package/dmalloc/dmalloc.hash index 113751656c..f4cc98e813 100644 --- a/package/dmalloc/dmalloc.hash +++ b/package/dmalloc/dmalloc.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a dmalloc-5.5.2.tgz -sha256 8659d49ceeeb006288ad246164e504ccfe33f7a4c1680439fb6ff6a393b0722b dmalloc.h.1 +sha256 480e3414ab6cedca837721c756b7d64b01a84d2d0e837378d98444e2f63a7c01 dmalloc-5.6.5.tgz +sha256 8657f6bc5ebb765dd792b2c3c54d5dc37b8b4e6bbe8aa48d464fd92081b1e720 LICENSE.txt diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 749c35359c..05943943d6 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -4,13 +4,12 @@ # ################################################################################ -DMALLOC_VERSION = 5.5.2 +DMALLOC_VERSION = 5.6.5 DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz DMALLOC_SITE = http://dmalloc.com/releases -DMALLOC_LICENSE = MIT-like -# license is in each file, dmalloc.h.1 is the smallest one -DMALLOC_LICENSE_FILES = dmalloc.h.1 +DMALLOC_LICENSE = ISC +DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) From 22ea19e8f952b290991b977870170f4d6ac0f24b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 24 Nov 2021 19:05:09 +0100 Subject: [PATCH 173/176] package/rpi-userland: fix download hash Commit 'package/rpi-userland: bump version to bab9bf8' (76875989326d9122db272c1a0f49b92961c3f2af) forgot to adjust the download hash. Fixes: - http://autobuild.buildroot.net/results/49a27362e36bad6076a727877bccb6e28edb06bd ERROR: rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz has wrong sha256 hash: ERROR: expected: e1ac871911e52b9fe07b3daa080b21bcdec3f1d2926cc98c934794780a4bf8d8 ERROR: got : 16c01befff64ebc11a0554e487b00939ed7a716f68dc795db4880b35bb25fa41 ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/rpi-userland/rpi-userland.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index da573f3eae..8ea184a4f6 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1ac871911e52b9fe07b3daa080b21bcdec3f1d2926cc98c934794780a4bf8d8 rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz +sha256 16c01befff64ebc11a0554e487b00939ed7a716f68dc795db4880b35bb25fa41 rpi-userland-bab9bf8790cd69660d443ce43b4e372999f3f7ac.tar.gz sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE From ed7321051552366a8145c6486c24452aab6ff450 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 Dec 2021 14:43:42 +0100 Subject: [PATCH 174/176] package/p7zip: update help text of 7za and 7zr Update help text of 7za and 7zr options (added in commit c1723424b8189730087006fc879fdae0cc123ca1) as suggested by Peter Korsgaard in https://patchwork.ozlabs.org/project/buildroot/patch/20211025215520.3712974-1-fontaine.fabrice@gmail.com/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/p7zip/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/p7zip/Config.in b/package/p7zip/Config.in index 3b30fd71cc..be2206eb76 100644 --- a/package/p7zip/Config.in +++ b/package/p7zip/Config.in @@ -21,14 +21,14 @@ choice config BR2_PACKAGE_P7ZIP_7ZA bool "7za" help - Stand-alone executable that handles fewer archive formats - than 7z + Full 7za archiver. The program supports 7z, ZIP, CAB, ARJ, + GZIP, BZIP2, TAR, CPIO, RPM and DEB formats config BR2_PACKAGE_P7ZIP_7ZR bool "7zr" help - Stand-alone executable which is a "light-version" of 7za that - only handles 7z archives and cannot handle encrypted archives + Lightweight 7zr archiver. The program only handles 7z archives + and cannot handle encrypted archives endchoice From e821078031e14df69e5142f23e9cb7b5a1ea0e77 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 11 Oct 2021 12:06:43 +0200 Subject: [PATCH 175/176] package/rpi-rgb-led-matrix: new package A library to control commonly available 64x64, 32x32 or 16x32 RGB LED panels with the Raspberry Pi. Can support PWM up to 11Bit per channel, providing true 24bpp color with CIE1931 profile. Signed-off-by: Grzegorz Blach [Arnout: reorder build/install hooks inside conditions] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + .../0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch | 46 +++++++++++ package/rpi-rgb-led-matrix/Config.in | 43 ++++++++++ .../rpi-rgb-led-matrix.hash | 3 + .../rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk | 78 +++++++++++++++++++ 6 files changed, 172 insertions(+) create mode 100644 package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch create mode 100644 package/rpi-rgb-led-matrix/Config.in create mode 100644 package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash create mode 100644 package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk diff --git a/DEVELOPERS b/DEVELOPERS index fd3ee964b2..1018bce420 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1098,6 +1098,7 @@ F: package/python-pyjwt/ F: package/python-redis/ F: package/python-rpi-ws281x/ F: package/python-wtforms/ +F: package/rpi-rgb-led-matrix/ N: Guillaume William Brs F: package/libnids/ diff --git a/package/Config.in b/package/Config.in index 006d3cf284..916bbfd836 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1621,6 +1621,7 @@ menu "Hardware handling" source "package/neardal/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" + source "package/rpi-rgb-led-matrix/Config.in" source "package/tslib/Config.in" source "package/uhd/Config.in" source "package/urg/Config.in" diff --git a/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch new file mode 100644 index 0000000000..f7a92f5fb2 --- /dev/null +++ b/package/rpi-rgb-led-matrix/0001-Rename-LDFLAGS-to-RGB_LDFLAGS.patch @@ -0,0 +1,46 @@ +From 056a189836a82b832cd8e6f886cb2090344bfa08 Mon Sep 17 00:00:00 2001 +From: Grzegorz Blach +Date: Sat, 29 Aug 2020 20:48:57 +0200 +Subject: [PATCH] Rename LDFLAGS to RGB_LDFLAGS. + +This change allows additional flags to be added to the linker +from the command line. + +Signed-off-by: Grzegorz Blach +--- + utils/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/utils/Makefile b/utils/Makefile +index e751adc..e704442 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -12,7 +12,7 @@ RGB_INCDIR=$(RGB_LIB_DISTRIBUTION)/include + RGB_LIBDIR=$(RGB_LIB_DISTRIBUTION)/lib + RGB_LIBRARY_NAME=rgbmatrix + RGB_LIBRARY=$(RGB_LIBDIR)/lib$(RGB_LIBRARY_NAME).a +-LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread ++RGB_LDFLAGS+=-L$(RGB_LIBDIR) -l$(RGB_LIBRARY_NAME) -lrt -lm -lpthread + + # Imagemagic flags, only needed if actually compiled. + MAGICK_CXXFLAGS?=$(shell GraphicsMagick++-config --cppflags --cxxflags) +@@ -28,13 +28,13 @@ $(RGB_LIBRARY): FORCE + $(MAKE) -C $(RGB_LIBDIR) + + text-scroller: text-scroller.o $(RGB_LIBRARY) +- $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) text-scroller.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) + + led-image-viewer: led-image-viewer.o $(RGB_LIBRARY) +- $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(MAGICK_LDFLAGS) ++ $(CXX) $(CXXFLAGS) led-image-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(MAGICK_LDFLAGS) + + video-viewer: video-viewer.o $(RGB_LIBRARY) +- $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(AV_LDFLAGS) ++ $(CXX) $(CXXFLAGS) video-viewer.o -o $@ $(LDFLAGS) $(RGB_LDFLAGS) $(AV_LDFLAGS) + + %.o : %.cc + $(CXX) -I$(RGB_INCDIR) $(CXXFLAGS) -c -o $@ $< +-- +2.24.3 (Apple Git-128) + diff --git a/package/rpi-rgb-led-matrix/Config.in b/package/rpi-rgb-led-matrix/Config.in new file mode 100644 index 0000000000..ca945a92af --- /dev/null +++ b/package/rpi-rgb-led-matrix/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_RPI_RGB_LED_MATRIX + bool "rpi-rgb-led-matrix" + depends on BR2_aarch64 || BR2_arm + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + help + A library to control commonly available 64x64, 32x32 or 16x32 + RGB LED panels with the Raspberry Pi. Can support PWM up to + 11Bit per channel, providing true 24bpp color with CIE1931 + profile. + + https://github.com/hzeller/rpi-rgb-led-matrix + +if BR2_PACKAGE_RPI_RGB_LED_MATRIX + +config BR2_PACKAGE_RPI_RGB_LED_MATRIX_IMAGE_VIEWER + bool "Build led-image-viewer" + select BR2_PACKAGE_GRAPHICSMAGICK + help + The image viewer reads all kinds of image formats, + including animated gifs. + +config BR2_PACKAGE_RPI_RGB_LED_MATRIX_TEXT_SCROLLER + bool "Build text-scroller" + help + The text scroller allows to show some scrolling text. + +config BR2_PACKAGE_RPI_RGB_LED_MATRIX_VIDEO_VIEWER + bool "Build video-viewer" + select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_FFMPEG_SWSCALE + help + The video viewer allows to play common video formats + on the RGB matrix (just the picture, no sound). + +endif + +comment "rpi-rgb-led-matrix needs a toolchain w/ C++, threads, dynamic library" + depends on BR2_aarch64 || BR2_arm + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash new file mode 100644 index 0000000000..3b1cb5fd76 --- /dev/null +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 5efc0293bb180b958079910e968721ff2dac291c435d065ecec9ceba8589567d rpi-rgb-led-matrix-63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk new file mode 100644 index 0000000000..b220bbc3db --- /dev/null +++ b/package/rpi-rgb-led-matrix/rpi-rgb-led-matrix.mk @@ -0,0 +1,78 @@ +################################################################################ +# +# rpi-rgb-led-matrix +# +################################################################################ + +RPI_RGB_LED_MATRIX_VERSION = 63e3e7ffdbe88223cc80e1faa508bc4f3cf2bea4 +RPI_RGB_LED_MATRIX_SITE = $(call github,hzeller,rpi-rgb-led-matrix,$(RPI_RGB_LED_MATRIX_VERSION)) +RPI_RGB_LED_MATRIX_LICENSE = GPL-2.0 +RPI_RGB_LED_MATRIX_LICENSE_FILES = COPYING +RPI_RGB_LED_MATRIX_INSTALL_STAGING = YES + +define RPI_RGB_LED_MATRIX_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib all +endef + +define RPI_RGB_LED_MATRIX_INSTALL_STAGING_CMDS + $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/rpi-rgb-led-matrix/ + $(INSTALL) -m 0644 $(@D)/include/*.h $(STAGING_DIR)/usr/include/rpi-rgb-led-matrix/ + $(INSTALL) -D -m 0644 $(@D)/lib/librgbmatrix.a $(STAGING_DIR)/usr/lib/librgbmatrix.a + $(INSTALL) -D -m 0755 $(@D)/lib/librgbmatrix.so.1 $(STAGING_DIR)/usr/lib/librgbmatrix.so.1 + ln -sf librgbmatrix.so.1 $(STAGING_DIR)/usr/lib/librgbmatrix.so +endef + +define RPI_RGB_LED_MATRIX_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/lib/librgbmatrix.so.1 $(TARGET_DIR)/usr/lib/librgbmatrix.so.1 + ln -sf librgbmatrix.so.1 $(TARGET_DIR)/usr/lib/librgbmatrix.so +endef + +ifeq ($(BR2_PACKAGE_RPI_RGB_LED_MATRIX_IMAGE_VIEWER),y) +RPI_RGB_LED_MATRIX_DEPENDENCIES += graphicsmagick + +define RPI_RGB_LED_MATRIX_BUILD_IMAGE_VIEWER_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + MAGICK_CXXFLAGS="-I$(STAGING_DIR)/usr/include/GraphicsMagick $(shell $(STAGING_DIR)/usr/bin/GraphicsMagick++-config --cxxflags)" \ + MAGICK_LDFLAGS="-L$(STAGING_DIR)/usr/lib $(shell $(STAGING_DIR)/usr/bin/GraphicsMagick++-config --libs)" \ + -C $(@D)/utils led-image-viewer +endef +RPI_RGB_LED_MATRIX_POST_BUILD_HOOKS += RPI_RGB_LED_MATRIX_BUILD_IMAGE_VIEWER_CMDS + +define RPI_RGB_LED_MATRIX_INSTALL_IMAGE_VIEWER_CMDS + $(INSTALL) -D -m 0755 $(@D)/utils/led-image-viewer $(TARGET_DIR)/usr/bin/led-image-viewer +endef +RPI_RGB_LED_MATRIX_POST_INSTALL_TARGET_HOOKS += RPI_RGB_LED_MATRIX_INSTALL_IMAGE_VIEWER_CMDS +endif + +ifeq ($(BR2_PACKAGE_RPI_RGB_LED_MATRIX_TEXT_SCROLLER),y) +define RPI_RGB_LED_MATRIX_BUILD_TEXT_SCROLLER_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/utils text-scroller +endef +RPI_RGB_LED_MATRIX_POST_BUILD_HOOKS += RPI_RGB_LED_MATRIX_BUILD_TEXT_SCROLLER_CMDS + +define RPI_RGB_LED_MATRIX_INSTALL_TEXT_SCROLLER_CMDS + $(INSTALL) -D -m 0755 $(@D)/utils/text-scroller $(TARGET_DIR)/usr/bin/text-scroller + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/rpi-rgb-led-matrix/fonts/ + $(INSTALL) -m 0644 $(@D)/fonts/*.bdf $(TARGET_DIR)/usr/share/rpi-rgb-led-matrix/fonts/ +endef +RPI_RGB_LED_MATRIX_POST_INSTALL_TARGET_HOOKS += RPI_RGB_LED_MATRIX_INSTALL_TEXT_SCROLLER_CMDS +endif + +ifeq ($(BR2_PACKAGE_RPI_RGB_LED_MATRIX_VIDEO_VIEWER),y) +RPI_RGB_LED_MATRIX_DEPENDENCIES += ffmpeg + +define RPI_RGB_LED_MATRIX_BUILD_VIDEO_VIEWER_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + AV_CXXFLAGS="$(shell $(HOST_DIR)/bin/pkg-config --cflags libavcodec libavformat libswscale libavutil)" \ + AV_LDFLAGS="$(shell $(HOST_DIR)/bin/pkg-config --libs libavcodec libavformat libswscale libavutil)" \ + -C $(@D)/utils video-viewer +endef +RPI_RGB_LED_MATRIX_POST_BUILD_HOOKS += RPI_RGB_LED_MATRIX_BUILD_VIDEO_VIEWER_CMDS + +define RPI_RGB_LED_MATRIX_INSTALL_VIDEO_VIEWER_CMDS + $(INSTALL) -D -m 0755 $(@D)/utils/video-viewer $(TARGET_DIR)/usr/bin/video-viewer +endef +RPI_RGB_LED_MATRIX_POST_INSTALL_TARGET_HOOKS += RPI_RGB_LED_MATRIX_INSTALL_VIDEO_VIEWER_CMDS +endif + +$(eval $(generic-package)) From 079528bb9c887b393ade82032761d0bef867313b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 3 Nov 2021 17:38:24 -0700 Subject: [PATCH 176/176] package/polkit: bump to version 0.120 - Drop upstreamed patches - change the location of polkit.its and polkit.loc to match their new locations. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...02-Improve-meson_post_install-script.patch | 124 ------------------ ...t-computation-of-dbus-data-directory.patch | 35 ----- ...Don-t-require-dbus-development-files.patch | 42 ------ package/polkit/polkit.hash | 2 +- package/polkit/polkit.mk | 6 +- 5 files changed, 4 insertions(+), 205 deletions(-) delete mode 100644 package/polkit/0002-Improve-meson_post_install-script.patch delete mode 100644 package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch delete mode 100644 package/polkit/0004-build-Don-t-require-dbus-development-files.patch diff --git a/package/polkit/0002-Improve-meson_post_install-script.patch b/package/polkit/0002-Improve-meson_post_install-script.patch deleted file mode 100644 index 932bf88f59..0000000000 --- a/package/polkit/0002-Improve-meson_post_install-script.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 6c8022392713955c5ae0061e22b50a16a1c2252a Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 15 Jul 2021 12:36:05 +0000 -Subject: [PATCH] Improve meson_post_install script - -[Retrieved from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/6c8022392713955c5ae0061e22b50a16a1c2252a] -Signed-off-by: Fabrice Fontaine ---- - .gitlab-ci.yml | 3 +-- - meson_post_install.py | 58 +++++++++++++++++++++++++++++++++++-------- - 2 files changed, 49 insertions(+), 12 deletions(-) - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index 8ac3e9f..6d0abb4 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -26,8 +26,6 @@ build_stable: - before_script: - - dnf upgrade -y --nogpgcheck fedora-release fedora-repos* - - dnf update -y && dnf install -y $DEPENDENCIES -- - getent group polkitd >/dev/null || groupadd -r polkitd -- - getent passwd polkitd >/dev/null || useradd -r -g polkitd -d / -s /sbin/nologin -c "User for polkitd" polkitd - - script: - - meson setup -@@ -43,6 +41,7 @@ build_stable: - - meson compile -C builddir - - meson test -C builddir - - meson install -C builddir -+ - DESTDIR=$(pwd)/DESTDIR meson install -C builddir - artifacts: - name: 'test logs' - when: 'always' -diff --git a/meson_post_install.py b/meson_post_install.py -index 0a0fccf..0ab7469 100644 ---- a/meson_post_install.py -+++ b/meson_post_install.py -@@ -1,20 +1,44 @@ - #!/usr/bin/env python3 - --import getpass - import os - import pwd - import sys - -+destdir = os.environ.get('DESTDIR') - prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX'] - --bindir = os.path.join(prefix, sys.argv[1]) --pkgdatadir = os.path.join(prefix, sys.argv[2]) --pkglibdir = os.path.join(prefix, sys.argv[3]) --pkgsysconfdir = os.path.join(prefix, sys.argv[4]) -+def destdir_path(p): -+ if os.path.isabs(p): -+ if destdir is None: -+ return p -+ else: -+ return os.path.join(destdir, os.path.relpath(p, '/')) -+ else: -+ return os.path.join(prefix, p) - --polkitd_uid = pwd.getpwnam(sys.argv[5]).pw_uid -+bindir = destdir_path(sys.argv[1]) -+pkgdatadir = destdir_path(sys.argv[2]) -+pkglibdir = destdir_path(sys.argv[3]) -+pkgsysconfdir = destdir_path(sys.argv[4]) -+polkitd_user = sys.argv[5] - --os.chmod(os.path.join(bindir, 'pkexec'), 0o4775) -+try: -+ polkitd_uid = pwd.getpwnam(polkitd_user).pw_uid -+except KeyError: -+ polkitd_uid = None -+ -+dst = os.path.join(bindir, 'pkexec') -+ -+if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) -+ os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) -+ ) - - dst_dirs = [ - os.path.join(pkgsysconfdir, 'rules.d'), -@@ -24,13 +48,27 @@ dst_dirs = [ - for dst in dst_dirs: - if not os.path.exists(dst): - os.makedirs(dst, mode=0o700) -- if getpass.getuser() == "root": -+ if os.geteuid() == 0 and polkitd_uid is not None: - os.chown(dst, polkitd_uid, -1) -+ else: -+ print( -+ 'Owner of {} needs to be set to {} after installation'.format( -+ dst, polkitd_user, -+ ) -+ ) - - # polkit-agent-helper-1 need to be setuid root because it's used to - # authenticate not only the invoking user, but possibly also root - # and/or other users. - dst = os.path.join(pkglibdir, 'polkit-agent-helper-1') --os.chmod(dst, 0o4755) --if getpass.getuser() == "root": -+ -+if os.geteuid() == 0: -+ os.chmod(dst, 0o4755) - os.chown(dst, 0, -1) -+else: -+ print( -+ 'Owner and mode of {} need to be setuid root (04755) after ' -+ 'installation'.format( -+ dst, -+ ) -+ ) --- -GitLab - diff --git a/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch b/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch deleted file mode 100644 index 7fce2e10a5..0000000000 --- a/package/polkit/0003-build-Remove-redundant-computation-of-dbus-data-directory.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9fa097f4dde92a0c1675400228b4cb965ed3e123 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 3 Jun 2021 18:55:29 +0100 -Subject: [PATCH] build: Remove redundant computation of dbus data directory - -We were asking pkg-config "if I define ${datadir} to pk_prefix/pk_datadir, -what would ${datadir} be?" but the answer is obviously always going to be -pk_prefix/pk_datadir. - -Signed-off-by: Simon McVittie - -[Retrieved (and slightly updated for duktape fork) from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/9fa097f4dde92a0c1675400228b4cb965ed3e123] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 6a6799e..03a7683 100644 ---- a/meson.build -+++ b/meson.build -@@ -136,8 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin - endif - - dbus_dep = dependency('dbus-1') --dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 --dbus_policydir = dbus_confdir / 'dbus-1/system.d' -+dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' - dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) - - # check OS --- -GitLab - diff --git a/package/polkit/0004-build-Don-t-require-dbus-development-files.patch b/package/polkit/0004-build-Don-t-require-dbus-development-files.patch deleted file mode 100644 index 1b7adbf67f..0000000000 --- a/package/polkit/0004-build-Don-t-require-dbus-development-files.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4bb2157adae620c8b07caf5a24b177d1f90f2fbb Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 3 Jun 2021 18:57:00 +0100 -Subject: [PATCH] build: Don't require dbus development files - -We don't actually need libdbus, only the dbus-daemon's installation -directory for system services, which in practice is always going to be -/usr/share/dbus-1/system-services. - -Signed-off-by: Simon McVittie - -[Retrieved (and slightly updated for duktape fork) from: -https://gitlab.freedesktop.org/polkit/polkit/-/commit/4bb2157adae620c8b07caf5a24b177d1f90f2fbb] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 03a7683..539ec7a 100644 ---- a/meson.build -+++ b/meson.build -@@ -135,9 +135,14 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin - js_dep = dependency('mozjs-78') - endif - --dbus_dep = dependency('dbus-1') -+dbus_dep = dependency('dbus-1', required: false) - dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' --dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) -+if dbus_dep.found() -+ dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) -+else -+ # libdbus development files not installed, assume a standard layout -+ dbus_system_bus_services_dir = pk_prefix / pk_datadir / 'dbus-1' / 'system-services' -+endif - - # check OS - host_system = host_machine.system() --- -GitLab - diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index 9677e19bb0..f108ac19ec 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 88d078f1d1f653fd31fe42e46cc3d9b7dd468e70684075e32fe1766dc7ece517 polkit-0.119.tar.gz +sha256 0a30dbc0ff798ff45f5bb303b4b40160f56679e81b139287cc0efb32aa5dfc1b polkit-0.120.tar.gz # Locally calculated sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index ed6f1a5a8f..a8b91d21bc 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -POLKIT_VERSION = 0.119 +POLKIT_VERSION = 0.120 POLKIT_SITE = $(call github,aduskett,polkit-duktape,v$(POLKIT_VERSION)) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING @@ -39,9 +39,9 @@ endif # polkit.{its,loc} are needed for gvfs and must be installed in $(HOST_DIR) # and not $(STAGING_DIR) define POLKIT_INSTALL_ITS - $(INSTALL) -D -m 644 $(@D)/data/polkit.its \ + $(INSTALL) -D -m 644 $(@D)/gettext/its/polkit.its \ $(HOST_DIR)/share/gettext/its/polkit.its - $(INSTALL) -D -m 644 $(@D)/data/polkit.loc \ + $(INSTALL) -D -m 644 $(@D)/gettext/its/polkit.loc \ $(HOST_DIR)/share/gettext/its/polkit.loc endef POLKIT_POST_INSTALL_TARGET_HOOKS += POLKIT_INSTALL_ITS