Compare commits
284
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bf78b4185 | ||
|
|
e272875fa7 | ||
|
|
24f4c18ccd | ||
|
|
e850c121ef | ||
|
|
143770fbdc | ||
|
|
29d7905db4 | ||
|
|
beb6064cd5 | ||
|
|
b9bb73c0eb | ||
|
|
9eb3839f23 | ||
|
|
dc3e25cbee | ||
|
|
e35028d708 | ||
|
|
431dfa0e0b | ||
|
|
98dcc7c43f | ||
|
|
c882087ec4 | ||
|
|
d09417453c | ||
|
|
845eb6c33d | ||
|
|
09e041bdf8 | ||
|
|
8a6bf80827 | ||
|
|
52b6234061 | ||
|
|
848adc792e | ||
|
|
d36d284bc2 | ||
|
|
aa290648ea | ||
|
|
f89a71d306 | ||
|
|
c4ac35c600 | ||
|
|
d0a755cfe2 | ||
|
|
f7b4ef3d38 | ||
|
|
69d6fd1be5 | ||
|
|
9527a010f2 | ||
|
|
1f642b56de | ||
|
|
df60f37551 | ||
|
|
9cfb7daaea | ||
|
|
6fad2374f0 | ||
|
|
09e77d09bb | ||
|
|
b8638757b2 | ||
|
|
c5ef366701 | ||
|
|
0744d70e27 | ||
|
|
311a9a8d89 | ||
|
|
a160539c5f | ||
|
|
6922f4b1fa | ||
|
|
ed5ec9571d | ||
|
|
86bf49e0f6 | ||
|
|
9f7467c84c | ||
|
|
6f1f23e55c | ||
|
|
68ed68d578 | ||
|
|
dc1dd39001 | ||
|
|
cc96e9214a | ||
|
|
279b5fd4c0 | ||
|
|
1416b2a9df | ||
|
|
b5ddb8b794 | ||
|
|
76ba19668b | ||
|
|
01e73806f1 | ||
|
|
e97f1cfe35 | ||
|
|
0475b9df92 | ||
|
|
82c003dbee | ||
|
|
16ae657333 | ||
|
|
802aa14e37 | ||
|
|
84bb54f628 | ||
|
|
10efa38ee5 | ||
|
|
1803d68a89 | ||
|
|
eebbf7b6bc | ||
|
|
1627619ad0 | ||
|
|
198829dc2f | ||
|
|
f6d2f86388 | ||
|
|
bb678171b4 | ||
|
|
828152362c | ||
|
|
ba8965f72d | ||
|
|
21868726d3 | ||
|
|
9ddd7fe42c | ||
|
|
463ee61b0f | ||
|
|
a82e419c3d | ||
|
|
127b327b99 | ||
|
|
30236c972d | ||
|
|
c2ce12fabc | ||
|
|
b20acc5bea | ||
|
|
3c7ed8125d | ||
|
|
7244ac0442 | ||
|
|
fb3e4e1d2d | ||
|
|
b91b6ff646 | ||
|
|
aecb01fa11 | ||
|
|
700f6e24a1 | ||
|
|
a43ad685df | ||
|
|
c4958f7b98 | ||
|
|
6f5c8638c1 | ||
|
|
50dcf7107f | ||
|
|
af8b9d3635 | ||
|
|
e4542119d6 | ||
|
|
2b8072fcbd | ||
|
|
39976c2bb8 | ||
|
|
9e371bf1e0 | ||
|
|
6a3f34be1a | ||
|
|
f8e626f026 | ||
|
|
e043bfbc7c | ||
|
|
5ac2cc70b2 | ||
|
|
5611da8c0c | ||
|
|
a57f9dbc1f | ||
|
|
7b360bde0d | ||
|
|
5eca2fdcad | ||
|
|
37992e0766 | ||
|
|
838449ec20 | ||
|
|
f510a02f93 | ||
|
|
e985152990 | ||
|
|
070d7302f2 | ||
|
|
3315c0d2c6 | ||
|
|
cf87779694 | ||
|
|
0d2f7675a2 | ||
|
|
7ca4625da7 | ||
|
|
d7c3aa1413 | ||
|
|
f409cf2452 | ||
|
|
bae0e9a453 | ||
|
|
e071e4dd0f | ||
|
|
7405e40023 | ||
|
|
350261e5b9 | ||
|
|
ed0fb7130f | ||
|
|
618b0c6822 | ||
|
|
b7a154df97 | ||
|
|
c5ac63e267 | ||
|
|
0315fd3d1f | ||
|
|
9308660696 | ||
|
|
dc36ea2088 | ||
|
|
aa066a537f | ||
|
|
5222d152d3 | ||
|
|
acc6b5d3d0 | ||
|
|
a00713b773 | ||
|
|
094ed4d09e | ||
|
|
1e8db1db49 | ||
|
|
30d817a6f9 | ||
|
|
3611cdc451 | ||
|
|
9461acbe5d | ||
|
|
4fa742eb86 | ||
|
|
027b6edc67 | ||
|
|
562e7fb5d2 | ||
|
|
e0fd58288c | ||
|
|
eaae745b40 | ||
|
|
a3010c58cf | ||
|
|
4beab2c92f | ||
|
|
04071794aa | ||
|
|
67ab9c832a | ||
|
|
7d33e2668b | ||
|
|
21c7f13b6b | ||
|
|
410fc58666 | ||
|
|
b495fc06c1 | ||
|
|
20b7af0d01 | ||
|
|
f244566d7f | ||
|
|
ca558fb399 | ||
|
|
ac7842ab6b | ||
|
|
19f5ea0f92 | ||
|
|
99520a4485 | ||
|
|
5bf3e72b57 | ||
|
|
7db91bf950 | ||
|
|
6a50b98029 | ||
|
|
160e25159f | ||
|
|
4618db63e0 | ||
|
|
94e3d1a741 | ||
|
|
8d4db92e66 | ||
|
|
24b6fcc197 | ||
|
|
cb492295c0 | ||
|
|
0584d66576 | ||
|
|
8fb28e79f2 | ||
|
|
0a258ddc56 | ||
|
|
b0bf5cb73a | ||
|
|
934795b78d | ||
|
|
c7684b92f6 | ||
|
|
9b4ab22096 | ||
|
|
9dedbd569c | ||
|
|
9011ca9d31 | ||
|
|
3d23d0a30a | ||
|
|
836753465c | ||
|
|
820df57a93 | ||
|
|
8140148332 | ||
|
|
1b9addfc6c | ||
|
|
c55f7eb582 | ||
|
|
f3a7d86a7c | ||
|
|
42f81fae5b | ||
|
|
3a2608c47a | ||
|
|
79b670f497 | ||
|
|
d943f82156 | ||
|
|
5d83145af3 | ||
|
|
ef6c4dddf3 | ||
|
|
a7eafdcb0e | ||
|
|
f4edd12ac1 | ||
|
|
c3846436d5 | ||
|
|
8ec8167d80 | ||
|
|
71fa1a61c5 | ||
|
|
980ee4e02f | ||
|
|
d362a9c2f6 | ||
|
|
262a051134 | ||
|
|
3b276e91c9 | ||
|
|
61261f2cad | ||
|
|
d6bba36979 | ||
|
|
6578fa8677 | ||
|
|
3bfab7709d | ||
|
|
c33f9a2871 | ||
|
|
8718e8be5e | ||
|
|
2853c71b31 | ||
|
|
60d6b2a58c | ||
|
|
70072dc0e2 | ||
|
|
9a315994a6 | ||
|
|
ca0f992fe9 | ||
|
|
7be6c54266 | ||
|
|
aed6e63fb8 | ||
|
|
7b000714da | ||
|
|
cdadcf814a | ||
|
|
6406861a56 | ||
|
|
cd84d000ce | ||
|
|
45e06e7e57 | ||
|
|
b9238d89a4 | ||
|
|
14e37d0278 | ||
|
|
656e2d012e | ||
|
|
792d1b9011 | ||
|
|
cff225bfb3 | ||
|
|
59d867fd97 | ||
|
|
ce4465f040 | ||
|
|
286173ff2c | ||
|
|
808cb90403 | ||
|
|
053eb1a984 | ||
|
|
65bc6c132c | ||
|
|
6aad76c4c4 | ||
|
|
6425628a87 | ||
|
|
6e99889c74 | ||
|
|
03b076fec8 | ||
|
|
a291caf139 | ||
|
|
a57d4e39bb | ||
|
|
45a8a415bc | ||
|
|
3709f8ee85 | ||
|
|
2942d6592d | ||
|
|
b7ec498e39 | ||
|
|
b807e9d053 | ||
|
|
0580d6a0b1 | ||
|
|
08d71521d3 | ||
|
|
b0aa7e5a23 | ||
|
|
974b5ce907 | ||
|
|
e73101a0c3 | ||
|
|
9dd501bcc9 | ||
|
|
a09176f8a9 | ||
|
|
e1edb6c9a8 | ||
|
|
d655b6e4f1 | ||
|
|
c4debc9909 | ||
|
|
638224b4e6 | ||
|
|
55a3abfcca | ||
|
|
3f3d6e43de | ||
|
|
bd57bf7129 | ||
|
|
52f83ccfbc | ||
|
|
d98d9ba28f | ||
|
|
8344efd764 | ||
|
|
6086429850 | ||
|
|
8745e0d5ca | ||
|
|
7bd818a067 | ||
|
|
655accbfea | ||
|
|
899703cb37 | ||
|
|
fa7fac0985 | ||
|
|
8b740cee42 | ||
|
|
3ce3e04d02 | ||
|
|
4d016a1d98 | ||
|
|
3b04688e7f | ||
|
|
80f8be48b6 | ||
|
|
9c12266739 | ||
|
|
f2b5cdf5a3 | ||
|
|
699a4a629f | ||
|
|
8c2947eaa5 | ||
|
|
442622055d | ||
|
|
dd2b360794 | ||
|
|
4d61edf6b1 | ||
|
|
15bb41a461 | ||
|
|
7c9d6018e6 | ||
|
|
a06d79862a | ||
|
|
6f311de2de | ||
|
|
eb1d45388f | ||
|
|
a1f691fb02 | ||
|
|
d4a998f0fa | ||
|
|
a65bbef5ba | ||
|
|
e11cac64a2 | ||
|
|
c522cd914a | ||
|
|
181242dfe8 | ||
|
|
29fae1d459 | ||
|
|
78513ff979 | ||
|
|
77e4a8858c | ||
|
|
fc4ec2369b | ||
|
|
eed28fd448 | ||
|
|
9ae99d19b9 | ||
|
|
bd1831d161 | ||
|
|
0981b4117d | ||
|
|
6e88765aa1 | ||
|
|
b41c6b21d5 | ||
|
|
f9f3e6ccc6 |
+3
-26
@@ -176,7 +176,6 @@ configs/uevm5432_defconfig lib_defconfig.ForceCheckHash
|
||||
configs/visionfive_defconfig lib_defconfig.ForceCheckHash
|
||||
configs/wandboard_defconfig lib_defconfig.ForceCheckHash
|
||||
configs/warp7_defconfig lib_defconfig.ForceCheckHash
|
||||
linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch lib_patch.Upstream
|
||||
package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream
|
||||
package/4th/0001-avoid-regen-during-install.patch lib_patch.Upstream
|
||||
package/acl/0001-Build-with-old-GCC-versions.patch lib_patch.Upstream
|
||||
@@ -201,7 +200,6 @@ package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch
|
||||
package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch lib_patch.Upstream
|
||||
package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch lib_patch.Upstream
|
||||
package/apache/0001-cross-compile.patch lib_patch.Upstream
|
||||
package/apache/S50apache Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/apr-util/0001-remove-checkapr.patch lib_patch.Upstream
|
||||
package/apr/0001-sys-param-h.patch lib_patch.Upstream
|
||||
package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch lib_patch.Upstream
|
||||
@@ -218,7 +216,6 @@ package/attr/0001-build-with-older-GCCs.patch lib_patch.Upstream
|
||||
package/aumix/0001-fix-incorrect-makefile-am.patch lib_patch.Upstream
|
||||
package/autoconf/0001-dont-add-dirty-to-version.patch lib_patch.Upstream
|
||||
package/automake/0001-noman.patch lib_patch.Upstream
|
||||
package/avahi/0001-Fix-NULL-pointer-crashes-from-175.patch lib_patch.Upstream
|
||||
package/avahi/S05avahi-setup.sh lib_sysv.Indent lib_sysv.Variables
|
||||
package/avahi/S50avahi-daemon lib_sysv.Indent lib_sysv.Variables
|
||||
package/babeld/S50babeld Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
@@ -305,7 +302,6 @@ package/davfs2/0001-src-Makefile.am-do-not-hardcode-fstack-protector-str.patch l
|
||||
package/dbus-cpp/0001-gcc4.7.patch lib_patch.Upstream
|
||||
package/dbus-cpp/0002-cross-compile-tools.patch lib_patch.Upstream
|
||||
package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch lib_patch.Upstream
|
||||
package/dbus/S30dbus Shellcheck lib_sysv.Indent lib_sysv.TrailingSpace lib_sysv.Variables
|
||||
package/dc3dd/0001-no_man.patch lib_patch.Upstream
|
||||
package/dc3dd/0002-fix-autoreconf.patch lib_patch.Upstream
|
||||
package/dc3dd/0003-fix-for-glibc-2.28.patch lib_patch.Upstream
|
||||
@@ -340,9 +336,7 @@ package/ebtables/0001-replace-ebtables-save-perl-script-with-bash.patch lib_patc
|
||||
package/ecryptfs-utils/0001-musl.patch lib_patch.Upstream
|
||||
package/ecryptfs-utils/0002-openssl110.patch lib_patch.Upstream
|
||||
package/ecryptfs-utils/0003-fix-parallel-build-issue.patch lib_patch.Upstream
|
||||
package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch lib_patch.Upstream
|
||||
package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch lib_patch.Upstream
|
||||
package/efl/0003-ecore_fb-fix-build-with-tslib.patch lib_patch.Upstream
|
||||
package/efl/0001-ecore_fb-fix-build-with-tslib.patch lib_patch.Upstream
|
||||
package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-compone.patch lib_patch.Upstream
|
||||
package/elftosb/0001-fixes-includes.patch lib_patch.Upstream
|
||||
package/elftosb/0002-force-cxx-compiler.patch lib_patch.Upstream
|
||||
@@ -504,7 +498,6 @@ package/irqbalance/S13irqbalance Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch lib_patch.Upstream
|
||||
package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch lib_patch.Upstream
|
||||
package/iucode-tool/S00iucode-tool lib_sysv.Variables
|
||||
package/iwd/S40iwd Shellcheck
|
||||
package/janus-gateway/0001-disable-ssp.patch lib_patch.Upstream
|
||||
package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream
|
||||
package/keyutils/0001-fix-install-rule.patch lib_patch.Upstream
|
||||
@@ -532,7 +525,6 @@ package/libb64/0002-Initialize-C++-objects.patch lib_patch.Upstream
|
||||
package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch lib_patch.Upstream
|
||||
package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch lib_patch.Upstream
|
||||
package/libcgicc/0001-disable-documentation-option.patch lib_patch.Sob lib_patch.Upstream
|
||||
package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch lib_patch.Upstream
|
||||
package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch lib_patch.Upstream
|
||||
package/libcuefile/0001-fix-static-link.patch lib_patch.Upstream
|
||||
package/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch lib_patch.Upstream
|
||||
@@ -771,8 +763,8 @@ package/olsr/0006-build-patch-for-gpsd-3-25.patch lib_patch.Upstream
|
||||
package/olsr/S50olsr Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch lib_patch.Upstream
|
||||
package/open2300/0001-fix-makefile.patch lib_patch.Upstream
|
||||
package/openjdk/17.0.9+9/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
|
||||
package/openjdk/21.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
|
||||
package/openjdk/17.0.12+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
|
||||
package/openjdk/21.0.4+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch lib_patch.Upstream
|
||||
package/openldap/0001-fix-bignum.patch lib_patch.Upstream
|
||||
package/openldap/0002-disable-docs.patch lib_patch.Upstream
|
||||
package/openntpd/S49ntp Shellcheck lib_sysv.Variables
|
||||
@@ -808,11 +800,7 @@ package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch li
|
||||
package/owfs/S55owserver Shellcheck lib_sysv.Variables
|
||||
package/owfs/S60owfs Shellcheck lib_sysv.Variables
|
||||
package/owl-linux/0001-fix-for-linux-3.3.x.patch lib_patch.Upstream
|
||||
package/patch/0001-Fix-segfault-with-mangled-rename-patch.patch lib_patch.Upstream
|
||||
package/patch/0002-Allow-input-files-to-be-missing-for-ed-style-patches.patch lib_patch.Upstream
|
||||
package/patch/0003-Fix-arbitrary-command-execution-in-ed-style-patches-.patch lib_patch.Upstream
|
||||
package/patch/0004-Invoke-ed-directly-instead-of-using-the-shell.patch lib_patch.Upstream
|
||||
package/patch/0005-Don-t-follow-symlinks-unless--follow-symlinks-is-given.patch lib_patch.Upstream
|
||||
package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch lib_patch.Upstream
|
||||
package/paxtest/0001-genpaxtest-move-log-location.patch lib_patch.Upstream
|
||||
package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch lib_patch.Upstream
|
||||
@@ -961,7 +949,6 @@ package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch
|
||||
package/shairport-sync/S99shairport-sync Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch lib_patch.Upstream
|
||||
package/shellinabox/0001-Makefile-disable-always-building-statically.patch lib_patch.Upstream
|
||||
package/shellinabox/0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch lib_patch.Upstream
|
||||
package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck
|
||||
package/slang/0001-slsh-libs.patch lib_patch.Upstream
|
||||
package/smcroute/S41smcroute NotExecutable lib_sysv.Indent lib_sysv.Variables
|
||||
@@ -1028,13 +1015,8 @@ package/ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream
|
||||
package/tinyalsa/0001-include-time.h-before-asound.h.patch lib_patch.Upstream
|
||||
package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch lib_patch.Upstream
|
||||
package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch lib_patch.Upstream
|
||||
package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch lib_patch.Upstream
|
||||
package/transmission/S92transmission Shellcheck lib_sysv.ConsecutiveEmptyLines lib_sysv.Indent lib_sysv.Variables
|
||||
package/triggerhappy/S10triggerhappy Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/trinity/0001-Fix-build-with-GCC-10.patch lib_patch.Upstream
|
||||
package/trinity/0002-net-proto-ip-raw.c-fix-build-with-kernel-5.13.patch lib_patch.Upstream
|
||||
package/trinity/0003-Use-fcntl-h-for-dev_t-mode_t.patch lib_patch.Upstream
|
||||
package/trinity/0004-drop-decnet.patch lib_patch.Upstream
|
||||
package/trousers/0001-Check-if-the-compiler-understands-pie-and-relro-options.patch lib_patch.Upstream
|
||||
package/trousers/0002-Check-that-getpwent_r-is-available-before-using-it.patch lib_patch.Upstream
|
||||
package/trousers/0003-Fix-build-with-LibreSSL-2-7.patch lib_patch.Upstream
|
||||
@@ -1139,11 +1121,6 @@ package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch lib_patch.
|
||||
package/xen/0002-Fix-build-with-64-bits-time_t.patch lib_patch.Upstream
|
||||
package/xen/0003-libs-light-fix-tv_sec-printf-format.patch lib_patch.Upstream
|
||||
package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch lib_patch.Upstream
|
||||
package/xinetd/0001-ar.patch lib_patch.Upstream
|
||||
package/xinetd/0002-destdir.patch lib_patch.Upstream
|
||||
package/xinetd/0003-rpc-fix.patch lib_patch.Upstream
|
||||
package/xinetd/0004-configure-rlim_t.patch lib_patch.Upstream
|
||||
package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch lib_patch.Upstream
|
||||
package/xl2tp/xl2tpd lib_shellscript.TrailingSpace
|
||||
package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch lib_patch.Upstream
|
||||
package/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch lib_patch.Upstream
|
||||
|
||||
@@ -13,3 +13,4 @@
|
||||
*.rej
|
||||
*~
|
||||
*.pyc
|
||||
/br.log
|
||||
|
||||
@@ -1,3 +1,98 @@
|
||||
2025.11.1, released January 20, 2026
|
||||
|
||||
Important / security related fixes:
|
||||
|
||||
apache: CVE-2025-55753, CVE-2025-58098, CVE-2025-59775, CVE-2025-65082,
|
||||
CVE-2025-66200
|
||||
cryptsetup
|
||||
dropbear: CVE-2025-14282, CVE-2019-6111
|
||||
exim: CVE-2025-67896
|
||||
gnupg2
|
||||
imagemagick: CVE-2025-66628
|
||||
libarchive
|
||||
libcoap: CVE-2025-59391, CVE-2025-65493, CVE-2025-65494
|
||||
CVE-2025-65495, CVE-2025-65496, CVE-2025-65497, CVE-2025-65498,
|
||||
CVE-2025-65499, CVE-2025-65500, CVE-2025-65501
|
||||
libcurl: CVE-2025-13034, CVE-2025-14017, CVE-2025-14524,
|
||||
CVE-2025-14819, CVE-2025-15079, CVE-2025-15224
|
||||
libfcgi: CVE-2025-23016.
|
||||
libfreeimage: CVE-2019-12211, CVE-2019-12213, CVE-2020-24292,
|
||||
CVE-2020-24293, CVE-2020-24295, CVE-2021-33367, CVE-2021-40263,
|
||||
CVE-2021-40266, CVE-2023-47995, CVE-2023-47997
|
||||
libpng: CVE-2025-66293
|
||||
liburiparser: CVE-2025-67899
|
||||
libxslt: CVE-2025-7424, CVE-2025-9714, CVE-2025-11731
|
||||
linenoise: CVE-2025-9810
|
||||
perl: CVE-2025-40909
|
||||
php: CVE-2025-14177, CVE-2025-14178, CVE-2025-14180
|
||||
python-django: CVE-2025-13372, CVE-2025-64460
|
||||
python-filelock: CVE-2025-68146
|
||||
python-fonttools: CVE-2025-66034
|
||||
python-urllib3: CVE-2025-66471, CVE-2025-66418
|
||||
unbound: CVE-2025-11411
|
||||
vlc
|
||||
xserver_xorg-server: CVE-2025-62229, CVE-2025-62230,
|
||||
CVE-2025-62231
|
||||
xwayland: CVE-2025-62229, CVE-2025-62230, CVE-2025-62231
|
||||
|
||||
Infrastructure updates/fixes:
|
||||
|
||||
- pkg-stats use HEAD request & unique HTTP user-agent
|
||||
- cve-check: don't fail with unknown CVE
|
||||
- generate-cyclonedx: support 'resolved_with_pedigree'
|
||||
- testing: add host bin dir to PATH
|
||||
- testing: add tests for FIT hash support in package/uboot-tools
|
||||
- testing: add libiio python bindings runtime test
|
||||
- testing: ddrescue: use dmsetup from lvm2
|
||||
- testing: ddrescue: use f-string for test config
|
||||
- testing: add tio runtime test
|
||||
- add 'CVE:' trailer in various patches
|
||||
- add md5 hash and update tarball url to various python packages
|
||||
- testing: ltp-testsuite: replace runltp by kirk
|
||||
- testing: new kvmtool runtime test
|
||||
- gitignore: ignore utils/brmake log output named `br.log`
|
||||
- testing: add opus-tools runtime test
|
||||
- testing: add flac runtime test
|
||||
- testing: test_xen: add block
|
||||
|
||||
Updated / fixed packages: apache, arm-trusted-firmware, atf, audit,
|
||||
bitcoin, boost, busybox, cage, cmake, collectl, cppcms, cpulimit,
|
||||
cryptsetup, dbus, dmraid, dropbear, efl, embiggen-disk, evilwm, exim,
|
||||
ficl, fio, fluent-bit, fontconfig, glibc, gnupg2, grpc, gvfs, icu,
|
||||
imagemagick, irqbalance, iwd, kvmtool, ledmon, libarchive, libcoap,
|
||||
libconfig, libcpprestsdk, libcurl, libdill, libdnet, libfcgi, libfreeimage,
|
||||
libgit2, libgtk3, libgtk4, libiio, libmbus, libpng, libselinux, libtirpc,
|
||||
libupnp, liburiparser, libvncserver, libxslt, linenoise, linux-tools,
|
||||
lttng-modules, lugaru, matchbox-fakekey, matchbox-keyboard, matchbox-lib,
|
||||
matchbox-panel, mender-update-modules, mesa3d, mosh, nfs-utils, open-lldp,
|
||||
opencv4, opencv4-contrib, openjdk, perl, perl-dbd-mysql, perl-mozilla-ca,
|
||||
php, pigz, pixman, python-brotli, python-can, python-certifi, python-django,
|
||||
python-filelock, python-fonttools, python-pyqt5, python-urllib3, python3,
|
||||
qt5enginio, qt5webkit, qt6base, racehound, rdesktop, rpcbind, rpi-firmware,
|
||||
rtl8192eu, rtl8723bu, rtl8723ds, rtl8821au, rtl8821cu, rtl8822cs, samba4,
|
||||
skopeo, softether, softhsm2, spice, ssdp-responder, sway, tio, trinity,
|
||||
tzdata, uboot, uboot-tools, uclibc, unbound, utfcpp, v4l2loopback, vim, vlc,
|
||||
xdriver_xf86-video-intel, xen, xinetd, xlib_libxshmfence,
|
||||
xserver_xorg-server, xvkbd, xwayland, zic, zxing-cpp
|
||||
|
||||
Removed packages: opencv3 'protobuf', opencv3 'ffmpeg',
|
||||
libdnet 'python', rpi-firmware 'vcdbg'
|
||||
|
||||
2025.11, released December 11th, 2025
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
linux: Default to 6.18 for runtime kernel and kernel headers,
|
||||
drop the now EOL 5.4.x series.
|
||||
|
||||
Updated/fixed packages: apache, audit, cryptodev-linux,
|
||||
dmraid, ficl, glibc, go, intel-mediadriver, intel-vpl-gpu-rt,
|
||||
kbd, libcap, libdbi, libgit2, libpng, libtirpc, libxslt,
|
||||
lugaru, mosh, pigz, podman, python-fonttools, python-urllib3,
|
||||
python3, racehound, rdesktop, rtl8188eu, softhsm, sqlite,
|
||||
strace, unbound, unzip, xapp_xkbutils,
|
||||
xdriver_xf86-video-intel, xl2tp, xserver_xorg-server, xwayland
|
||||
|
||||
2025.11-rc2, released November 30th, 2025
|
||||
|
||||
Fixes all over the tree.
|
||||
@@ -53,6 +148,37 @@
|
||||
linphone, logsurfer, mediastreamer, metacity, mongrel2, ola,
|
||||
ortp, procrank_linux, ramspeed, sylpheed
|
||||
|
||||
2025.08.3, released December 11, 2025
|
||||
|
||||
Important / security related fixes:
|
||||
|
||||
- asterisk: CVE-2025-1131, CVE-2025-57767, CVE-2025-49832,
|
||||
CVE-2025-47780, CVE-2025-47779
|
||||
- gnutls: CVE-2025-9820
|
||||
- libpng: CVE-2025-64505, CVE-2025-64506, CVE-2025-64720, CVE-2025-65018
|
||||
- luksmeta: CVE-2025-11568
|
||||
- mariadb: CVE-2025-30693, CVE-2025-30722, CVE-2023-52969,
|
||||
CVE-2023-52970, CVE-2023-52971
|
||||
- openvpn: CVE-2025-13086
|
||||
- postgresql: CVE-2025-12817, CVE-2025-12818
|
||||
- python-django: CVE-2025-64458, CVE-2025-64459
|
||||
- python-startlette: GHSA-7f5h-v6xp-fcq8
|
||||
|
||||
Infrastructure updates/fixes:
|
||||
|
||||
- New script support/scripts/cve-check to enricht CycloneDX SBoM with
|
||||
CVE information from NVD database.
|
||||
|
||||
Updated / fixed packages: 18xx-ti-utils, asterisk, enscript, gnutls,
|
||||
libpng, libroxml, libteam, linux-headers, luksmeta, mariadb, nbd, neard,
|
||||
nss-pam-ldapd, open-plc-utils, openjdk, openjdk-bin, openvpn, oprofile,
|
||||
pdmenu, perl-net-ssleay, postgresql, python-django, python-starlette,
|
||||
redis, sane-bacends, sbc, sdbusplus, sdl, swipl, tailscale, thermald,
|
||||
tmux, tor
|
||||
|
||||
Removed packages: bctoolbox, belle-sip, belr, linphone, mediastreamer,
|
||||
mongrel2, ortp
|
||||
|
||||
2025.08.2, released November 20, 2025
|
||||
|
||||
Important / security related fixes:
|
||||
@@ -633,6 +759,36 @@
|
||||
- netsnmp: unexpected header length in /proc/net/snmp...
|
||||
https://gitlab.com/buildroot.org/buildroot/-/issues/110
|
||||
|
||||
2025.02.9, released December 11, 2025
|
||||
|
||||
Important / security related fixes:
|
||||
|
||||
- asterisk: CVE-2025-1131, CVE-2025-57767, CVE-2025-49832,
|
||||
CVE-2025-47780, CVE-2025-47779
|
||||
- gnutls: CVE-2025-9820
|
||||
- libpng: CVE-2025-64505, CVE-2025-64506, CVE-2025-64720, CVE-2025-65018
|
||||
- luksmeta: CVE-2025-11568
|
||||
- mariadb: CVE-2025-30693, CVE-2025-30722, CVE-2023-52969,
|
||||
CVE-2023-52970, CVE-2023-52971
|
||||
- openvpn: CVE-2025-13086
|
||||
- postgresql: CVE-2025-12817, CVE-2025-12818
|
||||
- python-django: CVE-2025-64458, CVE-2025-64459
|
||||
- python-startlette: GHSA-7f5h-v6xp-fcq8
|
||||
|
||||
Infrastructure updates/fixes:
|
||||
|
||||
- New script support/scripts/cve-check to enricht CycloneDX SBoM with
|
||||
CVE information from NVD database.
|
||||
|
||||
Updated / fixed packages: 18xx-ti-utils, asterisk, gnutls, libpng,
|
||||
libroxml, libteam, linux-headers, luksmeta, mariadb, nbd, neard,
|
||||
openjdk, openjdk-bin, openvpn, oprofile, perl-net-ssleay, postgresql,
|
||||
python-django, python-starlette, redis, sdbusplus, sdl, swipl,
|
||||
tailscale, thermald, tmux, tor
|
||||
|
||||
Removed packages: bctoolbox, belle-sip, belr, linphone, mediastreamer,
|
||||
mongrel2, ortp
|
||||
|
||||
2025.02.8, released November 20, 2025
|
||||
|
||||
Important / security related fixes:
|
||||
|
||||
@@ -144,8 +144,44 @@ endif
|
||||
|
||||
###############################################################################
|
||||
|
||||
comment "Legacy options removed in 2025.11.1"
|
||||
|
||||
config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
|
||||
bool "rpi-firmware vcdbg option removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
rpi-firmware upstream has dropped the vcdbg tool
|
||||
|
||||
config BR2_PACKAGE_LIBDNET_PYTHON
|
||||
bool "libdnet python module removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
The libdnet Python module is no longer compatible with
|
||||
Python >= 3.13, so it had to be removed.
|
||||
|
||||
config BR2_PACKAGE_OPENCV3_WITH_FFMPEG
|
||||
bool "opencv3 ffmpeg support removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
Support for OpenCV 3 ffmpeg support has been removed as it
|
||||
was no longer compatible with recent versions of ffmpeg.
|
||||
|
||||
config BR2_PACKAGE_OPENCV3_WITH_PROTOBUF
|
||||
bool "opencv3 protobuf support removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
Support for OpenCV 3 protobuf support has been removed as it
|
||||
was no longer compatible with recent versions of protobuf.
|
||||
|
||||
comment "Legacy options removed in 2025.11"
|
||||
|
||||
config BR2_KERNEL_HEADERS_5_4
|
||||
bool "kernel headers version 5.4.x are no longer supported"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
Version 5.4.x of the Linux kernel headers are no longer
|
||||
maintained upstream and are now removed.
|
||||
|
||||
config BR2_PACKAGE_LIBARGTABLE2
|
||||
bool "libargtable2 has been removed"
|
||||
select BR2_LEGACY
|
||||
|
||||
+14
-16
@@ -420,6 +420,7 @@ F: package/libglew/
|
||||
F: package/libglu/
|
||||
F: package/libhdhomerun/
|
||||
F: package/libheif/
|
||||
F: package/libid3tag/
|
||||
F: package/libilbc/
|
||||
F: package/libldns/
|
||||
F: package/libmicrohttpd/
|
||||
@@ -1153,33 +1154,25 @@ F: configs/sipeed_licheepi_nano_defconfig
|
||||
F: configs/visionfive2_defconfig
|
||||
|
||||
N: Francois Perrad <francois.perrad@gadz.org>
|
||||
F: board/freescale/ls1028ardb/
|
||||
F: board/olimex/a20_olinuxino
|
||||
F: board/olimex/imx233_olinuxino/
|
||||
F: board/olimex/stmp1_olinuxino/
|
||||
F: configs/ls1028ardb_defconfig
|
||||
F: configs/olimex_a20_olinuxino_*
|
||||
F: configs/olimex_imx233_olinuxino_defconfig
|
||||
F: configs/olimex_stmp157_olinuxino_lime_defconfig
|
||||
F: package/4th/
|
||||
F: package/cgilua/
|
||||
F: package/chipmunk/
|
||||
F: package/cog/
|
||||
F: package/collectl/
|
||||
F: package/copas/
|
||||
F: package/coxpcall/
|
||||
F: package/dado/
|
||||
F: package/ficl/
|
||||
F: package/graphene/
|
||||
F: package/janet/
|
||||
F: package/libgtk4/
|
||||
F: package/libtomcrypt/
|
||||
F: package/libtommath/
|
||||
F: package/libwpe/
|
||||
F: package/linenoise/
|
||||
F: package/ljlinenoise/
|
||||
F: package/lua-inotify/
|
||||
F: package/lmdb/
|
||||
F: package/lpeg/
|
||||
F: package/lpty/
|
||||
F: package/lrandom/
|
||||
@@ -1188,16 +1181,11 @@ F: package/lua*
|
||||
F: package/lynis/
|
||||
F: package/lzlib/
|
||||
F: package/moarvm/
|
||||
F: package/mstpd/
|
||||
F: package/netsurf/
|
||||
F: package/perl*
|
||||
F: package/pkg-perl.mk
|
||||
F: package/pkg-luarocks.mk
|
||||
F: package/quickjs/
|
||||
F: package/rings/
|
||||
F: package/tekui/
|
||||
F: package/wpebackend-fdo/
|
||||
F: package/wpewebkit/
|
||||
F: package/wsapi/
|
||||
F: package/wsapi-fcgi/
|
||||
F: package/wsapi-xavante/
|
||||
@@ -1291,6 +1279,7 @@ F: configs/rockpro64_defconfig
|
||||
F: package/at/
|
||||
F: package/binutils/
|
||||
F: package/cryptsetup/
|
||||
F: package/dash/
|
||||
F: package/erlang-jiffy/
|
||||
F: package/esp-hosted/
|
||||
F: package/gcc/
|
||||
@@ -1301,6 +1290,7 @@ F: package/liblo/
|
||||
F: package/libnspr/
|
||||
F: package/libnss/
|
||||
F: package/libnvme/
|
||||
F: package/libtirpc/
|
||||
F: package/libtraceevent/
|
||||
F: package/libtracefs
|
||||
F: package/linux-tools/linux-tool-rtla.mk.in
|
||||
@@ -1309,10 +1299,12 @@ F: package/minicom/
|
||||
F: package/mongoose/
|
||||
F: package/mmc-utils/
|
||||
F: package/nfs-utils/
|
||||
F: package/putty/
|
||||
F: package/python-libconf/
|
||||
F: package/python-uvloop/
|
||||
F: package/qt5/
|
||||
F: package/rockchip-mali/
|
||||
F: package/rpcbind/
|
||||
F: package/rtl8188eu/
|
||||
F: package/rtl8189es/
|
||||
F: package/rtl8192eu/
|
||||
@@ -1326,9 +1318,13 @@ F: package/sunxi-mali-utgard-driver/
|
||||
F: package/sunxi-tools/
|
||||
F: package/swugenerator/
|
||||
F: package/swupdate/
|
||||
F: package/tmux/
|
||||
F: package/trace-cmd/
|
||||
F: package/udisks/
|
||||
F: package/util-linux/
|
||||
F: package/vim/
|
||||
F: package/wilc-driver/
|
||||
F: package/zlib-ng/
|
||||
F: toolchain/
|
||||
|
||||
N: Graeme Smecher <gsmecher@threespeedlogic.com>
|
||||
@@ -1888,6 +1884,7 @@ F: support/testing/tests/package/test_exfatprogs.py
|
||||
F: support/testing/tests/package/test_exfatprogs/
|
||||
F: support/testing/tests/package/test_file.py
|
||||
F: support/testing/tests/package/test_file/
|
||||
F: support/testing/tests/package/test_flac.py
|
||||
F: support/testing/tests/package/test_fluidsynth.py
|
||||
F: support/testing/tests/package/test_fluidsynth/
|
||||
F: support/testing/tests/package/test_fping.py
|
||||
@@ -1925,6 +1922,8 @@ F: support/testing/tests/package/test_kmod.py
|
||||
F: support/testing/tests/package/test_kmod/
|
||||
F: support/testing/tests/package/test_kmscube.py
|
||||
F: support/testing/tests/package/test_kmscube/
|
||||
F: support/testing/tests/package/test_kvmtool.py
|
||||
F: support/testing/tests/package/test_kvmtool/
|
||||
F: support/testing/tests/package/test_lame.py
|
||||
F: support/testing/tests/package/test_less.py
|
||||
F: support/testing/tests/package/test_libcamera.py
|
||||
@@ -1972,6 +1971,7 @@ F: support/testing/tests/package/test_oath_toolkit.py
|
||||
F: support/testing/tests/package/test_octave.py
|
||||
F: support/testing/tests/package/test_openblas.py
|
||||
F: support/testing/tests/package/test_openocd.py
|
||||
F: support/testing/tests/package/test_opus_tools.py
|
||||
F: support/testing/tests/package/test_parted.py
|
||||
F: support/testing/tests/package/test_patch.py
|
||||
F: support/testing/tests/package/test_patch/
|
||||
@@ -2013,6 +2013,7 @@ F: support/testing/tests/package/test_tcl.py
|
||||
F: support/testing/tests/package/test_tcl/
|
||||
F: support/testing/tests/package/test_tcpdump.py
|
||||
F: support/testing/tests/package/test_tesseract_ocr.py
|
||||
F: support/testing/tests/package/test_tio.py
|
||||
F: support/testing/tests/package/test_trace_cmd.py
|
||||
F: support/testing/tests/package/test_trace_cmd/
|
||||
F: support/testing/tests/package/test_tree.py
|
||||
@@ -2769,9 +2770,6 @@ F: package/libdvbpsi/
|
||||
F: package/mraa/
|
||||
F: package/synergy/
|
||||
|
||||
N: Prabhu Sannachi <prabhu.sannachi@collins.com>
|
||||
F: package/redis-plus-plus/
|
||||
|
||||
N: Qais Yousef <qais.yousef@arm.com>
|
||||
F: package/bpftrace/
|
||||
|
||||
|
||||
@@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2025.11-rc2
|
||||
export BR2_VERSION := 2025.11.1
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1764530000
|
||||
BR2_VERSION_EPOCH = 1768938600
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -3,7 +3,7 @@ Linux systems through cross-compilation.
|
||||
|
||||
The documentation can be found in docs/manual. You can generate a text
|
||||
document with 'make manual-text' and read output/docs/manual/manual.text.
|
||||
Online documentation can be found at http://buildroot.org/docs.html
|
||||
Online documentation can be found at https://buildroot.org/docs.html
|
||||
|
||||
To build and use the buildroot stuff, do the following:
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ image sdcard.img {
|
||||
partition u-boot {
|
||||
partition-type = 0xC
|
||||
bootable = "true"
|
||||
image = "boot.vfat"
|
||||
image = "boot.vfat"
|
||||
}
|
||||
|
||||
partition rootfs {
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 afc44e2899a3c32a1b968272a5816e5c90bea346341153807553396621e65dde linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz
|
||||
sha256 7c31df8061aae748a6e72417bfe743a54198fb5bdc96e229ecc605dc621d32ef linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz
|
||||
|
||||
@@ -162,6 +162,8 @@ endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y)
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31
|
||||
# Avoid BL31 environment variable from polluting the build
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL31=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT),y)
|
||||
|
||||
@@ -5,8 +5,8 @@ Subject: [PATCH] fs/hfs: Fix stack OOB write with grub_strcpy()
|
||||
|
||||
Replaced with grub_strlcpy().
|
||||
|
||||
Fixes: CVE-2024-45782
|
||||
Fixes: CVE-2024-56737
|
||||
CVE: CVE-2024-45782
|
||||
CVE: CVE-2024-56737
|
||||
Fixes: https://savannah.gnu.org/bugs/?66599
|
||||
|
||||
Reported-by: B Horn <b@horn.uk>
|
||||
|
||||
@@ -9,7 +9,7 @@ number parsed by read_number(). Later direct arithmetic calculation like
|
||||
grub_size_t leading to heap OOB write. This patch fixes the issue by
|
||||
using grub_add() and checking for an overflow.
|
||||
|
||||
Fixes: CVE-2024-45780
|
||||
CVE: CVE-2024-45780
|
||||
|
||||
Reported-by: Nils Langius <nils@langius.de>
|
||||
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
||||
|
||||
@@ -9,7 +9,7 @@ to 0 leading to heap OOB write. This patch fixes
|
||||
the issue by using grub_add() and checking for
|
||||
an overflow.
|
||||
|
||||
Fixes: CVE-2024-45777
|
||||
CVE: CVE-2024-45777
|
||||
|
||||
Reported-by: Nils Langius <nils@langius.de>
|
||||
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
||||
|
||||
@@ -6,8 +6,8 @@ Subject: [PATCH] fs/bfs: Disable under lockdown
|
||||
The BFS is not fuzz-clean. Don't allow it to be loaded under lockdown.
|
||||
This will also disable the AFS.
|
||||
|
||||
Fixes: CVE-2024-45778
|
||||
Fixes: CVE-2024-45779
|
||||
CVE: CVE-2024-45778
|
||||
CVE: CVE-2024-45779
|
||||
|
||||
Reported-by: Nils Langius <nils@langius.de>
|
||||
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
||||
|
||||
@@ -9,11 +9,11 @@ hfsplus, iso9660, squash4, tar, xfs and zfs.
|
||||
The JFS, ReiserFS, romfs, UDF and UFS security vulnerabilities were
|
||||
reported by Jonathan Bar Or <jonathanbaror@gmail.com>.
|
||||
|
||||
Fixes: CVE-2025-0677
|
||||
Fixes: CVE-2025-0684
|
||||
Fixes: CVE-2025-0685
|
||||
Fixes: CVE-2025-0686
|
||||
Fixes: CVE-2025-0689
|
||||
CVE: CVE-2025-0677
|
||||
CVE: CVE-2025-0684
|
||||
CVE: CVE-2025-0685
|
||||
CVE: CVE-2025-0686
|
||||
CVE: CVE-2025-0689
|
||||
|
||||
Suggested-by: Daniel Axtens <dja@axtens.net>
|
||||
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
||||
|
||||
@@ -9,8 +9,8 @@ overflow checks are in place.
|
||||
The HFS+ and squash4 security vulnerabilities were reported by
|
||||
Jonathan Bar Or <jonathanbaror@gmail.com>.
|
||||
|
||||
Fixes: CVE-2025-0678
|
||||
Fixes: CVE-2025-1125
|
||||
CVE: CVE-2025-0678
|
||||
CVE: CVE-2025-1125
|
||||
|
||||
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
||||
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||||
|
||||
@@ -9,6 +9,7 @@ The code is extracted from the upstream commit:
|
||||
|
||||
Fix: bsc#1234959
|
||||
|
||||
CVE: CVE-2024-56738
|
||||
Signed-off-by: Gary Lin <glin@suse.com>
|
||||
Upstream: not submitted upstream, as upstream has switched to gcrypt
|
||||
Taken-from: https://build.opensuse.org/projects/SUSE:SLE-15-SP5:Update/packages/grub2.39923/files/grub2-constant-time-grub_crypto_memcmp.patch?expand=0
|
||||
|
||||
@@ -15,17 +15,6 @@ HOST_GRUB2_DEPENDENCIES = host-bison host-flex host-gawk \
|
||||
$(BR2_PYTHON3_HOST_DEPENDENCY)
|
||||
GRUB2_INSTALL_IMAGES = YES
|
||||
|
||||
# CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which
|
||||
# doesn't exist upstream, but is added by the Redhat/Fedora
|
||||
# packaging. Not applicable to Buildroot.
|
||||
GRUB2_IGNORE_CVES += CVE-2019-14865
|
||||
# vulnerability is specific to the Redhat distribution, affects a
|
||||
# downstream change from Redhat related to password authentication
|
||||
GRUB2_IGNORE_CVES += CVE-2023-4001
|
||||
# vulnerability is specific to the Redhat distribution, affects the
|
||||
# grub2-set-bootflag tool, which doesn't exist upstream
|
||||
GRUB2_IGNORE_CVES += CVE-2024-1048
|
||||
|
||||
# 0004-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch (yes, two
|
||||
# CVEs are fixed by this patch)
|
||||
GRUB2_IGNORE_CVES += CVE-2024-45782
|
||||
|
||||
@@ -409,8 +409,12 @@ UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTLDFLAGS=
|
||||
ifeq ($(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE_ENABLED),y)
|
||||
UBOOT_DEFAULT_ENV_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_DEFAULT_ENV_FILE))
|
||||
define UBOOT_KCONFIG_DEFAULT_ENV_FILE
|
||||
# Pre-2025.10
|
||||
$(call KCONFIG_SET_OPT,CONFIG_USE_DEFAULT_ENV_FILE,y)
|
||||
$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENV_FILE,"$(shell readlink -f $(UBOOT_DEFAULT_ENV_FILE))")
|
||||
# 2025.10 and later
|
||||
$(call KCONFIG_SET_OPT,CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE,y)
|
||||
$(call KCONFIG_SET_OPT,CONFIG_ENV_DEFAULT_ENV_TEXT_FILE,"$(shell readlink -f $(UBOOT_DEFAULT_ENV_FILE))")
|
||||
endef
|
||||
endif
|
||||
endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
|
||||
|
||||
@@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero"
|
||||
|
||||
@@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-zero-w"
|
||||
|
||||
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2-64/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2-64/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-2-b"
|
||||
|
||||
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b"
|
||||
|
||||
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3"
|
||||
|
||||
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3"
|
||||
|
||||
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3"
|
||||
|
||||
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4-64/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4-64/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s"
|
||||
|
||||
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 broadcom/bcm2711-rpi-cm4 broadcom/bcm2711-rpi-cm4s"
|
||||
|
||||
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2712"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
|
||||
@@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2708-rpi-b-rev1 broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-plus broadcom/bcm2708-rpi-cm"
|
||||
|
||||
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io-64/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io-64/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4"
|
||||
|
||||
@@ -11,7 +11,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm4io/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm4io/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2711-rpi-cm4"
|
||||
|
||||
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypicm5io/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypicm5io/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2712"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
|
||||
@@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w-64/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w-64/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-zero-2-w"
|
||||
|
||||
@@ -10,7 +10,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypizero2w/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypizero2w/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,21b410140c47ffab5668399f6f143c7d7b935c8b)/linux-21b410140c47ffab5668399f6f143c7d7b935c8b.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-zero-2-w"
|
||||
|
||||
@@ -509,9 +509,9 @@ not and can not work as people would expect it should:
|
||||
* +LIBFOO_IGNORE_CVES+ is a space-separated list of CVEs that tells
|
||||
Buildroot CVE tracking tools which CVEs should be ignored for this
|
||||
package. This is typically used when the CVE is fixed by a patch in
|
||||
the package, or when the CVE for some reason does not affect the
|
||||
Buildroot package. A Makefile comment must always precede the
|
||||
addition of a CVE to this variable. Example:
|
||||
the package (see xref:additional-patch-documentation[]), or when the CVE for
|
||||
some reason does not affect the Buildroot package. A Makefile comment must
|
||||
always precede the addition of a CVE to this variable. Example:
|
||||
+
|
||||
----
|
||||
# 0001-fix-cve-2020-12345.patch
|
||||
|
||||
@@ -227,4 +227,4 @@ your kernel or use an alternative network manager.
|
||||
=== Migrating to 2025.11
|
||||
In 2025.11, the +FOO_INSTALL_BINS+ variable for golang packages is no longer
|
||||
supported; the list of binaries to install is automatically derived from
|
||||
the +FOO_BULD_TARGETS+ variable.
|
||||
the +FOO_BUILD_TARGETS+ variable.
|
||||
|
||||
@@ -144,6 +144,7 @@ AC_PROG_MAKE_SET
|
||||
+AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
|
||||
----
|
||||
|
||||
[[additional-patch-documentation]]
|
||||
=== Additional patch documentation
|
||||
|
||||
Ideally, all patches should document an upstream patch or patch submission, when
|
||||
@@ -177,4 +178,14 @@ Upstream: N/A <additional information about why patch is Buildroot specific>
|
||||
----
|
||||
|
||||
Adding this documentation helps streamline the patch review process during
|
||||
package version updates.
|
||||
package version updates.
|
||||
|
||||
If the patch addresses one or multiple vulnerabilities, list each identifier on
|
||||
a separate line with a +CVE+ trailer.
|
||||
|
||||
----
|
||||
CVE: <vulnerability identifier>
|
||||
----
|
||||
|
||||
If multiple patches address the same vulnerability, reference the vulnerability
|
||||
in every patch.
|
||||
|
||||
@@ -14,22 +14,22 @@
|
||||
<ul>
|
||||
<li>Reproducing, analyzing and fixing bugs from our
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/issues">bug tracker</a></li>
|
||||
<li>Analyzing and fixing <a href="http://autobuild.buildroot.org/">
|
||||
<li>Analyzing and fixing <a href="https://autobuild.buildroot.org/">
|
||||
autobuild failures</a></li>
|
||||
<li>Reviewing and testing patches sent by other developers. See the
|
||||
<a href="http://lists.buildroot.org/mailman/listinfo/buildroot">mailing list
|
||||
<a href="https://lists.buildroot.org/mailman/listinfo/buildroot">mailing list
|
||||
</a> or <a href="https://patchwork.ozlabs.org/project/buildroot/list/">
|
||||
patchwork</a>.</li>
|
||||
<li>Working on items from the
|
||||
<a href="http://www.elinux.org/Buildroot#Todo_list">TODO list</a></li>
|
||||
<li><a href="http://buildroot.org/manual.html#submitting-patches">Submitting
|
||||
<a href="https://www.elinux.org/Buildroot#Todo_list">TODO list</a></li>
|
||||
<li><a href="https://buildroot.org/manual.html#submitting-patches">Submitting
|
||||
your own patches</a> through the
|
||||
<a href="http://lists.buildroot.org/mailman/listinfo/buildroot">mailing list
|
||||
</a></li>
|
||||
</ul>
|
||||
|
||||
<p>For more details on these topics, check out the
|
||||
<a href="http://buildroot.org/manual.html#_contributing_to_buildroot">
|
||||
<a href="https://buildroot.org/manual.html#_contributing_to_buildroot">
|
||||
Contributing to buildroot</a> chapter in the Buildroot manual. Thanks for your help!</p>
|
||||
|
||||
<p>If you need any support yourself, have a look at <a href="./support.html">
|
||||
|
||||
+19
-17
@@ -16,6 +16,7 @@
|
||||
<th>Latest release date</th>
|
||||
<th colspan="2">Downloads</td>
|
||||
</tr>
|
||||
<!--
|
||||
<tr>
|
||||
<th>Candidate</th>
|
||||
<th>2025.11.x</th>
|
||||
@@ -42,61 +43,62 @@
|
||||
<a href="/downloads/buildroot-2025.11-rc2.tar.xz.sign">[PGP sig]</a>
|
||||
</td>
|
||||
</tr>
|
||||
-->
|
||||
<tr>
|
||||
<th>Stable</th>
|
||||
<th>2025.08.x</th>
|
||||
<td>December 2025</td>
|
||||
<th>2025.11.x</th>
|
||||
<td>March 2026</td>
|
||||
<td>
|
||||
2025.08.2<br/>
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.08.2/CHANGES">
|
||||
2025.11<br/>
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.11/CHANGES">
|
||||
Changelog
|
||||
</a>
|
||||
</td>
|
||||
<td>2025-11-20</td>
|
||||
<td>2025-12-11</td>
|
||||
<td>
|
||||
<a href="/downloads/buildroot-2025.08.2.tar.gz">
|
||||
<a href="/downloads/buildroot-2025.11.tar.gz">
|
||||
<img src="images/zip.png" width="24" alt="">
|
||||
.tar.gz
|
||||
</a><br/>
|
||||
<a href="/downloads/buildroot-2025.08.2.tar.gz.sign">[PGP sig]</a>
|
||||
<a href="/downloads/buildroot-2025.11.tar.gz.sign">[PGP sig]</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="/downloads/buildroot-2025.08.2.tar.xz">
|
||||
<a href="/downloads/buildroot-2025.11.tar.xz">
|
||||
<img src="images/package.png" width="24" alt="">
|
||||
.tar.xz
|
||||
</a><br/>
|
||||
<a href="/downloads/buildroot-2025.08.2.tar.xz.sign">[PGP sig]</a>
|
||||
<a href="/downloads/buildroot-2025.11.tar.xz.sign">[PGP sig]</a>
|
||||
</td>
|
||||
<tr>
|
||||
<th>Long-term support</th>
|
||||
<th>2025.02.x</th>
|
||||
<td>March 2028</td>
|
||||
<td>
|
||||
2025.02.8<br/>
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.02.8/CHANGES">
|
||||
2025.02.9<br/>
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.02.9/CHANGES">
|
||||
Changelog
|
||||
</a>
|
||||
</td>
|
||||
<td>2025-11-20</td>
|
||||
<td>
|
||||
<a href="/downloads/buildroot-2025.02.8.tar.gz">
|
||||
<a href="/downloads/buildroot-2025.02.9.tar.gz">
|
||||
<img src="images/zip.png" width="24" alt="">
|
||||
.tar.gz
|
||||
</a><br/>
|
||||
<a href="/downloads/buildroot-2025.02.8.tar.gz.sign">[PGP sig]</a>
|
||||
<a href="/downloads/buildroot-2025.02.9.tar.gz.sign">[PGP sig]</a>
|
||||
</td>
|
||||
<td>
|
||||
<a href="/downloads/buildroot-2025.02.8.tar.xz">
|
||||
<a href="/downloads/buildroot-2025.02.9.tar.xz">
|
||||
<img src="images/package.png" width="24" alt="">
|
||||
.tar.xz
|
||||
</a><br/>
|
||||
<a href="/downloads/buildroot-2025.02.8.tar.xz.sign">[PGP sig]</a>
|
||||
<a href="/downloads/buildroot-2025.02.9.tar.xz.sign">[PGP sig]</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
This and earlier releases (and their PGP signatures) can always be downloaded from
|
||||
<a href="/downloads/">http://buildroot.net/downloads/</a>.
|
||||
<a href="/downloads/">https://buildroot.org/downloads/</a>.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -121,7 +123,7 @@
|
||||
</div><br>
|
||||
|
||||
<p>If you are not already familiar with using Git, we recommend
|
||||
you visit <a href="http://git-scm.org">the Git
|
||||
you visit <a href="https://git-scm.org">the Git
|
||||
website</a>.</p>
|
||||
|
||||
<p>Once you've checked out a copy of the source tree, you can
|
||||
|
||||
@@ -9,6 +9,61 @@
|
||||
<h2>News</h2>
|
||||
<ul class="timeline">
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2025.11 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>11 December 2025</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2025.11 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.11/CHANGES">CHANGES</a>
|
||||
file for more details
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2025.11.tar.xz">2025.11 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2025.02.9 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>11 December 2025</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2025.02.9 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2025.02.8 release. See the
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.02.9/CHANGES">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="https://lore.kernel.org/buildroot/903acb17-d505-44b1-a4c8-6ee1d1e04853@rnout.be/T/#u">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2025.02.9.tar.xz">2025.02.9 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2025.08.3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>11 December 2025</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2025.08.3 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2025.08.2 release. See the
|
||||
<a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.08.3/CHANGES">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="https://lore.kernel.org/buildroot/31aa9f3b-d429-46c6-8bd5-1a153f5e86f6@rnout.be/T/#u">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2025.08.3.tar.xz">2025.08.3 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
||||
+2
-2
@@ -13,9 +13,9 @@ arch/microblaze/mm/init.c:71:2: error: #endif without #if
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33
|
||||
|
||||
Upstream: sent to Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: sent to
|
||||
Sebastian Andrzej Siewior <bigeasy@linutronix.de>]
|
||||
---
|
||||
arch/microblaze/mm/init.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
+9
-11
@@ -28,14 +28,14 @@ choice
|
||||
prompt "Kernel version"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "Latest version (6.17)"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 if BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
bool "Latest version (6.18)"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 if BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
# mips always generates an ITB image
|
||||
select BR2_PACKAGE_HOST_UBOOT_TOOLS if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
|
||||
select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
bool "Latest CIP SLTS version (5.10.162-cip24)"
|
||||
bool "Latest CIP SLTS version (5.10.246-cip66)"
|
||||
# Support was introduced in Linux 5.19
|
||||
depends on !BR2_loongarch64
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
@@ -57,7 +57,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
https://www.cip-project.org
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)"
|
||||
bool "Latest CIP RT SLTS version (5.10.246-cip66-rt29)"
|
||||
# Support was introduced in Linux 5.19
|
||||
depends on !BR2_loongarch64
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
@@ -141,9 +141,9 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "6.17.9" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
default "6.18.5" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "5.10.246-cip66" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default "5.10.246-cip66-rt29" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
|
||||
@@ -175,13 +175,11 @@ config BR2_LINUX_KERNEL_USE_DEFCONFIG
|
||||
|
||||
config BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG
|
||||
bool "Use the architecture default configuration"
|
||||
# We know that the default configuration on some architectures
|
||||
# We know that the default configuration on many architectures
|
||||
# requires host-openssl, so select it for the latest kernel
|
||||
# version. This is mainly needed to fix autobuilder testing.
|
||||
select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL if \
|
||||
BR2_LINUX_KERNEL_LATEST_VERSION && \
|
||||
(BR2_aarch64 || BR2_aarch64_be || BR2_arcle || BR2_arceb || \
|
||||
BR2_or1k || BR2_riscv || BR2_sparc || BR2_x86_64)
|
||||
BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
help
|
||||
This option will use the default configuration for the
|
||||
selected architecture. I.e, it is equivalent to running
|
||||
|
||||
+9
-9
@@ -1,15 +1,15 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
|
||||
sha256 6d08803b953c509df48d44d3281ed392524321d8bb353eb21c0555790c8f8e06 linux-6.17.9.tar.xz
|
||||
sha256 a1d2cd7327f10eec022615c1bb12c06439bd110d2020164be97f698f43ca58be linux-6.12.59.tar.xz
|
||||
sha256 643b31079222fdbda70cfdd0b68c514f05a3926104be4762a4685f62818b43d1 linux-6.6.117.tar.xz
|
||||
sha256 ad068bfdb604ec0f4f7de385c8e7ab944008aa78a4aeeca94f53206e6726bfda linux-6.1.158.tar.xz
|
||||
sha256 189d1f409cef8d0d234210e04595172df392f8cb297e14b447ed95720e2fd940 linux-6.18.5.tar.xz
|
||||
sha256 116802dc3ad1646163cc6ffe9bddba24a8069b569135ec0523cd799064f2edb9 linux-6.17.13.tar.xz
|
||||
sha256 54e852667af35c0ed06cfc81311e65fa7f5f798a3bfcf78a559d3b4785a139c1 linux-6.12.65.tar.xz
|
||||
sha256 405c332d59eedc4fd78863ff07a06c040dfeef651e58f022910a5ac953e4dc21 linux-6.6.120.tar.xz
|
||||
sha256 0e8546a8437558be17ef5a87142055347bf2e7e9863ee58bb3996cbf0fd28496 linux-6.1.160.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
|
||||
sha256 83157953598b026fb721c906c60dfdfd8e986f25ecb9910f3504f690e2770e05 linux-5.15.196.tar.xz
|
||||
sha256 eb6b76c269d2dc09791638b10b9dcb9d79fd2abd45113a31fc03f68731caa875 linux-5.10.246.tar.xz
|
||||
sha256 b7718766d060e6714bbe47004c71c360e844758f42fbf62cbaa5571119527962 linux-5.4.301.tar.xz
|
||||
sha256 fd218df8e2107a4443b6c29fef7f95aad167031e0fbdbc7a858ae8471360668a linux-5.15.197.tar.xz
|
||||
sha256 70c8b87ba1fcd8bfa663661934dc9bda92d0b5f3c0fc3197bb56399f69d9fe0c linux-5.10.247.tar.xz
|
||||
# Locally computed
|
||||
sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz
|
||||
sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz
|
||||
sha256 93408e0c5d70ff0ab63dcf9edec6fda2b8524281d611a88e56590436bda43914 linux-cip-5.10.246-cip66.tar.gz
|
||||
sha256 b3454708b98016f02604433e41060be2c1feb595c2bddeb25292596f047f0915 linux-cip-5.10.246-cip66-rt29.tar.gz
|
||||
|
||||
# Licenses hashes
|
||||
sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING
|
||||
|
||||
+11
-11
@@ -1,15 +1,15 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC2034 # checkpackage-required variable
|
||||
DAEMON="apache"
|
||||
|
||||
case "$1" in
|
||||
start|restart|graceful|graceful-stop|stop)
|
||||
apachectl -k $1
|
||||
;;
|
||||
reload)
|
||||
apachectl -k restart
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|restart|reload|graceful|graceful-stop|stop}"
|
||||
exit 1
|
||||
start|restart|graceful|graceful-stop|stop)
|
||||
apachectl -k "$1"
|
||||
;;
|
||||
reload)
|
||||
apachectl -k restart
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|restart|reload|graceful|graceful-stop|stop}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $?
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://archive.apache.org/dist/httpd/httpd-2.4.65.tar.bz2.{sha256,sha512}
|
||||
sha256 58b8be97d9940ec17f7656c0c6b9f41b618aac468b894b534148e3296c53b8b3 httpd-2.4.65.tar.bz2
|
||||
sha512 202f8bfe2aafcfbcd7315191d466e9c10b9a8c0abafb7864510b6e1abe4cb660aaacc2456aa77d43e48ef7a49e591d0b54170d3daf67abc3e06c3da1c63fdffc httpd-2.4.65.tar.bz2
|
||||
# From https://archive.apache.org/dist/httpd/httpd-2.4.66.tar.bz2.{sha256,sha512}
|
||||
sha256 94d7ff2b42acbb828e870ba29e4cbad48e558a79c623ad3596e4116efcfea25a httpd-2.4.66.tar.bz2
|
||||
sha512 49031a3465d956ee3b755e65810b6c35561ddd5fac2c624a273b733c238e115b914cd7b246837e5a3090ccfded6e0b8b3059bfd1f8ce4419081c805a38d05a4b httpd-2.4.66.tar.bz2
|
||||
# Locally computed
|
||||
sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APACHE_VERSION = 2.4.65
|
||||
APACHE_VERSION = 2.4.66
|
||||
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
|
||||
APACHE_SITE = https://archive.apache.org/dist/httpd
|
||||
APACHE_LICENSE = Apache-2.0
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 67e7d350a15aff88c151b1fc838dac83d35be955 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd@kuhls.net>
|
||||
Date: Sat, 22 Nov 2025 23:47:41 +0100
|
||||
Subject: [PATCH] atf-check.cpp: include time.h
|
||||
|
||||
Fixes build error with gcc 14 as reported by the buildroot autobuilders:
|
||||
https://autobuild.buildroot.net/results/41b/41b25ee8e66e34323eca011e4b5fe479ece9ed76/build-end.log
|
||||
|
||||
atf-sh/atf-check.cpp: In function 'useconds_t get_monotonic_useconds()':
|
||||
atf-sh/atf-check.cpp:183:24: error: 'CLOCK_MONOTONIC' was not declared in this scope
|
||||
|
||||
Upstream: https://github.com/freebsd/atf/commit/67e7d350a15aff88c151b1fc838dac83d35be955
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
atf-sh/atf-check.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp
|
||||
index 1354e3a..94da413 100644
|
||||
--- a/atf-sh/atf-check.cpp
|
||||
+++ b/atf-sh/atf-check.cpp
|
||||
@@ -30,6 +30,7 @@ extern "C" {
|
||||
#include <limits.h>
|
||||
#include <signal.h>
|
||||
#include <stdint.h>
|
||||
+#include <time.h>
|
||||
#include <unistd.h>
|
||||
}
|
||||
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -6,7 +6,7 @@ config BR2_PACKAGE_ATF
|
||||
ATF, or Automated Testing Framework, is a collection of
|
||||
libraries to write test programs in C, C++ and POSIX shell.
|
||||
|
||||
https://github.com/jmmv/atf
|
||||
https://github.com/freebsd/atf
|
||||
|
||||
comment "atf needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
ATF_VERSION = 0.23
|
||||
ATF_SITE = https://github.com/jmmv/atf/releases/download/atf-$(ATF_VERSION)
|
||||
ATF_SITE = https://github.com/freebsd/atf/releases/download/atf-$(ATF_VERSION)
|
||||
ATF_INSTALL_STAGING = YES
|
||||
ATF_LICENSE = BSD-2-Clause, BSD-3-Clause
|
||||
ATF_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -17,7 +17,7 @@ config BR2_PACKAGE_AUDIT
|
||||
|
||||
Note: The z/OS remote plugin is disabled in this package
|
||||
|
||||
http://people.redhat.com/sgrubb/audit/
|
||||
https://people.redhat.com/sgrubb/audit/
|
||||
|
||||
comment "audit needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
AUDIT_VERSION = 3.1.5
|
||||
AUDIT_SITE = http://people.redhat.com/sgrubb/audit
|
||||
AUDIT_SITE = https://people.redhat.com/sgrubb/audit
|
||||
AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
|
||||
AUDIT_LICENSE_FILES = COPYING COPYING.LIB
|
||||
AUDIT_CPE_ID_VENDOR = linux_audit_project
|
||||
|
||||
@@ -9,8 +9,8 @@ Add missing NULL pointer checks to fix it.
|
||||
|
||||
Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c]
|
||||
CVE: CVE-2021-36217
|
||||
Upstream: https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
avahi-core/browse-dns-server.c | 5 ++++-
|
||||
|
||||
@@ -6,6 +6,10 @@ config BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
|
||||
# support. BR2_TOOLCHAIN_HAS_ATOMIC does not provide a
|
||||
# size-level granularity to express this dependency.
|
||||
depends on !(BR2_arm || BR2_armeb) || BR2_USE_MMU
|
||||
# error: static assertion failed: Units of size ELEM_SIZE_ALIGN
|
||||
# need to be able to store a ListNode
|
||||
# note: the comparison reduces to ‘(4 <= 2)’
|
||||
depends on !BR2_m68k
|
||||
|
||||
config BR2_PACKAGE_BITCOIN
|
||||
bool "bitcoin"
|
||||
|
||||
+4
-15
@@ -24,7 +24,6 @@ config BR2_PACKAGE_BOOST_ATOMIC
|
||||
|
||||
config BR2_PACKAGE_BOOST_CHRONO
|
||||
bool "boost-chrono"
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Useful time utilities. C++11.
|
||||
|
||||
@@ -62,7 +61,6 @@ config BR2_PACKAGE_BOOST_CONTRACT
|
||||
bool "boost-contract"
|
||||
# pthread_condattr_setclock
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Contract programming for C++.
|
||||
|
||||
@@ -77,7 +75,6 @@ config BR2_PACKAGE_BOOST_COROUTINE
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context, boost-thread
|
||||
select BR2_PACKAGE_BOOST_CHRONO
|
||||
select BR2_PACKAGE_BOOST_CONTEXT
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
deprecated coroutine library, the non-deprecated coroutine2
|
||||
@@ -117,7 +114,6 @@ config BR2_PACKAGE_BOOST_FIBER
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
select BR2_PACKAGE_BOOST_CONTEXT
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
C++11 userland threads library.
|
||||
|
||||
@@ -134,7 +130,6 @@ config BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
bool "boost-filesystem"
|
||||
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic
|
||||
select BR2_PACKAGE_BOOST_ATOMIC
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
The Boost Filesystem Library provides portable facilities to
|
||||
query and manipulate paths, files, and directories.
|
||||
@@ -184,7 +179,6 @@ config BR2_PACKAGE_BOOST_LOCALE
|
||||
depends on !(BR2_TOOLCHAIN_HAS_GCC_BUG_64735 && BR2_PACKAGE_ICU) # boost-thread
|
||||
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
|
||||
|| !BR2_PACKAGE_ICU # boost-thread
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD if BR2_PACKAGE_ICU
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
@@ -209,7 +203,6 @@ config BR2_PACKAGE_BOOST_LOG
|
||||
select BR2_PACKAGE_BOOST_DATE_TIME
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_REGEX
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
Logging library.
|
||||
@@ -279,7 +272,6 @@ config BR2_PACKAGE_BOOST_PYTHON
|
||||
|
||||
config BR2_PACKAGE_BOOST_RANDOM
|
||||
bool "boost-random"
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
A complete system for random number generation.
|
||||
|
||||
@@ -306,13 +298,14 @@ comment "boost-stacktrace needs a toolchain w/ dynamic library"
|
||||
config BR2_PACKAGE_BOOST_SYSTEM
|
||||
bool "boost-system"
|
||||
help
|
||||
Operating system support, including the diagnostics support
|
||||
that will be part of the C++0x standard library.
|
||||
Extensible Error Reporting.
|
||||
|
||||
This library is now header only. Building a stub library
|
||||
is still supported for backward compatibility.
|
||||
|
||||
config BR2_PACKAGE_BOOST_TEST
|
||||
bool "boost-test"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_TIMER
|
||||
help
|
||||
Support for simple program testing, full unit testing, and for
|
||||
@@ -323,7 +316,6 @@ config BR2_PACKAGE_BOOST_THREAD
|
||||
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception
|
||||
select BR2_PACKAGE_BOOST_CHRONO
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Portable C++ multi-threading. C++11, C++14.
|
||||
|
||||
@@ -333,7 +325,6 @@ comment "boost-thread needs a toolchain not affected by GCC bug 64735"
|
||||
config BR2_PACKAGE_BOOST_TIMER
|
||||
bool "boost-timer"
|
||||
select BR2_PACKAGE_BOOST_CHRONO
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
help
|
||||
Event timer, progress timer, and progress display classes.
|
||||
|
||||
@@ -341,7 +332,6 @@ config BR2_PACKAGE_BOOST_TYPE_ERASURE
|
||||
bool "boost-type_erasure"
|
||||
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
Runtime polymorphism based on concepts.
|
||||
@@ -371,7 +361,6 @@ config BR2_PACKAGE_BOOST_WAVE
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread
|
||||
select BR2_PACKAGE_BOOST_DATE_TIME
|
||||
select BR2_PACKAGE_BOOST_FILESYSTEM
|
||||
select BR2_PACKAGE_BOOST_SYSTEM
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
help
|
||||
The Boost.Wave library is a Standards conformant, and highly
|
||||
|
||||
@@ -13,7 +13,8 @@ KLOGD_ARGS=""
|
||||
start() {
|
||||
printf 'Starting %s: ' "$DAEMON"
|
||||
# shellcheck disable=SC2086 # we need the word splitting
|
||||
start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
|
||||
start-stop-daemon --start --background --make-pidfile \
|
||||
--pidfile "$PIDFILE" --exec "/sbin/$DAEMON" \
|
||||
-- -n $KLOGD_ARGS
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
@@ -26,20 +27,24 @@ start() {
|
||||
|
||||
stop() {
|
||||
printf 'Stopping %s: ' "$DAEMON"
|
||||
start-stop-daemon -K -q -p "$PIDFILE"
|
||||
start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/sbin/$DAEMON"
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
rm -f "$PIDFILE"
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL"
|
||||
return "$status"
|
||||
fi
|
||||
while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \
|
||||
--exec "/sbin/$DAEMON"; do
|
||||
sleep 0.1
|
||||
done
|
||||
rm -f "$PIDFILE"
|
||||
return "$status"
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
sleep 1
|
||||
start
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
comment "cage needs udev, EGL and OpenGL ES support"
|
||||
comment "cage needs udev, EGL, OpenGL ES and GBM support"
|
||||
depends on !BR2_PACKAGE_HAS_LIBEGL || \
|
||||
!BR2_PACKAGE_HAS_LIBGLES || \
|
||||
!BR2_PACKAGE_HAS_LIBGBM || \
|
||||
!BR2_PACKAGE_HAS_UDEV
|
||||
|
||||
comment "cage needs a toolchain w/ threads, dynamic library"
|
||||
@@ -13,6 +14,7 @@ config BR2_PACKAGE_CAGE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL # wlroots
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES # wlroots
|
||||
depends on BR2_PACKAGE_HAS_LIBGBM # wlroots
|
||||
depends on BR2_PACKAGE_HAS_UDEV # wlroots
|
||||
select BR2_PACKAGE_WLROOTS
|
||||
help
|
||||
|
||||
@@ -11,8 +11,6 @@ CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
|
||||
CMAKE_LICENSE = BSD-3-Clause
|
||||
CMAKE_LICENSE_FILES = Copyright.txt
|
||||
CMAKE_CPE_ID_VALID = YES
|
||||
# Tool download MITM attack warning if using npm package to install cmake
|
||||
CMAKE_IGNORE_CVES = CVE-2016-10642
|
||||
|
||||
# The package is a dependency to ccache so ccache cannot be a dependency
|
||||
HOST_CMAKE_ADD_CCACHE_DEPENDENCY = NO
|
||||
|
||||
@@ -9,4 +9,4 @@ config BR2_PACKAGE_COLLECTL
|
||||
disk, inodes, infiniband, lustre, memory, network, nfs,
|
||||
processes, quadrics, slabs, sockets and tcp.
|
||||
|
||||
http://collectl.sourceforge.net/
|
||||
https://collectl.sourceforge.net/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750 collectl-4.3.2.src.tar.gz
|
||||
sha256 552bdbe9e97071767bf0871789e19ede7d2827b68824e75da9cd7664218ea440 collectl-4.3.2.tar.gz
|
||||
sha256 b92800d37afa2aa03c02817ff3b68efc7236436fe76af06ad9b1fc4682f59bcb ARTISTIC
|
||||
sha256 264fe27852db5624e6a9a9845b4e14e91ee5007305b33e5556dfade394d578a8 COPYING
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
COLLECTL_VERSION = 4.3.2
|
||||
COLLECTL_SOURCE = collectl-$(COLLECTL_VERSION).src.tar.gz
|
||||
COLLECTL_SITE = http://downloads.sourceforge.net/collectl/collectl
|
||||
COLLECTL_SITE = $(call github,sharkcz,collectl,$(COLLECTL_VERSION))
|
||||
COLLECTL_LICENSE = Artistic or GPL-2.0
|
||||
COLLECTL_LICENSE_FILES = COPYING ARTISTIC GPL
|
||||
|
||||
|
||||
@@ -13,9 +13,6 @@ CPP_HTTPLIB_INSTALL_STAGING = YES
|
||||
CPP_HTTPLIB_CONF_OPTS = \
|
||||
-Dtest=false
|
||||
|
||||
# 0001-merge-commit-from-fork.patch
|
||||
CPP_HTTPLIB_IGNORE_CVES += CVE-2025-46728
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CPP_HTTPLIB_COMPILE),y)
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcompile=true
|
||||
CPP_HTTPLIB_DEPENDENCIES += host-python3
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
From fb3943378d84a6ced1182502eb839d6fc6e51914 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Tue, 16 Dec 2025 15:31:38 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: make it compatible with CMake 4
|
||||
|
||||
The build with CMake >= 4 currently fails with:
|
||||
|
||||
CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
|
||||
Compatibility with CMake < 3.5 has been removed from CMake.
|
||||
|
||||
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
|
||||
to tell CMake that the project requires at least <min> but has been updated
|
||||
to work with policies introduced by <max> or earlier.
|
||||
|
||||
Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
|
||||
|
||||
we simply need to specify that the minimum version is 3.5 to fix the
|
||||
build.
|
||||
|
||||
Upstream: https://github.com/artyom-beilis/cppcms/pull/106
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
booster/CMakeLists.txt | 2 +-
|
||||
contrib/server_side/sessions/CMakeLists.txt | 2 +-
|
||||
contrib/server_side/sessions/berkeley_db/CMakeLists.txt | 2 +-
|
||||
contrib/server_side/sessions/cppdb/CMakeLists.txt | 2 +-
|
||||
contrib/server_side/sessions/sqlite3/CMakeLists.txt | 2 +-
|
||||
examples/message_board/CMakeLists.txt | 2 +-
|
||||
7 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a9c601b..826e87f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
|
||||
|
||||
|
||||
diff --git a/booster/CMakeLists.txt b/booster/CMakeLists.txt
|
||||
index 6ec1ffa..8f63254 100644
|
||||
--- a/booster/CMakeLists.txt
|
||||
+++ b/booster/CMakeLists.txt
|
||||
@@ -6,7 +6,7 @@
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
#
|
||||
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
project(booster)
|
||||
include(CheckFunctionExists)
|
||||
include(CheckCXXSourceCompiles)
|
||||
diff --git a/contrib/server_side/sessions/CMakeLists.txt b/contrib/server_side/sessions/CMakeLists.txt
|
||||
index 0909fa6..e7ae01f 100644
|
||||
--- a/contrib/server_side/sessions/CMakeLists.txt
|
||||
+++ b/contrib/server_side/sessions/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
add_subdirectory(sqlite3)
|
||||
add_subdirectory(cppdb)
|
||||
diff --git a/contrib/server_side/sessions/berkeley_db/CMakeLists.txt b/contrib/server_side/sessions/berkeley_db/CMakeLists.txt
|
||||
index 6bbac69..534bce2 100644
|
||||
--- a/contrib/server_side/sessions/berkeley_db/CMakeLists.txt
|
||||
+++ b/contrib/server_side/sessions/berkeley_db/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
if(WIN32 OR CYGWIN)
|
||||
add_definitions(-DDLL_EXPORT)
|
||||
diff --git a/contrib/server_side/sessions/cppdb/CMakeLists.txt b/contrib/server_side/sessions/cppdb/CMakeLists.txt
|
||||
index 9781be9..792ec39 100644
|
||||
--- a/contrib/server_side/sessions/cppdb/CMakeLists.txt
|
||||
+++ b/contrib/server_side/sessions/cppdb/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
if(WIN32 OR CYGWIN)
|
||||
add_definitions(-DDLL_EXPORT)
|
||||
diff --git a/contrib/server_side/sessions/sqlite3/CMakeLists.txt b/contrib/server_side/sessions/sqlite3/CMakeLists.txt
|
||||
index 4c236e3..82808f4 100644
|
||||
--- a/contrib/server_side/sessions/sqlite3/CMakeLists.txt
|
||||
+++ b/contrib/server_side/sessions/sqlite3/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
if(WIN32 OR CYGWIN)
|
||||
add_definitions(-DDLL_EXPORT)
|
||||
endif()
|
||||
diff --git a/examples/message_board/CMakeLists.txt b/examples/message_board/CMakeLists.txt
|
||||
index 0e5c555..96a56c2 100644
|
||||
--- a/examples/message_board/CMakeLists.txt
|
||||
+++ b/examples/message_board/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
project(cppcms)
|
||||
|
||||
include_directories(${CMAKE_SOURCE_DIR})
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From 58faaa72919076e2c847b595a739469243ac9706 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Tue, 16 Dec 2025 16:02:41 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: allow flags passed on the command line to win
|
||||
over built-in flags
|
||||
|
||||
CMakeLists.txt and booster/CMakeLists.txt define some flags in
|
||||
CXX_FLAGS, and then set CMAKE_CXX_FLAGS in a way that causes the flags
|
||||
in CXX_FLAGS to override the ones passed (for example on the command
|
||||
line through CMAKE_CXX_FLAGS). This prevents the user from overriding
|
||||
those compiler flags in CXX_FLAGS.
|
||||
|
||||
A specific example is that CXX_FLAGS sets -std=c++11, but with recent
|
||||
version of ICU (such as >= 77-1), -std=c++11 is not enough, passing
|
||||
-std=c++17 is needed. Unfortunately, it cannot be passed through
|
||||
CMAKE_CXX_FLAGS due to the aforementioned problem.
|
||||
|
||||
This commit allows to resolve this by ensuring that CMAKE_CXX_FLAGS
|
||||
and CMAKE_C_FLAGS win over CXX_FLAGS/C_FLAGS.
|
||||
|
||||
Upstream: https://github.com/artyom-beilis/cppcms/pull/107
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
booster/CMakeLists.txt | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 826e87f..86693e2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -141,8 +141,8 @@ elseif(MSVC)
|
||||
set(C_FLAGS "/W3")
|
||||
endif()
|
||||
|
||||
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAGS}")
|
||||
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS}")
|
||||
+set(CMAKE_CXX_FLAGS "${CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
|
||||
+set(CMAKE_C_FLAGS "${C_FLAGS} ${CMAKE_C_FLAGS} ")
|
||||
|
||||
#############################################################################
|
||||
#
|
||||
diff --git a/booster/CMakeLists.txt b/booster/CMakeLists.txt
|
||||
index 8f63254..4638f76 100644
|
||||
--- a/booster/CMakeLists.txt
|
||||
+++ b/booster/CMakeLists.txt
|
||||
@@ -223,7 +223,7 @@ if(NOT IS_WINDOWS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAGS}")
|
||||
+set(CMAKE_CXX_FLAGS "${CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
|
||||
|
||||
#############################################################################
|
||||
#
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -24,17 +24,17 @@ if BR2_PACKAGE_CPPCMS
|
||||
config BR2_PACKAGE_CPPCMS_ICU
|
||||
bool "enable icu support"
|
||||
depends on !BR2_BINFMT_FLAT # icu
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu
|
||||
depends on BR2_HOST_GCC_AT_LEAST_7 # icu
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # icu
|
||||
select BR2_PACKAGE_ICU
|
||||
help
|
||||
Using ICU allows advanced localization features into CppCMS,
|
||||
in another hand ICU is heavier than iconv.
|
||||
|
||||
comment "icu support needs a toolchain w/ gcc >= 4.9, host gcc >= 4.9"
|
||||
comment "icu support needs a toolchain w/ gcc >= 7, host gcc >= 7"
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_9
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_7
|
||||
|
||||
endif
|
||||
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
# From http://sourceforge.net/projects/cppcms/files/cppcms/2.0.0-beta2/
|
||||
sha1 746cc5e3f58565d91d9ded6e2616399d60e9d01d cppcms-2.0.0.beta2.tar.bz2
|
||||
md5 ef561d13ee92d2053151cab073feba10 cppcms-2.0.0.beta2.tar.bz2
|
||||
# Locally computed:
|
||||
sha256 697031c7d141fdd215c6be5090b66e2106a63bb3e52f09ee8120e8efc6c08a21 cppcms-2.0.0.beta2.tar.bz2
|
||||
sha256 4a7a2217b3fa59384650912a7000e016c308b4fa986a3d2562002691e5a9d6e7 cppcms-2.0.1.tar.gz
|
||||
sha256 fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db COPYING.TXT
|
||||
sha256 3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f MIT.TXT
|
||||
sha256 d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b THIRD_PARTY_SOFTWARE.TXT
|
||||
|
||||
@@ -4,11 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CPPCMS_VERSION = 2.0.0-beta2
|
||||
CPPCMS_SOURCE = cppcms-$(subst -,.,$(CPPCMS_VERSION)).tar.bz2
|
||||
CPPCMS_VERSION = 2.0.1
|
||||
CPPCMS_SITE = $(call github,artyom-beilis,cppcms,v$(CPPCMS_VERSION))
|
||||
CPPCMS_LICENSE = MIT, BSL-1.0 (boost), Public Domain (json2.js), Zlib (md5)
|
||||
CPPCMS_LICENSE_FILES = COPYING.TXT MIT.TXT THIRD_PARTY_SOFTWARE.TXT
|
||||
CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
|
||||
CPPCMS_INSTALL_STAGING = YES
|
||||
CPPCMS_CXXFLAGS = $(TARGET_CXXFLAGS)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 74e95c96e8d82e4e374f86142972fcf4305fe1f2 Mon Sep 17 00:00:00 2001
|
||||
From e94b6dd7b3ca884f72f02879fd85792a3aee961d Mon Sep 17 00:00:00 2001
|
||||
From: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Date: Wed, 2 Jul 2025 20:47:58 -0700
|
||||
Subject: [PATCH] Correct loop function signature
|
||||
@@ -23,7 +23,7 @@ Upstream: https://github.com/opsengine/cpulimit/pull/127
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/busy.c b/tests/busy.c
|
||||
index b3afb7cd853b..93f0bcce67a8 100644
|
||||
index b3afb7cd853b..8acbcd82e04f 100644
|
||||
--- a/tests/busy.c
|
||||
+++ b/tests/busy.c
|
||||
@@ -3,7 +3,7 @@
|
||||
@@ -31,7 +31,7 @@ index b3afb7cd853b..93f0bcce67a8 100644
|
||||
#include <unistd.h>
|
||||
|
||||
-void *loop()
|
||||
+void *loop(void *)
|
||||
+void *loop(void *unused)
|
||||
{
|
||||
while(1);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
From 08644db02d43478f802755903212f5ee506af73b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= <joanbrugueram@gmail.com>
|
||||
Date: Sat, 6 Sep 2025 20:36:38 +0000
|
||||
Subject: [PATCH] Fix build for Linux 6.18-rc1
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It's no longer required to use nth_page() when iterating pages within a
|
||||
single scatterlist entry.
|
||||
|
||||
Note I believe this code path in `sg_advance` is currently unreachable:
|
||||
It is only called from `get_userbuf_srtp`, passing in a scatterlist
|
||||
copied from one created by `__get_userbuf`, which only generates
|
||||
entries such that `sg->offset + sg->length <= PAGE_SIZE`.
|
||||
On the other hand, this code path in `sg_advance` requires that
|
||||
`sg->offset + sg->length > sg->offset + consumed >= PAGE_SIZE`.
|
||||
|
||||
See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f8f03eb5f0f91fddc9bb8563c7e82bd7d3ba1dd0
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ce00897b94bc5c62fab962625efcf1ab824d3688
|
||||
|
||||
Signed-off-by: Joan Bruguera Micó <joanbrugueram@gmail.com>
|
||||
|
||||
Upstream: https://github.com/cryptodev-linux/cryptodev-linux/commit/08644db02d43478f802755903212f5ee506af73b
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
util.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/util.c b/util.c
|
||||
index 9eba4836..d4267816 100644
|
||||
--- a/util.c
|
||||
+++ b/util.c
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <crypto/scatterwalk.h>
|
||||
#include <linux/scatterlist.h>
|
||||
+#include <linux/version.h>
|
||||
#include "util.h"
|
||||
|
||||
/* These were taken from Maxim Levitsky's patch to lkml.
|
||||
@@ -44,8 +45,12 @@ struct scatterlist *sg_advance(struct scatterlist *sg, int consumed)
|
||||
sg->length -= consumed;
|
||||
|
||||
if (sg->offset >= PAGE_SIZE) {
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 18, 0))
|
||||
+ struct page *page = sg_page(sg) + (sg->offset / PAGE_SIZE);
|
||||
+#else
|
||||
struct page *page =
|
||||
nth_page(sg_page(sg), sg->offset / PAGE_SIZE);
|
||||
+#endif
|
||||
sg_set_page(sg, page, sg->length, sg->offset % PAGE_SIZE);
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ In addition, done the following fixes and improvements:
|
||||
|
||||
- Use "static volatile int" for global variable job_canceled.
|
||||
|
||||
CVE: CVE-2023-24805
|
||||
Upstream: https://github.com/OpenPrinting/cups-filters/commit/93e60d3df358c0ae6f3dba79e1c9684657683d89
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# messagebus: The D-BUS systemwide message bus
|
||||
#
|
||||
# chkconfig: 345 97 03
|
||||
# description: This is a daemon which broadcasts notifications of system events \
|
||||
# and other messages. See http://www.freedesktop.org/software/dbus/
|
||||
#
|
||||
# processname: dbus-daemon
|
||||
# pidfile: /run/messagebus.pid
|
||||
#
|
||||
|
||||
# Create needed directories.
|
||||
[ -d /run/dbus ] || mkdir -p /run/dbus
|
||||
[ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys
|
||||
[ -d /tmp/dbus ] || mkdir -p /tmp/dbus
|
||||
|
||||
RETVAL=0
|
||||
|
||||
start() {
|
||||
printf "Starting system message bus: "
|
||||
|
||||
dbus-uuidgen --ensure
|
||||
dbus-daemon --system
|
||||
RETVAL=$?
|
||||
echo "done"
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dbus-daemon
|
||||
}
|
||||
|
||||
stop() {
|
||||
printf "Stopping system message bus: "
|
||||
|
||||
## we don't want to kill all the per-user $processname, we want
|
||||
## to use the pid file *only*; because we use the fake nonexistent
|
||||
## program name "$servicename" that should be safe-ish
|
||||
killall dbus-daemon
|
||||
RETVAL=$?
|
||||
echo "done"
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
rm -f /var/lock/subsys/dbus-daemon
|
||||
rm -f /run/messagebus.pid
|
||||
fi
|
||||
}
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
condrestart)
|
||||
if [ -f /var/lock/subsys/$servicename ]; then
|
||||
stop
|
||||
start
|
||||
fi
|
||||
;;
|
||||
reload)
|
||||
echo "Message bus can't reload its configuration, you have to restart it"
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|condrestart|reload}"
|
||||
;;
|
||||
esac
|
||||
exit $RETVAL
|
||||
@@ -0,0 +1,71 @@
|
||||
#!/bin/sh
|
||||
|
||||
DAEMON="dbus-daemon"
|
||||
# check-package lib_sysv.Variables
|
||||
PIDFILE="/run/messagebus.pid"
|
||||
|
||||
start() {
|
||||
printf 'Starting system %s: ' "$DAEMON"
|
||||
# Create needed directories
|
||||
mkdir -p /run/dbus
|
||||
mkdir -p /tmp/dbus
|
||||
# Generate /var/lib/dbus/machine-id if needed
|
||||
dbus-uuidgen --ensure
|
||||
|
||||
start-stop-daemon --start --pidfile "$PIDFILE" \
|
||||
--exec "/usr/bin/$DAEMON" \
|
||||
-- --system --syslog
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL"
|
||||
fi
|
||||
return "$status"
|
||||
}
|
||||
|
||||
stop() {
|
||||
printf 'Stopping %s: ' "$DAEMON"
|
||||
start-stop-daemon --stop --pidfile "$PIDFILE" --exec "/usr/bin/$DAEMON"
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL"
|
||||
return "$status"
|
||||
fi
|
||||
while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \
|
||||
--exec "/usr/bin/$DAEMON"; do
|
||||
sleep 0.1
|
||||
done
|
||||
rm -f "$PIDFILE"
|
||||
return "$status"
|
||||
}
|
||||
|
||||
reload() {
|
||||
printf "Reloading %s config: " "$DAEMON"
|
||||
start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \
|
||||
--exec "/usr/bin/$DAEMON"
|
||||
status=$?
|
||||
if [ "$status" -eq 0 ]; then
|
||||
echo "OK"
|
||||
else
|
||||
echo "FAIL"
|
||||
fi
|
||||
return "$status"
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start|stop|reload|restart)
|
||||
"$1"
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -93,8 +93,8 @@ endef
|
||||
DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES
|
||||
|
||||
define DBUS_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 0755 -D package/dbus/S30dbus \
|
||||
$(TARGET_DIR)/etc/init.d/S30dbus
|
||||
$(INSTALL) -m 0755 -D package/dbus/S30dbus-daemon \
|
||||
$(TARGET_DIR)/etc/init.d/S30dbus-daemon
|
||||
|
||||
mkdir -p $(TARGET_DIR)/var/lib
|
||||
rm -rf $(TARGET_DIR)/var/lib/dbus
|
||||
|
||||
@@ -12,7 +12,7 @@ config BR2_PACKAGE_DMRAID
|
||||
dmraid uses the Linux device-mapper to create devices with
|
||||
respective mappings for the ATARAID sets discovered.
|
||||
|
||||
http://people.redhat.com/~heinzm/sw/dmraid/
|
||||
https://people.redhat.com/~heinzm/sw/dmraid/
|
||||
|
||||
comment "dmraid needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2.md5.sum
|
||||
# From https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2.md5.sum
|
||||
md5 819338fcef98e8e25819f0516722beeb dmraid-1.0.0.rc16-3.tar.bz2
|
||||
# locally computed
|
||||
sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 1.0.0.rc16-3/dmraid/LICENSE_GPL
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
DMRAID_VERSION = 1.0.0.rc16-3
|
||||
DMRAID_SOURCE = dmraid-$(DMRAID_VERSION).tar.bz2
|
||||
DMRAID_SITE = http://people.redhat.com/~heinzm/sw/dmraid/src
|
||||
DMRAID_SITE = https://people.redhat.com/~heinzm/sw/dmraid/src
|
||||
DMRAID_SUBDIR = $(DMRAID_VERSION)/dmraid
|
||||
# lib and tools race with parallel make
|
||||
DMRAID_MAKE = $(MAKE1)
|
||||
|
||||
@@ -12,6 +12,7 @@ Fixed by moving mechanisms and username_filter from struct passdb_module
|
||||
to struct auth_passdb, which is where they should have been in the first
|
||||
place.
|
||||
|
||||
CVE: CVE-2022-30550
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/auth/auth-request.c | 6 +++---
|
||||
|
||||
@@ -21,12 +21,7 @@ DOVECOT_DEPENDENCIES = \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
|
||||
openssl
|
||||
|
||||
# CVE-2016-4983 is an issue in a postinstall script in the dovecot rpm, which
|
||||
# is part of the Red Hat packaging and not part of upstream dovecot
|
||||
DOVECOT_IGNORE_CVES += CVE-2016-4983
|
||||
|
||||
# 0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch
|
||||
|
||||
# Note: this ignore CVE entry is reported as stale by pkg-stats, but
|
||||
# the NVD database is incorrect:
|
||||
# https://lore.kernel.org/buildroot/20250517181815.02ce0393@windsurf/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
|
||||
sha256 783f50ea27b17c16da89578fafdb6decfa44bb8f6590e5698a4e4d3672dc53d4 dropbear-2025.88.tar.bz2
|
||||
sha256 0d1f7ca711cfc336dc8a85e672cab9cfd8223a02fe2da0a4a7aeb58c9e113634 dropbear-2025.89.tar.bz2
|
||||
|
||||
# License file, locally computed
|
||||
sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DROPBEAR_VERSION = 2025.88
|
||||
DROPBEAR_VERSION = 2025.89
|
||||
DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
|
||||
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
|
||||
DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From 00833baac6935bd1e3e9856211bc165c5b02a7bd Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sat, 1 Aug 2020 02:25:47 +0200
|
||||
Subject: [PATCH] ecore_evas/engines/drm/meson.build: use "gl_deps" as engine
|
||||
dependencies
|
||||
|
||||
Meson trigger an error since "engine_gl_drm" variable doesn't exist.
|
||||
|
||||
src/modules/ecore_evas/engines/drm/meson.build:10:2: ERROR: Unknown variable "engine_gl_drm".
|
||||
|
||||
Instead use "gl_deps" as engine dependencies.
|
||||
|
||||
Upstream status:
|
||||
https://sourceforge.net/p/enlightenment/mailman/message/37075016/
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
src/modules/ecore_evas/engines/drm/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build
|
||||
index 58071010d0..0741d7fccd 100644
|
||||
--- a/src/modules/ecore_evas/engines/drm/meson.build
|
||||
+++ b/src/modules/ecore_evas/engines/drm/meson.build
|
||||
@@ -3,7 +3,7 @@ engine_deps = [ecore_drm2, ecore_input, eeze, elput, libdrm, engine_drm]
|
||||
|
||||
if get_option('opengl') != 'none'
|
||||
config_h.set('BUILD_ECORE_EVAS_GL_DRM', '1')
|
||||
- engine_deps += [engine_gl_drm]
|
||||
+ engine_deps += [gl_deps]
|
||||
endif
|
||||
|
||||
engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm'))
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From a21e71cc2284a19a34c913aff757e656e3a8c14a Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sat, 1 Aug 2020 01:01:00 +0200
|
||||
Subject: [PATCH] ecore_evas/engines/drm/meson.build: fix "gl_drm" include
|
||||
directory
|
||||
|
||||
The Evas_Engine_GL_Drm.h file is in "gl_drm" directory, not "drm".
|
||||
|
||||
../src/modules/ecore_evas/engines/drm/ecore_evas_drm.c:23:11: fatal error: Evas_Engine_GL_Drm.h: No such file or directory
|
||||
23 | # include <Evas_Engine_GL_Drm.h>
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~
|
||||
compilation terminated.
|
||||
|
||||
Upstream status:
|
||||
https://sourceforge.net/p/enlightenment/mailman/message/37075004/
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
src/modules/ecore_evas/engines/drm/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build
|
||||
index 0741d7fccd..edda1abd71 100644
|
||||
--- a/src/modules/ecore_evas/engines/drm/meson.build
|
||||
+++ b/src/modules/ecore_evas/engines/drm/meson.build
|
||||
@@ -6,7 +6,7 @@ if get_option('opengl') != 'none'
|
||||
engine_deps += [gl_deps]
|
||||
endif
|
||||
|
||||
-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm'))
|
||||
+engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'gl_drm'))
|
||||
|
||||
shared_module(mod_full_name, engine_src,
|
||||
include_directories : config_dir + [engine_include_dir],
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,198 @@
|
||||
From 0fcaf460c4a33eb54a51b9d8cb38321603019529 Mon Sep 17 00:00:00 2001
|
||||
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
|
||||
Date: Thu, 24 Apr 2025 10:54:38 +0100
|
||||
Subject: [PATCH] evas - fix etc codec - move to Eina_Bool from bool for c23
|
||||
changes
|
||||
|
||||
fixes #84
|
||||
|
||||
@fix
|
||||
|
||||
Upstream: https://git.enlightenment.org/enlightenment/efl/commit/0fcaf460c4a33eb54a51b9d8cb38321603019529
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
src/static_libs/rg_etc/rg_etc1.c | 44 ++++++++++++++++----------------
|
||||
src/static_libs/rg_etc/rg_etc1.h | 6 ++---
|
||||
2 files changed, 25 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/src/static_libs/rg_etc/rg_etc1.c b/src/static_libs/rg_etc/rg_etc1.c
|
||||
index 9b889a3995..49e1aa3eff 100644
|
||||
--- a/src/static_libs/rg_etc/rg_etc1.c
|
||||
+++ b/src/static_libs/rg_etc/rg_etc1.c
|
||||
@@ -1074,7 +1074,7 @@ rg_etc1_block_color4_pack(unsigned int color, unsigned char scaled, unsigned cha
|
||||
|
||||
static inline void
|
||||
rg_etc1_block_color4_component_unpack(unsigned char *r, unsigned char *g, unsigned char *b,
|
||||
- unsigned short packed_color4, bool scaled)
|
||||
+ unsigned short packed_color4, Eina_Bool scaled)
|
||||
{
|
||||
*r = (packed_color4 >> 8) & 15;
|
||||
*g = (packed_color4 >> 4) & 15;
|
||||
@@ -1103,7 +1103,7 @@ rg_etc1_block_color4_unpack(unsigned short packed_color4, unsigned char scaled,
|
||||
|
||||
static inline unsigned char
|
||||
rg_etc1_block_color5_delta3_component_unpack(unsigned char *r, unsigned char *g, unsigned char *b,
|
||||
- unsigned short packed_color5, unsigned short packed_delta3, bool scaled)
|
||||
+ unsigned short packed_color5, unsigned short packed_delta3, Eina_Bool scaled)
|
||||
{
|
||||
unsigned char success = 1;
|
||||
char dc_r, dc_g, dc_b;
|
||||
@@ -1136,7 +1136,7 @@ rg_etc1_block_color5_delta3_component_unpack(unsigned char *r, unsigned char *g,
|
||||
static inline unsigned char
|
||||
rg_etc1_block_color5_delta3_unpack(unsigned int *result,
|
||||
unsigned short packed_color5, unsigned short packed_delta3,
|
||||
- bool scaled, unsigned char alpha)
|
||||
+ Eina_Bool scaled, unsigned char alpha)
|
||||
{
|
||||
unsigned char success;
|
||||
unsigned char r, g, b;
|
||||
@@ -1220,8 +1220,8 @@ rg_etc1_block_subblock_color4_abs_get(unsigned int dst[4], unsigned short packed
|
||||
}
|
||||
|
||||
// This is the exported function to unpack a block
|
||||
-bool
|
||||
-rg_etc1_unpack_block(const void *ETC1_block, unsigned int *pDst_pixels_BGRA, bool preserve_alpha)
|
||||
+Eina_Bool
|
||||
+rg_etc1_unpack_block(const void *ETC1_block, unsigned int *pDst_pixels_BGRA, Eina_Bool preserve_alpha)
|
||||
{
|
||||
unsigned char diff_flag, flip_flag, table_index0, table_index1;
|
||||
unsigned int subblock_colors0[4] = { 0 };
|
||||
@@ -1627,12 +1627,12 @@ struct _rg_etc1_optimizer_params
|
||||
uint m_num_src_pixels;
|
||||
const color_quad_u8* m_pSrc_pixels;
|
||||
|
||||
- bool m_use_color4;
|
||||
+ Eina_Bool m_use_color4;
|
||||
const int* m_pScan_deltas;
|
||||
uint m_scan_delta_size;
|
||||
|
||||
color_quad_u8 m_base_color5;
|
||||
- bool m_constrain_against_base_color5;
|
||||
+ Eina_Bool m_constrain_against_base_color5;
|
||||
};
|
||||
|
||||
static inline void
|
||||
@@ -1665,7 +1665,7 @@ typedef struct
|
||||
uint m_block_inten_table;
|
||||
uint m_n;
|
||||
uint8* m_pSelectors;
|
||||
- bool m_block_color4;
|
||||
+ Eina_Bool m_block_color4;
|
||||
} rg_etc1_optimizer_results;
|
||||
|
||||
static inline void
|
||||
@@ -1685,7 +1685,7 @@ typedef struct
|
||||
Etc1_Solution_Coordinates m_coords;
|
||||
uint8 m_selectors[8];
|
||||
uint64 m_error;
|
||||
- bool m_valid;
|
||||
+ Eina_Bool m_valid;
|
||||
} rg_etc1_potential_solution;
|
||||
|
||||
static inline void
|
||||
@@ -1730,14 +1730,14 @@ rg_etc1_optimizer_clear(rg_etc1_optimizer *optimizer)
|
||||
rg_etc1_potential_solution_clear(&optimizer->m_trial_solution);
|
||||
}
|
||||
|
||||
-static bool rg_etc1_optimizer_evaluate_solution(rg_etc1_optimizer *optimizer, const Etc1_Solution_Coordinates* coords,
|
||||
- rg_etc1_potential_solution* trial_solution,
|
||||
- rg_etc1_potential_solution* pBest_solution);
|
||||
-static bool rg_etc1_optimizer_evaluate_solution_fast(rg_etc1_optimizer *optimizer,const Etc1_Solution_Coordinates *coords,
|
||||
- rg_etc1_potential_solution *trial_solution,
|
||||
- rg_etc1_potential_solution *pBest_solution);
|
||||
+static Eina_Bool rg_etc1_optimizer_evaluate_solution(rg_etc1_optimizer *optimizer, const Etc1_Solution_Coordinates* coords,
|
||||
+ rg_etc1_potential_solution* trial_solution,
|
||||
+ rg_etc1_potential_solution* pBest_solution);
|
||||
+static Eina_Bool rg_etc1_optimizer_evaluate_solution_fast(rg_etc1_optimizer *optimizer,const Etc1_Solution_Coordinates *coords,
|
||||
+ rg_etc1_potential_solution *trial_solution,
|
||||
+ rg_etc1_potential_solution *pBest_solution);
|
||||
|
||||
-static bool
|
||||
+static Eina_Bool
|
||||
rg_etc1_optimizer_compute(rg_etc1_optimizer *optimizer)
|
||||
{
|
||||
const uint n = optimizer->m_pParams->m_num_src_pixels;
|
||||
@@ -1811,7 +1811,7 @@ rg_etc1_optimizer_compute(rg_etc1_optimizer *optimizer)
|
||||
color_quad_u8 base_color;
|
||||
float avg_delta_r_f, avg_delta_g_f, avg_delta_b_f;
|
||||
int br1, bg1, bb1;
|
||||
- bool skip;
|
||||
+ Eina_Bool skip;
|
||||
Etc1_Solution_Coordinates coords1;
|
||||
rg_etc1_solution_coordinates_get_scaled_color(&base_color, &optimizer->m_best_solution.m_coords);
|
||||
|
||||
@@ -1958,14 +1958,14 @@ rg_etc1_optimizer_init(rg_etc1_optimizer *optimizer, const rg_etc1_optimizer_par
|
||||
optimizer->m_best_solution.m_error = cUINT64_MAX;
|
||||
}
|
||||
|
||||
-static bool
|
||||
+static Eina_Bool
|
||||
rg_etc1_optimizer_evaluate_solution(rg_etc1_optimizer *optimizer, const Etc1_Solution_Coordinates* coords,
|
||||
rg_etc1_potential_solution* trial_solution, rg_etc1_potential_solution* pBest_solution)
|
||||
{
|
||||
color_quad_u8 base_color;
|
||||
const uint n = 8;
|
||||
uint inten_table;
|
||||
- bool success = EINA_FALSE;
|
||||
+ Eina_Bool success = EINA_FALSE;
|
||||
|
||||
trial_solution->m_valid = EINA_FALSE;
|
||||
|
||||
@@ -2062,14 +2062,14 @@ rg_etc1_optimizer_evaluate_solution(rg_etc1_optimizer *optimizer, const Etc1_Sol
|
||||
return success;
|
||||
}
|
||||
|
||||
-static bool
|
||||
+static Eina_Bool
|
||||
rg_etc1_optimizer_evaluate_solution_fast(rg_etc1_optimizer *optimizer, const Etc1_Solution_Coordinates *coords,
|
||||
rg_etc1_potential_solution *trial_solution, rg_etc1_potential_solution *pBest_solution)
|
||||
{
|
||||
color_quad_u8 base_color;
|
||||
const uint n = 8;
|
||||
int inten_table;
|
||||
- bool success = EINA_FALSE;
|
||||
+ Eina_Bool success = EINA_FALSE;
|
||||
|
||||
if (optimizer->m_pParams->m_constrain_against_base_color5)
|
||||
{
|
||||
@@ -2380,7 +2380,7 @@ rg_etc1_pack_block_solid_color(unsigned char *block, const color_quad_u8 *color,
|
||||
static uint
|
||||
rg_etc1_pack_block_solid_color_constrained(rg_etc1_optimizer_results *results,uint num_colors,
|
||||
const uint8* pColor, rg_etc1_pack_params *pack_params EINA_UNUSED,
|
||||
- bool use_diff, const color_quad_u8* pBase_color5_unscaled)
|
||||
+ Eina_Bool use_diff, const color_quad_u8* pBase_color5_unscaled)
|
||||
{
|
||||
static uint s_next_comp[4] = { 1, 2, 0, 1 };
|
||||
uint best_error = cUINT32_MAX, best_i = 0;
|
||||
diff --git a/src/static_libs/rg_etc/rg_etc1.h b/src/static_libs/rg_etc/rg_etc1.h
|
||||
index 4a695dc2d0..28742ca768 100644
|
||||
--- a/src/static_libs/rg_etc/rg_etc1.h
|
||||
+++ b/src/static_libs/rg_etc/rg_etc1.h
|
||||
@@ -3,13 +3,13 @@
|
||||
#ifndef __RG_ETC1_H__
|
||||
#define __RG_ETC1_H__
|
||||
|
||||
-typedef unsigned char bool;
|
||||
+#include <Eina.h>
|
||||
|
||||
// Unpacks an 8-byte ETC1 compressed block to a block of 4x4 32bpp RGBA pixels.
|
||||
// Returns false if the block is invalid. Invalid blocks will still be unpacked with clamping.
|
||||
// This function is thread safe, and does not dynamically allocate any memory.
|
||||
// If preserve_alpha is true, the alpha channel of the destination pixels will not be overwritten. Otherwise, alpha will be set to 255.
|
||||
-bool rg_etc1_unpack_block(const void *pETC1_block, unsigned int* pDst_pixels_rgba, bool preserve_alpha);
|
||||
+Eina_Bool rg_etc1_unpack_block(const void *pETC1_block, unsigned int* pDst_pixels_rgba, Eina_Bool preserve_alpha);
|
||||
|
||||
// Quality setting = the higher the quality, the slower.
|
||||
// To pack large textures, it is highly recommended to call pack_etc1_block() in parallel, on different blocks, from multiple threads (particularly when using cHighQuality).
|
||||
@@ -23,7 +23,7 @@ typedef enum {
|
||||
typedef struct
|
||||
{
|
||||
rg_etc1_quality m_quality;
|
||||
- bool m_dithering;
|
||||
+ Eina_Bool m_dithering;
|
||||
} rg_etc1_pack_params;
|
||||
|
||||
// pack_etc1_block_init() should be called before calling pack_etc1_block(),
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
From 9948f15ebdfae6b39f88ab58623e28c2b9320e0b Mon Sep 17 00:00:00 2001
|
||||
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
|
||||
Date: Mon, 28 Apr 2025 12:53:01 +0100
|
||||
Subject: [PATCH] eldbus - silence gcc 15 warnings
|
||||
|
||||
nmo bug here - just warnings for perfectly ok code and people using
|
||||
-Werror ...
|
||||
|
||||
fixes #85
|
||||
|
||||
Upstream: https://git.enlightenment.org/enlightenment/efl/commit/9948f15ebdfae6b39f88ab58623e28c2b9320e0b
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
src/lib/eldbus/eldbus_core.c | 2 +-
|
||||
src/lib/emile/emile_cipher_openssl.c | 54 ++++++++++++++++++++--------
|
||||
2 files changed, 41 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/lib/eldbus/eldbus_core.c b/src/lib/eldbus/eldbus_core.c
|
||||
index 513314741a..3f4aedd442 100644
|
||||
--- a/src/lib/eldbus/eldbus_core.c
|
||||
+++ b/src/lib/eldbus/eldbus_core.c
|
||||
@@ -103,7 +103,7 @@ eldbus_fd_handler_del(Eldbus_Handler_Data *hd)
|
||||
}
|
||||
|
||||
static void
|
||||
-_eldbus_fork_reset()
|
||||
+_eldbus_fork_reset(void *data EINA_UNUSED)
|
||||
{
|
||||
int i;
|
||||
|
||||
diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
|
||||
index 7dd2033db1..52575e653a 100644
|
||||
--- a/src/lib/emile/emile_cipher_openssl.c
|
||||
+++ b/src/lib/emile/emile_cipher_openssl.c
|
||||
@@ -313,7 +313,6 @@ EAPI Emile_SSL *
|
||||
emile_cipher_server_listen(Emile_Cipher_Type t)
|
||||
{
|
||||
Emile_SSL *r;
|
||||
- DH *dh_params = NULL;
|
||||
int options;
|
||||
int dh = 0;
|
||||
|
||||
@@ -343,20 +342,47 @@ emile_cipher_server_listen(Emile_Cipher_Type t)
|
||||
|
||||
if (!r->ssl_ctx) goto on_error;
|
||||
|
||||
- dh_params = DH_new();
|
||||
- if (!dh_params) goto on_error;
|
||||
- if (!DH_generate_parameters_ex(dh_params, 1024, DH_GENERATOR_5, NULL))
|
||||
- goto on_error;
|
||||
- if (!DH_check(dh_params, &dh))
|
||||
- goto on_error;
|
||||
- if ((dh & DH_CHECK_P_NOT_PRIME) || (dh & DH_CHECK_P_NOT_SAFE_PRIME))
|
||||
- goto on_error;
|
||||
- if (!DH_generate_key(dh_params))
|
||||
- goto on_error;
|
||||
- if (!SSL_CTX_set_tmp_dh(r->ssl_ctx, dh_params))
|
||||
- goto on_error;
|
||||
+//#define OPENSSL_DH_OLD 1
|
||||
+
|
||||
+ do
|
||||
+ {
|
||||
+#ifdef OPENSSL_DH_OLD
|
||||
+ DH *dh_params = DH_new();
|
||||
+ if (!dh_params) goto on_error;
|
||||
+ if (!DH_generate_parameters_ex(dh_params, 1024, DH_GENERATOR_5, NULL))
|
||||
+ goto on_error;
|
||||
+ if (!DH_check(dh_params, &dh))
|
||||
+ goto on_error;
|
||||
+ if ((dh & DH_CHECK_P_NOT_PRIME) || (dh & DH_CHECK_P_NOT_SAFE_PRIME))
|
||||
+ goto on_error;
|
||||
+ if (!DH_generate_key(dh_params))
|
||||
+ goto on_error;
|
||||
+ if (!SSL_CTX_set_tmp_dh(r->ssl_ctx, dh_params))
|
||||
+ goto on_error;
|
||||
+ DH_free(dh_params);
|
||||
+#else
|
||||
+ EVP_PKEY *params = NULL;
|
||||
+ EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_DH, NULL);
|
||||
+ if (!pctx)
|
||||
+ goto on_error;
|
||||
+ if (EVP_PKEY_paramgen_init(pctx) <= 0)
|
||||
+ goto on_error2;
|
||||
+ if (EVP_PKEY_CTX_set_dh_paramgen_prime_len(pctx, 1024) <= 0)
|
||||
+ goto on_error2;
|
||||
+ if (EVP_PKEY_CTX_set_dh_paramgen_generator(pctx, 5) <= 0)
|
||||
+ goto on_error2;
|
||||
+ if (EVP_PKEY_paramgen(pctx, ¶ms) <= 0)
|
||||
+ goto on_error2;
|
||||
+ if (SSL_CTX_set0_tmp_dh_pkey(r->ssl_ctx, params) <= 0)
|
||||
+ goto on_error2;
|
||||
+on_error2:
|
||||
+ if (params) EVP_PKEY_free(params);
|
||||
+ EVP_PKEY_CTX_free(pctx);
|
||||
+ if (!params) goto on_error;
|
||||
+#endif
|
||||
+ }
|
||||
+ while (0);
|
||||
|
||||
- DH_free(dh_params);
|
||||
INF("DH params successfully generated and applied!");
|
||||
|
||||
if (!SSL_CTX_set_cipher_list(r->ssl_ctx,
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,857 @@
|
||||
From 60217eff9672e55c67454df13a16236d106fc92f Mon Sep 17 00:00:00 2001
|
||||
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
|
||||
Date: Sat, 3 May 2025 15:08:54 +0100
|
||||
Subject: [PATCH] efl all - gcc 15 break older c std code
|
||||
|
||||
gcc 15 default policy of breaking existing code. adapt. this time it's
|
||||
the old func() == i take zero or more arguments func not NO arguments.
|
||||
gcc15 made this a compile error and efl used it as a shortcut all over
|
||||
to save being verbose when not needed.
|
||||
|
||||
adapt
|
||||
|
||||
Upstream: https://git.enlightenment.org/enlightenment/efl/commit/60217eff9672e55c67454df13a16236d106fc92f
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
src/bin/elementary/test_win_stack.c | 2 +-
|
||||
src/bin/exactness/player.c | 2 +-
|
||||
src/bin/exactness/recorder.c | 2 +-
|
||||
src/lib/ecore_imf/ecore_imf_context.c | 19 ++-
|
||||
src/lib/ecore_imf/ecore_imf_private.h | 4 +-
|
||||
src/lib/eeze/eeze_udev_watch.c | 2 +-
|
||||
src/lib/efl_canvas_wl/efl_canvas_wl.c | 16 +-
|
||||
src/lib/efl_canvas_wl/x11.x | 2 +-
|
||||
src/lib/efreet/efreet_cache.c | 2 +-
|
||||
src/lib/eio/eio_monitor_inotify.c | 2 +-
|
||||
.../system/systemd/ecore_system_systemd.c | 2 +-
|
||||
.../ecore/system/upower/ecore_system_upower.c | 2 +-
|
||||
.../evas/engines/gl_common/evas_gl_context.c | 158 ++++++++----------
|
||||
.../evas/engines/gl_common/evas_gl_core.c | 2 +-
|
||||
src/modules/evas/engines/gl_drm/evas_engine.c | 28 +---
|
||||
src/modules/evas/engines/gl_x11/evas_engine.c | 94 +++++------
|
||||
src/modules/evas/engines/gl_x11/evas_x_main.c | 4 +-
|
||||
.../evas/engines/wayland_egl/evas_engine.c | 31 +---
|
||||
18 files changed, 172 insertions(+), 202 deletions(-)
|
||||
|
||||
diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c
|
||||
index e3ca2b943e..96e0b54f41 100644
|
||||
--- a/src/bin/elementary/test_win_stack.c
|
||||
+++ b/src/bin/elementary/test_win_stack.c
|
||||
@@ -92,7 +92,7 @@ _bt_pressed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
|
||||
}
|
||||
|
||||
static void
|
||||
-_del()
|
||||
+_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *info EINA_UNUSED)
|
||||
{
|
||||
level = 0;
|
||||
popto_win = NULL;
|
||||
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
|
||||
index 6802c72efe..7e47a15664 100644
|
||||
--- a/src/bin/exactness/player.c
|
||||
+++ b/src/bin/exactness/player.c
|
||||
@@ -1040,7 +1040,7 @@ _write_unit_file(void)
|
||||
}
|
||||
#ifdef HAVE_DLSYM
|
||||
# define ORIGINAL_CALL_T(t, name, ...) \
|
||||
- t (*_original_init_cb)(); \
|
||||
+ t (*_original_init_cb)(...); \
|
||||
_original_init_cb = dlsym(RTLD_NEXT, name); \
|
||||
original_return = _original_init_cb(__VA_ARGS__);
|
||||
#else
|
||||
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
|
||||
index f161100cbc..45394c3c59 100644
|
||||
--- a/src/bin/exactness/recorder.c
|
||||
+++ b/src/bin/exactness/recorder.c
|
||||
@@ -301,7 +301,7 @@ _setup_ee_creation(void)
|
||||
|
||||
#ifdef HAVE_DLSYM
|
||||
# define ORIGINAL_CALL_T(t, name, ...) \
|
||||
- t (*_original_init_cb)(); \
|
||||
+ t (*_original_init_cb)(...); \
|
||||
_original_init_cb = dlsym(RTLD_NEXT, name); \
|
||||
original_return = _original_init_cb(__VA_ARGS__);
|
||||
#else
|
||||
diff --git a/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c
|
||||
index 5ade47002b..cea45ba54e 100644
|
||||
--- a/src/lib/ecore_imf/ecore_imf_context.c
|
||||
+++ b/src/lib/ecore_imf/ecore_imf_context.c
|
||||
@@ -780,7 +780,7 @@ ecore_imf_context_event_callback_add(Ecore_IMF_Context *ctx, Ecore_IMF_Callback_
|
||||
fn = calloc(1, sizeof (Ecore_IMF_Func_Node));
|
||||
if (!fn) return;
|
||||
|
||||
- fn->func = func;
|
||||
+ fn->func = (void *)func;
|
||||
fn->data = data;
|
||||
fn->type = type;
|
||||
|
||||
@@ -806,7 +806,7 @@ ecore_imf_context_event_callback_del(Ecore_IMF_Context *ctx, Ecore_IMF_Callback_
|
||||
|
||||
EINA_LIST_FOREACH_SAFE(ctx->callbacks, l, l_next, fn)
|
||||
{
|
||||
- if ((fn) && (fn->func == func) && (fn->type == type))
|
||||
+ if ((fn) && (fn->func == (void *)func) && (fn->type == type))
|
||||
{
|
||||
void *tmp = (void *)fn->data;
|
||||
free(fn);
|
||||
@@ -833,7 +833,11 @@ ecore_imf_context_event_callback_call(Ecore_IMF_Context *ctx, Ecore_IMF_Callback
|
||||
EINA_LIST_FOREACH(ctx->callbacks, l, fn)
|
||||
{
|
||||
if ((fn) && (fn->type == type) && (fn->func))
|
||||
- fn->func(fn->data, ctx, event_info);
|
||||
+ {
|
||||
+ Ecore_IMF_Event_Cb cb = (Ecore_IMF_Event_Cb)fn->func;
|
||||
+
|
||||
+ cb((void *)fn->data, ctx, event_info);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1210,6 +1214,8 @@ ecore_imf_context_input_panel_state_get(Ecore_IMF_Context *ctx)
|
||||
return state;
|
||||
}
|
||||
|
||||
+typedef void (*Ecore_IMF_Input_Panel_Callback) (void *data, Ecore_IMF_Context *ctx, int value);
|
||||
+
|
||||
EAPI void
|
||||
ecore_imf_context_input_panel_event_callback_add(Ecore_IMF_Context *ctx,
|
||||
Ecore_IMF_Input_Panel_Event type,
|
||||
@@ -1230,7 +1236,7 @@ ecore_imf_context_input_panel_event_callback_add(Ecore_IMF_Context *ctx,
|
||||
fn = calloc(1, sizeof (Ecore_IMF_Input_Panel_Callback_Node));
|
||||
if (!fn) return;
|
||||
|
||||
- fn->func = func;
|
||||
+ fn->func = (void *)func;
|
||||
fn->data = data;
|
||||
fn->type = type;
|
||||
|
||||
@@ -1258,7 +1264,7 @@ ecore_imf_context_input_panel_event_callback_del(Ecore_IMF_Context *ctx,
|
||||
|
||||
EINA_LIST_FOREACH_SAFE(ctx->input_panel_callbacks, l, l_next, fn)
|
||||
{
|
||||
- if ((fn) && (fn->func == func) && (fn->type == type))
|
||||
+ if ((fn) && (fn->func == (void *)func) && (fn->type == type))
|
||||
{
|
||||
free(fn);
|
||||
ctx->input_panel_callbacks = eina_list_remove_list(ctx->input_panel_callbacks, l);
|
||||
@@ -1284,7 +1290,8 @@ ecore_imf_context_input_panel_event_callback_call(Ecore_IMF_Context *ctx, Ecore_
|
||||
{
|
||||
if ((fn) && (fn->type == type) && (fn->func))
|
||||
{
|
||||
- fn->func(fn->data, ctx, value);
|
||||
+ Ecore_IMF_Input_Panel_Callback cb = (Ecore_IMF_Input_Panel_Callback)fn->func;
|
||||
+ cb((void *)fn->data, ctx, value);
|
||||
if (type == ECORE_IMF_INPUT_PANEL_STATE_EVENT &&
|
||||
value == ECORE_IMF_INPUT_PANEL_STATE_HIDE &&
|
||||
show_req_ctx == ctx)
|
||||
diff --git a/src/lib/ecore_imf/ecore_imf_private.h b/src/lib/ecore_imf/ecore_imf_private.h
|
||||
index 22d2942109..b9622bd165 100644
|
||||
--- a/src/lib/ecore_imf/ecore_imf_private.h
|
||||
+++ b/src/lib/ecore_imf/ecore_imf_private.h
|
||||
@@ -77,14 +77,14 @@ struct _Ecore_IMF_Module
|
||||
|
||||
struct _Ecore_IMF_Func_Node
|
||||
{
|
||||
- void (*func) ();
|
||||
+ void *func; // cast at call time
|
||||
const void *data;
|
||||
Ecore_IMF_Callback_Type type;
|
||||
};
|
||||
|
||||
struct _Ecore_IMF_Input_Panel_Callback_Node
|
||||
{
|
||||
- void (*func) ();
|
||||
+ void *func;
|
||||
const void *data;
|
||||
Ecore_IMF_Input_Panel_Event type;
|
||||
};
|
||||
diff --git a/src/lib/eeze/eeze_udev_watch.c b/src/lib/eeze/eeze_udev_watch.c
|
||||
index 7245f9d0a6..ba5b231a34 100644
|
||||
--- a/src/lib/eeze/eeze_udev_watch.c
|
||||
+++ b/src/lib/eeze/eeze_udev_watch.c
|
||||
@@ -362,7 +362,7 @@ error:
|
||||
}
|
||||
|
||||
static void
|
||||
-_eeze_udev_watch_reset()
|
||||
+_eeze_udev_watch_reset(void *data EINA_UNUSED)
|
||||
{
|
||||
Eeze_Udev_Watch *watch;
|
||||
|
||||
diff --git a/src/lib/efl_canvas_wl/efl_canvas_wl.c b/src/lib/efl_canvas_wl/efl_canvas_wl.c
|
||||
index 51ecde1b92..f0ef4a076c 100644
|
||||
--- a/src/lib/efl_canvas_wl/efl_canvas_wl.c
|
||||
+++ b/src/lib/efl_canvas_wl/efl_canvas_wl.c
|
||||
@@ -3199,11 +3199,11 @@ shell_surface_toplevel_set_app_id(struct wl_client *client EINA_UNUSED, struct w
|
||||
}
|
||||
|
||||
static void
|
||||
-shell_surface_toplevel_show_window_menu(){}
|
||||
+shell_surface_toplevel_show_window_menu(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED, struct wl_resource *resource2 EINA_UNUSED, uint32_t a EINA_UNUSED, int32_t b EINA_UNUSED, int32_t c EINA_UNUSED){}
|
||||
static void
|
||||
-shell_surface_toplevel_move(){}
|
||||
+shell_surface_toplevel_move(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED, struct wl_resource *resource2 EINA_UNUSED, uint32_t a EINA_UNUSED){}
|
||||
static void
|
||||
-shell_surface_toplevel_resize(){}
|
||||
+shell_surface_toplevel_resize(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED, struct wl_resource *resource2 EINA_UNUSED, uint32_t a EINA_UNUSED, uint32_t b EINA_UNUSED){}
|
||||
|
||||
static void
|
||||
shell_surface_toplevel_set_max_size(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, int32_t w, int32_t h)
|
||||
@@ -3224,15 +3224,15 @@ shell_surface_toplevel_set_min_size(struct wl_client *client EINA_UNUSED, struct
|
||||
}
|
||||
|
||||
static void
|
||||
-shell_surface_toplevel_set_maximized(){}
|
||||
+shell_surface_toplevel_set_maximized(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED){}
|
||||
static void
|
||||
-shell_surface_toplevel_unset_maximized(){}
|
||||
+shell_surface_toplevel_unset_maximized(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED){}
|
||||
static void
|
||||
-shell_surface_toplevel_set_fullscreen(){}
|
||||
+shell_surface_toplevel_set_fullscreen(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED, struct wl_resource *resource2 EINA_UNUSED){}
|
||||
static void
|
||||
-shell_surface_toplevel_unset_fullscreen(){}
|
||||
+shell_surface_toplevel_unset_fullscreen(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED){}
|
||||
static void
|
||||
-shell_surface_toplevel_set_minimized(){}
|
||||
+shell_surface_toplevel_set_minimized(struct wl_client *client EINA_UNUSED, struct wl_resource *resource EINA_UNUSED){}
|
||||
|
||||
static const struct xdg_toplevel_interface shell_surface_toplevel_interface =
|
||||
{
|
||||
diff --git a/src/lib/efl_canvas_wl/x11.x b/src/lib/efl_canvas_wl/x11.x
|
||||
index 2d7a88352f..93d5e21f01 100644
|
||||
--- a/src/lib/efl_canvas_wl/x11.x
|
||||
+++ b/src/lib/efl_canvas_wl/x11.x
|
||||
@@ -640,7 +640,7 @@ x11_kbd_apply(Comp_Seat *s)
|
||||
static void seat_keymap_update(Comp_Seat *s);
|
||||
|
||||
static Eina_Bool
|
||||
-x11_xkb_refresh()
|
||||
+x11_xkb_refresh(void *data EINA_UNUSED, int event EINA_UNUSED, void *info EINA_UNUSED)
|
||||
{
|
||||
Eina_List *l;
|
||||
Comp *c;
|
||||
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
|
||||
index dd4dfb0b99..62134fdcd0 100644
|
||||
--- a/src/lib/efreet/efreet_cache.c
|
||||
+++ b/src/lib/efreet/efreet_cache.c
|
||||
@@ -222,7 +222,7 @@ _cb_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
||||
}
|
||||
|
||||
static void
|
||||
-_efreet_cache_reset()
|
||||
+_efreet_cache_reset(void *data EINA_UNUSED)
|
||||
{
|
||||
const char *s;
|
||||
int len = 0;
|
||||
diff --git a/src/lib/eio/eio_monitor_inotify.c b/src/lib/eio/eio_monitor_inotify.c
|
||||
index e266877134..4c3353e832 100644
|
||||
--- a/src/lib/eio/eio_monitor_inotify.c
|
||||
+++ b/src/lib/eio/eio_monitor_inotify.c
|
||||
@@ -159,7 +159,7 @@ _eio_inotify_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fdh)
|
||||
*/
|
||||
static Eina_Bool reseting;
|
||||
static void
|
||||
-_eio_monitor_reset()
|
||||
+_eio_monitor_reset(void *data EINA_UNUSED)
|
||||
{
|
||||
Eina_Hash *h = _inotify_monitors;
|
||||
Eina_Iterator *it;
|
||||
diff --git a/src/modules/ecore/system/systemd/ecore_system_systemd.c b/src/modules/ecore/system/systemd/ecore_system_systemd.c
|
||||
index ab19ff36cd..3295e8f713 100644
|
||||
--- a/src/modules/ecore/system/systemd/ecore_system_systemd.c
|
||||
+++ b/src/modules/ecore/system/systemd/ecore_system_systemd.c
|
||||
@@ -253,7 +253,7 @@ static Eina_Bool _ecore_system_systemd_init(void);
|
||||
static unsigned int reseting = 0;
|
||||
|
||||
static void
|
||||
-_ecore_system_systemd_reset()
|
||||
+_ecore_system_systemd_reset(void *data EINA_UNUSED)
|
||||
{
|
||||
reseting = 1;
|
||||
_ecore_system_systemd_shutdown();
|
||||
diff --git a/src/modules/ecore/system/upower/ecore_system_upower.c b/src/modules/ecore/system/upower/ecore_system_upower.c
|
||||
index 17ef5170c8..9e0a3d04b4 100644
|
||||
--- a/src/modules/ecore/system/upower/ecore_system_upower.c
|
||||
+++ b/src/modules/ecore/system/upower/ecore_system_upower.c
|
||||
@@ -413,7 +413,7 @@ static void _ecore_system_upower_shutdown(void);
|
||||
static unsigned int reseting;
|
||||
|
||||
static void
|
||||
-_ecore_system_upower_reset()
|
||||
+_ecore_system_upower_reset(void *data EINA_UNUSED)
|
||||
{
|
||||
reseting = 1;
|
||||
_ecore_system_upower_shutdown();
|
||||
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
|
||||
index 85035d42f9..5c7deb4b30 100644
|
||||
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
|
||||
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
|
||||
@@ -42,14 +42,6 @@ const char *(*glsym_glGetStringi) (GLenum name, GLuint index) = NULL;
|
||||
# define GL_LINE_SMOOTH 0x0B20
|
||||
# endif
|
||||
|
||||
-// just used for finding symbols :)
|
||||
-typedef void (*_eng_fn) (void);
|
||||
-
|
||||
-typedef _eng_fn (*glsym_func_eng_fn) ();
|
||||
-typedef int (*secsym_func_int) ();
|
||||
-typedef unsigned int (*secsym_func_uint) ();
|
||||
-typedef void *(*secsym_func_void_ptr) ();
|
||||
-
|
||||
unsigned int (*eglsym_eglDestroyImage) (void *a, void *b) = NULL;
|
||||
void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
|
||||
void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d) = NULL;
|
||||
@@ -71,10 +63,6 @@ int (*secsym_tbm_surface_map) (void *surface, int opt, void *info) = NULL;
|
||||
int (*secsym_tbm_surface_unmap) (void *surface) = NULL;
|
||||
int (*secsym_tbm_surface_get_info) (void *surface, void *info) = NULL;
|
||||
////////////////////////////////////
|
||||
-#else
|
||||
-typedef void (*_eng_fn) (void);
|
||||
-
|
||||
-typedef _eng_fn (*glsym_func_eng_fn) ();
|
||||
#endif
|
||||
|
||||
static int dbgflushnum = -1;
|
||||
@@ -216,27 +204,27 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
|
||||
|
||||
glsym_glGetStringi = dlsym(RTLD_DEFAULT, "glGetStringi");
|
||||
|
||||
-#define FINDSYM(dst, sym, ext, typ) do { \
|
||||
+#define FINDSYM(dst, sym, ext) do { \
|
||||
if (!dst) { \
|
||||
if (_has_ext(ext, &exts, &num) && GetProcAddress) \
|
||||
- dst = (typ) GetProcAddress(sym); \
|
||||
+ dst = GetProcAddress(sym); \
|
||||
if (!dst) \
|
||||
- dst = (typ) dlsym(RTLD_DEFAULT, sym); \
|
||||
+ dst = dlsym(RTLD_DEFAULT, sym); \
|
||||
}} while (0)
|
||||
-#define FALLBAK(dst, typ) do { \
|
||||
+#define FALLBAK(dst) do { \
|
||||
if (!dst) { \
|
||||
ERR("Symbol '%s' could not be found!", (#dst) + 6); \
|
||||
- dst = (typ) sym_missing; \
|
||||
+ dst = (void *)sym_missing; \
|
||||
failed = EINA_TRUE; \
|
||||
}} while (0)
|
||||
|
||||
#ifdef GL_GLES
|
||||
|
||||
- FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffers", NULL, glsym_func_void);
|
||||
- FALLBAK(glsym_glGenFramebuffers, glsym_func_void);
|
||||
+ FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffers", NULL);
|
||||
+ FALLBAK(glsym_glGenFramebuffers);
|
||||
|
||||
- FINDSYM(glsym_glBindFramebuffer, "glBindFramebuffer", NULL, glsym_func_void);
|
||||
- FALLBAK(glsym_glBindFramebuffer, glsym_func_void);
|
||||
+ FINDSYM(glsym_glBindFramebuffer, "glBindFramebuffer", NULL);
|
||||
+ FALLBAK(glsym_glBindFramebuffer);
|
||||
|
||||
#else
|
||||
|
||||
@@ -274,79 +262,79 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
|
||||
glGenFramebuffers, glBindFramebuffer, glFramebufferTexture2D, glDeleteFramebuffers
|
||||
*/
|
||||
|
||||
- FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffers", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersARB", "GL_ARB_framebuffer_object", glsym_func_void);
|
||||
- FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersEXT", "GL_EXT_framebuffer_object", glsym_func_void);
|
||||
- FALLBAK(glsym_glGenFramebuffers, glsym_func_void);
|
||||
+ FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffers", NULL);
|
||||
+ FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersARB", "GL_ARB_framebuffer_object");
|
||||
+ FINDSYM(glsym_glGenFramebuffers, "glGenFramebuffersEXT", "GL_EXT_framebuffer_object");
|
||||
+ FALLBAK(glsym_glGenFramebuffers);
|
||||
|
||||
- FINDSYM(glsym_glBindFramebuffer, "glBindFramebuffer", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glBindFramebuffer, "glBindFramebufferARB", "GL_ARB_framebuffer_object", glsym_func_void);
|
||||
- FINDSYM(glsym_glBindFramebuffer, "glBindFramebufferEXT", "GL_EXT_framebuffer_object", glsym_func_void);
|
||||
- FALLBAK(glsym_glBindFramebuffer, glsym_func_void);
|
||||
+ FINDSYM(glsym_glBindFramebuffer, "glBindFramebuffer", NULL);
|
||||
+ FINDSYM(glsym_glBindFramebuffer, "glBindFramebufferARB", "GL_ARB_framebuffer_object");
|
||||
+ FINDSYM(glsym_glBindFramebuffer, "glBindFramebufferEXT", "GL_EXT_framebuffer_object");
|
||||
+ FALLBAK(glsym_glBindFramebuffer);
|
||||
|
||||
#endif
|
||||
|
||||
- FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2D", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2DARB", "GL_ARB_framebuffer_object", glsym_func_void);
|
||||
- FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2DEXT", "GL_EXT_framebuffer_object", glsym_func_void);
|
||||
- FALLBAK(glsym_glFramebufferTexture2D, glsym_func_void);
|
||||
+ FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2D", NULL);
|
||||
+ FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2DARB", "GL_ARB_framebuffer_object");
|
||||
+ FINDSYM(glsym_glFramebufferTexture2D, "glFramebufferTexture2DEXT", "GL_EXT_framebuffer_object");
|
||||
+ FALLBAK(glsym_glFramebufferTexture2D);
|
||||
|
||||
- FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffers", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffersARB", "GL_ARB_framebuffer_object", glsym_func_void);
|
||||
- FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffersEXT", "GL_EXT_framebuffer_object", glsym_func_void);
|
||||
- FALLBAK(glsym_glDeleteFramebuffers, glsym_func_void);
|
||||
+ FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffers", NULL);
|
||||
+ FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffersARB", "GL_ARB_framebuffer_object");
|
||||
+ FINDSYM(glsym_glDeleteFramebuffers, "glDeleteFramebuffersEXT", "GL_EXT_framebuffer_object");
|
||||
+ FALLBAK(glsym_glDeleteFramebuffers);
|
||||
|
||||
// Not sure there's an EXT variant
|
||||
- FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinary", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryOES", "GL_OES_get_program_binary", glsym_func_void);
|
||||
- FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryEXT", "GL_EXT_get_program_binary", glsym_func_void);
|
||||
+ FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinary", NULL);
|
||||
+ FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryOES", "GL_OES_get_program_binary");
|
||||
+ FINDSYM(glsym_glGetProgramBinary, "glGetProgramBinaryEXT", "GL_EXT_get_program_binary");
|
||||
|
||||
// Not sure there's an EXT variant
|
||||
- FINDSYM(glsym_glProgramBinary, "glProgramBinary", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glProgramBinary, "glProgramBinaryOES", "GL_OES_get_program_binary", glsym_func_void);
|
||||
- FINDSYM(glsym_glProgramBinary, "glProgramBinaryEXT", "GL_EXT_get_program_binary", glsym_func_void);
|
||||
+ FINDSYM(glsym_glProgramBinary, "glProgramBinary", NULL);
|
||||
+ FINDSYM(glsym_glProgramBinary, "glProgramBinaryOES", "GL_OES_get_program_binary");
|
||||
+ FINDSYM(glsym_glProgramBinary, "glProgramBinaryEXT", "GL_EXT_get_program_binary");
|
||||
|
||||
- FINDSYM(glsym_glProgramParameteri, "glProgramParameteri", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glProgramParameteri, "glProgramParameteriEXT", "GL_EXT_separate_shader_objects", glsym_func_void);
|
||||
- FINDSYM(glsym_glProgramParameteri, "glProgramParameteriARB", "GL_ARB_geometry_shader4", glsym_func_void);
|
||||
+ FINDSYM(glsym_glProgramParameteri, "glProgramParameteri", NULL);
|
||||
+ FINDSYM(glsym_glProgramParameteri, "glProgramParameteriEXT", "GL_EXT_separate_shader_objects");
|
||||
+ FINDSYM(glsym_glProgramParameteri, "glProgramParameteriARB", "GL_ARB_geometry_shader4");
|
||||
|
||||
- FINDSYM(glsym_glReleaseShaderCompiler, "glReleaseShaderCompiler", NULL, glsym_func_void);
|
||||
+ FINDSYM(glsym_glReleaseShaderCompiler, "glReleaseShaderCompiler", NULL);
|
||||
#ifndef GL_GLES
|
||||
- FINDSYM(glsym_glReleaseShaderCompiler, "glReleaseShaderCompiler", "GL_ARB_ES2_compatibility", glsym_func_void);
|
||||
+ FINDSYM(glsym_glReleaseShaderCompiler, "glReleaseShaderCompiler", "GL_ARB_ES2_compatibility");
|
||||
#endif
|
||||
|
||||
// Not sure there's a core variant, glActivateTileQCOM is strange as well
|
||||
- FINDSYM(glsym_glStartTiling, "glStartTilingQCOM", "GL_QCOM_tiled_rendering", glsym_func_void);
|
||||
- FINDSYM(glsym_glStartTiling, "glStartTiling", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glStartTiling, "glActivateTileQCOM", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glEndTiling, "glEndTilingQCOM", "GL_QCOM_tiled_rendering", glsym_func_void);
|
||||
- FINDSYM(glsym_glEndTiling, "glEndTiling", NULL, glsym_func_void);
|
||||
+ FINDSYM(glsym_glStartTiling, "glStartTilingQCOM", "GL_QCOM_tiled_rendering");
|
||||
+ FINDSYM(glsym_glStartTiling, "glStartTiling", NULL);
|
||||
+ FINDSYM(glsym_glStartTiling, "glActivateTileQCOM", NULL);
|
||||
+ FINDSYM(glsym_glEndTiling, "glEndTilingQCOM", "GL_QCOM_tiled_rendering");
|
||||
+ FINDSYM(glsym_glEndTiling, "glEndTiling", NULL);
|
||||
|
||||
if (!getenv("EVAS_GL_MAPBUFFER_DISABLE"))
|
||||
{
|
||||
// Not sure there's an EXT variant. (probably no KHR variant)
|
||||
- FINDSYM(glsym_glMapBuffer, "glMapBuffer", NULL, glsym_func_void_ptr);
|
||||
- FINDSYM(glsym_glMapBuffer, "glMapBufferOES", "GL_OES_mapbuffer", glsym_func_void_ptr);
|
||||
- FINDSYM(glsym_glMapBuffer, "glMapBufferARB", "GL_ARB_vertex_buffer_object", glsym_func_void_ptr);
|
||||
- FINDSYM(glsym_glMapBuffer, "glMapBufferARB", "GLX_ARB_vertex_buffer_object", glsym_func_void_ptr);
|
||||
- FINDSYM(glsym_glMapBuffer, "glMapBufferEXT", NULL, glsym_func_void_ptr);
|
||||
-
|
||||
- FINDSYM(glsym_glUnmapBuffer, "glUnmapBuffer", NULL, glsym_func_boolean);
|
||||
- FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferOES", "GL_OES_mapbuffer", glsym_func_boolean);
|
||||
- FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferARB", "GL_ARB_vertex_buffer_object", glsym_func_boolean);
|
||||
- FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferARB", "GLX_ARB_vertex_buffer_object", glsym_func_boolean);
|
||||
- FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferEXT", NULL, glsym_func_boolean);
|
||||
+ FINDSYM(glsym_glMapBuffer, "glMapBuffer", NULL);
|
||||
+ FINDSYM(glsym_glMapBuffer, "glMapBufferOES", "GL_OES_mapbuffer");
|
||||
+ FINDSYM(glsym_glMapBuffer, "glMapBufferARB", "GL_ARB_vertex_buffer_object");
|
||||
+ FINDSYM(glsym_glMapBuffer, "glMapBufferARB", "GLX_ARB_vertex_buffer_object");
|
||||
+ FINDSYM(glsym_glMapBuffer, "glMapBufferEXT", NULL);
|
||||
+
|
||||
+ FINDSYM(glsym_glUnmapBuffer, "glUnmapBuffer", NULL);
|
||||
+ FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferOES", "GL_OES_mapbuffer");
|
||||
+ FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferARB", "GL_ARB_vertex_buffer_object");
|
||||
+ FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferARB", "GLX_ARB_vertex_buffer_object");
|
||||
+ FINDSYM(glsym_glUnmapBuffer, "glUnmapBufferEXT", NULL);
|
||||
}
|
||||
|
||||
- FINDSYM(glsym_glRenderbufferStorageMultisample, "glRenderbufferStorageMultisample", NULL, glsym_func_void);
|
||||
+ FINDSYM(glsym_glRenderbufferStorageMultisample, "glRenderbufferStorageMultisample", NULL);
|
||||
|
||||
#ifdef GL_GLES
|
||||
-#define FINDSYMN(dst, sym, ext, typ) do { \
|
||||
+#define FINDSYMN(dst, sym, ext) do { \
|
||||
if (!dst) { \
|
||||
if (_ckext(extsn, ext) && GetProcAddress) \
|
||||
- dst = (typ) GetProcAddress(sym); \
|
||||
+ dst = GetProcAddress(sym); \
|
||||
if (!dst) \
|
||||
- dst = (typ) dlsym(RTLD_DEFAULT, sym); \
|
||||
+ dst = dlsym(RTLD_DEFAULT, sym); \
|
||||
}} while (0)
|
||||
|
||||
// yes - gl core looking for egl stuff. i know it's odd. a reverse-layer thing
|
||||
@@ -374,22 +362,22 @@ evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
|
||||
{
|
||||
eglsym_eglCreateImage = NULL;
|
||||
eglsym_eglDestroyImage = NULL;
|
||||
- FINDSYMN(eglsym_eglCreateImageKHR, "eglCreateImageKHR", "EGL_KHR_image_base", secsym_func_void_ptr);
|
||||
- FINDSYMN(eglsym_eglDestroyImage, "eglDestroyImageKHR", "EGL_KHR_image_base", secsym_func_uint);
|
||||
+ FINDSYMN(eglsym_eglCreateImageKHR, "eglCreateImageKHR", "EGL_KHR_image_base");
|
||||
+ FINDSYMN(eglsym_eglDestroyImage, "eglDestroyImageKHR", "EGL_KHR_image_base");
|
||||
}
|
||||
}
|
||||
|
||||
- FINDSYM(glsym_glProgramParameteri, "glProgramParameteri", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glProgramParameteri, "glProgramParameteriEXT", "GL_EXT_geometry_shader4", glsym_func_void);
|
||||
- FINDSYM(glsym_glProgramParameteri, "glProgramParameteriARB", "GL_ARB_geometry_shader4", glsym_func_void);
|
||||
+ FINDSYM(glsym_glProgramParameteri, "glProgramParameteri", NULL);
|
||||
+ FINDSYM(glsym_glProgramParameteri, "glProgramParameteriEXT", "GL_EXT_geometry_shader4");
|
||||
+ FINDSYM(glsym_glProgramParameteri, "glProgramParameteriARB", "GL_ARB_geometry_shader4");
|
||||
|
||||
- FINDSYM(secsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image_external", glsym_func_void);
|
||||
- FINDSYM(secsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image", glsym_func_void);
|
||||
+ FINDSYM(secsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image_external");
|
||||
+ FINDSYM(secsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image");
|
||||
|
||||
// Old SEC extensions
|
||||
- FINDSYMN(secsym_eglMapImageSEC, "eglMapImageSEC", NULL, secsym_func_void_ptr);
|
||||
- FINDSYMN(secsym_eglUnmapImageSEC, "eglUnmapImageSEC", NULL, secsym_func_uint);
|
||||
- FINDSYMN(secsym_eglGetImageAttribSEC, "eglGetImageAttribSEC", NULL, secsym_func_uint);
|
||||
+ FINDSYMN(secsym_eglMapImageSEC, "eglMapImageSEC", NULL);
|
||||
+ FINDSYMN(secsym_eglUnmapImageSEC, "eglUnmapImageSEC", NULL);
|
||||
+ FINDSYMN(secsym_eglGetImageAttribSEC, "eglGetImageAttribSEC", NULL);
|
||||
|
||||
#undef FINDSYMN
|
||||
|
||||
@@ -421,19 +409,19 @@ tbm_symbols(void)
|
||||
return;
|
||||
}
|
||||
|
||||
-#define FINDSYM(dst, sym, typ) \
|
||||
- if (!dst) dst = (typ)dlsym(tbm_lib_handle, sym); \
|
||||
+#define FINDSYM(dst, sym) \
|
||||
+ if (!dst) dst = dlsym(tbm_lib_handle, sym); \
|
||||
if (!dst) \
|
||||
{ \
|
||||
ERR("Symbol not found %s\n", sym); \
|
||||
return; \
|
||||
}
|
||||
|
||||
- FINDSYM(secsym_tbm_surface_create, "tbm_surface_create", secsym_func_void_ptr);
|
||||
- FINDSYM(secsym_tbm_surface_destroy, "tbm_surface_destroy", secsym_func_int);
|
||||
- FINDSYM(secsym_tbm_surface_map, "tbm_surface_map", secsym_func_int);
|
||||
- FINDSYM(secsym_tbm_surface_unmap, "tbm_surface_unmap", secsym_func_int);
|
||||
- FINDSYM(secsym_tbm_surface_get_info, "tbm_surface_get_info", secsym_func_int);
|
||||
+ FINDSYM(secsym_tbm_surface_create, "tbm_surface_create");
|
||||
+ FINDSYM(secsym_tbm_surface_destroy, "tbm_surface_destroy");
|
||||
+ FINDSYM(secsym_tbm_surface_map, "tbm_surface_map");
|
||||
+ FINDSYM(secsym_tbm_surface_unmap, "tbm_surface_unmap");
|
||||
+ FINDSYM(secsym_tbm_surface_get_info, "tbm_surface_get_info");
|
||||
|
||||
#undef FINDSYM
|
||||
#endif
|
||||
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c b/src/modules/evas/engines/gl_common/evas_gl_core.c
|
||||
index c7d453ffbd..40518b5cd9 100644
|
||||
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
|
||||
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
|
||||
@@ -21,7 +21,7 @@ EVGL_Engine *evgl_engine = NULL;
|
||||
int _evas_gl_log_dom = -1;
|
||||
int _evas_gl_log_level = -1;
|
||||
|
||||
-typedef void *(*glsym_func_void_ptr) ();
|
||||
+typedef void *(*glsym_func_void_ptr) (void *);
|
||||
glsym_func_void_ptr glsym_evas_gl_native_context_get = NULL;
|
||||
glsym_func_void_ptr glsym_evas_gl_engine_data_get = NULL;
|
||||
|
||||
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
|
||||
index d59f762160..1d57b69f4b 100644
|
||||
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
|
||||
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
|
||||
@@ -74,11 +74,7 @@ static struct gbm_device *gbm_dev = NULL;
|
||||
static int gbm_dev_refs = 0;
|
||||
|
||||
/* local function prototype types */
|
||||
-typedef void (*glsym_func_void)();
|
||||
-typedef void *(*glsym_func_void_ptr)();
|
||||
-typedef int (*glsym_func_int)();
|
||||
-typedef unsigned int (*glsym_func_uint)();
|
||||
-typedef const char *(*glsym_func_const_char_ptr)();
|
||||
+typedef void *(*glsym_func_void_ptr)(void);
|
||||
|
||||
/* external dynamic loaded Evas_GL function pointers */
|
||||
Evas_GL_Common_Image_Call glsym_evas_gl_common_image_ref = NULL;
|
||||
@@ -255,26 +251,20 @@ eng_egl_symbols(EGLDisplay edsp)
|
||||
|
||||
if (done) return;
|
||||
|
||||
-#define FINDSYM(dst, sym, typ) \
|
||||
- if (!dst) dst = (typ)glsym_eglGetProcAddress(sym);
|
||||
+#define FINDSYM(dst, sym) \
|
||||
+ if (!dst) dst = glsym_eglGetProcAddress(sym)
|
||||
|
||||
exts = eglQueryString(edsp, EGL_EXTENSIONS);
|
||||
|
||||
- FINDSYM(glsym_glEGLImageTargetTexture2DOES,
|
||||
- "glEGLImageTargetTexture2DOES", glsym_func_void);
|
||||
+ FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES");
|
||||
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageEXT",
|
||||
- glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageINTEL",
|
||||
- glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage",
|
||||
- glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageEXT");
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageINTEL");
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage");
|
||||
|
||||
- FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR",
|
||||
- glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR");
|
||||
|
||||
- FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL",
|
||||
- glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL");
|
||||
|
||||
if (_ckext(exts, "EGL_IMG_context_priority"))
|
||||
_extn_have_context_priority = 1;
|
||||
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
|
||||
index 72edcbf50e..86f5064cf3 100644
|
||||
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
|
||||
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
|
||||
@@ -33,13 +33,11 @@ static int gl_wins = 0;
|
||||
static int extn_have_y_inverted = 1;
|
||||
#endif
|
||||
|
||||
-typedef void (*_eng_fn) (void);
|
||||
-typedef _eng_fn (*glsym_func_eng_fn) ();
|
||||
-typedef void (*glsym_func_void) ();
|
||||
-typedef void *(*glsym_func_void_ptr) ();
|
||||
-typedef int (*glsym_func_int) ();
|
||||
-typedef unsigned int (*glsym_func_uint) ();
|
||||
-typedef const char *(*glsym_func_const_char_ptr) ();
|
||||
+typedef void *(*glsym_func_void_ptr) (void);
|
||||
+
|
||||
+typedef void (*glsym_func_void_in_voidp) (void *);
|
||||
+typedef void (*glsym_func_void_in_int) (int);
|
||||
+typedef int (*glsym_func_int_in_voidp) (void *);
|
||||
|
||||
Evas_GL_Common_Image_Call glsym_evas_gl_common_image_ref = NULL;
|
||||
Evas_GL_Common_Image_Call glsym_evas_gl_common_image_unref = NULL;
|
||||
@@ -68,14 +66,14 @@ Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_lock = NULL;
|
||||
Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock = NULL;
|
||||
Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_relax = NULL;
|
||||
|
||||
-glsym_func_void glsym_evas_gl_common_shaders_flush = NULL;
|
||||
-glsym_func_void glsym_evas_gl_common_error_set = NULL;
|
||||
-glsym_func_int glsym_evas_gl_common_error_get = NULL;
|
||||
-glsym_func_void_ptr glsym_evas_gl_common_current_context_get = NULL;
|
||||
+glsym_func_void_in_voidp glsym_evas_gl_common_shaders_flush = NULL;
|
||||
+glsym_func_void_in_int glsym_evas_gl_common_error_set = NULL;
|
||||
+glsym_func_int_in_voidp glsym_evas_gl_common_error_get = NULL;
|
||||
+glsym_func_void_ptr glsym_evas_gl_common_current_context_get = NULL;
|
||||
|
||||
#ifdef GL_GLES
|
||||
|
||||
-_eng_fn (*glsym_eglGetProcAddress) (const char *a) = NULL;
|
||||
+void *(*glsym_eglGetProcAddress) (const char *a) = NULL;
|
||||
EGLImageKHR (*glsym_evas_gl_common_eglCreateImage)(EGLDisplay a, EGLContext b, EGLenum c, EGLClientBuffer d, const EGLAttrib *e) = NULL;
|
||||
int (*glsym_evas_gl_common_eglDestroyImage) (EGLDisplay a, void *b) = NULL;
|
||||
void (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
|
||||
@@ -87,7 +85,7 @@ unsigned int (*glsym_eglQueryWaylandBufferWL)(EGLDisplay a, /*struct wl_resource
|
||||
|
||||
typedef XID (*glsym_func_xid) ();
|
||||
|
||||
-_eng_fn (*glsym_glXGetProcAddress) (const char *a) = NULL;
|
||||
+void *(*glsym_glXGetProcAddress) (const char *a) = NULL;
|
||||
void (*glsym_glXBindTexImage) (Display *a, GLXDrawable b, int c, int *d) = NULL;
|
||||
void (*glsym_glXReleaseTexImage) (Display *a, GLXDrawable b, int c) = NULL;
|
||||
int (*glsym_glXGetVideoSync) (unsigned int *a) = NULL;
|
||||
@@ -1310,19 +1308,19 @@ gl_symbols(void)
|
||||
LINK2GENERIC(evas_gl_common_current_context_get);
|
||||
LINK2GENERIC(evas_gl_common_shaders_flush);
|
||||
|
||||
-#define FINDSYM(dst, sym, typ) if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym);
|
||||
+#define FINDSYM(dst, sym) if (!dst) dst = dlsym(RTLD_DEFAULT, sym)
|
||||
#ifdef GL_GLES
|
||||
|
||||
- FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressKHR", glsym_func_eng_fn);
|
||||
- FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT", glsym_func_eng_fn);
|
||||
- FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressARB", glsym_func_eng_fn);
|
||||
- FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress", glsym_func_eng_fn);
|
||||
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressKHR");
|
||||
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressEXT");
|
||||
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddressARB");
|
||||
+ FINDSYM(glsym_eglGetProcAddress, "eglGetProcAddress");
|
||||
|
||||
#else
|
||||
|
||||
- FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressEXT", glsym_func_eng_fn);
|
||||
- FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressARB", glsym_func_eng_fn);
|
||||
- FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddress", glsym_func_eng_fn);
|
||||
+ FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressEXT");
|
||||
+ FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddressARB");
|
||||
+ FINDSYM(glsym_glXGetProcAddress, "glXGetProcAddress");
|
||||
|
||||
#endif
|
||||
#undef FINDSYM
|
||||
@@ -1348,12 +1346,12 @@ eng_gl_symbols(Outbuf *ob)
|
||||
*/
|
||||
|
||||
#ifdef GL_GLES
|
||||
-#define FINDSYM(dst, sym, ext, typ) do { \
|
||||
+#define FINDSYM(dst, sym, ext) do { \
|
||||
if (!dst) { \
|
||||
if (_has_ext(exts, ext) && glsym_eglGetProcAddress) \
|
||||
- dst = (typ) glsym_eglGetProcAddress(sym); \
|
||||
+ dst = glsym_eglGetProcAddress(sym); \
|
||||
if (!dst) \
|
||||
- dst = (typ) dlsym(RTLD_DEFAULT, sym); \
|
||||
+ dst = dlsym(RTLD_DEFAULT, sym); \
|
||||
}} while (0)
|
||||
|
||||
// Find EGL extensions
|
||||
@@ -1365,23 +1363,23 @@ eng_gl_symbols(Outbuf *ob)
|
||||
LINK2GENERIC(evas_gl_common_eglCreateImage);
|
||||
LINK2GENERIC(evas_gl_common_eglDestroyImage);
|
||||
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage", NULL, glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageEXT", "EGL_EXT_swap_buffers_with_damage", glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageKHR", "EGL_KHR_swap_buffers_with_damage", glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageINTEL", "EGL_INTEL_swap_buffers_with_damage", glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage", NULL);
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageEXT", "EGL_EXT_swap_buffers_with_damage");
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageKHR", "EGL_KHR_swap_buffers_with_damage");
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageINTEL", "EGL_INTEL_swap_buffers_with_damage");
|
||||
|
||||
- FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR", "EGL_KHR_partial_update", glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR", "EGL_KHR_partial_update");
|
||||
|
||||
- FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL", "EGL_WL_bind_wayland_display", glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL", "EGL_WL_bind_wayland_display");
|
||||
|
||||
// This is a GL extension
|
||||
exts = (const char *) glGetString(GL_EXTENSIONS);
|
||||
- FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image_external", glsym_func_void);
|
||||
- FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image", glsym_func_void);
|
||||
+ FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image_external");
|
||||
+ FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES", "GL_OES_EGL_image");
|
||||
|
||||
#else
|
||||
|
||||
-#define FINDSYM(dst, sym, ext, typ) do { \
|
||||
+#define FINDSYM(dst, sym, ext) do { \
|
||||
if (!dst) { \
|
||||
if (_has_ext(exts, ext) && glsym_glXGetProcAddress) \
|
||||
dst = (typ) glsym_glXGetProcAddress(sym); \
|
||||
@@ -1395,30 +1393,30 @@ eng_gl_symbols(Outbuf *ob)
|
||||
// Find GL extensions
|
||||
glsym_evas_gl_symbols((void*)glsym_glXGetProcAddress, exts);
|
||||
|
||||
- FINDSYM(glsym_glXBindTexImage, "glXBindTexImage", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glXBindTexImage, "glXBindTexImageEXT", "GLX_EXT_texture_from_pixmap", glsym_func_void);
|
||||
- FINDSYM(glsym_glXBindTexImage, "glXBindTexImageARB", "GLX_ARB_render_texture", glsym_func_void);
|
||||
+ FINDSYM(glsym_glXBindTexImage, "glXBindTexImage", NULL);
|
||||
+ FINDSYM(glsym_glXBindTexImage, "glXBindTexImageEXT", "GLX_EXT_texture_from_pixmap");
|
||||
+ FINDSYM(glsym_glXBindTexImage, "glXBindTexImageARB", "GLX_ARB_render_texture");
|
||||
|
||||
- FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImage", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageEXT", "GLX_EXT_texture_from_pixmap", glsym_func_void);
|
||||
- FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageARB", "GLX_ARB_render_texture", glsym_func_void);
|
||||
+ FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImage", NULL);
|
||||
+ FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageEXT", "GLX_EXT_texture_from_pixmap");
|
||||
+ FINDSYM(glsym_glXReleaseTexImage, "glXReleaseTexImageARB", "GLX_ARB_render_texture");
|
||||
|
||||
- FINDSYM(glsym_glXGetVideoSync, "glXGetVideoSyncSGI", "GLX_SGI_video_sync", glsym_func_int);
|
||||
- FINDSYM(glsym_glXWaitVideoSync, "glXWaitVideoSyncSGI", "GLX_SGI_video_sync", glsym_func_int);
|
||||
+ FINDSYM(glsym_glXGetVideoSync, "glXGetVideoSyncSGI", "GLX_SGI_video_sync");
|
||||
+ FINDSYM(glsym_glXWaitVideoSync, "glXWaitVideoSyncSGI", "GLX_SGI_video_sync");
|
||||
|
||||
// GLX 1.3
|
||||
- FINDSYM(glsym_glXCreatePixmap, "glXCreatePixmap", NULL, glsym_func_xid);
|
||||
- FINDSYM(glsym_glXDestroyPixmap, "glXDestroyPixmap", NULL, glsym_func_void);
|
||||
- FINDSYM(glsym_glXQueryDrawable, "glXQueryDrawable", NULL, glsym_func_void);
|
||||
+ FINDSYM(glsym_glXCreatePixmap, "glXCreatePixmap", NULL);
|
||||
+ FINDSYM(glsym_glXDestroyPixmap, "glXDestroyPixmap", NULL);
|
||||
+ FINDSYM(glsym_glXQueryDrawable, "glXQueryDrawable", NULL);
|
||||
|
||||
// swap interval: MESA and SGI take (interval)
|
||||
- FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalMESA", "GLX_MESA_swap_control", glsym_func_int);
|
||||
- FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalSGI", "GLX_SGI_swap_control", glsym_func_int);
|
||||
+ FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalMESA", "GLX_MESA_swap_control");
|
||||
+ FINDSYM(glsym_glXSwapIntervalSGI, "glXSwapIntervalSGI", "GLX_SGI_swap_control");
|
||||
|
||||
// swap interval: EXT takes (dpy, drawable, interval)
|
||||
- FINDSYM(glsym_glXSwapIntervalEXT, "glXSwapIntervalEXT", "GLX_EXT_swap_control", glsym_func_void);
|
||||
+ FINDSYM(glsym_glXSwapIntervalEXT, "glXSwapIntervalEXT", "GLX_EXT_swap_control");
|
||||
|
||||
- FINDSYM(glsym_glXReleaseBuffersMESA, "glXReleaseBuffersMESA", "GLX_MESA_release_buffers", glsym_func_void);
|
||||
+ FINDSYM(glsym_glXReleaseBuffersMESA, "glXReleaseBuffersMESA", "GLX_MESA_release_buffers");
|
||||
|
||||
#endif
|
||||
#undef FINDSYM
|
||||
diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c b/src/modules/evas/engines/gl_x11/evas_x_main.c
|
||||
index 3bc2b0b6e5..06e05f8e4d 100644
|
||||
--- a/src/modules/evas/engines/gl_x11/evas_x_main.c
|
||||
+++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
|
||||
@@ -7,8 +7,8 @@
|
||||
static Eina_TLS _outbuf_key = 0;
|
||||
static Eina_TLS _context_key = 0;
|
||||
|
||||
-typedef void (*glsym_func_void) ();
|
||||
-glsym_func_void glsym_evas_gl_common_context_restore_set = NULL;
|
||||
+typedef void (*glsym_func_void_in_bool) (Eina_Bool);
|
||||
+glsym_func_void_in_bool glsym_evas_gl_common_context_restore_set = NULL;
|
||||
|
||||
Eina_Bool gles3_supported = EINA_FALSE;
|
||||
|
||||
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
|
||||
index 58eb54a467..3d1b106ecf 100644
|
||||
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
|
||||
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
|
||||
@@ -27,13 +27,6 @@ struct _Render_Engine
|
||||
Render_Output_GL_Generic generic;
|
||||
};
|
||||
|
||||
-/* local function prototypes */
|
||||
-typedef void (*glsym_func_void) ();
|
||||
-typedef void *(*glsym_func_void_ptr) ();
|
||||
-typedef int (*glsym_func_int) ();
|
||||
-typedef unsigned int (*glsym_func_uint) ();
|
||||
-typedef const char *(*glsym_func_const_char_ptr) ();
|
||||
-
|
||||
Evas_GL_Common_Image_Call glsym_evas_gl_common_image_ref = NULL;
|
||||
Evas_GL_Common_Image_Call glsym_evas_gl_common_image_unref = NULL;
|
||||
Evas_GL_Common_Image_Call glsym_evas_gl_common_image_free = NULL;
|
||||
@@ -142,11 +135,11 @@ eng_gl_symbols(EGLDisplay edsp)
|
||||
const char *exts = NULL;
|
||||
|
||||
if (done) return;
|
||||
-#define FINDSYM(dst, sym, typ) \
|
||||
+#define FINDSYM(dst, sym) \
|
||||
if (glsym_eglGetProcAddress) { \
|
||||
- if (!dst) dst = (typ)glsym_eglGetProcAddress(sym); \
|
||||
+ if (!dst) dst = glsym_eglGetProcAddress(sym); \
|
||||
} else { \
|
||||
- if (!dst) dst = (typ)dlsym(RTLD_DEFAULT, sym); \
|
||||
+ if (!dst) dst = dlsym(RTLD_DEFAULT, sym); \
|
||||
}
|
||||
|
||||
// Find EGL extensions
|
||||
@@ -155,20 +148,14 @@ eng_gl_symbols(EGLDisplay edsp)
|
||||
// Find GL extensions
|
||||
glsym_evas_gl_symbols(glsym_eglGetProcAddress, exts);
|
||||
|
||||
- FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES",
|
||||
- glsym_func_void);
|
||||
+ FINDSYM(glsym_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES");
|
||||
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageEXT",
|
||||
- glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageINTEL",
|
||||
- glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage",
|
||||
- glsym_func_uint);
|
||||
- FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR",
|
||||
- glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageEXT");
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamageINTEL");
|
||||
+ FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage");
|
||||
+ FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR");
|
||||
|
||||
- FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL",
|
||||
- glsym_func_uint);
|
||||
+ FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL");
|
||||
|
||||
done = EINA_TRUE;
|
||||
}
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 6e63309b26c25cc1c09228b9d06fd47bd6b13884 Mon Sep 17 00:00:00 2001
|
||||
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
|
||||
Date: Mon, 28 Apr 2025 18:27:37 +0100
|
||||
Subject: [PATCH] ecore-file: silence gcc 15 warnings
|
||||
|
||||
no bug here - just warnings for perfectly ok code and people using -Werror ...
|
||||
|
||||
fixes #85
|
||||
|
||||
Upstream: https://git.enlightenment.org/enlightenment/efl/commit/6e63309b26c25cc1c09228b9d06fd47bd6b13884
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
src/lib/ecore_file/ecore_file_monitor_inotify.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/lib/ecore_file/ecore_file_monitor_inotify.c b/src/lib/ecore_file/ecore_file_monitor_inotify.c
|
||||
index 988893de4f..b187fbc2c1 100644
|
||||
--- a/src/lib/ecore_file/ecore_file_monitor_inotify.c
|
||||
+++ b/src/lib/ecore_file/ecore_file_monitor_inotify.c
|
||||
@@ -51,7 +51,7 @@ static Eina_Bool reseting;
|
||||
static Eina_Hash *monitor_hash;
|
||||
|
||||
static void
|
||||
-_ecore_file_monitor_inotify_reset()
|
||||
+_ecore_file_monitor_inotify_reset(void *data EINA_UNUSED)
|
||||
{
|
||||
Eina_Iterator *it;
|
||||
Ecore_File_Monitor *em;
|
||||
@@ -132,7 +132,7 @@ ecore_file_monitor_backend_add(const char *path,
|
||||
if (_inotify_fd_pid == -1) return NULL;
|
||||
|
||||
if (_inotify_fd_pid != getpid())
|
||||
- _ecore_file_monitor_inotify_reset();
|
||||
+ _ecore_file_monitor_inotify_reset(NULL);
|
||||
|
||||
em = (Ecore_File_Monitor *)calloc(1, sizeof(Ecore_File_Monitor_Inotify));
|
||||
if (!em) return NULL;
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
From 628c40cce2de0a18818b40615d3351b0c9e9b889 Mon Sep 17 00:00:00 2001
|
||||
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
|
||||
Date: Sat, 3 May 2025 15:04:54 +0100
|
||||
Subject: [PATCH] edje - edit - gcc15 break - adapt to new keywords in c23
|
||||
|
||||
gcc 15 default policy of breaking existing code. adapt.
|
||||
|
||||
Upstream: https://git.enlightenment.org/enlightenment/efl/commit/628c40cce2de0a18818b40615d3351b0c9e9b889
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
src/lib/edje/edje_edit.c | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
|
||||
index 70294fd824..e4a5b4a1da 100644
|
||||
--- a/src/lib/edje/edje_edit.c
|
||||
+++ b/src/lib/edje/edje_edit.c
|
||||
@@ -7757,11 +7757,11 @@ edje_edit_state_map_backface_cull_get(Evas_Object *obj, const char *part, const
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
-edje_edit_state_map_backface_cull_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool bool)
|
||||
+edje_edit_state_map_backface_cull_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool b)
|
||||
{
|
||||
GET_PD_OR_RETURN(EINA_FALSE);
|
||||
|
||||
- pd->map.backcull = bool;
|
||||
+ pd->map.backcull = b;
|
||||
|
||||
edje_object_calc_force(obj);
|
||||
return EINA_TRUE;
|
||||
@@ -7776,11 +7776,11 @@ edje_edit_state_map_perspective_on_get(Evas_Object *obj, const char *part, const
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
-edje_edit_state_map_perspective_on_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool bool)
|
||||
+edje_edit_state_map_perspective_on_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool b)
|
||||
{
|
||||
GET_PD_OR_RETURN(EINA_FALSE);
|
||||
|
||||
- pd->map.persp_on = bool;
|
||||
+ pd->map.persp_on = b;
|
||||
|
||||
edje_object_calc_force(obj);
|
||||
return EINA_TRUE;
|
||||
@@ -7795,22 +7795,22 @@ edje_edit_state_map_alpha_get(Evas_Object *obj, const char *part, const char *st
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
-edje_edit_state_map_alpha_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool bool)
|
||||
+edje_edit_state_map_alpha_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool b)
|
||||
{
|
||||
GET_PD_OR_RETURN(EINA_FALSE);
|
||||
|
||||
- pd->map.alpha = bool;
|
||||
+ pd->map.alpha = b;
|
||||
|
||||
edje_object_calc_force(obj);
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
-edje_edit_state_map_smooth_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool bool)
|
||||
+edje_edit_state_map_smooth_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool b)
|
||||
{
|
||||
GET_PD_OR_RETURN(EINA_FALSE);
|
||||
|
||||
- pd->map.smooth = bool;
|
||||
+ pd->map.smooth = b;
|
||||
|
||||
edje_object_calc_force(obj);
|
||||
return EINA_TRUE;
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From c7ff646ed8b62e60159bdf0ff77132c3a242d919 Mon Sep 17 00:00:00 2001
|
||||
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
|
||||
Date: Sun, 4 May 2025 09:29:41 +0100
|
||||
Subject: [PATCH] evas - gl - fix evas gl full builds after gcc 15 changes
|
||||
|
||||
Upstream: https://git.enlightenment.org/enlightenment/efl/commit/c7ff646ed8b62e60159bdf0ff77132c3a242d919
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
src/modules/evas/engines/gl_x11/evas_engine.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
|
||||
index 86f5064cf3..8926c6afea 100644
|
||||
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
|
||||
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
|
||||
@@ -1382,9 +1382,9 @@ eng_gl_symbols(Outbuf *ob)
|
||||
#define FINDSYM(dst, sym, ext) do { \
|
||||
if (!dst) { \
|
||||
if (_has_ext(exts, ext) && glsym_glXGetProcAddress) \
|
||||
- dst = (typ) glsym_glXGetProcAddress(sym); \
|
||||
+ dst = glsym_glXGetProcAddress(sym); \
|
||||
if (!dst) \
|
||||
- dst = (typ) dlsym(RTLD_DEFAULT, sym); \
|
||||
+ dst = dlsym(RTLD_DEFAULT, sym); \
|
||||
}} while (0)
|
||||
|
||||
// Find GLX extensions
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -0,0 +1,155 @@
|
||||
From fc4c5ec8afc3d1d145eff9807e5235ae6bfeea83 Mon Sep 17 00:00:00 2001
|
||||
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
|
||||
Date: Sat, 3 May 2025 15:02:45 +0100
|
||||
Subject: [PATCH] emrbyo - new gcc 15 breaks builds - new keyword constexpr
|
||||
|
||||
gcc 15 default policy of breaking existing code. adapt.
|
||||
|
||||
Upstream: https://git.enlightenment.org/enlightenment/efl/commit/fc4c5ec8afc3d1d145eff9807e5235ae6bfeea83
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
src/bin/embryo/embryo_cc_sc.h | 2 +-
|
||||
src/bin/embryo/embryo_cc_sc1.c | 28 ++++++++++++++--------------
|
||||
src/bin/embryo/embryo_cc_sc2.c | 2 +-
|
||||
3 files changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/bin/embryo/embryo_cc_sc.h b/src/bin/embryo/embryo_cc_sc.h
|
||||
index f6271afec0..19fc084501 100644
|
||||
--- a/src/bin/embryo/embryo_cc_sc.h
|
||||
+++ b/src/bin/embryo/embryo_cc_sc.h
|
||||
@@ -432,7 +432,7 @@ symbol *fetchfunc(char *name, int tag);
|
||||
char *operator_symname(char *symname, char *opername, int tag1,
|
||||
int tag2, int numtags, int resulttag);
|
||||
char *funcdisplayname(char *dest, char *funcname);
|
||||
-int constexpr(cell * val, int *tag);
|
||||
+int constexpress(cell * val, int *tag);
|
||||
constvalue *append_constval(constvalue * table, char *name, cell val,
|
||||
short index);
|
||||
constvalue *find_constval(constvalue * table, char *name, short index);
|
||||
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
|
||||
index 9fbeb4dcf0..4cc0da293f 100644
|
||||
--- a/src/bin/embryo/embryo_cc_sc1.c
|
||||
+++ b/src/bin/embryo/embryo_cc_sc1.c
|
||||
@@ -1513,7 +1513,7 @@ init(int ident, int *tag)
|
||||
} /* if */
|
||||
*tag = 0;
|
||||
}
|
||||
- else if (constexpr(&i, tag))
|
||||
+ else if (constexpress(&i, tag))
|
||||
{
|
||||
stowlit(i); /* store expression result in literal table */
|
||||
} /* if */
|
||||
@@ -1532,7 +1532,7 @@ needsub(int *tag)
|
||||
*tag = 0;
|
||||
if (matchtoken(']')) /* we've already seen "[" */
|
||||
return 0; /* null size (like "char msg[]") */
|
||||
- constexpr(&val, tag); /* get value (must be constant expression) */
|
||||
+ constexpress(&val, tag); /* get value (must be constant expression) */
|
||||
if (val < 0)
|
||||
{
|
||||
error(9); /* negative array size is invalid; assumed zero */
|
||||
@@ -1561,7 +1561,7 @@ decl_const(int vclass)
|
||||
strncpy(constname, str, sizeof(constname) - 1); /* save symbol name */
|
||||
constname[sizeof(constname) - 1] = 0;
|
||||
needtoken('=');
|
||||
- constexpr(&val, &exprtag); /* get value */
|
||||
+ constexpress(&val, &exprtag); /* get value */
|
||||
needtoken(tTERM);
|
||||
/* add_constant() checks for duplicate definitions */
|
||||
if (!matchtag(tag, exprtag, FALSE))
|
||||
@@ -1627,15 +1627,15 @@ decl_enum(int vclass)
|
||||
{
|
||||
if (matchtoken(taADD))
|
||||
{
|
||||
- constexpr(&increment, NULL);
|
||||
+ constexpress(&increment, NULL);
|
||||
}
|
||||
else if (matchtoken(taMULT))
|
||||
{
|
||||
- constexpr(&multiplier, NULL);
|
||||
+ constexpress(&multiplier, NULL);
|
||||
}
|
||||
else if (matchtoken(taSHL))
|
||||
{
|
||||
- constexpr(&lexval, NULL);
|
||||
+ constexpress(&lexval, NULL);
|
||||
while (lexval-- > 0)
|
||||
multiplier *= 2;
|
||||
} /* if */
|
||||
@@ -1659,9 +1659,9 @@ decl_enum(int vclass)
|
||||
constname[sNAMEMAX] = 0;
|
||||
size = increment; /* default increment of 'val' */
|
||||
if (tok == tLABEL || matchtoken(':'))
|
||||
- constexpr(&size, NULL); /* get size */
|
||||
+ constexpress(&size, NULL); /* get size */
|
||||
if (matchtoken('='))
|
||||
- constexpr(&enumvalue, NULL); /* get value */
|
||||
+ constexpress(&enumvalue, NULL); /* get value */
|
||||
/* add_constant() checks whether a variable (global or local) or
|
||||
* a constant with the same name already exists */
|
||||
add_constant(constname, enumvalue, vclass, tag);
|
||||
@@ -2137,7 +2137,7 @@ funcstub(int native)
|
||||
}
|
||||
else
|
||||
{
|
||||
- constexpr(&val, NULL);
|
||||
+ constexpress(&val, NULL);
|
||||
sym->addr = val;
|
||||
/*
|
||||
* ?? Must mark this address, so that it won't be generated again
|
||||
@@ -2758,7 +2758,7 @@ doarg(char *name, int ident, int offset, int tags[], int numtags,
|
||||
}
|
||||
else
|
||||
{
|
||||
- constexpr(&arg->defvalue.val, &arg->defvalue_tag);
|
||||
+ constexpress(&arg->defvalue.val, &arg->defvalue_tag);
|
||||
assert(numtags > 0);
|
||||
if (!matchtag(tags[0], arg->defvalue_tag, TRUE))
|
||||
error(213); /* tagname mismatch */
|
||||
@@ -3391,10 +3391,10 @@ doexpr(int comma, int chkeffect, int allowarray, int mark_endexpr,
|
||||
} /* if */
|
||||
}
|
||||
|
||||
-/* constexpr
|
||||
+/* constexpress
|
||||
*/
|
||||
int
|
||||
-constexpr(cell * val, int *tag)
|
||||
+constexpress(cell * val, int *tag)
|
||||
{
|
||||
int constant, idx;
|
||||
cell cidx;
|
||||
@@ -3728,7 +3728,7 @@ doswitch(void)
|
||||
* parse all expressions until that special token.
|
||||
*/
|
||||
|
||||
- constexpr(&val, NULL);
|
||||
+ constexpress(&val, NULL);
|
||||
/* Search the insertion point (the table is kept in sorted
|
||||
* order, so that advanced abstract machines can sift the
|
||||
* case table with a binary search). Check for duplicate
|
||||
@@ -3753,7 +3753,7 @@ doswitch(void)
|
||||
{
|
||||
cell end;
|
||||
|
||||
- constexpr(&end, NULL);
|
||||
+ constexpress(&end, NULL);
|
||||
if (end <= val)
|
||||
error(50); /* invalid range */
|
||||
while (++val <= end)
|
||||
diff --git a/src/bin/embryo/embryo_cc_sc2.c b/src/bin/embryo/embryo_cc_sc2.c
|
||||
index 5a51655a54..f0416e86c9 100644
|
||||
--- a/src/bin/embryo/embryo_cc_sc2.c
|
||||
+++ b/src/bin/embryo/embryo_cc_sc2.c
|
||||
@@ -742,7 +742,7 @@ preproc_expr(cell * val, int *tag)
|
||||
term = strchr(pline, '\0');
|
||||
assert(term != NULL);
|
||||
chrcat(pline, PREPROC_TERM); /* the "DEL" code (see SC.H) */
|
||||
- result = constexpr(val, tag); /* get value (or 0 on error) */
|
||||
+ result = constexpress(val, tag); /* get value (or 0 on error) */
|
||||
*term = '\0'; /* erase the token (if still present) */
|
||||
lexclr(FALSE); /* clear any "pushed" tokens */
|
||||
return result;
|
||||
--
|
||||
2.47.3
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
# From https://www.enlightenment.org/news/2022-09-16-efl-1.26.3
|
||||
sha256 d9f83aa0fd9334f44deeb4e4952dc0e5144683afac786feebce6030951617d15 efl-1.26.3.tar.xz
|
||||
# From https://www.enlightenment.org/news/2025-03-17-efl-1.28.1
|
||||
sha256 84cf6145f9cc82bfff690005be24392c8f3c52f8e00ff04d8eea371429c09424 efl-1.28.1.tar.xz
|
||||
|
||||
sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE
|
||||
sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING
|
||||
sha256 e5133b4034a4749a781e2220ffb230b60a282b88861f1124d69a58abd5143994 COPYING.images
|
||||
sha256 c95bae1d1ce0235ecccd3560b772ec1efb97f348a79f0fbe0a634f0c2ccefe2c licenses/COPYING.ASL
|
||||
sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD
|
||||
sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1 licenses/COPYING.FTL
|
||||
|
||||
+3
-4
@@ -4,14 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EFL_VERSION = 1.26.3
|
||||
EFL_VERSION = 1.28.1
|
||||
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
|
||||
EFL_SITE = https://download.enlightenment.org/rel/libs/efl
|
||||
EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
|
||||
EFL_LICENSE_FILES = \
|
||||
COMPLIANCE \
|
||||
COPYING \
|
||||
COPYING.images \
|
||||
licenses/COPYING.ASL \
|
||||
licenses/COPYING.BSD \
|
||||
licenses/COPYING.FTL \
|
||||
@@ -214,7 +213,7 @@ endif
|
||||
# json evas loader is disabled by default by upstream.
|
||||
# Disable libspectre (ps).
|
||||
# Keep all other evas loader enabled or handled below.
|
||||
EFL_EVAS_LOADERS_DISABLER = avif gst heif json ps
|
||||
EFL_EVAS_LOADERS_DISABLER = avif gst heif json ps jxl
|
||||
|
||||
# efl already depends on jpeg.
|
||||
ifeq ($(BR2_PACKAGE_EFL_JPEG),y)
|
||||
@@ -348,7 +347,7 @@ HOST_EFL_CONF_OPTS += \
|
||||
|
||||
# List of modular image/vector loaders to disable in efl
|
||||
HOST_EFL_EVAS_LOADERS_DISABLER = avif bmp dds eet generic gst heif ico json \
|
||||
jp2k pdf pmaps ps psd raw rsvg tga tgv tiff wbmp webp xcf xpm
|
||||
jp2k jxl pdf pmaps ps psd raw rsvg tga tgv tiff wbmp webp xcf xpm
|
||||
|
||||
HOST_EFL_CONF_OPTS += -Devas-loaders-disabler=$(subst $(space),$(comma),$(HOST_EFL_EVAS_LOADERS_DISABLER))
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 25e536bd58969077554927a456cd3cb79e21f126e47545ba511abe64a0f3ba5e embiggen-disk-v20240521-go2.tar.gz
|
||||
sha256 67ab51d13c85c5e3f1805f1e7b1e2db92edf8472007cd859c5919692eb0c0cbc embiggen-disk-20240521-go2.tar.gz
|
||||
sha256 063aedec1652c5a05c2d04c40e032b932453142ee8ef7fd53c04a9acc127fc95 LICENSE
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EMBIGGEN_DISK_VERSION = v20240521
|
||||
EMBIGGEN_DISK_SITE = $(call github,skiffos,embiggen-disk,$(EMBIGGEN_DISK_VERSION))
|
||||
EMBIGGEN_DISK_VERSION = 20240521
|
||||
EMBIGGEN_DISK_SITE = $(call github,skiffos,embiggen-disk,v$(EMBIGGEN_DISK_VERSION))
|
||||
EMBIGGEN_DISK_LICENSE = Apache-2.0
|
||||
EMBIGGEN_DISK_LICENSE_FILES = LICENSE
|
||||
|
||||
|
||||
@@ -18,4 +18,26 @@ endef
|
||||
|
||||
EVILWM_POST_INSTALL_TARGET_HOOKS += EVILWM_INSTALL_XSESSION_FILE
|
||||
|
||||
$(eval $(autotools-package))
|
||||
EVILWM_TOOLS_PREFIX += $(patsubst %-,%,$(TARGET_CROSS))
|
||||
|
||||
# the configure script is not generated by autoconf
|
||||
define EVILWM_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/share/man \
|
||||
--host=$(EVILWM_TOOLS_PREFIX) \
|
||||
)
|
||||
endef
|
||||
|
||||
define EVILWM_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define EVILWM_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt
|
||||
sha256 5df38b042ffa9a9c8d31b20bc8481558070e361b06f657608622a62a327adcba exim-4.99.tar.xz
|
||||
sha256 eae967bd49a5f879933b8c6ec88c30475a1c6646232135f37f05b55dbc4e3447 exim-4.99.1.tar.xz
|
||||
# From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt
|
||||
sha512 06521aff437dfe99c015606d2cdde76eaf6e4d2f03779b07fbc0e7d06fe0584366cae9c3fa7d73a86c348f0d25336acd06c42bd5b8f18e5a969de9849088e3aa exim-4.99.tar.xz
|
||||
sha512 41a280673b23a79684124dba9ba1db4da57047eefd7bac8560fab3e399659698160386c5369deb4aabdbcba1ba9278fb0a61fc1667dc2745c280b3004d02f45d exim-4.99.1.tar.xz
|
||||
# Locally calculated
|
||||
sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EXIM_VERSION = 4.99
|
||||
EXIM_VERSION = 4.99.1
|
||||
EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz
|
||||
EXIM_SITE = https://ftp.exim.org/pub/exim/exim4
|
||||
EXIM_LICENSE = GPL-2.0+
|
||||
|
||||
@@ -297,11 +297,11 @@ else
|
||||
FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
|
||||
endif
|
||||
|
||||
# To avoid a circular dependency only use opencv if opencv itself does
|
||||
# not depend on ffmpeg.
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx)
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC),y)
|
||||
FFMPEG_CONF_OPTS += --enable-libopencv
|
||||
FFMPEG_DEPENDENCIES += opencv3
|
||||
# To avoid a circular dependency only use opencv if opencv itself does
|
||||
# not depend on ffmpeg.
|
||||
else ifeq ($(BR2_PACKAGE_OPENCV4_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV4_WITH_FFMPEG),yx)
|
||||
FFMPEG_CONF_OPTS += --enable-libopencv \
|
||||
--extra-cflags=-I$(STAGING_DIR)/usr/include/opencv4
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
FICL_VERSION_MAJOR = 4.1
|
||||
FICL_VERSION = $(FICL_VERSION_MAJOR).0
|
||||
FICL_SITE = http://downloads.sourceforge.net/project/ficl/ficl-all/ficl$(FICL_VERSION_MAJOR)
|
||||
FICL_SITE = https://sourceforge.net/projects/ficl/files/OldFiles/Ficl4%20%28retired%29
|
||||
FICL_LICENSE = BSD-2-Clause
|
||||
FICL_LICENSE_FILES = ReadMe.txt
|
||||
FICL_INSTALL_STAGING = YES
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From ccce76d2850d6e52da3d7986c950af068fbfe0fd Mon Sep 17 00:00:00 2001
|
||||
From: Arthur Gautier <arthur.gautier@arista.com>
|
||||
Date: Sat, 13 Dec 2025 20:07:11 -0800
|
||||
Subject: [PATCH] fix musl builds
|
||||
|
||||
This commit fixes the build on musl which fails with the following
|
||||
error:
|
||||
```
|
||||
oslib/linux-blkzoned.c: In function 'blkzoned_move_zone_wp':
|
||||
oslib/linux-blkzoned.c:389:37: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function)
|
||||
389 | ret = fallocate(fd, FALLOC_FL_ZERO_RANGE, z->wp, length);
|
||||
| ^~~~~~~~~~~~~~~~~~~~
|
||||
oslib/linux-blkzoned.c:389:37: note: each undeclared identifier is reported only once for each function it appears in
|
||||
make: *** [Makefile:501: oslib/linux-blkzoned.o] Error 1
|
||||
make: *** Waiting for unfinished jobs....
|
||||
```
|
||||
|
||||
Signed-off-by: Arthur Gautier <arthur.gautier@arista.com>
|
||||
|
||||
Upstream: https://github.com/axboe/fio/commit/ccce76d2850d6e52da3d7986c950af068fbfe0fd
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
oslib/linux-blkzoned.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/oslib/linux-blkzoned.c b/oslib/linux-blkzoned.c
|
||||
index 78e25fca91..c45ef623de 100644
|
||||
--- a/oslib/linux-blkzoned.c
|
||||
+++ b/oslib/linux-blkzoned.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#ifndef BLKFINISHZONE
|
||||
#define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range)
|
||||
#endif
|
||||
+#include <linux/falloc.h>
|
||||
|
||||
/*
|
||||
* If the uapi headers installed on the system lacks zone capacity support,
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user