From b58657be6c17595171d654a607262eea9974403e Mon Sep 17 00:00:00 2001 From: kth5 Date: Fri, 5 May 2023 08:53:49 +0200 Subject: [PATCH] * various updates --- chromium/PKGBUILD | 167 +++++------------- .../PKGBUILD | 2 +- .../glslang-11.13.0-cmake_include_dirs.patch | 24 +++ julia/PKGBUILD | 32 ++-- libcap/libcap-2.68-cgo_flags.patch | 41 +++++ libgpod/libgpod-0.8.3-pkgconfig_sharp.patch | 17 ++ libmms/libmms-Remove-requires-glib2.0.patch | 21 +++ .../libmodplug-0.8.9.0-no-fast-math.patch | 12 ++ .../libphonenumber-8.12.37-cmake.patch | 54 ++++++ .../libphonenumber-8.12.37-testing.patch | 110 ++++++++++++ linux-lts/PKGBUILD | 4 +- lmdb/PKGBUILD | 4 +- ...IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch | 51 ++++++ ...d-abort-if-kernel-can-t-allocate-mem.patch | 34 ++++ ...-fix-scheduling-of-HALT-instructions.patch | 130 ++++++++++++++ nauty/nauty-2.8.6-gentreeg-gentourng.patch | 144 +++++++++++++++ opencv/PKGBUILD | 2 +- ostree/ostree-2023.1-use_fuse3.patch | 74 ++++++++ rtl88x2bu-dkms/PKGBUILD | 4 +- texlive-bin/ptex-debug-print.patch | 14 ++ ...ename-min-max-defines-to-tpg_min-max.patch | 36 ++++ 21 files changed, 830 insertions(+), 147 deletions(-) create mode 100644 glslang/glslang-11.13.0-cmake_include_dirs.patch create mode 100644 libcap/libcap-2.68-cgo_flags.patch create mode 100644 libgpod/libgpod-0.8.3-pkgconfig_sharp.patch create mode 100644 libmms/libmms-Remove-requires-glib2.0.patch create mode 100644 libmodplug/libmodplug-0.8.9.0-no-fast-math.patch create mode 100644 libphonenumber/libphonenumber-8.12.37-cmake.patch create mode 100644 libphonenumber/libphonenumber-8.12.37-testing.patch create mode 100644 mesa/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch create mode 100644 mesa/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch create mode 100644 mesa/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch create mode 100644 nauty/nauty-2.8.6-gentreeg-gentourng.patch create mode 100644 ostree/ostree-2023.1-use_fuse3.patch create mode 100644 texlive-bin/ptex-debug-print.patch create mode 100644 v4l-utils/0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch diff --git a/chromium/PKGBUILD b/chromium/PKGBUILD index 4a980058b0..d33f5eef91 100644 --- a/chromium/PKGBUILD +++ b/chromium/PKGBUILD @@ -5,17 +5,17 @@ # Contributor: Daniel J Griffiths pkgname=chromium -pkgver=108.0.5359.124 -pkgrel=2 +pkgver=112.0.5615.165 +pkgrel=1 _launcher_ver=8 -_gcc_patchset=2 +_manual_clone=0 pkgdesc="A web browser built for speed, simplicity, and security" -arch=(x86_64 powerpc64le) +arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://www.chromium.org/Home" license=('BSD') depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt' 'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva' - 'wayland' 'desktop-file-utils' 'hicolor-icon-theme') + 'libffi' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire' 'qt5-base' 'java-runtime-headless' 'git') optdepends=('pipewire: WebRTC desktop sharing under Wayland' @@ -23,73 +23,26 @@ optdepends=('pipewire: WebRTC desktop sharing under Wayland' 'qt5-base: enable Qt5 with --enable-features=AllowQt' 'org.freedesktop.secrets: password storage backend on GNOME / Xfce' 'kwallet: support for storing passwords in KWallet on Plasma') -options=('!debug' '!lto') # Chromium adds its own flags for ThinLTO +options=('!lto') # Chromium adds its own flags for ThinLTO source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz - https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz - re-fix-TFLite-build-error-on-linux-with-system-zlib.patch - chromium-icu72.patch - v8-enhance-Date-parser-to-take-Unicode-SPACE.patch - REVERT-roll-src-third_party-ffmpeg-m102.patch - REVERT-roll-src-third_party-ffmpeg-m106.patch + add-cstring-for-std-strlen-in-web_view_impl.cc.patch + download-bubble-typename.patch + webauthn-variant.patch disable-GlobalMediaControlsCastStartStop.patch - angle-wayland-include-protocol.patch - use-oauth2-client-switches-as-default.patch - xxx-ppc64le-4k-pages.patch - xxx-ppc64le-libvpx.patch - xxx-ppc64le-sandbox-linux-stat.patch - xxx-ppc64le-support.patch - xxx-ppc64le-swiftshader.patch - fix-narrowing-cast.patch - fix-gnu-libc-version-usage.patch - fix-missing-TEMP_FAILURE_RETRY-macro.patch - chromium-revert-drop-of-system-java.patch - chromium-system-nodejs.patch - unbundled-cross-toolchain.patch - cursed^Uscoped_file.patch - remove-sys-cdefs-includes.patch - sandbox-membarrier.patch - webrtc-size_t.patch - browser-size_t.patch - libc_malloc.patch - fix-dawn-platform.patch - systypes.patch - no-getcontext.patch - no-execinfo.patch - build-add-use_cxx17.patch) -sha256sums=('d48dfac2a61b14a5d7d2f460b09b70ef3ab88e27b82e3173938cb54eaa612a75' + use-oauth2-client-switches-as-default.patch) +sha256sums=('168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '40ef8af65e78901bb8554eddbbb5ebc55c0b8e7927f6ca51b2a353d1c7c50652' - '9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716' - 'dabb5ab204b63be73d3c5c8b7c1fa74053105a285852ba3bbc4fb77646608572' - 'b83406a881d66627757d9cbc05e345cbb2bd395a48b6d4c970e5e1cb3f6ed454' - '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44' - '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152' + '5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a' + 'd464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a' + '590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7' '7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302' - 'cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572' - 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711' - 'be737fc71a582310e846902b836f5aa50e522b900bcecd6a9a6a52da0ad081dc' - 'f4b2286b39f34d7838e17dd3eb4492c68df57175c16810f013af0111267426fb' - '16361d737c14135e464bf52e09d0b79c0e9ef84c364253e08f435e8e72d7b5c9' - '9e4f95ce745b87a26b7aefeaf45c4749234a3305e7d46757a603ee82083162a2' - 'be9416182beb25f0835bae1dad5a26786f694dbda2e5106f83714be42add653a' - '771395e3e84a4a1627945112b8c100c898221e04d86b76d4cff946530010e1a4' - '320794a9d5a376e34f223805018160fb7a202d98a7c6080737e7de3b86b8d583' - '0f945626f07a6eda7e3bea956397c79e3e67a5a4ba55e86553a9132792513fa1' - '4f74164ad790b00389565c638bf3e752017ca7ef4bb77a86a17b6e498de501de' - 'd6dc5081c74f9025e672ea5fde6629b8d53157e0d0528e3a41004250fdf823be' - 'c25d166fdd7d7b4e1065c23955dc887a49cf78238c756e51c614999d5c48354e' - '6cfec4a32160df642ffa4b3c1e10ba19e94f1004bac65a349fa273b0f684b8ac' - '649640f75a3da1b5e7d9a03a4b3e71ee2bac6fda2ba62cf9535a6fc8b31f308e' - 'ba514c06cc03d728d2c1727fac85f2bbe953fe9720dcf8c2fa8de0ae4385e33b' - '83904114e89c2b1ed55814bc07ba5a0ad198010b3cac9f223c72ac4fbac3646b' - 'd2028d47da62f054eb83ab692f8801d726f87d22c9a96e7b96c779ed0aba9287' - '07e382665b70bb546336c0a6b73981cd14606969893f7d840c36b952891035be' - 'c001ffeda1b7cac9011df7b3630354663f1315475b29cc634b537d6a108e4985' - '2811e156fc733c8e3c12ca1554fc00e52f471dd6d7459457e9cd5e79c0654f5e' - '26111345b8d9bf87f7336c35aa401ff2f1b2911519e7b725e224c59f33593378' - 'a76ec1a929b54d79b1fa643036fcbd9ff2c2cc99e7d7e1573122ca0b5e760347' - '8f85d432b917c57c143eecd7344bc6b3d1af022520b4562c9d29ce61f118840c') + 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') + +if (( _manual_clone )); then + source[0]=fetch-chromium-release + makedepends+=('python-httplib2' 'python-pyparsing' 'python-six') +fi # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py # Keys are the names in the above script; values are the dependencies in Arch @@ -103,8 +56,8 @@ declare -gA _system_libs=( [harfbuzz-ng]=harfbuzz [icu]=icu [jsoncpp]=jsoncpp - [libaom]=aom - [libavif]=libavif + #[libaom]=aom # https://aomedia.googlesource.com/aom/+/706ee36dcc82 + #[libavif]=libavif # https://github.com/AOMediaCodec/libavif/commit/4d2776a3 [libdrm]= [libjpeg]=libjpeg [libpng]=libpng @@ -116,7 +69,7 @@ declare -gA _system_libs=( [re2]=re2 [snappy]=snappy [woff2]=woff2 - [zlib]=minizip + #[zlib]=minizip # broken include from chrome/common/safe_browsing/zip_analyzer.h ) _unwanted_bundled_libs=( $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/') @@ -132,6 +85,9 @@ depends+=(${_system_libs[@]}) _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM prepare() { + if (( _manual_clone )); then + ./fetch-chromium-release $pkgver + fi cd chromium-$pkgver # Allow building against system libraries in official builds @@ -151,54 +107,30 @@ prepare() { patch -Np1 -i ../use-oauth2-client-switches-as-default.patch # Upstream fixes - patch -Np1 -i ../re-fix-TFLite-build-error-on-linux-with-system-zlib.patch - patch -Np1 -i ../chromium-icu72.patch - patch -Np1 -d v8 <../v8-enhance-Date-parser-to-take-Unicode-SPACE.patch - - # Revert ffmpeg roll requiring new channel layout API support - # https://crbug.com/1325301 - patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m102.patch - # Revert switch from AVFrame::pkt_duration to AVFrame::duration - patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m106.patch + patch -Np1 -i ../add-cstring-for-std-strlen-in-web_view_impl.cc.patch # Disable kGlobalMediaControlsCastStartStop by default # https://crbug.com/1314342 patch -Np1 -i ../disable-GlobalMediaControlsCastStartStop.patch - # https://crbug.com/angleproject/7582 - patch -Np0 -i ../angle-wayland-include-protocol.patch + # Build fixes + patch -Np1 -i ../download-bubble-typename.patch + patch -Np1 -i ../webauthn-variant.patch - # Fixes for building with libstdc++ instead of libc++ - patch -Np1 -i ../patches/chromium-103-VirtualCursor-std-layout.patch - - # ppc64 support - patch -Np1 -i ../xxx-ppc64le-swiftshader.patch - patch -Np1 -i ../xxx-ppc64le-support.patch - patch -Np1 -i ../xxx-ppc64le-sandbox-linux-stat.patch - patch -Np1 -i ../xxx-ppc64le-libvpx.patch - patch -Np1 -i ../xxx-ppc64le-4k-pages.patch - patch -Np1 -i ../fix-narrowing-cast.patch - patch -Np1 -i ../fix-gnu-libc-version-usage.patch - patch -Np1 -i ../fix-missing-TEMP_FAILURE_RETRY-macro.patch - patch -Np1 -i ../chromium-revert-drop-of-system-java.patch - patch -Np1 -i ../chromium-system-nodejs.patch - patch -Np1 -i ../unbundled-cross-toolchain.patch - patch -Np1 -i ../cursed^Uscoped_file.patch - patch -Np1 -i ../remove-sys-cdefs-includes.patch - patch -Np1 -i ../sandbox-membarrier.patch - patch -Np1 -i ../webrtc-size_t.patch - patch -Np1 -i ../browser-size_t.patch - patch -Np1 -i ../libc_malloc.patch - patch -Np1 -i ../fix-dawn-platform.patch - patch -Np1 -i ../systypes.patch - patch -Np1 -i ../no-getcontext.patch - patch -Np1 -i ../no-execinfo.patch - patch -Np1 -i ../build-add-use_cxx17.patch + # powerpc64le support + case "${CARCH}" in + powerpc64*) + sed -i 's,^update_readme$,#update_readme,' third_party/libvpx/generate_gni.sh + pushd third_party/libvpx + mkdir -p source/config/linux/ppc64 + ./generate_gni.sh + popd + ;; + esac # Link to system tools required by the build - mkdir -p third_party/node/linux/node-linux-x64/bin + mkdir -p third_party/node/linux/node-linux-{ppc64,x64}/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ - mkdir -p third_party/node/linux/node-linux-ppc64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-ppc64/bin/ ln -s /usr/bin/java third_party/jdk/current/bin/ @@ -217,17 +149,6 @@ prepare() { ./build/linux/unbundle/replace_gn_files.py \ --system-libraries "${!_system_libs[@]}" - - # prevent annoying errors when regenerating gni - sed -i 's,^update_readme$,#update_readme,' third_party/libvpx/generate_gni.sh - case "${CARCH}" in - powerpc64*) - pushd third_party/libvpx - mkdir -p source/config/linux/ppc64 - ./generate_gni.sh - popd - ;; - esac } build() { @@ -258,8 +179,7 @@ build() { 'use_custom_libcxx=false' 'use_gnome_keyring=false' 'use_sysroot=false' - 'use_system_libwayland=true' - 'use_system_wayland_scanner=true' + 'use_system_libffi=true' 'enable_hangout_services_extension=true' 'enable_widevine=true' 'enable_nacl=false' @@ -302,7 +222,7 @@ build() { CXXFLAGS=${CXXFLAGS/-Wp,-D_GLIBCXX_ASSERTIONS} gn gen out/Release --args="${_flags[*]}" - CCACHE_SLOPPINESS=include_file_mtime ninja -C out/Release chrome chrome_sandbox chrome_crashpad_handler chromedriver.unstripped + ninja -C out/Release chrome chrome_sandbox chromedriver.unstripped } package() { @@ -341,6 +261,7 @@ package() { chrome_100_percent.pak chrome_200_percent.pak chrome_crashpad_handler + libqt5_shim.so resources.pak v8_context_snapshot.bin diff --git a/cross-compilers/riscv64-unknown-linux-gnu-binutils/PKGBUILD b/cross-compilers/riscv64-unknown-linux-gnu-binutils/PKGBUILD index 2029c7a715..94b09d9967 100644 --- a/cross-compilers/riscv64-unknown-linux-gnu-binutils/PKGBUILD +++ b/cross-compilers/riscv64-unknown-linux-gnu-binutils/PKGBUILD @@ -9,7 +9,7 @@ pkgver=2.40 _commit=78eca0130feecb321bb6943045b2161583f61dd2 pkgrel=1 pkgdesc='Assemble and manipulate binary and object files for 32-bit and 64-bit RISC-V' -arch=(x86_64 powerpc64le powerpc) +arch=(x86_64 powerpc64le powerpc64 powerpc) url='https://gnu.org/software/binutils/' license=(GPL) groups=(risc-v) diff --git a/glslang/glslang-11.13.0-cmake_include_dirs.patch b/glslang/glslang-11.13.0-cmake_include_dirs.patch new file mode 100644 index 0000000000..f9bf8fb95c --- /dev/null +++ b/glslang/glslang-11.13.0-cmake_include_dirs.patch @@ -0,0 +1,24 @@ +diff -ruN a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +--- a/SPIRV/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100 ++++ b/SPIRV/CMakeLists.txt 2022-12-16 12:15:03.231070779 +0100 +@@ -100,7 +100,7 @@ + target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) + target_include_directories(SPIRV PUBLIC + $ +- $) ++ ) + else() + target_link_libraries(SPIRV PRIVATE MachineIndependent) + endif() +diff -ruN a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +--- a/StandAlone/CMakeLists.txt 2022-12-06 23:34:33.000000000 +0100 ++++ b/StandAlone/CMakeLists.txt 2022-12-16 12:15:20.527812776 +0100 +@@ -83,7 +83,7 @@ + target_link_libraries(glslangValidator ${LIBRARIES}) + target_include_directories(glslangValidator PUBLIC + $ +- $) ++) + + if(ENABLE_OPT) + target_include_directories(glslangValidator diff --git a/julia/PKGBUILD b/julia/PKGBUILD index f6813f398d..35f4ba6905 100644 --- a/julia/PKGBUILD +++ b/julia/PKGBUILD @@ -10,14 +10,14 @@ pkgname=julia epoch=2 pkgver=1.8.5 -pkgrel=4 +pkgrel=5 arch=(x86_64 powerpc64le powerpc riscv64) pkgdesc='High-level, high-performance, dynamic programming language' url='https://julialang.org/' license=(MIT) depends=(fftw hicolor-icon-theme libgit2 libunwind libutf8proc openblas64 cblas64 lapack64 - suitesparse64 mbedtls openlibm pcre2 llvm14-libs p7zip libblastrampoline) -makedepends=(cmake gcc-fortran python llvm14 patchelf libwhich) + suitesparse64 mbedtls openlibm pcre2 llvm-libs p7zip libblastrampoline) +makedepends=(cmake gcc-fortran python llvm patchelf libwhich) optdepends=('gnuplot: If using the Gaston Package from julia') replaces=(julia-docs) source=(https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$pkgver-full.tar.gz{,.asc} @@ -69,19 +69,19 @@ prepare() { cd $pkgname-$pkgver # Fixes for LLVM 14 - patch -p1 -i ../ed9851b0.patch - patch -p1 -i ../074d761f.patch - patch -p1 -i ../700c69b1.patch - patch -p1 -i ../LLVM-14.patch +# patch -p1 -i ../ed9851b0.patch +# patch -p1 -i ../074d761f.patch +# patch -p1 -i ../700c69b1.patch +# patch -p1 -i ../LLVM-14.patch # Fixes for LLVM 15 - builds, but many tests fail -# patch -p1 -i ../0db596e6.patch -# patch -p1 -i ../7b2d1e08.patch -# patch -p1 -i ../190565c2.patch -# patch -p1 -i ../68adc00e.patch -# patch -p1 -i ../3423639d.patch -# patch -p1 -i ../23f39f83.patch -# patch -p1 -i ../2ef4aba7.patch -# patch -p1 -i ../julia-llvm-15.patch + patch -p1 -i ../0db596e6.patch + patch -p1 -i ../7b2d1e08.patch + patch -p1 -i ../190565c2.patch + patch -p1 -i ../68adc00e.patch + patch -p1 -i ../3423639d.patch + patch -p1 -i ../23f39f83.patch + patch -p1 -i ../2ef4aba7.patch + patch -p1 -i ../julia-llvm-15.patch # libunwind 1.6 compatibility patch -p1 -i ../julia-libunwind-1.6.patch # Add and use option to build with system cblas @@ -143,7 +143,7 @@ _buildopts="prefix=/usr \ LIBCBLASNAME=libcblas64 \ LIBLAPACK=-llapack64 \ LIBLAPACKNAME=liblapack64 \ - LLVM_CONFIG=llvm-config-14" + LLVM_CONFIG=llvm-config" build() { cd $pkgname-$pkgver diff --git a/libcap/libcap-2.68-cgo_flags.patch b/libcap/libcap-2.68-cgo_flags.patch new file mode 100644 index 0000000000..84ccbafa2a --- /dev/null +++ b/libcap/libcap-2.68-cgo_flags.patch @@ -0,0 +1,41 @@ +From 522b78b9d6a1b6cf282a22657dea59bc5c960557 Mon Sep 17 00:00:00 2001 +From: David Runge +Date: Tue, 28 Mar 2023 13:44:20 +0200 +Subject: [PATCH] Provide flags when building go binaries + +go/Makefile: +Provide CGO_CFLAGS, CGO_CPPFLAGS, CGO_CXXFLAGS, CGO_LDFLAGS and GOFLAGS +to the go compiler, so that they may be set for e.g. supplying +downstream flags (such as for PIE and full RELRO). +--- + go/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/go/Makefile b/go/Makefile +index 38c1cf3..3a98af3 100644 +--- a/go/Makefile ++++ b/go/Makefile +@@ -68,16 +68,16 @@ ifeq ($(RAISE_GO_FILECAP),yes) + endif + + setid: ../goapps/setid/setid.go CAPGOPACKAGE PSXGOPACKAGE +- CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor -o $@ $< ++ CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build $(GO_BUILD_FLAGS) $(GOFLAGS) -mod=vendor -o $@ $< + + gowns: ../goapps/gowns/gowns.go CAPGOPACKAGE +- CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor -o $@ $< ++ CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build $(GO_BUILD_FLAGS) $(GOFLAGS) -mod=vendor -o $@ $< + + captree: ../goapps/captree/captree.go CAPGOPACKAGE +- CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor -o $@ $< ++ CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build $(GO_BUILD_FLAGS) $(GOFLAGS) -mod=vendor -o $@ $< + + captrace: ../goapps/captrace/captrace.go CAPGOPACKAGE +- CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor -o $@ $< ++ CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) CGO_CFLAGS="$(CGO_CFLAGS)" CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) build $(GO_BUILD_FLAGS) $(GOFLAGS) -mod=vendor -o $@ $< + + ok: ok.go vendor/modules.txt + CC="$(CC)" CGO_ENABLED="0" $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $< +-- +2.40.0 + diff --git a/libgpod/libgpod-0.8.3-pkgconfig_sharp.patch b/libgpod/libgpod-0.8.3-pkgconfig_sharp.patch new file mode 100644 index 0000000000..d12ef2b83f --- /dev/null +++ b/libgpod/libgpod-0.8.3-pkgconfig_sharp.patch @@ -0,0 +1,17 @@ +diff -Nurp libgpod-0.8.3/bindings/mono/libgpod-sharp/Makefile.am libgpod-0.8.3-pkgconfig_sharp/bindings/mono/libgpod-sharp/Makefile.am +--- libgpod-0.8.3/bindings/mono/libgpod-sharp/Makefile.am 2013-07-09 09:37:38.000000000 +0000 ++++ libgpod-0.8.3-pkgconfig_sharp/bindings/mono/libgpod-sharp/Makefile.am 2023-02-05 21:34:47.042376473 +0000 +@@ -23,12 +23,12 @@ libgpod-sharp.dll.config: $(top_srcdir)/ + sed "s/@DLNAME@/$(dlname)/g" $< >$@ + + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = libgpod-sharp.pc + EXTRAS = \ + libgpod-sharp.pc.in + + if HAVE_MONO + include $(srcdir)/../Makefile.include ++pkgconfig_DATA = libgpod-sharp.pc + module_SCRIPTS += libgpod-sharp.dll.config + EXTRA_DIST += libgpod-sharp.dll.config.in + DISTCLEANFILES += libgpod-sharp.dll.config diff --git a/libmms/libmms-Remove-requires-glib2.0.patch b/libmms/libmms-Remove-requires-glib2.0.patch new file mode 100644 index 0000000000..ff8c0b80ee --- /dev/null +++ b/libmms/libmms-Remove-requires-glib2.0.patch @@ -0,0 +1,21 @@ +From b9bbe17c08e5dcbe3ce841e6bed52ce8d8b10f9e Mon Sep 17 00:00:00 2001 +From: John Lindgren +Date: Thu, 29 May 2014 22:42:53 -0400 +Subject: Remove "Requires: glib-2.0" since libmms no longer depends on GLib. + +Signed-off-by: Hans de Goede + +diff --git a/pkgconfig/libmms.pc.in b/pkgconfig/libmms.pc.in +index 602c967..a86d15a 100644 +--- a/pkgconfig/libmms.pc.in ++++ b/pkgconfig/libmms.pc.in +@@ -4,8 +4,7 @@ libdir=@libdir@ + includedir=@includedir@/ + + Name: libmms +-Description: Library implementing the MMS protocol +-Requires: glib-2.0 ++Description: Library implementing the MMS protocol + Version: @VERSION@ + Libs: -L${libdir} -lmms -lm + Cflags: -I${includedir} diff --git a/libmodplug/libmodplug-0.8.9.0-no-fast-math.patch b/libmodplug/libmodplug-0.8.9.0-no-fast-math.patch new file mode 100644 index 0000000000..83bf8d9a8e --- /dev/null +++ b/libmodplug/libmodplug-0.8.9.0-no-fast-math.patch @@ -0,0 +1,12 @@ +diff -uNr a/configure.ac b/configure.ac +--- a/configure.ac 2017-07-26 22:39:07.461198820 +0100 ++++ b/configure.ac 2017-07-26 22:39:53.284622741 +0100 +@@ -31,7 +31,7 @@ + AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h]) + AC_CHECK_FUNCS(setenv sinf) + +-CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -ffast-math -fno-common -D_REENTRANT" ++CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -fno-common -D_REENTRANT" + + AC_CANONICAL_HOST + case "$host" in diff --git a/libphonenumber/libphonenumber-8.12.37-cmake.patch b/libphonenumber/libphonenumber-8.12.37-cmake.patch new file mode 100644 index 0000000000..bfc7e8701a --- /dev/null +++ b/libphonenumber/libphonenumber-8.12.37-cmake.patch @@ -0,0 +1,54 @@ +Upstream: no, I probably should, although this patch isn't nice, but + neither is their cmake code + +From a0c72f32b3c318f66975400af81b9b44d8a8d9c7 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Wed, 27 Mar 2019 21:07:22 +0100 +Subject: [PATCH] Fix build with BUILD_STATIC_LIB=ON + +--- + cpp/CMakeLists.txt | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 38ce1f50..dd9399be 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -441,7 +441,9 @@ if (${BUILD_GEOCODER} STREQUAL "ON") + list (APPEND GEOCODER_DEPS ${COMMON_DEPS}) + # Note that the subset of base/ on which the geocoder relies is implemented + # on top of Boost header-only libraries (e.g. scoped_ptr.hpp). +- target_link_libraries (geocoding ${LIBRARY_DEPS}) ++ if (${BUILD_STATIC_LIB} STREQUAL "ON") ++ target_link_libraries (geocoding ${LIBRARY_DEPS}) ++ endif() + target_link_libraries (geocoding-shared ${LIBRARY_DEPS}) + endif () + +@@ -599,7 +601,9 @@ if (BUILD_SHARED_LIB) + endif () + + if (${BUILD_GEOCODER} STREQUAL "ON") +- install (TARGETS geocoding LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR}) ++ if (${BUILD_STATIC_LIB} STREQUAL "ON") ++ install (TARGETS geocoding LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR}) ++ endif() + install (TARGETS geocoding-shared LIBRARY DESTINATION ${LIBDIR} ARCHIVE + DESTINATION ${LIBDIR}) + endif () +@@ -611,7 +615,11 @@ if (${BUILD_GEOCODER} STREQUAL "ON") + geocoding_test_program + "test/phonenumbers/geocoding/geocoding_test_program.cc" + ) +- target_link_libraries (geocoding_test_program geocoding phonenumber) ++ if (${BUILD_STATIC_LIB} STREQUAL "ON") ++ target_link_libraries (geocoding_test_program geocoding phonenumber) ++ else () ++ target_link_libraries (geocoding_test_program geocoding-shared phonenumber-shared) ++ endif () + endif () + + # Build an RPM +-- +2.21.0 + diff --git a/libphonenumber/libphonenumber-8.12.37-testing.patch b/libphonenumber/libphonenumber-8.12.37-testing.patch new file mode 100644 index 0000000000..0ea039aea2 --- /dev/null +++ b/libphonenumber/libphonenumber-8.12.37-testing.patch @@ -0,0 +1,110 @@ +From 387f1daf0f9cd25ffa2654cc536e5678dd96a571 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 15 Nov 2021 19:13:37 +0100 +Subject: [PATCH] Add BUILD_TESTING option + +Signed-off-by: Andreas Sturmlechner +--- + cpp/CMakeLists.txt | 13 +++++++++++-- + tools/cpp/CMakeLists.txt | 17 +++++++++-------- + 2 files changed, 20 insertions(+), 10 deletions(-) + +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 44db6834..f8e40978 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -32,7 +32,9 @@ endif () + # depends on. + + include (GNUInstallDirs) +-include (../tools/cpp/gtest.cmake) ++if (BUILD_TESTING) ++ include (../tools/cpp/gtest.cmake) ++endif() + + function (print_error DESCRIPTION FILE) + message (FATAL_ERROR +@@ -90,6 +92,7 @@ option ("USE_STD_MAP" "Force the use of std::map" "OFF") + option ("BUILD_STATIC_LIB" "Build static libraries" "ON") + option ("USE_STDMUTEX" "Use C++ 2011 std::mutex for multi-threading" "OFF") + option ("USE_POSIX_THREAD" "Use Posix api for multi-threading" "OFF") ++option ("BUILD_TESTING" "Build unit tests (gtest sources are needed)" "ON") + + if (${USE_ALTERNATE_FORMATS} STREQUAL "ON") + add_definitions ("-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS") +@@ -121,7 +124,9 @@ if (${USE_BOOST} STREQUAL "OFF" AND ${USE_STDMUTEX} STREQUAL "OFF") + find_package (Threads) + endif() + +-find_or_build_gtest () ++if (BUILD_TESTING) ++ find_or_build_gtest () ++endif() + + if (${USE_RE2} STREQUAL "ON") + find_required_library (RE2 re2/re2.h re2 "Google RE2") +@@ -492,11 +497,13 @@ if (${BUILD_GEOCODER} STREQUAL "ON") + endif () + + # Build a specific library for testing purposes. ++if (BUILD_TESTING) + add_library (phonenumber_testing STATIC ${TESTING_LIBRARY_SOURCES}) + if (${BUILD_GEOCODER} STREQUAL "ON") + add_dependencies (phonenumber_testing generate_geocoding_data) + endif () + target_link_libraries (phonenumber_testing ${LIBRARY_DEPS}) ++endif() + + if (${BUILD_GEOCODER} STREQUAL "ON") + # Test geocoding data cpp files generation. +@@ -551,6 +558,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON") + endif () + + # Build the testing binary. ++if (BUILD_TESTING) + include_directories ("test") + add_executable (libphonenumber_test ${TEST_SOURCES}) + set (TEST_LIBS phonenumber_testing ${GTEST_LIB}) +@@ -575,6 +583,7 @@ else () + DEPENDS libphonenumber_test + ) + endif () ++endif () + + # Install rules. + install (FILES +diff --git a/tools/cpp/CMakeLists.txt b/tools/cpp/CMakeLists.txt +index fafa8469..0c3a84e0 100644 +--- a/tools/cpp/CMakeLists.txt ++++ b/tools/cpp/CMakeLists.txt +@@ -20,11 +20,10 @@ project (generate_geocoding_data) + + # Helper functions dealing with finding libraries and programs this library + # depends on. +- +-include (gtest.cmake) +- +-find_or_build_gtest () +- ++if (BUILD_TESTING) ++ include (gtest.cmake) ++ find_or_build_gtest () ++endif () + set ( + SOURCES + "src/cpp-build/generate_geocoding_data.cc" +@@ -52,6 +51,8 @@ if (NOT WIN32) + endif () + + # Build the testing binary. +-include_directories ("test") +-add_executable (generate_geocoding_data_test ${TEST_SOURCES}) +-target_link_libraries (generate_geocoding_data_test ${TEST_LIBS}) ++if (BUILD_TESTING) ++ include_directories ("test") ++ add_executable (generate_geocoding_data_test ${TEST_SOURCES}) ++ target_link_libraries (generate_geocoding_data_test ${TEST_LIBS}) ++endif () +-- +2.33.1 + diff --git a/linux-lts/PKGBUILD b/linux-lts/PKGBUILD index 094309ca5b..9d18f48c0c 100644 --- a/linux-lts/PKGBUILD +++ b/linux-lts/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andreas Radke pkgbase=linux-lts -pkgver=5.10.176 +pkgver=5.10.178 pkgrel=1 pkgdesc='LTS Linux' url="https://www.kernel.org/" @@ -30,7 +30,7 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('ce072c60ba04173e05b2a1de3fefdeba5ac8b28b1958d92d21bdbf9b736ef793' +sha256sums=('1acfade3715e560f00fb30615d5471e24b3940b549381558787aee9734e7a8af' 'SKIP' '8185ec01454b5ea28517e5de186bcf310f4f403b0328d879c5fe2d7c38a27cba' '072b5927d04f715311276c32fbaf302ccd9bdef44727086e120cf4d290be4217' diff --git a/lmdb/PKGBUILD b/lmdb/PKGBUILD index 57b904ef8a..313502a11d 100644 --- a/lmdb/PKGBUILD +++ b/lmdb/PKGBUILD @@ -5,7 +5,7 @@ pkgname=lmdb pkgver=0.9.30 _commit=8f44dca45d87bc1f8da65428172668c5e6154179 -pkgrel=2 +pkgrel=3 pkgdesc="Symas Lightning Memory-Mapped Database" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://symas.com/lmdb" @@ -24,7 +24,7 @@ prepare() { build() { cd openldap/libraries/liblmdb - make prefix=/usr + make CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" prefix=/usr } check() { diff --git a/mesa/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch b/mesa/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch new file mode 100644 index 0000000000..425857a134 --- /dev/null +++ b/mesa/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Thu, 29 Dec 2022 13:43:27 +0800 +Subject: [PATCH] iris: Retry DRM_IOCTL_I915_GEM_EXECBUFFER2 on ENOMEM +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We are seeing endless DRM_IOCTL_SYNCOBJ_WAIT ioctl when system memory is +under pressured. + +Commit f9d8d9acbb6a ("iris: Avoid abort() if kernel can't allocate +memory") avoids the abort() on ENOMEM by resetting the batch. However, +when there's an ongoing OpenGL query, resetting the batch will make the +snapshots_landed never be flipped, so iris_get_query_result() gets stuck +in the while loop forever. + +Since there's no guarantee that the next batch after resetting won't hit +ENOMEM, so instead of resetting the batch, be patient and wait until kernel has +enough memory. Once the batch is submiited and snapshots_landed gets +flipped, iris_get_query_result() can proceed normally. + +Reviewed-by: José Roberto de Souza +Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6851 +Part-of: +--- + src/gallium/drivers/iris/iris_batch.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c +index c7a08a0e1f5f..deab85ce4aaf 100644 +--- a/src/gallium/drivers/iris/iris_batch.c ++++ b/src/gallium/drivers/iris/iris_batch.c +@@ -981,9 +981,14 @@ submit_batch(struct iris_batch *batch) + } + + int ret = 0; +- if (!batch->screen->devinfo->no_hw && +- intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf)) +- ret = -errno; ++ if (!batch->screen->devinfo->no_hw) { ++ do { ++ ret = intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf); ++ } while (ret && errno == ENOMEM); ++ ++ if (ret) ++ ret = -errno; ++ } + + simple_mtx_unlock(bo_deps_lock); + diff --git a/mesa/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch b/mesa/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch new file mode 100644 index 0000000000..a66637c8d5 --- /dev/null +++ b/mesa/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kai-Heng Feng +Date: Thu, 29 Dec 2022 14:01:31 +0800 +Subject: [PATCH] Revert "iris: Avoid abort() if kernel can't allocate memory" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit f9d8d9acbb6a620684fb4dac4affe25816587d92. + +Now ENOMEM is handled in submit_batch(), we don't need to check it for +resetting anymore. + +Reviewed-by: José Roberto de Souza +Part-of: +--- + src/gallium/drivers/iris/iris_batch.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c +index deab85ce4aaf..2993f0ab7ee8 100644 +--- a/src/gallium/drivers/iris/iris_batch.c ++++ b/src/gallium/drivers/iris/iris_batch.c +@@ -1097,9 +1097,8 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line) + * with a new logical context, and inform iris_context that all state + * has been lost and needs to be re-initialized. If this succeeds, + * dubiously claim success... +- * Also handle ENOMEM here. + */ +- if ((ret == -EIO || ret == -ENOMEM) && replace_kernel_ctx(batch)) { ++ if (ret == -EIO && replace_kernel_ctx(batch)) { + if (batch->reset->reset) { + /* Tell gallium frontends the device is lost and it was our fault. */ + batch->reset->reset(batch->reset->data, PIPE_GUILTY_CONTEXT_RESET); diff --git a/mesa/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch b/mesa/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch new file mode 100644 index 0000000000..d8b44a868d --- /dev/null +++ b/mesa/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch @@ -0,0 +1,130 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin +Date: Mon, 3 Apr 2023 14:52:59 +0300 +Subject: [PATCH] intel/fs: fix scheduling of HALT instructions + +With the following test : + +dEQP-VK.spirv_assembly.instruction.terminate_invocation.terminate.no_out_of_bounds_load + +There is a : + +shader_start: + ... <- no control flow + g0 = some_alu + g1 = fbl + g2 = broadcast g3, g1 + g4 = get_buffer_size g2 + ... <- no control flow + halt <- on some lanes + g5 = send , g4 + +eliminate_find_live_channel will remove the fbl/broadcast because it +assumes lane0 is active at get_buffer_size : + +shader_start: + ... <- no control flow + g0 = some_alu + g4 = get_buffer_size g0 + ... <- no control flow + halt <- on some lanes + g5 = send , g4 + +But then the instruction scheduler will move the get_buffer_size after +the halt : + +shader_start: + ... <- no control flow + halt <- on some lanes + g0 = some_alu + g4 = get_buffer_size g0 + g5 = send , g4 + +get_buffer_size pulls the surface index from lane0 in g0 which could +have been turned off by the halt and we end up accessing an invalid +surface handle. + +Signed-off-by: Lionel Landwerlin +Cc: mesa-stable +--- + .../compiler/brw_schedule_instructions.cpp | 46 +++++++++++++++++++ + 1 file changed, 46 insertions(+) + +diff --git a/src/intel/compiler/brw_schedule_instructions.cpp b/src/intel/compiler/brw_schedule_instructions.cpp +index 3286e3f83b96..43f63784b2e8 100644 +--- a/src/intel/compiler/brw_schedule_instructions.cpp ++++ b/src/intel/compiler/brw_schedule_instructions.cpp +@@ -651,6 +651,7 @@ public: + ralloc_free(this->mem_ctx); + } + void add_barrier_deps(schedule_node *n); ++ void add_cross_lane_deps(schedule_node *n); + void add_dep(schedule_node *before, schedule_node *after, int latency); + void add_dep(schedule_node *before, schedule_node *after); + +@@ -1098,6 +1099,28 @@ is_scheduling_barrier(const backend_instruction *inst) + inst->has_side_effects(); + } + ++static bool ++has_cross_lane_access(const fs_inst *inst) ++{ ++ if (inst->opcode == SHADER_OPCODE_BROADCAST || ++ inst->opcode == SHADER_OPCODE_READ_SR_REG || ++ inst->opcode == SHADER_OPCODE_CLUSTER_BROADCAST || ++ inst->opcode == SHADER_OPCODE_SHUFFLE || ++ inst->opcode == FS_OPCODE_LOAD_LIVE_CHANNELS || ++ inst->opcode == SHADER_OPCODE_FIND_LAST_LIVE_CHANNEL || ++ inst->opcode == SHADER_OPCODE_FIND_LIVE_CHANNEL) ++ return true; ++ ++ for (unsigned s = 0; s < inst->sources; s++) { ++ if (inst->src[s].file == VGRF) { ++ if (inst->src[s].stride == 0) ++ return true; ++ } ++ } ++ ++ return false; ++} ++ + /** + * Sometimes we really want this node to execute after everything that + * was before it and before everything that followed it. This adds +@@ -1128,6 +1151,25 @@ instruction_scheduler::add_barrier_deps(schedule_node *n) + } + } + ++/** ++ * Because some instructions like HALT can disable lanes, scheduling prior to ++ * a cross lane access should not be allowed, otherwise we could end up with ++ * later instructions accessing uninitialized data. ++ */ ++void ++instruction_scheduler::add_cross_lane_deps(schedule_node *n) ++{ ++ schedule_node *prev = (schedule_node *)n->prev; ++ ++ if (prev) { ++ while (!prev->is_head_sentinel()) { ++ if (has_cross_lane_access((fs_inst *)prev->inst)) ++ add_dep(prev, n, 0); ++ prev = (schedule_node *)prev->prev; ++ } ++ } ++} ++ + /* instruction scheduling needs to be aware of when an MRF write + * actually writes 2 MRFs. + */ +@@ -1165,6 +1207,10 @@ fs_instruction_scheduler::calculate_deps() + if (is_scheduling_barrier(inst)) + add_barrier_deps(n); + ++ if (inst->opcode == BRW_OPCODE_HALT || ++ inst->opcode == SHADER_OPCODE_HALT_TARGET) ++ add_cross_lane_deps(n); ++ + /* read-after-write deps. */ + for (int i = 0; i < inst->sources; i++) { + if (inst->src[i].file == VGRF) { diff --git a/nauty/nauty-2.8.6-gentreeg-gentourng.patch b/nauty/nauty-2.8.6-gentreeg-gentourng.patch new file mode 100644 index 0000000000..322b25326e --- /dev/null +++ b/nauty/nauty-2.8.6-gentreeg-gentourng.patch @@ -0,0 +1,144 @@ +From edb0474a4db8e69f971e4eebe18716309f5a7bb3 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Tue, 17 Jan 2023 19:44:49 -0500 +Subject: [PATCH 1/1] Upstream fixes for gentreeg and gentourng. + +https://mailman.anu.edu.au/pipermail/nauty/2023-January/000903.html +--- + gentourng.c | 2 +- + gentreeg.c | 95 ++++++++++++++++++++++++++++------------------------- + 2 files changed, 51 insertions(+), 46 deletions(-) + +diff --git a/gentourng.c b/gentourng.c +index 634e5e8..5c7ffff 100644 +--- a/gentourng.c ++++ b/gentourng.c +@@ -1408,7 +1408,7 @@ PLUGIN_INIT + (*outproc)(outfile,g,1); + } + } +- else ++ else if (!connec || maxn != 2) + { + makeleveldata(); + +diff --git a/gentreeg.c b/gentreeg.c +index 946d5f8..15bf87b 100644 +--- a/gentreeg.c ++++ b/gentreeg.c +@@ -1,4 +1,4 @@ +-/* gentree version 1.3; Brendan McKay Oct 2022 */ ++/* gentree version 1.4; Brendan McKay Dec 2022 */ + /* This program is a wrapper for the program FreeTrees.c written + * by Gang Li & Frank Ruskey. See below for their original + * comments. */ +@@ -32,49 +32,54 @@ Counts for n=1..45: + 1: 1 + 2: 1 + 3: 1 +- 4: 1 +- 5: 2 +- 6: 3 +- 7: 6 +- 8: 11 +- 9: 23 +-10: 47 +-11: 106 +-12: 235 +-13: 551 +-14: 1301 +-15: 3159 +-16: 7741 +-17: 19320 +-18: 48629 +-19: 123867 +-20: 317955 +-21: 823065 +-22: 2144505 +-23: 5623756 +-24: 14828074 +-25: 39299897 +-26: 104636890 +-27: 279793450 +-28: 751065460 +-29: 2023443032 +-30: 5469566585 +-31: 14830871802 +-32: 40330829030 +-33: 109972410221 +-34: 300628862480 +-35: 823779631721 +-36: 2262366343746 +-37: 6226306037178 +-38: 17169677490714 +-39: 47436313524262 +-40: 131290543779126 +-41: 363990257783343 +-42: 1010748076717151 +-43: 2810986483493475 +-44: 7828986221515605 +-45: 21835027912963086 +-********************************/ ++ 4: 2 ++ 5: 3 ++ 6: 6 ++ 7: 11 ++ 8: 23 ++ 9: 47 ++10: 106 ++11: 235 ++12: 551 ++13: 1301 ++14: 3159 ++15: 7741 ++16: 19320 ++17: 48629 ++18: 123867 ++19: 317955 ++20: 823065 ++21: 2144505 ++22: 5623756 ++23: 14828074 ++24: 39299897 ++25: 104636890 ++26: 279793450 ++27: 751065460 ++28: 2023443032 ++29: 5469566585 ++30: 14830871802 ++31: 40330829030 ++32: 109972410221 ++33: 300628862480 ++34: 823779631721 ++35: 2262366343746 ++36: 6226306037178 ++37: 17169677490714 ++38: 47436313524262 ++39: 131290543779126 ++40: 363990257783343 ++41: 1010748076717151 ++42: 2810986483493475 ++43: 7828986221515605 ++44: 21835027912963086 ++45: 60978390985918906 ++46: 170508699155987862 ++47: 477355090753926460 ++48: 1337946100045842285 ++49: 3754194185716399992 ++50: 10545233702911509534 ++*******************************/ + + /* Comments on original program by original authors */ + /*==============================================================*/ +@@ -676,7 +681,7 @@ PLUGIN_INIT + } + else if (nv == 2) + { +- if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 2) ++ if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 1) + { + par[1] = 0; + par[2] = 1; +-- +2.38.2 + diff --git a/opencv/PKGBUILD b/opencv/PKGBUILD index 00dd6c2408..48ecec83ac 100644 --- a/opencv/PKGBUILD +++ b/opencv/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=opencv pkgname=(opencv opencv-samples python-opencv) [ "${CARCH}" == 'x86_86' ] && pkgname+=(opencv-cuda) pkgver=4.7.0 -pkgrel=6 +pkgrel=8 pkgdesc='Open Source Computer Vision Library' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) license=(BSD) diff --git a/ostree/ostree-2023.1-use_fuse3.patch b/ostree/ostree-2023.1-use_fuse3.patch new file mode 100644 index 0000000000..c1b345ef40 --- /dev/null +++ b/ostree/ostree-2023.1-use_fuse3.patch @@ -0,0 +1,74 @@ +diff --git i/docs/buildsystem-and-repos.md w/docs/buildsystem-and-repos.md +index e265ee7a..2e9250d5 100644 +--- i/docs/buildsystem-and-repos.md ++++ w/docs/buildsystem-and-repos.md +@@ -151,7 +151,7 @@ rofiles-fuse exampleos-build mnt + # Now run global "triggers", generate cache files: + ldconfig -r mnt + (Insert other programs here) +-fusermount -u mnt ++fusermount3 -u mnt + ostree --repo=build-repo commit -b exampleos/x86_64/standard --link-checkout-speedup exampleos-build + ``` + +diff --git i/man/rofiles-fuse.xml w/man/rofiles-fuse.xml +index f4d23739..e8569130 100644 +--- i/man/rofiles-fuse.xml ++++ w/man/rofiles-fuse.xml +@@ -89,7 +89,7 @@ $ mkdir mnt/anewdir + $ rm mnt/someoriginalcontent -rf + + # Commit and cleanup +-$ fusermount -u mnt ++$ fusermount3 -u mnt + $ ostree --repo=repo commit --link-checkout-speedup -b somebranch -s 'Commit new content' --tree=dir=branch-checkout + $ rm mnt branch-checkout -rf + +diff --git i/tests/libtest.sh w/tests/libtest.sh +index 264094b1..cd1e0986 100755 +--- i/tests/libtest.sh ++++ w/tests/libtest.sh +@@ -683,7 +683,7 @@ skip_one_without_strace_fault_injection() { + } + + skip_without_fuse () { +- fusermount --version >/dev/null 2>&1 || skip "no fusermount" ++ fusermount3 --version >/dev/null 2>&1 || skip "no fusermount3" + + capsh --print | grep -q 'Bounding set.*[^a-z]cap_sys_admin' || \ + skip "No cap_sys_admin in bounding set, can't use FUSE" +diff --git i/tests/test-demo-buildsystem.sh w/tests/test-demo-buildsystem.sh +index 2dc78dc3..50995b87 100755 +--- i/tests/test-demo-buildsystem.sh ++++ w/tests/test-demo-buildsystem.sh +@@ -55,7 +55,7 @@ exampleos_recompose() { + # Now that we have our rootfs, run triggers + rofiles-fuse exampleos-build mnt + demo_triggers mnt/ +- fusermount -u mnt ++ fusermount3 -u mnt + + # Then we commit it, using --link-checkout-speedup to effectively + # only re-checksum the ldconfig file. We also have dummy commit +diff --git i/tests/test-rofiles-fuse.sh w/tests/test-rofiles-fuse.sh +index a56a76c6..c61945d6 100755 +--- i/tests/test-rofiles-fuse.sh ++++ w/tests/test-rofiles-fuse.sh +@@ -37,7 +37,7 @@ $OSTREE checkout -H test2 checkout-test2 + + rofiles-fuse checkout-test2 mnt + cleanup_fuse() { +- fusermount -u ${test_tmpdir}/mnt || true ++ fusermount3 -u ${test_tmpdir}/mnt || true + } + libtest_exit_cmds+=(cleanup_fuse) + assert_file_has_content mnt/firstfile first +@@ -133,7 +133,7 @@ echo "ok flock" + + copyup_reset() { + cd ${test_tmpdir} +- fusermount -u mnt ++ fusermount3 -u mnt + rm checkout-test2 -rf + $OSTREE checkout -H test2 checkout-test2 + rofiles-fuse --copyup checkout-test2 mnt diff --git a/rtl88x2bu-dkms/PKGBUILD b/rtl88x2bu-dkms/PKGBUILD index 283156435b..d7431e6aaf 100644 --- a/rtl88x2bu-dkms/PKGBUILD +++ b/rtl88x2bu-dkms/PKGBUILD @@ -3,7 +3,7 @@ pkgname=rtl88x2bu-dkms _pkgbase=${pkgname/-dkms/} -pkgver=5.6.1.r60.9c6c253 +pkgver=5.6.1.r181.2812290 _pkgver=5.6.1 pkgrel=1 pkgdesc="Kernel module for Realtek rtl88x2bu WiFi chipset" @@ -12,7 +12,7 @@ url="https://github.com/RinCat/RTL88x2BU-Linux-Driver" license=('GPL2') depends=('dkms' 'bc') makedepends=('git') -_commit="a543f246e3f6b023a98f7146cccec667600a23fe" +_commit="281229078fd32c06ecf80c701ad5dd54a42d2f6a" source=("git+https://github.com/RinCat/RTL88x2BU-Linux-Driver.git#commit=${_commit}" rtl88x2bu-5.6.1-disable-debug.patch) sha512sums=('SKIP' diff --git a/texlive-bin/ptex-debug-print.patch b/texlive-bin/ptex-debug-print.patch new file mode 100644 index 0000000000..cc2953d995 --- /dev/null +++ b/texlive-bin/ptex-debug-print.patch @@ -0,0 +1,14 @@ +diff --git a/texk/ptexenc/ptexenc.c b/texk/ptexenc/ptexenc.c +index 4e81dbee7c..3c98d68125 100644 +--- a/texk/ptexenc/ptexenc.c ++++ b/texk/ptexenc/ptexenc.c +@@ -1044,7 +1044,9 @@ long input_line2(FILE *fp, unsigned char *buff, unsigned char *buff2, + enc = ptenc_guess_enc(fp); + if (string_to_enc(enc) > 0) { + infile_enc[fd] = string_to_enc(enc); ++#ifdef DEBUG + fprintf(stderr, "(guessed encoding #%d: %s = %s)", fd, enc, enc_to_string(infile_enc[fd])); ++#endif /* DEBUG */ + } else { + infile_enc[fd] = get_file_enc(); + } diff --git a/v4l-utils/0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch b/v4l-utils/0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch new file mode 100644 index 0000000000..d2bbc6e415 --- /dev/null +++ b/v4l-utils/0001-v4l2-tpg.patch-rename-min-max-defines-to-tpg_min-max.patch @@ -0,0 +1,36 @@ +From 02f295d4c4c1b401cdb589df5bef2645c7f83813 Mon Sep 17 00:00:00 2001 +From: Hans Verkuil +Date: Mon, 15 Mar 2021 08:13:14 +0100 +Subject: [PATCH] v4l2-tpg.patch: rename min/max defines to tpg_min/max + +With gcc 11 the min/max defines clash with what gcc provides, +so rename these defines. They are only used in the min3/max3 +defines, so the change it kept to a minimum. + +Signed-off-by: Hans Verkuil +Reported-by: Gregor Jasny +--- + utils/common/v4l2-tpg.h | 10 ++++------ + utils/common/v4l2-tpg.patch | 12 +++++------- + 2 files changed, 9 insertions(+), 13 deletions(-) + +diff --git a/utils/common/v4l2-tpg.h b/utils/common/v4l2-tpg.h +index caf7b1a1..ecdb6eba 100644 +--- a/utils/common/v4l2-tpg.h ++++ b/utils/common/v4l2-tpg.h +@@ -28,12 +28,10 @@ typedef __s8 s8; + #define pr_info printf + #define noinline + +-#ifndef min +-#define min(a,b) ((a) < (b) ? (a) : (b)) +-#define max(a,b) ((a) > (b) ? (a) : (b)) +-#endif /* !min */ +-#define min3(x, y, z) min((typeof(x))min(x, y), z) +-#define max3(x, y, z) max((typeof(x))max(x, y), z) ++#define tpg_min(a,b) ((a) < (b) ? (a) : (b)) ++#define tpg_max(a,b) ((a) > (b) ? (a) : (b)) ++#define min3(x, y, z) tpg_min((typeof(x))tpg_min(x, y), z) ++#define max3(x, y, z) tpg_max((typeof(x))tpg_max(x, y), z) + #define array_size(a, b) ((a) * (b)) + #define array3_size(a, b, c) ((a) * (b) * (c))