[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/, media-libs/shaderc/files/

2020-11-28 Thread Andreas Sturmlechner 
commit: e7ef1eb448ee00078898167b5f68dec3ea7b3700
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 28 21:20:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 28 21:56:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ef1eb4

media-libs/shaderc: Drop 2018* 2019* and 2020.1

Bug: https://bugs.gentoo.org/751007
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/shaderc/Manifest|  3 -
 .../shaderc-2018.0-fix-glslang-link-order.patch| 26 ---
 ...derc-2019.0-fix-build-against-new-glslang.patch | 54 --
 .../shaderc-2019.0-fix-glslang-link-order.patch| 26 ---
 media-libs/shaderc/shaderc-2018.0.ebuild   | 85 -
 media-libs/shaderc/shaderc-2019.0-r1.ebuild| 86 -
 media-libs/shaderc/shaderc-2020.1.ebuild   | 87 --
 7 files changed, 367 deletions(-)

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index ab03783825f..2aa1ccceae8 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,5 +1,2 @@
-DIST shaderc-2018.0.tar.gz 206013 BLAKE2B 
b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b
 SHA512 
7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 
53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5
 SHA512 
c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 
06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2
 SHA512 
3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
 DIST shaderc-2020.2.tar.gz 278161 BLAKE2B 
8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320
 SHA512 
1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97
 DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B 
5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f
 SHA512 
99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2

diff --git 
a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch 
b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
deleted file mode 100644
index 837303d84e1..000
--- a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
 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)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..b189430 100644
 a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -35,7 +35,7 @@ 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})
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util

diff --git 
a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch 
b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
deleted file mode 100644
index 807540cf62a..000
--- 
a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
-index 3c3c3de..b5fc6cb 100644
 a/libshaderc/src/shaderc.cc
-+++ b/libshaderc/src/shaderc.cc
-@@ -20,7 +20,7 @@
- #include 
- #include 
- 
--#include "SPIRV/spirv.hpp"
-+#include "glslang/SPIRV/spirv.hpp"
- 
- #include "libshaderc_util/compiler.h"
- #include "libshaderc_util/counting_includer.h"
-diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
-index

[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/, media-libs/shaderc/files/

2020-06-15 Thread Matt Turner 
commit: d5dea1dc4455fb41579ddd071f02b1a1a553b853
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jun 15 20:31:39 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jun 15 21:04:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5dea1dc

media-libs/shaderc: Version bump to 2020.1

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/shaderc/Manifest|  1 +
 .../shaderc/files/shaderc-2020.1-fix-build.patch   | 17 +
 media-libs/shaderc/shaderc-2020.1.ebuild   | 87 ++
 3 files changed, 105 insertions(+)

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 9811b2fe18e..a5a202aab66 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,3 +1,4 @@
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B 
b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b
 SHA512 
7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 
53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5
 SHA512 
c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
+DIST shaderc-2020.1.tar.gz 276137 BLAKE2B 
06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2
 SHA512 
3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
 DIST shaderc-2020.4_pre20200405.tar.gz 273897 BLAKE2B 
6cd02d0db17d0c92b3f2b65bd46284b8432538e3899e088c2e08648a6797ed596af13e251afdf0c1747abc27fa49b56df32ce67beb72c6e99a6bda463cf9dea1
 SHA512 
556d519faf6e3df6efbe77a24b21e74198468b0638dd7c3143228afce5625f04707fa77aaec997998795166705271e2e8d086cd2e82609eaaef786ea36554ac4

diff --git a/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch 
b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
new file mode 100644
index 000..f46aa5ddb66
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
@@ -0,0 +1,17 @@
+This patch is a revert of commit 15a66d72f33a099ec65e0fd37cf14548ed1d2bdb 
(Rolling 5 dependencies and fixing build (#1057)) because it adds usage of the 
.maxDualSourceDrawBuffersEXT field which is not available in any tagged release 
of glslang. The field is added in glslang in 
https://github.com/KhronosGroup/glslang/commit/e05cc20ec20a154d94256c744a3837c23719c0f9
+
+---
+diff --git b/libshaderc_util/src/resources.cc 
a/libshaderc_util/src/resources.cc
+index d64e47f..458a63f 100644
+--- b/libshaderc_util/src/resources.cc
 a/libshaderc_util/src/resources.cc
+@@ -125,7 +125,7 @@ const TBuiltInResource kDefaultTBuiltInResource = {
+ /* .maxTaskWorkGroupSizeY_NV = */ 1,
+ /* .maxTaskWorkGroupSizeZ_NV = */ 1,
+ /* .maxMeshViewCountNV = */ 4,
+-/* .maxDualSourceDrawBuffersEXT = */ 1,
++
+ // This is the glslang TLimits structure.
+ // It defines whether or not the following features are enabled.
+ // We want them to all be enabled.
+-- 

diff --git a/media-libs/shaderc/shaderc-2020.1.ebuild 
b/media-libs/shaderc/shaderc-2020.1.ebuild
new file mode 100644
index 000..747ae7fac6b
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2020.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc;
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+   >=dev-util/glslang-8.13.3560_pre20200404[${MULTILIB_USEDEP}]
+   >=dev-util/spirv-tools-2020.3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   >=dev-util/spirv-headers-1.5.3
+   doc? ( dev-ruby/asciidoctor )
+   test? (
+   dev-cpp/gtest
+   $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+   )
+"
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-build.patch
+)
+
+python_check_deps() {
+   if use test; then
+   has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
+   fi
+}
+
+src_prepare() {
+   cmake_comment_add_subdirectory examples
+
+   # Unbundle glslang, spirv-headers, spirv-tools
+   cmake_comment_add_subdirectory third_party
+   sed -i \
+   -e "s|\$|${EPREFIX}/usr/bin/spirv-dis|" \
+   glslc/test/CMakeLists.txt || die
+
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/, media-libs/shaderc/files/

2019-10-28 Thread Nick Sarnie 
commit: 71fd8fefba4a17eccf86e805e00af942171b29b6
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Oct 28 23:14:17 2019 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Oct 28 23:15:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fd8fef

media-libs/shaderc: Fix build

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=698688
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Nick Sarnie  gentoo.org>

 ...derc-2019.0-fix-build-against-new-glslang.patch | 54 ++
 ...derc-2019.0.ebuild => shaderc-2019.0-r1.ebuild} |  9 ++--
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git 
a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch 
b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
new file mode 100644
index 000..807540cf62a
--- /dev/null
+++ 
b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
@@ -0,0 +1,54 @@
+diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
+index 3c3c3de..b5fc6cb 100644
+--- a/libshaderc/src/shaderc.cc
 b/libshaderc/src/shaderc.cc
+@@ -20,7 +20,7 @@
+ #include 
+ #include 
+ 
+-#include "SPIRV/spirv.hpp"
++#include "glslang/SPIRV/spirv.hpp"
+ 
+ #include "libshaderc_util/compiler.h"
+ #include "libshaderc_util/counting_includer.h"
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index ef7867f..acc172b 100644
+--- a/libshaderc_util/src/compiler.cc
 b/libshaderc_util/src/compiler.cc
+@@ -26,7 +26,7 @@
+ #include "libshaderc_util/string_piece.h"
+ #include "libshaderc_util/version_profile.h"
+ 
+-#include "SPIRV/GlslangToSpv.h"
++#include "glslang/SPIRV/GlslangToSpv.h"
+ 
+ namespace {
+ using shaderc_util::string_piece;
+@@ -291,17 +291,12 @@ std::tuple, size_t> 
Compiler::Compile(
+   bases[static_cast(UniformKind::StorageBuffer)]);
+   shader.setShiftUavBinding(
+   bases[static_cast(UniformKind::UnorderedAccessView)]);
+-  shader.setHlslIoMapping(hlsl_iomap_);
+   shader.setResourceSetBinding(
+   hlsl_explicit_bindings_[static_cast(used_shader_stage)]);
+   shader.setEnvClient(target_client_info.client,
+   target_client_info.client_version);
+   shader.setEnvTarget(target_client_info.target_language,
+   target_client_info.target_language_version);
+-  if (hlsl_functionality1_enabled_) {
+-shader.setEnvTargetHlslFunctionality1();
+-  }
+-
+   const EShMessages rules = GetMessageRules(target_env_, source_language_,
+ hlsl_offsets_,
+ generate_debug_info_);
+@@ -478,9 +473,6 @@ std::tuple 
Compiler::PreprocessShader(
+   }
+   shader.setEnvClient(target_client_info.client,
+   target_client_info.client_version);
+-  if (hlsl_functionality1_enabled_) {
+-shader.setEnvTargetHlslFunctionality1();
+-  }
+ 
+   // The preprocessor might be sensitive to the target environment.
+   // So combine the existing rules with the just-give-me-preprocessor-output

diff --git a/media-libs/shaderc/shaderc-2019.0.ebuild 
b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
similarity index 86%
rename from media-libs/shaderc/shaderc-2019.0.ebuild
rename to media-libs/shaderc/shaderc-2019.0-r1.ebuild
index 6c1e8c8b019..b125681aee4 100644
--- a/media-libs/shaderc/shaderc-2019.0.ebuild
+++ b/media-libs/shaderc/shaderc-2019.0-r1.ebuild
@@ -17,12 +17,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
-   >=dev-util/glslang-7.10[${MULTILIB_USEDEP}]
-   dev-util/spirv-tools[${MULTILIB_USEDEP}]
+   >=dev-util/glslang-7.12.3353_pre20191027[${MULTILIB_USEDEP}]
+   >=dev-util/spirv-tools-2019.10_pre20191027[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
${PYTHON_DEPS}
-   dev-util/spirv-headers
+   >=dev-util/spirv-headers-1.5.1
doc? ( dev-ruby/asciidoctor )
test? (
dev-cpp/gtest
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}
 # https://github.com/google/shaderc/issues/470
 RESTRICT=test
 
-PATCHES=( "${FILESDIR}/${P}-fix-glslang-link-order.patch" )
+PATCHES=("${FILESDIR}/${P}-fix-glslang-link-order.patch"
+"${FILESDIR}/${P}-fix-build-against-new-glslang.patch" )
 
 python_check_deps() {
if use test; then

[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/, media-libs/shaderc/files/

2019-10-06 Thread Pacho Ramos 
commit: 3662bab0ea70353a8363b7587f8aec944c69af67
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  6 17:56:02 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  6 17:56:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3662bab0

media-libs/shaderc: Drop live ebuild as it's not being maintained

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Pacho Ramos  gentoo.org>

 .../shaderc-2017.2-fix-glslang-link-order.patch| 46 
 media-libs/shaderc/shaderc-.ebuild | 85 --
 2 files changed, 131 deletions(-)

diff --git 
a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch 
b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
deleted file mode 100644
index 2cd24a165e5..000
--- a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Original upstream PR: https://github.com/google/shaderc/pull/463
-
-From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
-From: Niklas Haas 
-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(-)
-
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
 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)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..6d0c465 100644
 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

diff --git a/media-libs/shaderc/shaderc-.ebuild 
b/media-libs/shaderc/shaderc-.ebuild
deleted file mode 100644
index aad02e3ab3f..000
--- a/media-libs/shaderc/shaderc-.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-multilib python-any-r1 git-r3
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc;
-EGIT_REPO_URI="https://github.com/google/shaderc.git;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc test"
-
-RDEPEND="
-   ~dev-util/glslang-[${MULTILIB_USEDEP}]
-   ~dev-util/spirv-tools-[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   ~dev-util/spirv-headers-
-   doc? ( dev-ruby/asciidoctor )
-   test? (
-   dev-cpp/gtest
-   $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-   )
-"
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${PN}-2017.2-fix-glslang-link-order.patch" )
-
-python_check_deps() {
-   if use test; then
-   has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-   fi
-}
-
-src_prepare() {
-   cmake_comment_add_subdirectory examples
-
-   # Unbundle glslang, spirv-headers, spirv-tools
-   cmake_comment_add_subdirectory third_party
-   sed -i \
-   -e "s|\$|${EPREFIX}/usr/bin/spirv-dis|" \
-   glslc/test/CMakeLists.txt || die
-
-   # Disable git versioning
-   sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-   # Manually create build-version.inc as we disabled git versioning
-   cat <<- EOF > glslc/src/build-version.inc || die
-   "${P}\n"
-   "$(best_version dev-util/spirv-tools)\n"
-   "$(best_version dev-util/glslang)\n"
-   EOF
-
-   cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DSHADERC_SKIP_TESTS="$(usex !test)"
-   )
-   cmake-utils_src_configure
-}
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/, media-libs/shaderc/files/

2018-06-20 Thread Georgy Yakovlev 
commit: c31d001aeedaf97917fa29fa859e16090cc50282
Author: Ilya Tumaykin  gmail  com>
AuthorDate: Sat Jun 16 18:06:50 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Jun 20 22:41:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31d001a

media-libs/shaderc: new package

A collection of tools, libraries and tests for shader compilation.
Includes, for example, a GLSL -> SPIR-V compiler as a shared library,
which is required for the upcoming Vulkan support in media-video/mpv.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/shaderc/Manifest|  1 +
 .../shaderc-2017.2-fix-glslang-link-order.patch| 46 +++
 media-libs/shaderc/metadata.xml| 15 
 media-libs/shaderc/shaderc-2017.2.ebuild   | 89 ++
 media-libs/shaderc/shaderc-.ebuild | 85 +
 5 files changed, 236 insertions(+)

diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
new file mode 100644
index 000..6e1fa802596
--- /dev/null
+++ b/media-libs/shaderc/Manifest
@@ -0,0 +1 @@
+DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B 
e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b
 SHA512 
558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18

diff --git 
a/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch 
b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
new file mode 100644
index 000..2cd24a165e5
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2017.2-fix-glslang-link-order.patch
@@ -0,0 +1,46 @@
+Original upstream PR: https://github.com/google/shaderc/pull/463
+
+From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
+From: Niklas Haas 
+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(-)
+
+diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
+index acf6fb0..0f5d888 100644
+--- 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)
+diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
+index 873540a..6d0c465 100644
+--- 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

diff --git a/media-libs/shaderc/metadata.xml b/media-libs/shaderc/metadata.xml
new file mode 100644
index 000..8935ad3118c
--- /dev/null
+++ b/media-libs/shaderc/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   itumaykin+gen...@gmail.com
+   Coacher
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   google/shaderc
+   
+

diff --git a/media-libs/shaderc/shaderc-2017.2.ebuild 
b/media-libs/shaderc/shaderc-2017.2.ebuild
new file mode 100644
index 000..3657eab08ee
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2017.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="7a23a01742b88329fb2260eda007172135ba25d4"
+MY_P="${PN}-${EGIT_COMMIT}"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc;
+SRC_URI="https://github.com/google/shaderc/archive/${EGIT_COMMIT}.tar.gz -> 
${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+   dev-util/glslang[${MULTILIB_USEDEP}]
+