diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-08-16 09:34:34 -0400 |
|---|---|---|
| committer | Bart Ribbers <bribbers@disroot.org> | 2021-08-18 11:57:33 +0000 |
| commit | 6e0c18f813e92459de99c2a6d2b0284504edee28 (patch) | |
| tree | e2addb5c19007f64baecdbc1439cb77e5eb853fb | |
| parent | 50650e33c7b445a88f078c0ac51b373a8cbe63ae (diff) | |
community/shaderc: bump to 2021.1
| -rw-r--r-- | community/shaderc/APKBUILD | 15 | ||||
| -rw-r--r-- | community/shaderc/fix-link-order.patch | 44 |
2 files changed, 7 insertions, 52 deletions
diff --git a/community/shaderc/APKBUILD b/community/shaderc/APKBUILD index f1d41c378cb..fb1d1dd27f0 100644 --- a/community/shaderc/APKBUILD +++ b/community/shaderc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: pkgname=shaderc -pkgver=2020.0 -pkgrel=1 +pkgver=2021.1 +pkgrel=0 pkgdesc="A collection of tools, libraries, and tests for Vulkan shader compilation" options="!check" # Fails to configure when tests are enabled url="https://github.com/google/shaderc" @@ -11,9 +11,7 @@ license="Apache-2.0" makedepends="cmake glslang-static glslang-dev spirv-tools-dev python3" subpackages="$pkgname-static $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/google/shaderc/archive/v$pkgver.tar.gz - fix-link-order.patch - third-party.patch - " + third-party.patch" prepare() { default_prepare @@ -54,6 +52,7 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="1971673d7a5fe77ef827c29db14112d4935c573c7c4f3b00fff3729334284d11640ee40c9e97ebcb2a14c6d5c6db0cf5e2ef6b2dfb59c759d1322c6d38624eb4 shaderc-2020.0.tar.gz -bd24c90b93bf8bd7e56682e02543ff8a5c988549e76502144c2f4904e96b67ca0bc9d1e94b811bcdad1e765625256d3feabeb20ca299f2abb220e6e398d5a590 fix-link-order.patch -5c5171ef2561070fece6b4cfa087f5baace7e5f828443719570494d9adc39ad724a414da7570f38629dbc9e7b563c8ad8226143c907ce7139a87615098006585 third-party.patch" +sha512sums=" +b6668bc2dd54cc745184c6a0b9a8f7ba6579fd6b67691a57179d03300f3054776e70b54b82e54b16e04aa14f3b5b28385079d2533657191a69e5698af3cde444 shaderc-2021.1.tar.gz +5c5171ef2561070fece6b4cfa087f5baace7e5f828443719570494d9adc39ad724a414da7570f38629dbc9e7b563c8ad8226143c907ce7139a87615098006585 third-party.patch +" diff --git a/community/shaderc/fix-link-order.patch b/community/shaderc/fix-link-order.patch deleted file mode 100644 index f356959837f..00000000000 --- a/community/shaderc/fix-link-order.patch +++ /dev/null @@ -1,44 +0,0 @@ -Original upstream PR: https://github.com/google/shaderc/pull/463 - -From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001 -From: Niklas Haas <git@haasn.xyz> -Date: Tue, 29 May 2018 07:34:00 +0200 -Subject: [PATCH] Fix the link order of libglslang and libHLSL - -libglslang depends on libHLSL, so the latter needs to be specified last. -This fixes an issue when trying to build shaderc against system-wide -versions of libglslang/libHLSL, rather than the in-tree versions from -third_party. - -Additionally, libshaderc_util also depends on SPIRV-Tools ---- - glslc/CMakeLists.txt | 2 +- - libshaderc_util/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -18,7 +18,7 @@ add_library(glslc STATIC - shaderc_default_compile_options(glslc) - target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) - target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler -- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT}) -+ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT}) - target_link_libraries(glslc PRIVATE shaderc_util shaderc) - - add_executable(glslc_exe src/main.cc) ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) - - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) -+ glslang OSDependent OGLCompiler glslang HLSL SPIRV -+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( - TEST_PREFIX shaderc_util - - |