diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/d/python-setuptools/python-setuptools.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/boost/boost.SlackBuild | 7 | ||||
-rw-r--r-- | source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch | 42 | ||||
-rwxr-xr-x | source/n/epic5/epic5.SlackBuild | 2 | ||||
-rwxr-xr-x | source/x/vulkan-sdk/fetch-sources.sh | 4 | ||||
-rw-r--r-- | source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch | 30 | ||||
-rwxr-xr-x | source/x/vulkan-sdk/vulkan-sdk.SlackBuild | 5 |
7 files changed, 52 insertions, 40 deletions
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild index f531546dc..c44ac34f5 100755 --- a/source/d/python-setuptools/python-setuptools.SlackBuild +++ b/source/d/python-setuptools/python-setuptools.SlackBuild @@ -35,7 +35,7 @@ fi PKGNAM=python-setuptools VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} SRCNAM=setuptools diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index af1870beb..b311eccb6 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -92,6 +92,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix missing `boost/serialization/split_member.hpp` include: +zcat $CWD/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch.gz | patch -p2 --verbose || exit 1 + # First build bjam, the boost build system: ./bootstrap.sh \ --with-toolset=gcc \ @@ -137,7 +140,7 @@ find . \ install || exit 1 # one more run to build libboost_python3.. -sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \ +sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}} ;@' \ -i bootstrap.sh ./bootstrap.sh \ diff --git a/source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch b/source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch new file mode 100644 index 000000000..0090bf042 --- /dev/null +++ b/source/l/boost/boost.f61dd9c5324d8439c52764c7aebaac7d0d4b7128.patch @@ -0,0 +1,42 @@ +From f61dd9c5324d8439c52764c7aebaac7d0d4b7128 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sat, 21 Dec 2019 14:02:13 +0100 +Subject: [PATCH] Fix missing `boost/serialization/split_member.hpp` include + +* As suggested by @glenfe and @robertramey in + https://github.com/boostorg/serialization/commit/c32a663c9963385430abc563f9c85f94d8da43a9#r36528430, + the `boost/serialization/split_member.hpp` include is not part + of the interface and consumers should not rely on it being + included. + +Fixes lightspark/lightspark#406 +Fixes https://bugs.gentoo.org/703294 +--- + include/boost/bimap/detail/map_view_iterator.hpp | 1 + + include/boost/bimap/detail/set_view_iterator.hpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/include/boost/bimap/detail/map_view_iterator.hpp b/include/boost/bimap/detail/map_view_iterator.hpp +index 17d43cb..4af8484 100644 +--- a/include/boost/bimap/detail/map_view_iterator.hpp ++++ b/include/boost/bimap/detail/map_view_iterator.hpp +@@ -22,6 +22,7 @@ + + #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION + #include <boost/serialization/nvp.hpp> ++ #include <boost/serialization/split_member.hpp> + #endif // BOOST_BIMAP_DISABLE_SERIALIZATION + + #include <boost/iterator/detail/enable_if.hpp> +diff --git a/include/boost/bimap/detail/set_view_iterator.hpp b/include/boost/bimap/detail/set_view_iterator.hpp +index e785ed7..b1e2dfa 100644 +--- a/include/boost/bimap/detail/set_view_iterator.hpp ++++ b/include/boost/bimap/detail/set_view_iterator.hpp +@@ -22,6 +22,7 @@ + + #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION + #include <boost/serialization/nvp.hpp> ++ #include <boost/serialization/split_member.hpp> + #endif // BOOST_BIMAP_DISABLE_SERIALIZATION + + #include <boost/iterator/detail/enable_if.hpp> diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index f1cb70a28..f89eb837a 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible. # Patches to fix this are welcome, otherwise we'll keep an eye on upstream. diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index 48e51e3d8..a7ad23f13 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -27,8 +27,8 @@ # # Example: VERSION=1.1.92.1 ./fetch-sources.sh -VERSION=${VERSION:-1.1.126.0} -BRANCH=${BRANCH:-sdk-1.1.126} +VERSION=${VERSION:-1.1.130.0} +BRANCH=${BRANCH:-sdk-1.1.130} rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \ Vulkan-Headers-sdk-${VERSION}* \ diff --git a/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch b/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch deleted file mode 100644 index e5a475916..000000000 --- a/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 32687831d..3ed33960b 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:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -96,9 +96,6 @@ 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 \) \ |