Index: Mk/Uses/cargo.mk =================================================================== --- Mk/Uses/cargo.mk +++ Mk/Uses/cargo.mk @@ -45,7 +45,7 @@ CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.47.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.48.0:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) Index: audio/ncspot/Makefile =================================================================== --- audio/ncspot/Makefile +++ audio/ncspot/Makefile @@ -3,6 +3,7 @@ PORTNAME= ncspot DISTVERSIONPREFIX= v DISTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= ports@FreeBSD.org Index: audio/spotify-tui/Makefile =================================================================== --- audio/spotify-tui/Makefile +++ audio/spotify-tui/Makefile @@ -3,7 +3,7 @@ PORTNAME= spotify-tui DISTVERSIONPREFIX= v DISTVERSION= 0.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= vulcan@wired.sh Index: audio/spotifyd/Makefile =================================================================== --- audio/spotifyd/Makefile +++ audio/spotifyd/Makefile @@ -3,7 +3,7 @@ PORTNAME= spotifyd DISTVERSIONPREFIX= v DISTVERSION= 0.2.24 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= audio MAINTAINER= mikael@FreeBSD.org Index: benchmarks/hyperfine/Makefile =================================================================== --- benchmarks/hyperfine/Makefile +++ benchmarks/hyperfine/Makefile @@ -3,7 +3,7 @@ PORTNAME= hyperfine DISTVERSIONPREFIX= v DISTVERSION= 1.11.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org Index: deskutils/just/Makefile =================================================================== --- deskutils/just/Makefile +++ deskutils/just/Makefile @@ -3,6 +3,7 @@ PORTNAME= just DISTVERSIONPREFIX= v DISTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org Index: devel/bingrep/Makefile =================================================================== --- devel/bingrep/Makefile +++ devel/bingrep/Makefile @@ -2,7 +2,7 @@ PORTNAME= bingrep PORTVERSION= 0.8.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: devel/cargo-c/Makefile =================================================================== --- devel/cargo-c/Makefile +++ devel/cargo-c/Makefile @@ -2,6 +2,7 @@ PORTNAME= cargo-c DISTVERSION= 0.6.16+cargo-0.45 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO # XXX Teach USES=cargo to have proper default Index: devel/cargo-generate/Makefile =================================================================== --- devel/cargo-generate/Makefile +++ devel/cargo-generate/Makefile @@ -3,7 +3,7 @@ PORTNAME= cargo-generate DISTVERSIONPREFIX= v DISTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= vulcan@wired.sh Index: devel/desed/Makefile =================================================================== --- devel/desed/Makefile +++ devel/desed/Makefile @@ -2,7 +2,7 @@ PORTNAME= desed DISTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} Index: devel/dtool/Makefile =================================================================== --- devel/dtool/Makefile +++ devel/dtool/Makefile @@ -3,7 +3,7 @@ PORTNAME= dtool DISTVERSIONPREFIX= v DISTVERSION= 0.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= vulcan@wired.sh Index: devel/gbump/Makefile =================================================================== --- devel/gbump/Makefile +++ devel/gbump/Makefile @@ -2,7 +2,7 @@ PORTNAME= gbump PORTVERSION= 1.0.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} Index: devel/git-absorb/Makefile =================================================================== --- devel/git-absorb/Makefile +++ devel/git-absorb/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-absorb DISTVERSION= 0.5.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology Index: devel/git-delta/Makefile =================================================================== --- devel/git-delta/Makefile +++ devel/git-delta/Makefile @@ -2,6 +2,7 @@ PORTNAME= delta DISTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= git- Index: devel/gitui/Makefile =================================================================== --- devel/gitui/Makefile +++ devel/gitui/Makefile @@ -3,7 +3,7 @@ PORTNAME= gitui DISTVERSIONPREFIX= v DISTVERSION= 0.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org Index: devel/interactive_rebase_tool/Makefile =================================================================== --- devel/interactive_rebase_tool/Makefile +++ devel/interactive_rebase_tool/Makefile @@ -2,7 +2,7 @@ PORTNAME= interactive_rebase_tool DISTVERSION= 1.2.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel MAINTAINER= petteri.valkonen@iki.fi Index: devel/pijul/Makefile =================================================================== --- devel/pijul/Makefile +++ devel/pijul/Makefile @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.12.0 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: devel/py-maturin/Makefile =================================================================== --- devel/py-maturin/Makefile +++ devel/py-maturin/Makefile @@ -3,6 +3,7 @@ PORTNAME= maturin DISTVERSIONPREFIX= v DISTVERSION= 0.8.3 +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: devel/racer/Makefile =================================================================== --- devel/racer/Makefile +++ devel/racer/Makefile @@ -3,6 +3,7 @@ PORTNAME= racer DISTVERSION= 2.1.36 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} Index: devel/rust-analyzer/Makefile =================================================================== --- devel/rust-analyzer/Makefile +++ devel/rust-analyzer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rust-analyzer DISTVERSION= 2020-09-28 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= rust@FreeBSD.org Index: devel/rust-bindgen/Makefile =================================================================== --- devel/rust-bindgen/Makefile +++ devel/rust-bindgen/Makefile @@ -2,7 +2,7 @@ PORTNAME= bindgen DISTVERSION= 0.54.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Index: devel/rust-cbindgen/Makefile =================================================================== --- devel/rust-cbindgen/Makefile +++ devel/rust-cbindgen/Makefile @@ -2,7 +2,7 @@ PORTNAME= cbindgen DISTVERSION= 0.15.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO PKGNAMEPREFIX= rust- Index: devel/sccache/Makefile =================================================================== --- devel/sccache/Makefile +++ devel/sccache/Makefile @@ -2,7 +2,7 @@ PORTNAME= sccache DISTVERSION= 0.2.13 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= devel Index: devel/sentry-cli/Makefile =================================================================== --- devel/sentry-cli/Makefile +++ devel/sentry-cli/Makefile @@ -2,7 +2,7 @@ PORTNAME= sentry-cli DISTVERSION= 1.58.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= vulcan@wired.sh Index: devel/tokei/Makefile =================================================================== --- devel/tokei/Makefile +++ devel/tokei/Makefile @@ -3,7 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 12.0.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= mikael@FreeBSD.org Index: dns/dog/Makefile =================================================================== --- dns/dog/Makefile +++ dns/dog/Makefile @@ -3,6 +3,7 @@ PORTNAME= dog DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 +PORTREVISION= 1 CATEGORIES= dns net MAINTAINER= vulcan@wired.sh Index: dns/doh-proxy/Makefile =================================================================== --- dns/doh-proxy/Makefile +++ dns/doh-proxy/Makefile @@ -3,7 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.3.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: dns/encrypted-dns-server/Makefile =================================================================== --- dns/encrypted-dns-server/Makefile +++ dns/encrypted-dns-server/Makefile @@ -2,6 +2,7 @@ PORTNAME= encrypted-dns-server DISTVERSION= 0.3.21 +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= felix@userspace.com.au Index: editors/kak-lsp/Makefile =================================================================== --- editors/kak-lsp/Makefile +++ editors/kak-lsp/Makefile @@ -3,7 +3,7 @@ PORTNAME= kak-lsp DISTVERSIONPREFIX= v DISTVERSION= 8.0.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= editors MAINTAINER= mikael@FreeBSD.org Index: editors/kibi/Makefile =================================================================== --- editors/kibi/Makefile +++ editors/kibi/Makefile @@ -3,7 +3,7 @@ PORTNAME= kibi DISTVERSIONPREFIX= v DISTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= vulcan@wired.sh Index: editors/parinfer-rust/Makefile =================================================================== --- editors/parinfer-rust/Makefile +++ editors/parinfer-rust/Makefile @@ -3,7 +3,7 @@ PORTNAME= parinfer-rust DISTVERSIONPREFIX= v DISTVERSION= 0.4.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= editors MAINTAINER= mikael@FreeBSD.org Index: editors/xi-core/Makefile =================================================================== --- editors/xi-core/Makefile +++ editors/xi-core/Makefile @@ -3,7 +3,7 @@ PORTNAME= xi-core DISTVERSIONPREFIX= v DISTVERSION= 0.3.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com Index: editors/xi-term/Makefile =================================================================== --- editors/xi-term/Makefile +++ editors/xi-term/Makefile @@ -2,6 +2,7 @@ PORTNAME= xi-term DISTVERSION= g20190913 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= ed.arrakis@gmail.com Index: games/abstreet/Makefile =================================================================== --- games/abstreet/Makefile +++ games/abstreet/Makefile @@ -3,7 +3,7 @@ PORTNAME= abstreet DISTVERSIONPREFIX= v DISTVERSION= 0.2.9-49 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g74aca40c0 CATEGORIES= games MASTER_SITES= LOCAL/yuri:data Index: games/anki/Makefile =================================================================== --- games/anki/Makefile +++ games/anki/Makefile @@ -3,6 +3,7 @@ PORTNAME= anki DISTVERSION= 2.1.35 +PORTREVISION= 1 # Don't forget to update ${_MY_BUILDHASH} CATEGORIES= games python MASTER_SITES= LOCAL/kai/:npmcache Index: games/dose-response/Makefile =================================================================== --- games/dose-response/Makefile +++ games/dose-response/Makefile @@ -3,7 +3,7 @@ PORTNAME= dose-response DISTVERSIONPREFIX= v DISTVERSION= 1.0.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MAINTAINER= greg@unrelenting.technology Index: games/genact/Makefile =================================================================== --- games/genact/Makefile +++ games/genact/Makefile @@ -3,7 +3,7 @@ PORTNAME= genact DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= 0mp@FreeBSD.org Index: games/jaggedalliance2/Makefile =================================================================== --- games/jaggedalliance2/Makefile +++ games/jaggedalliance2/Makefile @@ -4,7 +4,7 @@ PORTNAME= ja2 DISTVERSIONPREFIX= v DISTVERSION= 0.17.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MAINTAINER= ports@FreeBSD.org Index: games/veloren/Makefile =================================================================== --- games/veloren/Makefile +++ games/veloren/Makefile @@ -3,7 +3,7 @@ PORTNAME= veloren DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= https://veloren.net/icons/favicon/:icon DISTFILES= android-icon-192x192.png:icon Index: games/veloren/files/patch-packed_simd =================================================================== --- games/veloren/files/patch-packed_simd +++ games/veloren/files/patch-packed_simd @@ -0,0 +1,92 @@ +From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:36:03 +0200 +Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro + +--- + src/codegen/reductions/mask/x86/sse.rs | 32 -------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs +index 7482f943..eb1ef7fa 100644 +--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs ++++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs +@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { + } + }; + } +- +-macro_rules! x86_m8x8_sse_impl { +- ($id:ident) => { +- impl All for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn all(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- // _mm_movemask_pi8(a) creates an 8bit mask containing the most +- // significant bit of each byte of `a`. If all bits are set, +- // then all 8 lanes of the mask are true. +- _mm_movemask_pi8(crate::mem::transmute(self)) +- == u8::max_value() as i32 +- } +- } +- impl Any for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn any(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- +- _mm_movemask_pi8(crate::mem::transmute(self)) != 0 +- } +- } +- }; +-} +From 778c0706f356118c7a5dd11c06725fc6c6b84621 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:27:53 +0200 +Subject: [PATCH] Replace `_mm_movemask_pi8` with the fallback_impl + +This has to be done, because `_mm_movemask_pi8` got removed +from stdarch in https://github.com/rust-lang/stdarch/pull/890 +--- + src/codegen/reductions/mask/x86.rs | 8 +------- + src/lib.rs | 1 - + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs +index 2ae4ed81..bcfb1a6e 100644 +--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs ++++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs +@@ -19,13 +19,7 @@ mod avx2; + /// x86 64-bit m8x8 implementation + macro_rules! x86_m8x8_impl { + ($id:ident) => { +- cfg_if! { +- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] { +- x86_m8x8_sse_impl!($id); +- } else { +- fallback_impl!($id); +- } +- } ++ fallback_impl!($id); + }; + } + +diff --git a/src/lib.rs b/src/lib.rs +index c3da0d3c..cbd438c0 100644 +--- cargo-crates/packed_simd-0.3.3/src/lib.rs ++++ cargo-crates/packed_simd-0.3.3/src/lib.rs +@@ -210,7 +210,6 @@ + core_intrinsics, + stmt_expr_attributes, + align_offset, +- mmx_target_feature, + crate_visibility_modifier, + custom_inner_attributes + )] Index: graphics/dssim/Makefile =================================================================== --- graphics/dssim/Makefile +++ graphics/dssim/Makefile @@ -2,7 +2,7 @@ PORTNAME= dssim DISTVERSION= 2.11.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= CRATESIO # XXX Teach USES=cargo to have proper default Index: graphics/ikona/Makefile =================================================================== --- graphics/ikona/Makefile +++ graphics/ikona/Makefile @@ -2,7 +2,7 @@ PORTNAME= ikona DISTVERSION= 1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ Index: graphics/libopenraw/Makefile =================================================================== --- graphics/libopenraw/Makefile +++ graphics/libopenraw/Makefile @@ -3,6 +3,7 @@ PORTNAME= libopenraw PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://libopenraw.freedesktop.org/download/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: graphics/librsvg2-rust/Makefile =================================================================== --- graphics/librsvg2-rust/Makefile +++ graphics/librsvg2-rust/Makefile @@ -3,7 +3,7 @@ PORTNAME= librsvg PORTVERSION= 2.50.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 2-rust Index: graphics/pastel/Makefile =================================================================== --- graphics/pastel/Makefile +++ graphics/pastel/Makefile @@ -3,7 +3,7 @@ PORTNAME= pastel DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MAINTAINER= vulcan@wired.sh Index: graphics/rx/Makefile =================================================================== --- graphics/rx/Makefile +++ graphics/rx/Makefile @@ -3,7 +3,7 @@ PORTNAME= rx DISTVERSIONPREFIX= v DISTVERSION= 0.4.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics PKGNAMESUFFIX= -editor Index: graphics/svgbob/Makefile =================================================================== --- graphics/svgbob/Makefile +++ graphics/svgbob/Makefile @@ -2,7 +2,7 @@ PORTNAME= svgbob DISTVERSION= g20190412 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MAINTAINER= mikael@FreeBSD.org Index: graphics/viu/Makefile =================================================================== --- graphics/viu/Makefile +++ graphics/viu/Makefile @@ -3,6 +3,7 @@ PORTNAME= viu DISTVERSIONPREFIX= v DISTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= vulcan@wired.sh Index: java/icedtea-web/Makefile =================================================================== --- java/icedtea-web/Makefile +++ java/icedtea-web/Makefile @@ -3,7 +3,7 @@ PORTNAME= icedtea-web PORTVERSION= 1.8.4 DISTVERSIONPREFIX= icedtea-web- -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java www DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile +++ lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.47.0 +PORTVERSION?= 1.48.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -37,7 +37,7 @@ libgit2.so:devel/libgit2 \ libssh2.so:security/libssh2 -USES= pkgconfig python:3.3+,build ssl tar:xz +USES= pkgconfig python:3.6+,build ssl tar:xz MAKE_ENV= DESTDIR=${STAGEDIR} \ LIBGIT2_SYS_USE_PKG_CONFIG=1 \ @@ -66,9 +66,9 @@ WASM_VARS_OFF= _RUST_BUILD_WASM=false # See WRKSRC/src/stage0.txt for the date and version values. -BOOTSTRAPS_DATE?= 2020-08-27 -RUST_BOOTSTRAP_VERSION?= 1.46.0 -CARGO_BOOTSTRAP_VERSION?= 0.47.0 +BOOTSTRAPS_DATE?= 2020-10-08 +RUST_BOOTSTRAP_VERSION?= 1.47.0 +CARGO_BOOTSTRAP_VERSION?= 0.48.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} @@ -177,12 +177,10 @@ .endif @${REINPLACE_CMD} 's,%CC%,${CC},g' \ ${WRKSRC}/src/bootstrap/native.rs -# src/librustc_llvm has moved to compiler/rustc_llvm in nightly -# this reinplace_cmd is used for ppc64-elfv1 -.if !defined(NIGHTLY_DATE) +# this reinplace_cmd is used for ppc64-elfv1, don't remove it +# even if sed_checked.sh says it's unused @${REINPLACE_CMD} 's,%CC%,${CC},g' \ - ${WRKSRC}/src/librustc_llvm/build.rs -.endif + ${WRKSRC}/compiler/rustc_llvm/build.rs do-build: @cd ${WRKSRC} && \ Index: lang/rust/distinfo =================================================================== --- lang/rust/distinfo +++ lang/rust/distinfo @@ -1,51 +1,51 @@ -TIMESTAMP = 1602225332 -SHA256 (rust/rustc-1.47.0-src.tar.xz) = ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2 -SIZE (rust/rustc-1.47.0-src.tar.xz) = 104143736 -SHA256 (rust/2020-08-27/rustc-1.46.0-aarch64-unknown-freebsd.tar.xz) = 77d1cad786ca38ad3fb17bb13eb98ee7adeffcbb6925e8aeb3b084b726fffa1a -SIZE (rust/2020-08-27/rustc-1.46.0-aarch64-unknown-freebsd.tar.xz) = 46123756 -SHA256 (rust/2020-08-27/rust-std-1.46.0-aarch64-unknown-freebsd.tar.xz) = 10c3896a1b10ec0b99351c5c479f2c053923136165befafa39c18eeeb738973b -SIZE (rust/2020-08-27/rust-std-1.46.0-aarch64-unknown-freebsd.tar.xz) = 12424080 -SHA256 (rust/2020-08-27/cargo-0.47.0-aarch64-unknown-freebsd.tar.xz) = 463dd5338a8600758cac0f7e5c2a62c0068e20e59a3bc7bcfab4efa6da58e99b -SIZE (rust/2020-08-27/cargo-0.47.0-aarch64-unknown-freebsd.tar.xz) = 3124348 -SHA256 (rust/2020-08-27/rustc-1.46.0-x86_64-unknown-freebsd.tar.xz) = 05f78c027c8fea8b19927b1af84c96959896d96d9692d432ea64210f2540947d -SIZE (rust/2020-08-27/rustc-1.46.0-x86_64-unknown-freebsd.tar.xz) = 34583796 -SHA256 (rust/2020-08-27/rust-std-1.46.0-x86_64-unknown-freebsd.tar.xz) = 24d011a0f1b48bdffa5577cbc8298758f7f2ac091f647b93442c8251de31e493 -SIZE (rust/2020-08-27/rust-std-1.46.0-x86_64-unknown-freebsd.tar.xz) = 13078008 -SHA256 (rust/2020-08-27/cargo-0.47.0-x86_64-unknown-freebsd.tar.xz) = 5e5fbda34ea2cc3e2ed57090edfbf1b32948ebd8550b4e25bbc64b96b6ef72c0 -SIZE (rust/2020-08-27/cargo-0.47.0-x86_64-unknown-freebsd.tar.xz) = 4635900 -SHA256 (rust/2020-08-27/rustc-1.46.0-armv6-unknown-freebsd.tar.xz) = 8d5f1c519fde1b47062ed63721db43d7edff2483cc33490b4d84a3dd9c41d94a -SIZE (rust/2020-08-27/rustc-1.46.0-armv6-unknown-freebsd.tar.xz) = 32934396 -SHA256 (rust/2020-08-27/rust-std-1.46.0-armv6-unknown-freebsd.tar.xz) = 744019b69dd9146d024bcbbf3c75edd64b9e2bd21d5e8164cc43b192ea74fada -SIZE (rust/2020-08-27/rust-std-1.46.0-armv6-unknown-freebsd.tar.xz) = 12370772 -SHA256 (rust/2020-08-27/cargo-0.47.0-armv6-unknown-freebsd.tar.xz) = 8c42654cbda2efd4ffd156f566a1e289052b9d743389e1c668c73235d91a3442 -SIZE (rust/2020-08-27/cargo-0.47.0-armv6-unknown-freebsd.tar.xz) = 4081880 -SHA256 (rust/2020-08-27/rustc-1.46.0-armv7-unknown-freebsd.tar.xz) = d82bd2e50339ca0749812e8f4078ed466217cba7e3f68886d7d2baaf74257c3c -SIZE (rust/2020-08-27/rustc-1.46.0-armv7-unknown-freebsd.tar.xz) = 33430540 -SHA256 (rust/2020-08-27/rust-std-1.46.0-armv7-unknown-freebsd.tar.xz) = c1417394efb65c264000842eb5dbbd9a00061cdc02415b5f3a5e416753bb3d5f -SIZE (rust/2020-08-27/rust-std-1.46.0-armv7-unknown-freebsd.tar.xz) = 12358112 -SHA256 (rust/2020-08-27/cargo-0.47.0-armv7-unknown-freebsd.tar.xz) = 32268a102117cf4c51c260945c0627c7f00769fa6d2cb387b05d0148b4a2e48e -SIZE (rust/2020-08-27/cargo-0.47.0-armv7-unknown-freebsd.tar.xz) = 4070860 -SHA256 (rust/2020-08-27/rustc-1.46.0-i686-unknown-freebsd.tar.xz) = 24a95b887e2a66980052d39a04a02662593b9b57b4d0dc1339c60549208b389e -SIZE (rust/2020-08-27/rustc-1.46.0-i686-unknown-freebsd.tar.xz) = 35015008 -SHA256 (rust/2020-08-27/rust-std-1.46.0-i686-unknown-freebsd.tar.xz) = 885a0bb88d044b29b07ba31e5acbf18db175eb0dbb4187c8c0f88c4e7115a615 -SIZE (rust/2020-08-27/rust-std-1.46.0-i686-unknown-freebsd.tar.xz) = 12964928 -SHA256 (rust/2020-08-27/cargo-0.47.0-i686-unknown-freebsd.tar.xz) = d04245ea7183d733c03e4f93ed487e1450bcec3fbad0f2bd12d98471d76966f5 -SIZE (rust/2020-08-27/cargo-0.47.0-i686-unknown-freebsd.tar.xz) = 4651612 -SHA256 (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 466790a920feae2932f578d70c01735ddd5bafa7ea6236e4ceac0c5146fa520b -SIZE (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 38373788 -SHA256 (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 45e52a1d3a176ad5a47f87dc031b9c1f8c6e85c22c71ce99b186059ebceaf811 -SIZE (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 12300552 -SHA256 (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = a176b017c751316d90247c8779db7624741f706b4868cb670822e24dbdacb3af -SIZE (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4521544 -SHA256 (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 376c921c989182973c1336ee1d3ecb9b90b75ab479fd6632e83cf0391f038b66 -SIZE (rust/2020-08-27/rustc-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 32563056 -SHA256 (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 1b67251c2a97ef25e566231baffc38c32689ab7be8d165a6688979ec25858afb -SIZE (rust/2020-08-27/rust-std-1.46.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 12255592 -SHA256 (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 312c8502aaa49aa339fb8252cec94de7f2f29220d237ddc144c6b19de90334ef -SIZE (rust/2020-08-27/cargo-0.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4254320 -SHA256 (rust/2020-08-27/cargo-0.47.0-powerpc64le-unknown-freebsd.tar.xz) = 5391388fce390adaa10bb2ab7de9cbdeda8307ab95a64d53d501ced257f99ff2 -SIZE (rust/2020-08-27/cargo-0.47.0-powerpc64le-unknown-freebsd.tar.xz) = 4493584 -SHA256 (rust/2020-08-27/rust-std-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = aa207e73c88f12d512aaa42c704145eb84ce04e48d027dffb0363965e74a8820 -SIZE (rust/2020-08-27/rust-std-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = 12494160 -SHA256 (rust/2020-08-27/rustc-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = 559ee2c55f3614351ca5618166a3bbe8ebcda7bddf0074c5e2c5917734c1d279 -SIZE (rust/2020-08-27/rustc-1.46.0-powerpc64le-unknown-freebsd.tar.xz) = 33672276 +TIMESTAMP = 1605689255 +SHA256 (rust/rustc-1.48.0-src.tar.xz) = ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908 +SIZE (rust/rustc-1.48.0-src.tar.xz) = 105951736 +SHA256 (rust/2020-10-08/rustc-1.47.0-aarch64-unknown-freebsd.tar.xz) = 4809cfc78c13049f3c8da500f33242964dbe7aa4df3b511432a7f745ee9898e8 +SIZE (rust/2020-10-08/rustc-1.47.0-aarch64-unknown-freebsd.tar.xz) = 50672176 +SHA256 (rust/2020-10-08/rust-std-1.47.0-aarch64-unknown-freebsd.tar.xz) = 0278b986c43e04611ee718c13babbd72fbe08d7765fff68d9a8b6d5bdc999831 +SIZE (rust/2020-10-08/rust-std-1.47.0-aarch64-unknown-freebsd.tar.xz) = 16961564 +SHA256 (rust/2020-10-08/cargo-0.48.0-aarch64-unknown-freebsd.tar.xz) = bf8003784eb79710323c86fe46e42a37c901f2c64da6a122e0ea26a278b618a2 +SIZE (rust/2020-10-08/cargo-0.48.0-aarch64-unknown-freebsd.tar.xz) = 3267200 +SHA256 (rust/2020-10-08/rustc-1.47.0-x86_64-unknown-freebsd.tar.xz) = 4a6d872a6f4ba837e65f3a0689b59c3769c3645eede963e80919e374eafcd676 +SIZE (rust/2020-10-08/rustc-1.47.0-x86_64-unknown-freebsd.tar.xz) = 38800024 +SHA256 (rust/2020-10-08/rust-std-1.47.0-x86_64-unknown-freebsd.tar.xz) = 783b5659440331807600d8e391f9da35684465843cd671e6236929fc295faf1d +SIZE (rust/2020-10-08/rust-std-1.47.0-x86_64-unknown-freebsd.tar.xz) = 18402664 +SHA256 (rust/2020-10-08/cargo-0.48.0-x86_64-unknown-freebsd.tar.xz) = 068d5a21faa84d8d7cf6c0c840f7060b370cb9a61ffd9e42d79bad87e0e2e58f +SIZE (rust/2020-10-08/cargo-0.48.0-x86_64-unknown-freebsd.tar.xz) = 4817536 +SHA256 (rust/2020-10-08/rustc-1.47.0-armv6-unknown-freebsd.tar.xz) = c1fa3a4f23c79cd7eee9bf876b04fba7f5d137c0ae7eedf52650874c5aaccf73 +SIZE (rust/2020-10-08/rustc-1.47.0-armv6-unknown-freebsd.tar.xz) = 37540840 +SHA256 (rust/2020-10-08/rust-std-1.47.0-armv6-unknown-freebsd.tar.xz) = c80f48a0d2dc1da2767ba53f99005076857a1229687685a759a1558abee9056c +SIZE (rust/2020-10-08/rust-std-1.47.0-armv6-unknown-freebsd.tar.xz) = 16950080 +SHA256 (rust/2020-10-08/cargo-0.48.0-armv6-unknown-freebsd.tar.xz) = e3a323d54310501ead63da5ee1921355af415eaa4cfc8d9526351469e3b021e2 +SIZE (rust/2020-10-08/cargo-0.48.0-armv6-unknown-freebsd.tar.xz) = 4234128 +SHA256 (rust/2020-10-08/rustc-1.47.0-armv7-unknown-freebsd.tar.xz) = 465abb5c5e9a645f3e45b1a9d5fdc9f6587feae12278ff1c6578ac182c6e04a5 +SIZE (rust/2020-10-08/rustc-1.47.0-armv7-unknown-freebsd.tar.xz) = 37322636 +SHA256 (rust/2020-10-08/rust-std-1.47.0-armv7-unknown-freebsd.tar.xz) = 8c5d8f9257044a95278fc9db563c6421d95c1a5ee74fb7e9717ed3526998947b +SIZE (rust/2020-10-08/rust-std-1.47.0-armv7-unknown-freebsd.tar.xz) = 16895888 +SHA256 (rust/2020-10-08/cargo-0.48.0-armv7-unknown-freebsd.tar.xz) = 4b0b7de3c50636d57fb9b137b0aacb479e71ec48eb5b0472c204f0420ab5bb76 +SIZE (rust/2020-10-08/cargo-0.48.0-armv7-unknown-freebsd.tar.xz) = 4224144 +SHA256 (rust/2020-10-08/rustc-1.47.0-i686-unknown-freebsd.tar.xz) = 42fe57233c01aee72857363c1a9159edb966ebc8e531bf0567f2ff74e46e3c53 +SIZE (rust/2020-10-08/rustc-1.47.0-i686-unknown-freebsd.tar.xz) = 40170160 +SHA256 (rust/2020-10-08/rust-std-1.47.0-i686-unknown-freebsd.tar.xz) = 724c0f627a2167bfb0d4622a9306eb0385624b966669fecf114f59c1dda61ce9 +SIZE (rust/2020-10-08/rust-std-1.47.0-i686-unknown-freebsd.tar.xz) = 18333648 +SHA256 (rust/2020-10-08/cargo-0.48.0-i686-unknown-freebsd.tar.xz) = ed3cd6121bd5e1a54526d61525ac546706b69cf9fa7ba79f7a0cf94464f3d4cf +SIZE (rust/2020-10-08/cargo-0.48.0-i686-unknown-freebsd.tar.xz) = 4891828 +SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 47e3df2e0a8fce74026bc48da0aad67228b6df7ea3fc75434fa36d0148a7afad +SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 43535196 +SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = c4a3c622e987352f6c574ead2c44f5009a64e9dcc292a7dbbb3efeaf2f0e0fb7 +SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16909364 +SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 76e97500d41060ae62bcca97e188c7b2200a06744402001aa108643e2fb08ea1 +SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4707416 +SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = dbd867e7dafca668feca05db717ebf6e6d6d31544f09a3ecd28de61edd971342 +SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 38752420 +SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 91958a7c3d07c47cd017e31c2a9d599c66da2b593002c73d1a1bb3fa97e9f79b +SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 17004748 +SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64le-unknown-freebsd.tar.xz) = 9409208a1fd44182c08e4111b28542a6ec6ee0a257347d8a5af06b981e9ce35f +SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64le-unknown-freebsd.tar.xz) = 4651420 +SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 86b4ef213c780a5d2c88e85a5ca20ea2219fa919407a6bfc7661f2f23675a55f +SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 36841600 +SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 62d951e288b2c56aa11780a95ce16cd9e56b4b13814b0c1bd2c2cc1ed187b283 +SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16841320 +SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = b628741be429426848c5f0a76e8aefa00a097c108512d48722795e04231a819e +SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4405904 Index: lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs =================================================================== --- lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs +++ lang/rust/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs @@ -1,5 +1,5 @@ ---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig 2020-01-23 19:40:44 UTC -+++ src/librustc_target/spec/i686_unknown_freebsd.rs +--- compiler/rustc_target/src/spec/i686_unknown_freebsd.rs.orig 2020-01-23 19:40:44 UTC ++++ compiler/rustc_target/src/spec/i686_unknown_freebsd.rs @@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { Index: lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs =================================================================== --- lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs +++ lang/rust/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs @@ -1,11 +0,0 @@ ---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig 2020-01-23 19:40:44 UTC -+++ src/librustc_target/spec/i686_unknown_freebsd.rs -@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult}; - - pub fn target() -> TargetResult { - let mut base = super::freebsd_base::opts(); -- base.cpu = "pentium4".to_string(); -+ base.cpu = "pentiumpro".to_string(); - base.max_atomic_width = Some(64); - let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap(); - pre_link_args.push("-m32".to_string()); Index: lang/spidermonkey78/Makefile =================================================================== --- lang/spidermonkey78/Makefile +++ lang/spidermonkey78/Makefile @@ -2,6 +2,7 @@ PORTNAME= spidermonkey DISTVERSION= 78.4.0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} Index: mail/thunderbird/Makefile =================================================================== --- mail/thunderbird/Makefile +++ mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 78.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source Index: mail/thunderbird/files/patch-packed_simd =================================================================== --- mail/thunderbird/files/patch-packed_simd +++ mail/thunderbird/files/patch-packed_simd @@ -0,0 +1,112 @@ +2 errors: +error[E0432]: unresolved import `crate::arch::x86_64::_mm_movemask_pi8` +https://github.com/rust-lang/packed_simd/pull/290 + +unresolved import `crate::arch::x86_64::__m64` +https://github.com/rust-lang/packed_simd/pull/292/commits/57d96e45916066fa9b5cdf2bc695e190207e78af + + + +From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:36:03 +0200 +Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro + +--- + src/codegen/reductions/mask/x86/sse.rs | 32 -------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs +index 7482f943..eb1ef7fa 100644 +--- third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs ++++ third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs +@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { + } + }; + } +- +-macro_rules! x86_m8x8_sse_impl { +- ($id:ident) => { +- impl All for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn all(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- // _mm_movemask_pi8(a) creates an 8bit mask containing the most +- // significant bit of each byte of `a`. If all bits are set, +- // then all 8 lanes of the mask are true. +- _mm_movemask_pi8(crate::mem::transmute(self)) +- == u8::max_value() as i32 +- } +- } +- impl Any for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn any(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- +- _mm_movemask_pi8(crate::mem::transmute(self)) != 0 +- } +- } +- }; +-} + +diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs +index 2ae4ed81..bcfb1a6e 100644 +--- third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs ++++ third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs +@@ -19,13 +19,7 @@ mod avx2; + /// x86 64-bit m8x8 implementation + macro_rules! x86_m8x8_impl { + ($id:ident) => { +- cfg_if! { +- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] { +- x86_m8x8_sse_impl!($id); +- } else { +- fallback_impl!($id); +- } +- } ++ fallback_impl!($id); + }; + } + +--- third_party/rust/packed_simd/src/lib.rs.orig 2019-02-05 21:18:53.000000000 +0100 ++++ third_party/rust/packed_simd/src/lib.rs 2020-11-18 15:06:43.736722000 +0100 +@@ -210,7 +210,6 @@ + core_intrinsics, + stmt_expr_attributes, + align_offset, +- mmx_target_feature, + crate_visibility_modifier, + custom_inner_attributes + )] + + + +From 57d96e45916066fa9b5cdf2bc695e190207e78af Mon Sep 17 00:00:00 2001 +From: Jubilee Young +Date: Wed, 23 Sep 2020 12:23:29 -0700 +Subject: [PATCH] Remove __m64 type + +--- + src/api/into_bits/arch_specific.rs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/api/into_bits/arch_specific.rs b/src/api/into_bits/arch_specific.rs +index 6cc2fa37..7b560107 100644 +--- third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs ++++ third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs +@@ -84,7 +84,6 @@ macro_rules! impl_arch { + // FIXME: 64-bit single element types + // FIXME: arm/aarch float16x4_t missing + impl_arch!( +- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64], + [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t, + poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, + uint64x1_t], Index: misc/broot/Makefile =================================================================== --- misc/broot/Makefile +++ misc/broot/Makefile @@ -3,6 +3,7 @@ PORTNAME= broot DISTVERSIONPREFIX= v DISTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= vulcan@wired.sh Index: misc/ruut/Makefile =================================================================== --- misc/ruut/Makefile +++ misc/ruut/Makefile @@ -3,7 +3,7 @@ PORTNAME= ruut DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org Index: multimedia/librav1e/Makefile =================================================================== --- multimedia/librav1e/Makefile +++ multimedia/librav1e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMEPREFIX= lib MASTERDIR= ${.CURDIR}/../rav1e Index: multimedia/librespot/Makefile =================================================================== --- multimedia/librespot/Makefile +++ multimedia/librespot/Makefile @@ -3,7 +3,7 @@ PORTNAME= librespot PORTVERSION= 0.1.3 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= ehaupt@FreeBSD.org Index: multimedia/rav1e/Makefile =================================================================== --- multimedia/rav1e/Makefile +++ multimedia/rav1e/Makefile @@ -3,7 +3,7 @@ PORTNAME= rav1e DISTVERSIONPREFIX= v DISTVERSION= 0.3.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Index: multimedia/termplay/Makefile =================================================================== --- multimedia/termplay/Makefile +++ multimedia/termplay/Makefile @@ -2,7 +2,7 @@ PORTNAME= termplay DISTVERSION= 2.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: net-im/fractal/Makefile =================================================================== --- net-im/fractal/Makefile +++ net-im/fractal/Makefile @@ -2,7 +2,7 @@ PORTNAME= fractal DISTVERSION= 4.2.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-im MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/ Index: net-mgmt/bandwhich/Makefile =================================================================== --- net-mgmt/bandwhich/Makefile +++ net-mgmt/bandwhich/Makefile @@ -2,6 +2,7 @@ PORTNAME= bandwhich DISTVERSION= 0.20.0 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= petteri.valkonen@iki.fi Index: net-p2p/openethereum/Makefile =================================================================== --- net-p2p/openethereum/Makefile +++ net-p2p/openethereum/Makefile @@ -3,6 +3,7 @@ PORTNAME= openethereum DISTVERSIONPREFIX= v DISTVERSION= 3.1.0 +PORTREVISION= 1 CATEGORIES= net-p2p MAINTAINER= ale@FreeBSD.org Index: net/findomain/Makefile =================================================================== --- net/findomain/Makefile +++ net/findomain/Makefile @@ -2,7 +2,7 @@ PORTNAME= findomain DISTVERSION= 2.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net security MAINTAINER= vulcan@wired.sh Index: net/proby/Makefile =================================================================== --- net/proby/Makefile +++ net/proby/Makefile @@ -3,7 +3,7 @@ PORTNAME= proby DISTVERSIONPREFIX= v DISTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org Index: net/quiche/Makefile =================================================================== --- net/quiche/Makefile +++ net/quiche/Makefile @@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v DISTVERSION= ${GIT_VERSION} DISTVERSIONSUFFIX= -g${GIT_HASH} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= junho.choi@gmail.com Index: net/rabbiteer/Makefile =================================================================== --- net/rabbiteer/Makefile +++ net/rabbiteer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rabbiteer DISTVERSION= 1.4.1 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= net MAINTAINER= dch@FreeBSD.org Index: net/routinator/Makefile =================================================================== --- net/routinator/Makefile +++ net/routinator/Makefile @@ -2,6 +2,7 @@ PORTNAME= routinator PORTVERSION= 0.8.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net Index: security/acmed/Makefile =================================================================== --- security/acmed/Makefile +++ security/acmed/Makefile @@ -3,6 +3,7 @@ PORTNAME= acmed DISTVERSIONPREFIX= v DISTVERSION= 0.13.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= greg@unrelenting.technology Index: security/cargo-audit/Makefile =================================================================== --- security/cargo-audit/Makefile +++ security/cargo-audit/Makefile @@ -3,6 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.13.1 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= mikael@FreeBSD.org Index: security/cloak/Makefile =================================================================== --- security/cloak/Makefile +++ security/cloak/Makefile @@ -3,7 +3,7 @@ PORTNAME= cloak DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= security MAINTAINER= mikael@FreeBSD.org Index: security/rustscan/Makefile =================================================================== --- security/rustscan/Makefile +++ security/rustscan/Makefile @@ -2,6 +2,7 @@ PORTNAME= rustscan PORTVERSION= 1.10.1 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= mikael@FreeBSD.org Index: security/sequoia/Makefile =================================================================== --- security/sequoia/Makefile +++ security/sequoia/Makefile @@ -2,7 +2,7 @@ PORTNAME= sequoia PORTVERSION= 0.19.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= security Index: security/suricata/Makefile =================================================================== --- security/suricata/Makefile +++ security/suricata/Makefile @@ -3,6 +3,7 @@ PORTNAME= suricata DISTVERSION= 5.0.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://www.openinfosecfoundation.org/download/ Index: shells/ion/Makefile =================================================================== --- shells/ion/Makefile +++ shells/ion/Makefile @@ -2,7 +2,7 @@ PORTNAME= ion DISTVERSION= 1.0.5-1355 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= shells PKGNAMESUFFIX= -shell Index: shells/starship/Makefile =================================================================== --- shells/starship/Makefile +++ shells/starship/Makefile @@ -2,6 +2,7 @@ PORTNAME= starship DISTVERSION= 0.47.0 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: sysutils/diskonaut/Makefile =================================================================== --- sysutils/diskonaut/Makefile +++ sysutils/diskonaut/Makefile @@ -2,7 +2,7 @@ PORTNAME= diskonaut PORTVERSION= 0.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org Index: sysutils/dua-cli/Makefile =================================================================== --- sysutils/dua-cli/Makefile +++ sysutils/dua-cli/Makefile @@ -3,6 +3,7 @@ PORTNAME= dua-cli DISTVERSIONPREFIX= v DISTVERSION= 2.10.3 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= vulcan@wired.sh Index: sysutils/exa/Makefile =================================================================== --- sysutils/exa/Makefile +++ sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= sysutils MAINTAINER= mikael@FreeBSD.org Index: sysutils/fd/Makefile =================================================================== --- sysutils/fd/Makefile +++ sysutils/fd/Makefile @@ -4,7 +4,7 @@ PORTNAME= fd DISTVERSIONPREFIX= v DISTVERSION= 8.1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils PKGNAMESUFFIX= -find Index: sysutils/flowgger/Makefile =================================================================== --- sysutils/flowgger/Makefile +++ sysutils/flowgger/Makefile @@ -2,6 +2,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.10 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= CRATESIO DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} Index: sysutils/fselect/Makefile =================================================================== --- sysutils/fselect/Makefile +++ sysutils/fselect/Makefile @@ -2,7 +2,7 @@ PORTNAME= fselect DISTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= vulcan@wired.sh Index: sysutils/fusefs-sandboxfs/Makefile =================================================================== --- sysutils/fusefs-sandboxfs/Makefile +++ sysutils/fusefs-sandboxfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= sandboxfs DISTVERSIONPREFIX= sandboxfs- DISTVERSION= 0.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- Index: sysutils/hexyl/Makefile =================================================================== --- sysutils/hexyl/Makefile +++ sysutils/hexyl/Makefile @@ -3,7 +3,7 @@ PORTNAME= hexyl DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= mikael@FreeBSD.org Index: sysutils/jail_exporter/Makefile =================================================================== --- sysutils/jail_exporter/Makefile +++ sysutils/jail_exporter/Makefile @@ -3,6 +3,7 @@ PORTNAME= jail_exporter DISTVERSIONPREFIX= v DISTVERSION= 0.13.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= dor.bsd@xm0.uk Index: sysutils/lsd/Makefile =================================================================== --- sysutils/lsd/Makefile +++ sysutils/lsd/Makefile @@ -2,7 +2,7 @@ PORTNAME= lsd DISTVERSION= 0.17.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= andoriyu@gmail.com Index: sysutils/onefetch/Makefile =================================================================== --- sysutils/onefetch/Makefile +++ sysutils/onefetch/Makefile @@ -3,7 +3,7 @@ PORTNAME= onefetch DISTVERSIONPREFIX= v DISTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils devel MAINTAINER= vulcan@wired.sh Index: sysutils/potnet/Makefile =================================================================== --- sysutils/potnet/Makefile +++ sysutils/potnet/Makefile @@ -2,7 +2,7 @@ PORTNAME= potnet DISTVERSION= 0.4.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org Index: sysutils/rsfetch/Makefile =================================================================== --- sysutils/rsfetch/Makefile +++ sysutils/rsfetch/Makefile @@ -2,7 +2,7 @@ PORTNAME= rsfetch DISTVERSION= 2.0.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MAINTAINER= vulcan@wired.sh Index: sysutils/tealdeer/Makefile =================================================================== --- sysutils/tealdeer/Makefile +++ sysutils/tealdeer/Makefile @@ -3,7 +3,7 @@ PORTNAME= tealdeer DISTVERSIONPREFIX= v DISTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= vulcan@wired.sh Index: sysutils/vector/Makefile =================================================================== --- sysutils/vector/Makefile +++ sysutils/vector/Makefile @@ -3,6 +3,7 @@ PORTNAME= vector DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= greg@unrelenting.technology Index: sysutils/zoxide/Makefile =================================================================== --- sysutils/zoxide/Makefile +++ sysutils/zoxide/Makefile @@ -3,7 +3,7 @@ PORTNAME= zoxide DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils MAINTAINER= andoriyu@gmail.com Index: textproc/angle-grinder/Makefile =================================================================== --- textproc/angle-grinder/Makefile +++ textproc/angle-grinder/Makefile @@ -3,7 +3,7 @@ PORTNAME= angle-grinder DISTVERSIONPREFIX= v DISTVERSION= 0.15.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= vulcan@wired.sh Index: textproc/bat/Makefile =================================================================== --- textproc/bat/Makefile +++ textproc/bat/Makefile @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.16.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org Index: textproc/mdbook/Makefile =================================================================== --- textproc/mdbook/Makefile +++ textproc/mdbook/Makefile @@ -3,6 +3,7 @@ PORTNAME= mdbook DISTVERSIONPREFIX= v DISTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= 0mp@FreeBSD.org Index: textproc/ripgrep/Makefile =================================================================== --- textproc/ripgrep/Makefile +++ textproc/ripgrep/Makefile @@ -3,7 +3,7 @@ PORTNAME= ripgrep DISTVERSION= 12.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi Index: textproc/ripgrep/files/patch-packed_sim =================================================================== --- textproc/ripgrep/files/patch-packed_sim +++ textproc/ripgrep/files/patch-packed_sim @@ -0,0 +1,114 @@ +From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:36:03 +0200 +Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro + +--- + src/codegen/reductions/mask/x86/sse.rs | 32 -------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs +index 7482f943..eb1ef7fa 100644 +--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs ++++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs +@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { + } + }; + } +- +-macro_rules! x86_m8x8_sse_impl { +- ($id:ident) => { +- impl All for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn all(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- // _mm_movemask_pi8(a) creates an 8bit mask containing the most +- // significant bit of each byte of `a`. If all bits are set, +- // then all 8 lanes of the mask are true. +- _mm_movemask_pi8(crate::mem::transmute(self)) +- == u8::max_value() as i32 +- } +- } +- impl Any for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn any(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- +- _mm_movemask_pi8(crate::mem::transmute(self)) != 0 +- } +- } +- }; +-} +From 778c0706f356118c7a5dd11c06725fc6c6b84621 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:27:53 +0200 +Subject: [PATCH] Replace `_mm_movemask_pi8` with the fallback_impl + +This has to be done, because `_mm_movemask_pi8` got removed +from stdarch in https://github.com/rust-lang/stdarch/pull/890 +--- + src/codegen/reductions/mask/x86.rs | 8 +------- + src/lib.rs | 1 - + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs +index 2ae4ed81..bcfb1a6e 100644 +--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs ++++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs +@@ -19,13 +19,7 @@ mod avx2; + /// x86 64-bit m8x8 implementation + macro_rules! x86_m8x8_impl { + ($id:ident) => { +- cfg_if! { +- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] { +- x86_m8x8_sse_impl!($id); +- } else { +- fallback_impl!($id); +- } +- } ++ fallback_impl!($id); + }; + } + +diff --git a/src/lib.rs b/src/lib.rs +index c3da0d3c..cbd438c0 100644 +--- cargo-crates/packed_simd-0.3.3/src/lib.rs ++++ cargo-crates/packed_simd-0.3.3/src/lib.rs +@@ -210,7 +210,6 @@ + core_intrinsics, + stmt_expr_attributes, + align_offset, +- mmx_target_feature, + crate_visibility_modifier, + custom_inner_attributes + )] + +From 57d96e45916066fa9b5cdf2bc695e190207e78af Mon Sep 17 00:00:00 2001 +From: Jubilee Young +Date: Wed, 23 Sep 2020 12:23:29 -0700 +Subject: [PATCH] Remove __m64 type + +--- + src/api/into_bits/arch_specific.rs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/api/into_bits/arch_specific.rs b/src/api/into_bits/arch_specific.rs +index 6cc2fa37..7b560107 100644 +--- cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs ++++ cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs +@@ -84,7 +84,6 @@ macro_rules! impl_arch { + // FIXME: 64-bit single element types + // FIXME: arm/aarch float16x4_t missing + impl_arch!( +- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64], + [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t, + poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, + uint64x1_t], Index: textproc/sd/Makefile =================================================================== --- textproc/sd/Makefile +++ textproc/sd/Makefile @@ -3,7 +3,7 @@ PORTNAME= sd DISTVERSIONPREFIX= v DISTVERSION= 0.7.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MAINTAINER= mikael@FreeBSD.org Index: textproc/sonic/Makefile =================================================================== --- textproc/sonic/Makefile +++ textproc/sonic/Makefile @@ -3,7 +3,7 @@ PORTNAME= sonic DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MAINTAINER= mikael@FreeBSD.org Index: textproc/xsv-rs/Makefile =================================================================== --- textproc/xsv-rs/Makefile +++ textproc/xsv-rs/Makefile @@ -2,7 +2,7 @@ PORTNAME= xsv DISTVERSION= 0.13.0 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= textproc PKGNAMESUFFIX= -rs Index: www/castor/Makefile =================================================================== --- www/castor/Makefile +++ www/castor/Makefile @@ -2,6 +2,7 @@ PORTNAME= castor DISTVERSION= 0.8.16 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://git.sr.ht/~julienxx/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: www/cliqz/Makefile =================================================================== --- www/cliqz/Makefile +++ www/cliqz/Makefile @@ -2,7 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.38.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz Index: www/cliqz/files/patch-packed_simd =================================================================== --- www/cliqz/files/patch-packed_simd +++ www/cliqz/files/patch-packed_simd @@ -0,0 +1,106 @@ +2 errors: +error[E0432]: unresolved import `crate::arch::x86_64::_mm_movemask_pi8` +https://github.com/rust-lang/packed_simd/pull/290 + +unresolved import `crate::arch::x86_64::__m64` +https://github.com/rust-lang/packed_simd/pull/292/commits/57d96e45916066fa9b5cdf2bc695e190207e78af + +From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:36:03 +0200 +Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro + +--- + src/codegen/reductions/mask/x86/sse.rs | 32 -------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs +index 7482f943..eb1ef7fa 100644 +--- mozilla-release/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs ++++ mozilla-release/third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs +@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { + } + }; + } +- +-macro_rules! x86_m8x8_sse_impl { +- ($id:ident) => { +- impl All for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn all(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- // _mm_movemask_pi8(a) creates an 8bit mask containing the most +- // significant bit of each byte of `a`. If all bits are set, +- // then all 8 lanes of the mask are true. +- _mm_movemask_pi8(crate::mem::transmute(self)) +- == u8::max_value() as i32 +- } +- } +- impl Any for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn any(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- +- _mm_movemask_pi8(crate::mem::transmute(self)) != 0 +- } +- } +- }; +-} +--- mozilla-release/third_party/rust/packed_simd/src/lib.rs.orig 2019-02-05 21:18:53.000000000 +0100 ++++ mozilla-release/third_party/rust/packed_simd/src/lib.rs 2020-11-18 15:06:43.736722000 +0100 +@@ -210,7 +210,6 @@ + core_intrinsics, + stmt_expr_attributes, + align_offset, +- mmx_target_feature, + crate_visibility_modifier, + custom_inner_attributes + )] +diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs +index 2ae4ed81..bcfb1a6e 100644 +--- mozilla-release/third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs ++++ mozilla-release/third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs +@@ -19,13 +19,7 @@ mod avx2; + /// x86 64-bit m8x8 implementation + macro_rules! x86_m8x8_impl { + ($id:ident) => { +- cfg_if! { +- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] { +- x86_m8x8_sse_impl!($id); +- } else { +- fallback_impl!($id); +- } +- } ++ fallback_impl!($id); + }; + } + +From 57d96e45916066fa9b5cdf2bc695e190207e78af Mon Sep 17 00:00:00 2001 +From: Jubilee Young +Date: Wed, 23 Sep 2020 12:23:29 -0700 +Subject: [PATCH] Remove __m64 type + +--- + src/api/into_bits/arch_specific.rs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/api/into_bits/arch_specific.rs b/src/api/into_bits/arch_specific.rs +index 6cc2fa37..7b560107 100644 +--- mozilla-release/third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs ++++ mozilla-release/third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs +@@ -84,7 +84,6 @@ macro_rules! impl_arch { + // FIXME: 64-bit single element types + // FIXME: arm/aarch float16x4_t missing + impl_arch!( +- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64], + [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t, + poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, + uint64x1_t], Index: www/deno/Makefile =================================================================== --- www/deno/Makefile +++ www/deno/Makefile @@ -3,6 +3,7 @@ PORTNAME= deno DISTVERSIONPREFIX= v DISTVERSION= 1.5.3 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= mikael@FreeBSD.org Index: www/ffsend/Makefile =================================================================== --- www/ffsend/Makefile +++ www/ffsend/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffsend DISTVERSIONPREFIX= v DISTVERSION= 0.2.68 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= 0mp@FreeBSD.org Index: www/firefox-esr/Makefile =================================================================== --- www/firefox-esr/Makefile +++ www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 78.5.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Index: www/firefox-esr/files/patch-packed_simd =================================================================== --- www/firefox-esr/files/patch-packed_simd +++ www/firefox-esr/files/patch-packed_simd @@ -0,0 +1,112 @@ +2 errors: +error[E0432]: unresolved import `crate::arch::x86_64::_mm_movemask_pi8` +https://github.com/rust-lang/packed_simd/pull/290 + +unresolved import `crate::arch::x86_64::__m64` +https://github.com/rust-lang/packed_simd/pull/292/commits/57d96e45916066fa9b5cdf2bc695e190207e78af + + + +From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:36:03 +0200 +Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro + +--- + src/codegen/reductions/mask/x86/sse.rs | 32 -------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs +index 7482f943..eb1ef7fa 100644 +--- third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs ++++ third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs +@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { + } + }; + } +- +-macro_rules! x86_m8x8_sse_impl { +- ($id:ident) => { +- impl All for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn all(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- // _mm_movemask_pi8(a) creates an 8bit mask containing the most +- // significant bit of each byte of `a`. If all bits are set, +- // then all 8 lanes of the mask are true. +- _mm_movemask_pi8(crate::mem::transmute(self)) +- == u8::max_value() as i32 +- } +- } +- impl Any for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn any(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- +- _mm_movemask_pi8(crate::mem::transmute(self)) != 0 +- } +- } +- }; +-} + +diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs +index 2ae4ed81..bcfb1a6e 100644 +--- third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs ++++ third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs +@@ -19,13 +19,7 @@ mod avx2; + /// x86 64-bit m8x8 implementation + macro_rules! x86_m8x8_impl { + ($id:ident) => { +- cfg_if! { +- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] { +- x86_m8x8_sse_impl!($id); +- } else { +- fallback_impl!($id); +- } +- } ++ fallback_impl!($id); + }; + } + +--- third_party/rust/packed_simd/src/lib.rs.orig 2019-02-05 21:18:53.000000000 +0100 ++++ third_party/rust/packed_simd/src/lib.rs 2020-11-18 15:06:43.736722000 +0100 +@@ -210,7 +210,6 @@ + core_intrinsics, + stmt_expr_attributes, + align_offset, +- mmx_target_feature, + crate_visibility_modifier, + custom_inner_attributes + )] + + + +From 57d96e45916066fa9b5cdf2bc695e190207e78af Mon Sep 17 00:00:00 2001 +From: Jubilee Young +Date: Wed, 23 Sep 2020 12:23:29 -0700 +Subject: [PATCH] Remove __m64 type + +--- + src/api/into_bits/arch_specific.rs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/api/into_bits/arch_specific.rs b/src/api/into_bits/arch_specific.rs +index 6cc2fa37..7b560107 100644 +--- third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs ++++ third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs +@@ -84,7 +84,6 @@ macro_rules! impl_arch { + // FIXME: 64-bit single element types + // FIXME: arm/aarch float16x4_t missing + impl_arch!( +- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64], + [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t, + poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, + uint64x1_t], Index: www/firefox/Makefile =================================================================== --- www/firefox/Makefile +++ www/firefox/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 83.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Index: www/firefox/files/patch-packed_simd =================================================================== --- www/firefox/files/patch-packed_simd +++ www/firefox/files/patch-packed_simd @@ -0,0 +1,112 @@ +2 errors: +error[E0432]: unresolved import `crate::arch::x86_64::_mm_movemask_pi8` +https://github.com/rust-lang/packed_simd/pull/290 + +unresolved import `crate::arch::x86_64::__m64` +https://github.com/rust-lang/packed_simd/pull/292/commits/57d96e45916066fa9b5cdf2bc695e190207e78af + + + +From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001 +From: Justus K +Date: Tue, 22 Sep 2020 15:36:03 +0200 +Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro + +--- + src/codegen/reductions/mask/x86/sse.rs | 32 -------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs +index 7482f943..eb1ef7fa 100644 +--- third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs ++++ third_party/rust/packed_simd/src/codegen/reductions/mask/x86/sse.rs +@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { + } + }; + } +- +-macro_rules! x86_m8x8_sse_impl { +- ($id:ident) => { +- impl All for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn all(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- // _mm_movemask_pi8(a) creates an 8bit mask containing the most +- // significant bit of each byte of `a`. If all bits are set, +- // then all 8 lanes of the mask are true. +- _mm_movemask_pi8(crate::mem::transmute(self)) +- == u8::max_value() as i32 +- } +- } +- impl Any for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn any(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- +- _mm_movemask_pi8(crate::mem::transmute(self)) != 0 +- } +- } +- }; +-} + +diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs +index 2ae4ed81..bcfb1a6e 100644 +--- third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs ++++ third_party/rust/packed_simd/src/codegen/reductions/mask/x86.rs +@@ -19,13 +19,7 @@ mod avx2; + /// x86 64-bit m8x8 implementation + macro_rules! x86_m8x8_impl { + ($id:ident) => { +- cfg_if! { +- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] { +- x86_m8x8_sse_impl!($id); +- } else { +- fallback_impl!($id); +- } +- } ++ fallback_impl!($id); + }; + } + +--- third_party/rust/packed_simd/src/lib.rs.orig 2019-02-05 21:18:53.000000000 +0100 ++++ third_party/rust/packed_simd/src/lib.rs 2020-11-18 15:06:43.736722000 +0100 +@@ -210,7 +210,6 @@ + core_intrinsics, + stmt_expr_attributes, + align_offset, +- mmx_target_feature, + crate_visibility_modifier, + custom_inner_attributes + )] + + + +From 57d96e45916066fa9b5cdf2bc695e190207e78af Mon Sep 17 00:00:00 2001 +From: Jubilee Young +Date: Wed, 23 Sep 2020 12:23:29 -0700 +Subject: [PATCH] Remove __m64 type + +--- + src/api/into_bits/arch_specific.rs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/api/into_bits/arch_specific.rs b/src/api/into_bits/arch_specific.rs +index 6cc2fa37..7b560107 100644 +--- third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs ++++ third_party/rust/packed_simd/src/api/into_bits/arch_specific.rs +@@ -84,7 +84,6 @@ macro_rules! impl_arch { + // FIXME: 64-bit single element types + // FIXME: arm/aarch float16x4_t missing + impl_arch!( +- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64], + [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t, + poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, + uint64x1_t], Index: www/geckodriver/Makefile =================================================================== --- www/geckodriver/Makefile +++ www/geckodriver/Makefile @@ -2,7 +2,7 @@ PORTNAME= geckodriver DISTVERSION= 0.26.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www MASTER_SITES= https://hg.mozilla.org/mozilla-central/archive/${DISTNAME}.zip/testing/geckodriver/?dummy=/ DISTNAME= e9783a644016aa9b317887076618425586730d73 Index: www/jwt-cli/Makefile =================================================================== --- www/jwt-cli/Makefile +++ www/jwt-cli/Makefile @@ -3,7 +3,7 @@ PORTNAME= jwt-cli PORTVERSION= 3.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Index: www/miniserve/Makefile =================================================================== --- www/miniserve/Makefile +++ www/miniserve/Makefile @@ -3,6 +3,7 @@ PORTNAME= miniserve DISTVERSIONPREFIX= v DISTVERSION= 0.10.3 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= mikael@FreeBSD.org Index: www/monolith/Makefile =================================================================== --- www/monolith/Makefile +++ www/monolith/Makefile @@ -3,7 +3,7 @@ PORTNAME= monolith DISTVERSIONPREFIX= v DISTVERSION= 2.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MAINTAINER= vulcan@wired.sh Index: www/newsboat/Makefile =================================================================== --- www/newsboat/Makefile +++ www/newsboat/Makefile @@ -3,7 +3,7 @@ PORTNAME= newsboat PORTVERSION= 2.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: www/websocat/Makefile =================================================================== --- www/websocat/Makefile +++ www/websocat/Makefile @@ -4,7 +4,7 @@ PORTNAME= websocat DISTVERSIONPREFIX= v DISTVERSION= 1.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MAINTAINER= osa@FreeBSD.org Index: www/zola/Makefile =================================================================== --- www/zola/Makefile +++ www/zola/Makefile @@ -3,7 +3,7 @@ PORTNAME= zola DISTVERSIONPREFIX= v DISTVERSION= 0.12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= mikael@FreeBSD.org Index: x11/admiral/Makefile =================================================================== --- x11/admiral/Makefile +++ x11/admiral/Makefile @@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-7 DISTVERSIONSUFFIX= -g5a9f33b -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= x11 MAINTAINER= rigoletto@FreeBSD.org Index: x11/alacritty/Makefile =================================================================== --- x11/alacritty/Makefile +++ x11/alacritty/Makefile @@ -3,7 +3,7 @@ PORTNAME= alacritty DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= mikael@FreeBSD.org Index: x11/squeekboard/Makefile =================================================================== --- x11/squeekboard/Makefile +++ x11/squeekboard/Makefile @@ -3,6 +3,7 @@ PORTNAME= squeekboard DISTVERSIONPREFIX= v DISTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org