diff options
Diffstat (limited to 'dev-util')
15 files changed, 122 insertions, 11 deletions
diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild index f0531f0841d6..e7c0cfeda69e 100644 --- a/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild +++ b/dev-util/coccinelle/coccinelle-1.1.1-r4.ebuild @@ -46,7 +46,10 @@ BDEPEND=" " DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt ) - +PATCHES=( + "${FILESDIR}"/${P}-bash-completion.patch + "${FILESDIR}"/${P}-find-xxdate.patch +) SITEFILE=50coccinelle-gentoo.el pkg_setup() { @@ -101,7 +104,7 @@ src_test() { } src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes install + emake DESTDIR="${D}" PREFIX="${EPREFIX}" VERBOSE=yes -j1 install if use python ; then python_optimize @@ -114,6 +117,7 @@ src_install() { elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi + einstalldocs use doc && dodoc docs/manual/*.pdf newdoc editors/vim/README README-vim diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch new file mode 100644 index 000000000000..1958dbd498f4 --- /dev/null +++ b/dev-util/coccinelle/files/coccinelle-1.1.1-bash-completion.patch @@ -0,0 +1,19 @@ +--- a/scripts/spatch.bash_completion ++++ b/scripts/spatch.bash_completion +@@ -34,7 +34,6 @@ __spatchcomp_1 () + done + } + +-have spatch && + _spatch() + { + local cur prev xspec +@@ -89,8 +88,6 @@ _spatch() + complete -F _spatch -o bashdefault -o default -o nospace spatch \ + || complete -F _spatch -o default -o nospace spatch + +-complete -F _spatch -o bashdefault -o default -o nospace spatch.opt \ +- || complete -F _spatch -o default -o nospace spatch.opt + + # Local variables: + # mode: shell-script diff --git a/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch b/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch new file mode 100644 index 000000000000..0b8143f29cfd --- /dev/null +++ b/dev-util/coccinelle/files/coccinelle-1.1.1-find-xxdate.patch @@ -0,0 +1,11 @@ +--- a/docs/manual/find-xxdate ++++ b/docs/manual/find-xxdate +@@ -9,7 +9,7 @@ + # Otherwise, a warning is printed on stderr and the script returns 1 + + file=xxdate.exe +-directories="$(opam var hevea:lib) /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" ++directories="/usr/lib/hevea /usr/lib64/hevea /usr/share/hevea /usr/local/lib/hevea /opt/local/share/hevea" + + for dir in ${directories}; do + fullpath=${dir}/${file}; diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index bb1609390d75..2d49fc095c50 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,3 +1,4 @@ DIST glslang-1.3.216.tar.gz 3537750 BLAKE2B 0eddc7be8a4499a283b941b51aefec5bfa3d555b8f44408f33a6993db1bea96b6dfeedb093d64117ef4ffca6ad264ea5968492af642fc2b0563bb43eff241cb8 SHA512 4ab3953df2e881e4eb923307d6ec906daaa1786a1ad1b4d7d6713d63599c8f7cfd41257d53f7caeddcc4ad8cc4aac707393d2b7a1c7452ff5e9d1ae5f84696e8 DIST glslang-1.3.224.tar.gz 3543160 BLAKE2B 5773f884b39f2bd01bf71269e62ee3c0ee36a736249e65b6b205560227698230e708feb4137cffe7b4b30e8756c206e53663bb3942b1d5d528511ac96e8bc407 SHA512 d982fb166d07e8862b8b41d90652fd419a35a0987ff86e21b4cb760594e0c8505d927dcdb089540168ca4b47e4d89d5e150706758ff82b25011f52c1716cfbf4 DIST glslang-1.3.231.tar.gz 3657070 BLAKE2B 3a33854d165e966f339027f73d0f05bf4a2df5998f379529413209eaca2b3e95939ead4bb606e7f65effb7a32e81ce40f4bd7af94b2e6fbad1ed8d809f6a1f19 SHA512 2235c476b03bcb93ac9d0d8a88fdf980f6435086d7ce13a1d9c8ff223880d788a49f35e7392f1b5af9174da7b501a171b80ce4e89bc0c6d609d2b737da982e56 +DIST glslang-1.3.236.tar.gz 3659402 BLAKE2B 7ee37cf00e5d9bd821253d7c907d29422410cf6809f7ec09551b1d0b08e53924add24595a52b241017b69890037ea91660be1ea5645e18cb1e0bba80ad224a5b SHA512 4758b137a31bc6ef999c6b00f4d4a55c0edc879eb09082acbc22a56549a53e61ee5a67e705a40f679f2e25f3a5f1245c14a880e646febc5270e8374809debcb3 diff --git a/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch new file mode 100644 index 000000000000..826e0f6cd856 --- /dev/null +++ b/dev-util/glslang/files/glslang-1.3.236-Install-static-libs.patch @@ -0,0 +1,39 @@ +diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt +index b44cbc73..41f6de93 100644 +--- a/OGLCompilersDLL/CMakeLists.txt ++++ b/OGLCompilersDLL/CMakeLists.txt +@@ -41,7 +41,7 @@ if(WIN32) + source_group("Source" FILES ${SOURCES}) + endif(WIN32) + +-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) ++if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OGLCompiler EXPORT glslang-targets) + + # Backward compatibility +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index a8b14911..57ec1efd 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -203,7 +203,7 @@ endif() + ################################################################################ + if(ENABLE_GLSLANG_INSTALL) + install(TARGETS glslang EXPORT glslang-targets) +- if(NOT BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS) + install(TARGETS MachineIndependent EXPORT glslang-targets) + install(TARGETS GenericCodeGen EXPORT glslang-targets) + +diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt +index 16eb939b..959788dc 100644 +--- a/glslang/OSDependent/Unix/CMakeLists.txt ++++ b/glslang/OSDependent/Unix/CMakeLists.txt +@@ -52,7 +52,7 @@ else() + target_link_libraries(OSDependent Threads::Threads) + endif() + +-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) ++if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OSDependent EXPORT glslang-targets) + + # Backward compatibility diff --git a/dev-util/glslang/glslang-1.3.236.ebuild b/dev-util/glslang/glslang-1.3.236.ebuild new file mode 100644 index 000000000000..6d28840077ab --- /dev/null +++ b/dev-util/glslang/glslang-1.3.236.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" + inherit git-r3 +else + SNAPSHOT_COMMIT="sdk-${PV}.0" + SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" +fi + +DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" +HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" + +PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" ) + +LICENSE="BSD" +SLOT="0/1" + +BDEPEND="${PYTHON_DEPS}" + +# Bug 698850 +RESTRICT="test" + +multilib_src_configure() { + local mycmakeargs=( + -DENABLE_PCH=OFF + ) + cmake_src_configure +} diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild index bf0ec120bc7d..332413a2ac5d 100644 --- a/dev-util/glslang/glslang-9999.ebuild +++ b/dev-util/glslang/glslang-9999.ebuild @@ -19,7 +19,7 @@ fi DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" -PATCHES=( "${FILESDIR}/${PN}-1.3.231-Install-static-libs.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.3.236-Install-static-libs.patch" ) LICENSE="BSD" SLOT="0/1" diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest index e30f3cd3faa0..9eab65e5f541 100644 --- a/dev-util/spirv-headers/Manifest +++ b/dev-util/spirv-headers/Manifest @@ -1,2 +1,2 @@ -DIST spirv-headers-1.3.224.tar.gz 436938 BLAKE2B a0b1ddeb89a20a9ab3fa9dc0af9574a207fba2b7ff0e588678b33e1d773c19d09ce828980f9bd7956a94d1d7b6f1f138b3b9d48b45b7b307c6ebc37962f8f8ee SHA512 fbf776a3ef1db2e7b33067b3f36c1d4189ff3d89b73058374c5020c048931f88b798b84a89209b2bee419afa56fbf9bfe9df6a7387198778b8f23e79597cb057 DIST spirv-headers-1.3.231.tar.gz 439643 BLAKE2B 034f3ff56a36dbd62290980f55ead654af209eb23359b541b6d6de72f8c6dbd67d7e0ca5c64f0e2b2f29077a19b224909c507d373a17b76010862df3222e8a08 SHA512 227d0ae49d3095813cb48b5657858df4caebfc4c711b5d8b1d358f4b37f40b482d4cc7ca4d91cb029c32c8ba6af73221ba0fa02724e795a46dc324f2bc832ff9 +DIST spirv-headers-1.3.236.tar.gz 445166 BLAKE2B cf64f91a3d4368f876fb5834c0fa42d36861519b842fee8789515752dc8cb519266579cec8be26f3e0ea2917884b3bad2644f337adf9184cda139224cbc33240 SHA512 0cd35cbff41b5dc6f78c5129c138c83e099c8bea63eca9dfc8fdf0a19fed015b9d4435fc8e1c8d98997f1c673162b289842e0bbe3ba243f798bc631cd92d85d2 diff --git a/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild index 7a7c95b03c13..d2781b9e4327 100644 --- a/dev-util/spirv-headers/spirv-headers-1.3.224.ebuild +++ b/dev-util/spirv-headers/spirv-headers-1.3.236.ebuild @@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 43ba443255b9..d5f357d0b2f8 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,2 +1,2 @@ -DIST spirv-tools-1.3.224.tar.gz 3033611 BLAKE2B 806c1de27d0c8dac4991dbff321fb8f62647b25b5c87d66b2f924449599e37e85ace876b848afc2e16e42f943f413e0eb759983cce95d826952809974dd9ac7d SHA512 1265db4c15d4d6c6fcb201bc958386e9c910386a82ff595b5d5f84dc03f6ab7f70f67fd59a90ffa92533b02d809305334c06228b869151cbcfdee529e90e7bbc DIST spirv-tools-1.3.231.tar.gz 3044417 BLAKE2B f59afde3ec653e9ed0e8c43814e2ec8e9e379d3872c5f277215948d57ff4dc29374525e42fb5cace08d59c8322c28a9077c3573691242c5aaf4b057865ed7cf1 SHA512 d38ca24b9316e9e878f56e63a08ee40d7cae5aa947546f4d9e789d71b81d0f551fcafacce09d59e9874e284705f55f98e5fdc0acc27ec429fab02f9762e47952 +DIST spirv-tools-1.3.236.tar.gz 3079909 BLAKE2B 97c773b3bee60d3889f9bda49d0b729ce199fab1d6ac211f0bcc9fd0ec2d1d770ed6dccd603cf9beae82541d009fa37bc6d5e1a3a8cae82985c84e3bcfbc4149 SHA512 c70287582cc42eca1a4b81259217f02e4d7003503d43a2aabc24b3c6c50b9081768bdd69ed8a9c8489b1e9a52e9762629c920a96eb2ef43a96e9ead7a1438674 diff --git a/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild index 0a195ede3843..7faa069801fc 100644 --- a/dev-util/spirv-tools/spirv-tools-1.3.224.ebuild +++ b/dev-util/spirv-tools/spirv-tools-1.3.236.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="sdk-${PV}.0" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest index f4f4e18d9d79..538734e330bd 100644 --- a/dev-util/vulkan-headers/Manifest +++ b/dev-util/vulkan-headers/Manifest @@ -1,2 +1,2 @@ -DIST vulkan-headers-1.3.224.tar.gz 1521365 BLAKE2B 08e6e1badb473dfb760e20ee8a60f83cd288f33c4ad136026d2aecf474e1da13008691453886ee092e87cbd2ebbbbcf6bfcdff963276bdc8464521e07551ffa2 SHA512 856d80869267ba9c934400313cca1f9af67c1169974d70d21aed7469a39bf6d1821a95072a81edf8cdd463a62d766d478ee1c28bfc0f17a45b55ebd1634b9984 DIST vulkan-headers-1.3.231.tar.gz 1691630 BLAKE2B 321ad1d472a80ec31e0bbc80e8eb79ef831a385415e216b2ddf83014fcf4c3fda804fb8d085be10b35bd9454ab42cada4bf3d7f25d3d854cd607f7afd8ace906 SHA512 3d460c2e768de02f8bf5ad2963c4c75c4efe03be3d6a5a752c54676307fc2913fd765c7955bee4da42a9f9c64c20b984ffde805c3561b4e97d2b4120049e88ab +DIST vulkan-headers-1.3.236.tar.gz 1764629 BLAKE2B bcab4628979aba6121779f876010cca18308b42b2eea5f7e2c9ab45855914a5ef8f2f217a9853feca461c2fd002ad44696b60ef229c4a2f187aacb7e68ae3dd4 SHA512 f4623a9076896403ceff2c97b02bbda0692535be01dba0a51a1faaa015d9c57c47aaa0960505b94553f24b4efb9ebb84adac5a949d341bbb13898d734e6c722c diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild index 767fada760a0..591287d773f0 100644 --- a/dev-util/vulkan-headers/vulkan-headers-1.3.224.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-1.3.236.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 07e629cf2971..6c6ab95b9c4d 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,2 +1,2 @@ -DIST vulkan-tools-1.3.224.tar.gz 868481 BLAKE2B 464e923f1bd7f72b0c9fab1ba6afa0aa179355f0ebd17c4cd6eeaf84b61efde61c60ce982d0eb081f88a64659dc5676eba77b9782e00df9d9214594806699d98 SHA512 89d2fddaaa710c78020e03b133c947afd79e9bfd1b4de711e5ac8f3e3bd5486e75960dc5a5cb7722ec55a6973233ca8a438e19627b59aaacad1c54040fdd6acb DIST vulkan-tools-1.3.231.tar.gz 876613 BLAKE2B 5c57e5f1f101d79b2bc57a7033a438c470db0d089beaeafa69865f95f14a55c0f71fcc0fb0dea1d898ddcdb80364abb883805e6b60f488a2b5b56bb42cffd4e9 SHA512 b6b1404e3d77e85c5f5d7e111193503e9b2a409a506692a862fcfc01a57d3ee5c6410f47dc7175175b817a1f0e9af62b7a99934c33c68f90babd698aeaeb0b8f +DIST vulkan-tools-1.3.236.tar.gz 880927 BLAKE2B 0d2b885057d063946140489eae4fb08ad8ff3172d23243f746c74090a20990901b18126cfb41efdd38b24f7c2e7dcd62dd3453f0f6130c618632592a4ecb1d31 SHA512 aa3b934ab084a29ae2503be96f0af69c52b693525cd5bd641c85b5a6f79ec3b7a48ba1b08a1a898229f80086bd5fc819b8ad4019835490653edadcf2d086b9f3 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild index 97f8f6db26b9..e8e28db2193f 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.3.224.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.3.236.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi |