Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e9f426a
support/scripts/pkg-stats: fix RuntimeError with python 3.14 asyncio
jolivain Jan 25, 2026
574aa2c
package/glibc: add CVE-2025-15281 CVE-2026-0861 CVE-2026-0915 to _IGN…
jolivain Jan 25, 2026
22ec30b
package/xinetd: fix build failure due to missing BR2_PACKAGE_LIBTIRPC…
bkuhls Jan 18, 2026
ef9f0a0
package/pkg-cmake.mk: add Platform/Buildroot-Initialize.cmake
jolivain Jan 17, 2026
105e461
package/openobex: fix build with cmake 4
bkuhls Jan 17, 2026
32c6fff
package/mesa3d: fix aarch64_be build
bkuhls Feb 3, 2026
63877f9
support/misc/relocate-sdk.sh: pre-calculate files in need of relocation
florolf May 31, 2025
2b31a28
package/openobex: fix line endings in patch
tpetazzoni Feb 4, 2026
96f0193
package/libopenssl: fix powerpc64 build
bkuhls Feb 4, 2026
fbad192
package/bind: security bump version to 9.18.44
giuliobenetti Feb 4, 2026
ed9466e
support/scripts/pkg-stats: add -N/--needs-update option
kadambininema May 15, 2025
166bfd3
arch: riscv: Add RISCV_ISA_EXTRA config string
charlie-rivos May 7, 2025
fefc82a
package/wine: bump to version 11.0
jolivain Jan 17, 2026
21311f7
package/screen: fix usage with readonly rootfs
bkuhls Jan 18, 2026
8c5214f
rpi-firmware: support installing extra files
oli-ben May 7, 2025
10b2c1b
configs/microchip_mpfs_icicle: Bump U-Boot
jamiegibbons Jan 13, 2026
e1c8ab1
configs/microchip_mpfs_icicle: Bump Linux
jamiegibbons Jan 13, 2026
758188b
configs/beaglev_fire: Bump U-Boot
jamiegibbons Jan 13, 2026
e9e5513
configs/beaglev_fire: Bump Linux
jamiegibbons Jan 13, 2026
27fed8e
beaglev_fire: remove fdt set from boot script
jamiegibbons Jan 13, 2026
c0fd48d
package/libbsd: fix build with uClibc
tpetazzoni Feb 4, 2026
e0b129e
package/libite: add dependency on MMU, requires fork()
troglobit Dec 16, 2025
8e7a54f
package/libite: bump to v2.6.2
troglobit Dec 16, 2025
b009935
package/strongswan: add patch to fix CVE-2025-62291
wbx-github Jan 23, 2026
5a63ee3
package/libcurl: also specify the CA bundle location
lancethepants Apr 17, 2025
302a325
package/brotli: fix LoongArch64 build
bkuhls Jan 4, 2026
06eacc3
package/brltty: fix musl build
bkuhls Jan 4, 2026
b3abf16
package/libwebsockets: fix LWS_MAX_SMP when BR2_TOOLCHAIN_HAS_THREADS…
barcobarvs Sep 20, 2024
e57c73b
package/cjson: add a patch to allow cross-compilation with sysroot.
Apr 28, 2025
e4e71c6
package/asterisk: add workaround to fix build issues
wbx-github Feb 2, 2026
137d6e2
package/kvm-unit-tests: assume AArch64 supports KVM
stsquad Sep 11, 2025
46ce2e7
package/qemu: introduce kvm and tcg system options
stsquad Sep 11, 2025
1634ee6
Revert "package/cjson: add a patch to allow cross-compilation with sy…
tpetazzoni Feb 4, 2026
9668821
package/systemd: enable ukify for host build
bravl Feb 24, 2025
95519e0
package/dvdrw-tools: remove package
tpetazzoni Feb 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,6 @@ package/dt/0002-dt-default-source-define.patch lib_patch.Upstream
package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch lib_patch.Upstream
package/dvblast/0001-missing-lm.patch lib_patch.Upstream
package/dvblast/0002-fix-int-types.patch lib_patch.Upstream
package/dvdrw-tools/0001-limits.h.patch lib_patch.Upstream
package/dvdrw-tools/0002-Include-sysmacros.h-to-compile-with-newer-gcc.patch lib_patch.Upstream
package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch lib_patch.Upstream
package/earlyoom/S02earlyoom Shellcheck lib_sysv.Indent
package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch lib_patch.Upstream
Expand Down
7 changes: 7 additions & 0 deletions Config.in.legacy
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,13 @@ endif

comment "Legacy options removed in 2026.02"

config BR2_PACKAGE_DVDRW_TOOLS
bool "dvdrw-tools removed"
select BR2_LEGACY
help
dvdrw-tools was no longer maintained upstream, so it has
been dropped.

config BR2_PACKAGE_PHP_ZMQ
bool "php-zmq removed"
select BR2_LEGACY
Expand Down
1 change: 0 additions & 1 deletion DEVELOPERS
Original file line number Diff line number Diff line change
Expand Up @@ -3140,7 +3140,6 @@ F: package/libcli/

N: Steve Kenton <skenton@ou.edu>
F: package/dvdauthor/
F: package/dvdrw-tools/
F: package/memtest86/
F: package/mjpegtools/
F: package/udftools/
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,16 @@ prepare-sdk: world
@$(call MESSAGE,"Preparing the SDK")
$(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh
mkdir -p $(HOST_DIR)/share/buildroot
(\
export LC_ALL=C; \
grep -lr '$(HOST_DIR)' '$(HOST_DIR)' | while read -r FILE; do \
if file -b --mime-type "$$FILE" | grep -q '^text/' && \
[ "$$FILE" != '$(HOST_DIR)/share/buildroot/sdk-location' ] && \
[ "$$FILE" != '$(HOST_DIR)/share/buildroot/sdk-relocs' ]; then \
echo "$$FILE"; \
fi; \
done \
) | sed -e 's|^$(HOST_DIR)|.|g' > $(HOST_DIR)/share/buildroot/sdk-relocs
echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location

BR2_SDK_PREFIX ?= $(GNU_TARGET_NAME)_sdk-buildroot
Expand Down
7 changes: 7 additions & 0 deletions arch/Config.in.riscv
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ config BR2_RISCV_ISA_RVV
bool "Vector Instructions (V)"
select BR2_ARCH_NEEDS_GCC_AT_LEAST_12

config BR2_RISCV_ISA_EXTRA
string "Append extra RISC-V ISA extensions"
help
Extra ISA extensions to append to the ISA extensions string.
They are underscore-separated. For example,
"zba_zbb_zvl256b".

choice
prompt "Target Architecture Size"
default BR2_RISCV_64
Expand Down
5 changes: 5 additions & 0 deletions arch/arch.mk.riscv
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,9 @@ ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_12),y)
GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)_zicsr_zifencei
endif

ARCH_RISV_ISA_EXTRA = $(call qstrip, $(BR2_RISCV_ISA_EXTRA))
ifneq ($(ARCH_RISV_ISA_EXTRA),)
GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)_$(ARCH_RISV_ISA_EXTRA)
endif

endif
1 change: 0 additions & 1 deletion board/beagleboard/beaglev_fire/boot.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ bootm loados ${scriptaddr};
# Try to load a ramdisk if available inside fitImage
bootm ramdisk;
bootm prep;
fdt set /soc/ethernet@20110000 mac-address ${beaglevfire_mac_addr0};
run design_overlays;
bootm go;
2 changes: 1 addition & 1 deletion board/beagleboard/beaglev_fire/patches/linux/linux.hash
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Locally calculated
sha256 7bd234a93bc6351d6a830f9ef18e9e780d70c478d280a6513a30bc2f945fb050 linux-linux4microchip+fpga-2024.09.1.tar.gz
sha256 37191994758d521dc7223cb5010a67ef83bd061bf70194ea522abc9ef2b17391 linux-linux4microchip+fpga-2025.10.tar.gz
2 changes: 1 addition & 1 deletion board/beagleboard/beaglev_fire/patches/uboot/uboot.hash
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Locally calculated
sha256 a2fad7fe7f933fa4679b070e952e1e7a21dbd8b586d7a9a11bfcb99e75ae7ad6 uboot-linux4microchip+fpga-2024.09.tar.gz
sha256 591c80f7e16d6f43192deb7ab7587ae81b31ba7c7de1a668c14b9997b6c976c8 uboot-linux4microchip+fpga-2025.10.tar.gz
2 changes: 1 addition & 1 deletion board/microchip/mpfs_icicle/patches/linux/linux.hash
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Locally calculated
sha256 7789cc2844cb9633aa8c146e194c9ad3482bf06ace707d66d0ca6039ed16833d linux-linux4microchip+fpga-2025.07.tar.gz
sha256 37191994758d521dc7223cb5010a67ef83bd061bf70194ea522abc9ef2b17391 linux-linux4microchip+fpga-2025.10.tar.gz
2 changes: 1 addition & 1 deletion board/microchip/mpfs_icicle/patches/uboot/uboot.hash
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Locally calculated
sha256 8dab9abc2861d95e609cd62a44b4687d03dc13eae6487fd1ae1ded6398ddb0cd uboot-linux4microchip+fpga-2025.07.tar.gz
sha256 591c80f7e16d6f43192deb7ab7587ae81b31ba7c7de1a668c14b9997b6c976c8 uboot-linux4microchip+fpga-2025.10.tar.gz
6 changes: 3 additions & 3 deletions configs/beaglev_fire_defconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
BR2_riscv=y
BR2_RISCV_ISA_RVC=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglev_fire/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_SYSTEM_DHCP="eth0"
BR2_ROOTFS_OVERLAY="board/beagleboard/beaglev_fire/rootfs-overlay/"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboard/beaglev_fire/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2024.09.1)/linux-linux4microchip+fpga-2024.09.1.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2025.10)/linux-linux4microchip+fpga-2025.10.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="mpfs"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="microchip/mpfs-beaglev-fire"
Expand All @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2024.09)/uboot-linux4microchip+fpga-2024.09.tar.gz"
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2025.10)/uboot-linux4microchip+fpga-2025.10.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="beaglev_fire"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beagleboard/beaglev_fire/uboot-fragment.config"
BR2_TARGET_UBOOT_NEEDS_DTC=y
Expand Down
4 changes: 2 additions & 2 deletions configs/microchip_mpfs_icicle_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BR2_TARGET_GENERIC_HOSTNAME="mpfs_icicle"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/microchip/mpfs_icicle/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2025.07)/linux-linux4microchip+fpga-2025.07.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,linux,linux4microchip+fpga-2025.10)/linux-linux4microchip+fpga-2025.10.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="mpfs"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
Expand All @@ -17,7 +17,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2025.07)/uboot-linux4microchip+fpga-2025.07.tar.gz"
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4microchip,u-boot-mchp,linux4microchip+fpga-2025.10)/uboot-linux4microchip+fpga-2025.10.tar.gz"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="microchip_mpfs_icicle"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/microchip/mpfs_icicle/uboot-fragment-rootfs.config"
BR2_TARGET_UBOOT_NEEDS_DTC=y
Expand Down
1 change: 0 additions & 1 deletion package/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ menu "Audio and video applications"
source "package/bluez-alsa/Config.in"
source "package/dvblast/Config.in"
source "package/dvdauthor/Config.in"
source "package/dvdrw-tools/Config.in"
source "package/espeak/Config.in"
source "package/faad2/Config.in"
source "package/ffmpeg/Config.in"
Expand Down
26 changes: 26 additions & 0 deletions package/asterisk/0005-Makefile-don-t-clean-menuselect.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 844c1cddf38fd91e15a93eef96c67a5834fc9a78 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 10 Jan 2026 12:25:30 +0100
Subject: [PATCH] Makefile: don't clean menuselect

Upstream: not applicable
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
Makefile | 1 -
1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index b57f77477f..80035a09e7 100644
--- a/Makefile
+++ b/Makefile
@@ -436,7 +436,6 @@ _clean:
rm -f doxygen.log
rm -rf latex
rm -f rest-api-templates/*.pyc
- @$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean

dist-clean: distclean
--
2.47.3

4 changes: 2 additions & 2 deletions package/bind/bind.hash
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Verified from https://ftp.isc.org/isc/bind9/9.18.41/bind-9.18.41.tar.xz.asc
# Verified from https://ftp.isc.org/isc/bind9/9.18.44/bind-9.18.44.tar.xz.asc
# with key D99CCEAF879747014F038D63182E23579462EFAA
sha256 6ddc1d981511c4da0b203b0513af131e5d15e5f1c261145736fe1f35dd1fe79d bind-9.18.41.tar.xz
sha256 81f5035a25c576af1a93f0061cf70bde6d00a0c7bd1274abf73f5b5389a6f82d bind-9.18.44.tar.xz
sha256 9734825d67a3ac967b2c2f7c9a83c9e5db1c2474dbe9599157c3a4188749ebd4 COPYRIGHT
2 changes: 1 addition & 1 deletion package/bind/bind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

BIND_VERSION = 9.18.41
BIND_VERSION = 9.18.44
BIND_SOURCE= bind-$(BIND_VERSION).tar.xz
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
BIND_INSTALL_STAGING = YES
Expand Down
98 changes: 98 additions & 0 deletions package/brltty/0004-check-for-functions-inb-outb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
From 876bdd3153c791a51422a43403143ff10acb6e82 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Sat, 3 Jan 2026 15:35:48 +0100
Subject: [PATCH] check for functions inb & outb

Musl C library provides sys/io.h but inb and outb are missing on some
archs. This patch adds a configure check ported from sane-backends:
https://github.com/solanoalves/sane-backend/blob/059b97962ecb1b1ab068f524988d16c5b55bbd29/configure.ac#L314
to fix build errors detected by buildroot autobuilders:
https://autobuild.buildroot.net/results/76d/76d18437241d1281566b76ed1cec2ba99c3532da//build-end.log

./ports_glibc.c: In function 'readPort1':
./ports_glibc.c:54:10: error: implicit declaration of function 'inb' [-Wimplicit-function-declaration]
54 | return inb(port);
| ^~~
./ports_glibc.c: In function 'writePort1':
./ports_glibc.c:63:3: error: implicit declaration of function 'outb' [-Wimplicit-function-declaration]
63 | outb(value, port);
| ^~~~

Upstream: https://github.com/brltty/brltty/commit/85cadac951cda709ce53d49923114595c16a8f16

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Programs/ports_glibc.c | 4 ++--
config.h.in | 3 +++
configure.ac | 19 +++++++++++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Programs/ports_glibc.c b/Programs/ports_glibc.c
index 4233f9ea0..4a57f626d 100644
--- a/Programs/ports_glibc.c
+++ b/Programs/ports_glibc.c
@@ -50,7 +50,7 @@ disablePorts (unsigned short int base, unsigned short int count) {

unsigned char
readPort1 (unsigned short int port) {
-#ifdef HAVE_SYS_IO_H
+#ifdef BRLTTY_HAVE_SYS_IO_H_WITH_INB_OUTB
return inb(port);
#else /* HAVE_SYS_IO_H */
return 0;
@@ -59,7 +59,7 @@ readPort1 (unsigned short int port) {

void
writePort1 (unsigned short int port, unsigned char value) {
-#ifdef HAVE_SYS_IO_H
+#ifdef BRLTTY_HAVE_SYS_IO_H_WITH_INB_OUTB
outb(value, port);
#endif /* HAVE_SYS_IO_H */
}
diff --git a/config.h.in b/config.h.in
index 537d3af92..edea70cea 100644
--- a/config.h.in
+++ b/config.h.in
@@ -331,6 +331,9 @@ extern "C" {
/* Define this if the header file sys/io.h exists. */
#undef HAVE_SYS_IO_H

+/* Define to 1 if you have the <sys/io.h> providing inb,outb. */
+#undef BRLTTY_HAVE_SYS_IO_H_WITH_INB_OUTB
+
/* Define this if the header file sys/modem.h exists. */
#undef HAVE_SYS_MODEM_H

diff --git a/configure.ac b/configure.ac
index b78d482f6..0a2a70dd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -961,6 +961,25 @@ AC_CHECK_FUNCS([shmget shm_open])
AC_CHECK_FUNCS([getpeereid getpeerucred getzoneid])
AC_CHECK_FUNCS([mempcpy wmempcpy])

+dnl sys/io.h might provide ioperm but not inb,outb (like for
+dnl non i386/x32/x86_64 with musl libc)
+if test "${ac_cv_header_sys_io_h}" = "yes"; then
+ AC_MSG_CHECKING([for inb,outb (provided by sys/io.h)])
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <sys/io.h>]],
+ [[inb(0);outb(0,0);]])],
+ [AC_MSG_RESULT([yes])
+ brltty_cv_have_sys_io_h_with_inb_outb="yes"],
+ [AC_MSG_RESULT([no])
+ brltty_cv_have_sys_io_h_with_inb_outb="no"
+ AC_MSG_WARN([sys/io.h does not provide inb,outb (non i386/x32/x86_64 arch?)])])
+ if test "$brltty_cv_have_sys_io_h_with_inb_outb" = "yes"; then
+ AC_DEFINE(BRLTTY_HAVE_SYS_IO_H_WITH_INB_OUTB, 1, [Define to 1 if you have the <sys/io.h> providing inb,outb.])
+ fi
+else
+ brltty_cv_have_sys_io_h_with_inb_outb="no"
+fi
+
case "${host_os}"
in
cygwin*|mingw*)
--
2.47.3

1 change: 1 addition & 0 deletions package/brltty/brltty.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ BRLTTY_CONF_OPTS = \
# Autoreconf is needed because we're patching configure.ac in
# 0001-Fix-linking-error-on-mips64el and
# 0002-configure.ac-link-fv-driver-with-ltinfo-only-if-avai.
# 0004-check-for-functions-inb-outb.patch
# However, a plain autoreconf doesn't work, because this package
# is only autoconf-based.
define BRLTTY_AUTOCONF
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From e230f474b87134e8c6c85b630084c612057f253e Mon Sep 17 00:00:00 2001
From: Evgenii Kliuchnikov <eustas@google.com>
Date: Mon, 3 Nov 2025 07:20:19 -0800
Subject: [PATCH] disable BROTLI_MODEL macro for some targets

PiperOrigin-RevId: 827486322

Upstream: https://github.com/google/brotli/commit/e230f474b87134e8c6c85b630084c612057f253e

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
c/common/platform.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/c/common/platform.h b/c/common/platform.h
index b59f9b809..e1254d5ca 100644
--- a/c/common/platform.h
+++ b/c/common/platform.h
@@ -213,6 +213,10 @@ To apply compiler hint, enclose the branching condition into macros, like this:
#define BROTLI_TARGET_MIPS64
#endif

+#if defined(__ia64__) || defined(_M_IA64)
+#define BROTLI_TARGET_IA64
+#endif
+
#if defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \
defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) || \
defined(BROTLI_TARGET_LOONGARCH64) || defined(BROTLI_TARGET_MIPS64)
@@ -665,13 +669,14 @@ BROTLI_UNUSED_FUNCTION void BrotliSuppressUnusedFunctions(void) {
#undef BROTLI_TEST
#endif

-#if BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3)
+#if !defined(BROTLI_MODEL) && BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) && \
+ !defined(BROTLI_TARGET_IA64) && !defined(BROTLI_TARGET_LOONGARCH64)
#define BROTLI_MODEL(M) __attribute__((model(M)))
#else
#define BROTLI_MODEL(M) /* M */
#endif

-#if BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0)
+#if !defined(BROTLI_COLD) && BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0)
#define BROTLI_COLD __attribute__((cold))
#else
#define BROTLI_COLD /* cold */
23 changes: 0 additions & 23 deletions package/dvdrw-tools/0001-limits.h.patch

This file was deleted.

This file was deleted.

Loading