diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/d/rust/0001-WIP-minimize-the-rust-std-component.patch | 55 | ||||
-rw-r--r-- | source/d/rust/hack.diff | 29 | ||||
-rwxr-xr-x | source/d/rust/rust.SlackBuild | 12 | ||||
-rw-r--r-- | source/d/rust/rust.url | 14 | ||||
-rw-r--r-- | source/l/wavpack/slack-desc | 17 | ||||
-rwxr-xr-x | source/l/wavpack/wavpack.SlackBuild | 7 | ||||
-rw-r--r-- | source/l/wavpack/wavpack.url | 1 | ||||
-rwxr-xr-x | source/n/bind/bind.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/php/fetch-php.sh | 4 | ||||
-rwxr-xr-x | source/n/php/php.SlackBuild | 2 | ||||
-rw-r--r-- | source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch | 30 | ||||
-rwxr-xr-x | source/x/vulkan-sdk/vulkan-sdk.SlackBuild | 5 | ||||
-rw-r--r-- | source/xfce/exo/exo.url | 2 |
13 files changed, 62 insertions, 118 deletions
diff --git a/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch b/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch deleted file mode 100644 index e46a7265c..000000000 --- a/source/d/rust/0001-WIP-minimize-the-rust-std-component.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- ./src/bootstrap/dist.rs.orig 2019-11-07 16:25:16.099477103 -0600 -+++ ./src/bootstrap/dist.rs 2019-11-07 16:31:36.510445625 -0600 -@@ -675,36 +675,28 @@ - return distdir(builder).join(format!("{}-{}.tar.gz", name, target)); - } - -- // We want to package up as many target libraries as possible -- // for the `rust-std` package, so if this is a host target we -- // depend on librustc and otherwise we just depend on libtest. -- if builder.hosts.iter().any(|t| t == target) { -- builder.ensure(compile::Rustc { compiler, target }); -- } else { -- builder.ensure(compile::Std { compiler, target }); -- } -+ builder.ensure(compile::Std { compiler, target }); -+ builder.ensure(compile::Rustc { compiler, target }); - - let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); - let _ = fs::remove_dir_all(&image); - -- let dst = image.join("lib/rustlib").join(target); -+ let dst = image.join("lib/rustlib").join(target).join("lib"); - t!(fs::create_dir_all(&dst)); -- let mut src = builder.sysroot_libdir(compiler, target).to_path_buf(); -- src.pop(); // Remove the trailing /lib folder from the sysroot_libdir -- builder.cp_filtered(&src, &dst, &|path| { -- if let Some(name) = path.file_name().and_then(|s| s.to_str()) { -- if name == builder.config.rust_codegen_backends_dir.as_str() { -- return false -- } -- if name == "bin" { -- return false -- } -- if name.contains("LLVM") { -- return false -- } -+ -+ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); -+ let stamp = dbg!(compile::libstd_stamp(builder, compiler_to_use, target)); -+ for (path, host) in builder.read_stamp_file(&stamp) { -+ if !host { -+ builder.copy(&path, &dst.join(path.file_name().unwrap())); - } -- true -- }); -+ } -+ let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); -+ for (path, host) in builder.read_stamp_file(&stamp) { -+ if !host { -+ builder.copy(&path, &dst.join(path.file_name().unwrap())); -+ } -+ } - - let mut cmd = rust_installer(builder); - cmd.arg("generate") diff --git a/source/d/rust/hack.diff b/source/d/rust/hack.diff deleted file mode 100644 index c5031fb01..000000000 --- a/source/d/rust/hack.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- ./src/bootstrap/dist.rs.orig 2019-11-07 18:12:33.835944390 -0600 -+++ ./src/bootstrap/dist.rs 2019-11-07 22:05:17.991788876 -0600 -@@ -676,7 +676,6 @@ - } - - builder.ensure(compile::Std { compiler, target }); -- builder.ensure(compile::Rustc { compiler, target }); - - let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); - let _ = fs::remove_dir_all(&image); -@@ -691,12 +690,12 @@ - builder.copy(&path, &dst.join(path.file_name().unwrap())); - } - } -- let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); -- for (path, host) in builder.read_stamp_file(&stamp) { -- if !host { -- builder.copy(&path, &dst.join(path.file_name().unwrap())); -- } -- } -+ // let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); -+ // for (path, host) in builder.read_stamp_file(&stamp) { -+ // if !host { -+ // builder.copy(&path, &dst.join(path.file_name().unwrap())); -+ // } -+ // } - - let mut cmd = rust_installer(builder); - cmd.arg("generate") diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 2dee9b218..3c261906f 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.39.0} +VERSION=${VERSION:-1.40.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.38.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2019-09-26} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.39.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.39.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2019-11-07} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.40.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -148,10 +148,6 @@ if [ "${SYSTEM_LLVM}" = "YES" ]; then zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1 fi -# Try to debloat the build: -zcat $CWD/0001-WIP-minimize-the-rust-std-component.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/hack.diff.gz | patch -p1 --verbose || exit 1 - if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then # rust requires bootstrapping with the previous rust version. # versions are defined in src/stage0.txt. diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index a6838aff4..0b18f23d9 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar @@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar exit 0 # i686 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/cargo-0.40.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rust-std-1.39.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-11-07/rustc-1.39.0-x86_64-unknown-linux-gnu.tar.gz diff --git a/source/l/wavpack/slack-desc b/source/l/wavpack/slack-desc index 981b6a6d6..74838bb80 100644 --- a/source/l/wavpack/slack-desc +++ b/source/l/wavpack/slack-desc @@ -7,15 +7,14 @@ # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -wavpack: wavpack (A lossless WAV file compressor) +wavpack: wavpack (WAV audio file compressor) wavpack: -wavpack: Wavpack is a hybrid lossless wavefile compressor. Wavfile is -wavpack: Copyright (c) 1998 - 2006 Conifer Software. All Rights Reserved. +wavpack: WavPack is a completely open audio compression format providing +wavpack: lossless, high-quality lossy, and a unique hybrid compression mode. +wavpack: The hybrid mode creates both a relatively small, high-quality lossy +wavpack: file that can be used all by itself, and a "correction" file that +wavpack: (when combined with the lossy file) provides full lossless +wavpack: restoration. wavpack: -wavpack: Wavpack is distributed under the BSD Software License. +wavpack: Homepage: http://www.wavpack.com wavpack: -wavpack: Visit the wavpack project online: http://www.wavpack.com -wavpack: -wavpack: -wavpack: - diff --git a/source/l/wavpack/wavpack.SlackBuild b/source/l/wavpack/wavpack.SlackBuild index daff66a6f..d19ba2e3e 100755 --- a/source/l/wavpack/wavpack.SlackBuild +++ b/source/l/wavpack/wavpack.SlackBuild @@ -5,7 +5,7 @@ # Updated by Andrew Brouwers, abrouwers@gmail.com # Modified by the SlackBuilds.org project # Modified to build wavpack. -# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wavpack VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,7 +90,6 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --enable-static=no \ - --enable-mmx \ --build=$ARCH-slackware-linux \ || exit 1 @@ -102,7 +101,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS NEWS README* \ + AUTHORS* COPYING* NEWS* README* \ $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/l/wavpack/wavpack.url b/source/l/wavpack/wavpack.url new file mode 100644 index 000000000..c8d5906d4 --- /dev/null +++ b/source/l/wavpack/wavpack.url @@ -0,0 +1 @@ +https://github.com/dbry/WavPack diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index 71891160a..eccd97507 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind -VERSION=${VERSION:-9.14.8} +VERSION=${VERSION:-9.14.9} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index bb523034e..6aa0ef113 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-7.4.0.tar.xz.asc -lftpget http://us.php.net/distributions/php-7.4.0.tar.xz +lftpget http://us.php.net/distributions/php-7.4.1.tar.xz.asc +lftpget http://us.php.net/distributions/php-7.4.1.tar.xz diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index 0f50aeea6..01210af57 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.21 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch b/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch new file mode 100644 index 000000000..e5a475916 --- /dev/null +++ b/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch @@ -0,0 +1,30 @@ +From 199d115e1542fe0a8427efda5fa36158474fb6cf Mon Sep 17 00:00:00 2001 +From: John Kessenich <cepheus@frii.com> +Date: Tue, 5 Nov 2019 18:05:42 -0700 +Subject: [PATCH] Fix #1959 by reverting 7b0e236 to put files in two places. + +--- + SPIRV/CMakeLists.txt | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + mode change 100644 => 100755 SPIRV/CMakeLists.txt + +diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +old mode 100644 +new mode 100755 +index e25ec0a13..9869bafdc +--- a/SPIRV/CMakeLists.txt ++++ b/SPIRV/CMakeLists.txt +@@ -90,9 +90,10 @@ if(ENABLE_GLSLANG_INSTALL) + install(TARGETS SPIRV EXPORT SPIRVTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() +- +- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake) +- install(EXPORT SPIRVTargets DESTINATION lib/cmake) + ++ install(EXPORT SPVRemapperTargets DESTINATION lib/cmake) ++ install(EXPORT SPIRVTargets DESTINATION lib/cmake) ++ ++ install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/) + install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) + endif(ENABLE_GLSLANG_INSTALL) diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild index 3ed33960b..32687831d 100755 --- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vulkan-sdk VERSION=${VERSION:-$(echo Vulkan-ValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -96,6 +96,9 @@ mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers cd $TMP/glslang-${GLSLANG_VERSION} +# Upstream revert to fix building shaderc (and others): +zcat $CWD/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/xfce/exo/exo.url b/source/xfce/exo/exo.url index 4c1d02fc0..174a28eff 100644 --- a/source/xfce/exo/exo.url +++ b/source/xfce/exo/exo.url @@ -1 +1 @@ -http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.10.tar.bz2 +http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.11.tar.bz2 |