* [gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/files/, media-libs/shaderc/
@ 2018-12-19 2:57 Georgy Yakovlev
0 siblings, 0 replies; 4+ messages in thread
From: Georgy Yakovlev @ 2018-12-19 2:57 UTC (permalink / raw
To: gentoo-commits
commit: d7b891fb1485664188eebc4efb01b1865d664cbd
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 02:54:25 2018 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 02:54:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b891fb
media-libs/shaderc: bump to 2018.0
Bug: https://bugs.gentoo.org/672652
Closes: https://bugs.gentoo.org/672684
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
media-libs/shaderc/Manifest | 1 +
.../shaderc-2018.0-fix-glslang-link-order.patch | 26 +++++++
media-libs/shaderc/shaderc-2018.0.ebuild | 85 ++++++++++++++++++++++
3 files changed, 112 insertions(+)
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 6e1fa802596..5be0f13941b 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1 +1,2 @@
+DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
DIST shaderc-7a23a01742b88329fb2260eda007172135ba25d4.tar.gz 186291 BLAKE2B e91f57ba5c9339fed17d409b82df284a7897ed8bcabb203a0b8aab439df1d460ff5efdaa49e9140801b1430e831bbdca6920181fd1ddd07d8d35eb17b519246b SHA512 558447bc29b0c7610fda0f6c2a6b66f3c8fc7f2f5e336ad190ae959caa8c7aa1e09d3c2efe0e197cb2cbe1fa97e0c68623ce423c658b29fcbd1f1e1ea4c85f18
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
new file mode 100644
index 00000000000..837303d84e1
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
@@ -0,0 +1,26 @@
+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/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
new file mode 100644
index 00000000000..e0b0e435fad
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2018.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-util/glslang-7.10[${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}/${P}-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|\$<TARGET_FILE:spirv-dis>|${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
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi && use doc; then
+ cmake-utils_src_make glslc_doc_README
+ fi
+ cmake-utils_src_compile
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+ fi
+ cmake-utils_src_install
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/files/, media-libs/shaderc/
@ 2019-10-22 3:24 Nick Sarnie
0 siblings, 0 replies; 4+ messages in thread
From: Nick Sarnie @ 2019-10-22 3:24 UTC (permalink / raw
To: gentoo-commits
commit: b80df046136e8783bb48b2fe244f42a17cbd0d3e
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 03:20:26 2019 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 03:24:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80df046
media-libs/shaderc: Version bump
Fixes: https://bugs.gentoo.org/698126
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
media-libs/shaderc/Manifest | 1 +
.../shaderc-2019.0-fix-glslang-link-order.patch | 26 +++++++
media-libs/shaderc/shaderc-2019.0.ebuild | 85 ++++++++++++++++++++++
3 files changed, 112 insertions(+)
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index a0ed3bcc63d..d84218ff3d6 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1 +1,2 @@
DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
+DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
new file mode 100644
index 00000000000..660d1bf8dfd
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
@@ -0,0 +1,26 @@
+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 f8ae95d..069c48a 100644
+--- a/libshaderc_util/CMakeLists.txt
++++ b/libshaderc_util/CMakeLists.txt
+@@ -32,7 +32,7 @@ add_definitions(-DENABLE_HLSL)
+
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+- glslang OSDependent OGLCompiler HLSL glslang SPIRV
++ glslang OSDependent OGLCompiler glslang SPIRV HLSL
+ SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
+
+ shaderc_add_tests(
diff --git a/media-libs/shaderc/shaderc-2019.0.ebuild b/media-libs/shaderc/shaderc-2019.0.ebuild
new file mode 100644
index 00000000000..1f712cb201d
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2019.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+
+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 x86"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-util/glslang-7.10[${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}/${P}-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|\$<TARGET_FILE:spirv-dis>|${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
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi && use doc; then
+ cmake-utils_src_make glslc_doc_README
+ fi
+ cmake-utils_src_compile
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+ fi
+ cmake-utils_src_install
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/files/, media-libs/shaderc/
@ 2020-11-07 3:59 Nick Sarnie
0 siblings, 0 replies; 4+ messages in thread
From: Nick Sarnie @ 2020-11-07 3:59 UTC (permalink / raw
To: gentoo-commits
commit: 35c4ea23e9f5db108f2002bc8286163cf785423f
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 03:44:19 2020 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 03:58:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c4ea23
media-libs/shaderc: Bump to 2020.4
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
media-libs/shaderc/Manifest | 1 +
.../shaderc/files/shaderc-2020.4-fix-build.patch | 13 +++
.../shaderc/shaderc-2020.4_pre20201106.ebuild | 92 ++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 7c4fc2204f9..ab03783825f 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -2,3 +2,4 @@ DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea
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-2020.4-fix-build.patch b/media-libs/shaderc/files/shaderc-2020.4-fix-build.patch
new file mode 100644
index 00000000000..93f8252831f
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2020.4-fix-build.patch
@@ -0,0 +1,13 @@
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index c5ce37e..4703634 100644
+--- a/libshaderc_util/src/compiler.cc
++++ b/libshaderc_util/src/compiler.cc
+@@ -20,7 +20,7 @@
+ #include <thread>
+ #include <tuple>
+
+-#include "SPIRV/GlslangToSpv.h"
++#include "glslang/SPIRV/GlslangToSpv.h"
+ #include "libshaderc_util/format.h"
+ #include "libshaderc_util/io.h"
+ #include "libshaderc_util/message.h"
diff --git a/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
new file mode 100644
index 00000000000..b96cf483ee1
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2020.4_pre20201106.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="fcafd5b49266d65ab7e4268c825224e8b6c1b8bb"
+SRC_URI="https://github.com/google/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-util/glslang-10.11.0.0_pre20200924[${MULTILIB_USEDEP}]
+ >=dev-util/spirv-tools-2020.5_pre20200922[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=dev-util/spirv-headers-1.5.4
+ doc? ( dev-ruby/asciidoctor )
+ test? (
+ dev-cpp/gtest
+ $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+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|\$<TARGET_FILE:spirv-dis>|${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_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DSHADERC_SKIP_TESTS="$(usex !test)"
+ -DSHADERC_ENABLE_WERROR_COMPILE="false"
+ )
+ cmake_src_configure
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi && use doc; then
+ cmake_src_make glslc_doc_README
+ fi
+ cmake_src_compile
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+ fi
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/files/, media-libs/shaderc/
@ 2020-12-16 20:09 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-12-16 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 6f99c02ebff8db2dcbe180e021f5d6f2b44fa930
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 19:56:30 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 20:08:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f99c02e
media-libs/shaderc: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/shaderc/Manifest | 1 -
.../shaderc/files/shaderc-2020.1-fix-build.patch | 17 ----
media-libs/shaderc/shaderc-2020.2.ebuild | 90 ----------------------
3 files changed, 108 deletions(-)
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 2aa1ccceae8..d04536b9863 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,2 +1 @@
-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-2020.1-fix-build.patch b/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
deleted file mode 100644
index f46aa5ddb66..00000000000
--- a/media-libs/shaderc/files/shaderc-2020.1-fix-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.2.ebuild b/media-libs/shaderc/shaderc-2020.2.ebuild
deleted file mode 100644
index d059007510d..00000000000
--- a/media-libs/shaderc/shaderc-2020.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-CMAKE_ECLASS=cmake
-
-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}]')
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2020.1-fix-build.patch
-)
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-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|\$<TARGET_FILE:spirv-dis>|${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_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DSHADERC_SKIP_TESTS="$(usex !test)"
- -DSHADERC_ENABLE_WERROR_COMPILE="false"
- )
- cmake_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use doc; then
- cmake_src_make glslc_doc_README
- fi
- cmake_src_compile
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
- fi
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-16 20:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-19 2:57 [gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/files/, media-libs/shaderc/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2019-10-22 3:24 Nick Sarnie
2020-11-07 3:59 Nick Sarnie
2020-12-16 20:09 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox