From afcb9236a72cf602364c28b9bde6648e4a7f1ca5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jan 2024 02:09:25 +0000 Subject: gentoo auto-resync : 21:01:2024 - 02:09:25 --- dev-util/Manifest.gz | Bin 64308 -> 64299 bytes dev-util/gtk-update-icon-cache/Manifest | 2 + .../gtk-update-icon-cache-3.24.40.ebuild | 30 ++++ dev-util/reuse/Manifest | 2 + dev-util/reuse/reuse-3.0.1.ebuild | 50 ++++++ dev-util/spirv-llvm-translator/Manifest | 3 +- ...v-llvm-translator-17.0.0-intel-capability.patch | 181 +++++++++++++++++++++ .../spirv-llvm-translator-17.0.0-r1.ebuild | 59 +++++++ .../spirv-llvm-translator-17.0.0.ebuild | 57 ------- dev-util/uglifyjs/Manifest | 2 - dev-util/uglifyjs/uglifyjs-3.17.3.ebuild | 40 ----- 11 files changed, 326 insertions(+), 100 deletions(-) create mode 100644 dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.ebuild create mode 100644 dev-util/reuse/reuse-3.0.1.ebuild create mode 100644 dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-intel-capability.patch create mode 100644 dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild delete mode 100644 dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0.ebuild delete mode 100644 dev-util/uglifyjs/uglifyjs-3.17.3.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 00c5f348fb9e..112d68e5fb64 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest index b92086388edf..3de035087be0 100644 --- a/dev-util/gtk-update-icon-cache/Manifest +++ b/dev-util/gtk-update-icon-cache/Manifest @@ -1,7 +1,9 @@ DIST gtk-update-icon-cache-3.24.31.tar.bz2 92491 BLAKE2B 4388e7dfbb89e80bc686d5def74dc363562f944ee29b7355849c42ae391034039e138e1e25f5bfaaade09a6f71a5a94e47f5ad921a51ed6ab0485c0d863045ab SHA512 bc86fe49ce1e6eb3a4657dc536a9106eaeaa1f6682d7f8b61da36a5577add7ada8dd46e81de8274800c9e659ddbc4d4d610d6b691c8e582f35298a7e619c3c0c DIST gtk-update-icon-cache-3.24.38.tar.bz2 92762 BLAKE2B 9edd023da4aa9bfb2540132eff5e5fb4e7ee3a0381e17ea923fcd9c3263d0634cbf7a3c241422dbf2d8c9c12df64219720d5258a5956df95d4cf28ffbeb341cc SHA512 362c87c77a05aef4c670c85865c6bcdfa344f8307b2eadb20f52d9683af253fe0edd27cda209c4501b67da3af852beade1a15c9143d6caaea50b2b48f2b15cab DIST gtk-update-icon-cache-3.24.39.tar.bz2 92389 BLAKE2B 74bbbb7d0e4528a1179400a8c14090ec72f1103306a2819b60d643543de070b445fd837ca85ca97493bbcbce999a009b3dd03ca044bed089177fb5fa4974db4c SHA512 127858788bfa9c3715114c54bc52a2a52c4bebe1423c77227ce5b7165f19f39f794be33df06d9994baaf3b0dc6224fc98b5c1ee8c63554d5c3e2361b96b161da +DIST gtk-update-icon-cache-3.24.40.tar.bz2 92308 BLAKE2B 5ea926db785728bb52d68d4b804d61297239ae2da7fb089b5a76485aa3f690bc6d958e74bb3ac8115e9ae2beb272785c75dc3f39317d5b928a3eb67e929dbc77 SHA512 7eea7b49f4a53b0c04819c7d79885df0b476400e01adb5d704dcba907d8cfaa9f089012e651da7426963eb096b2f58914f95a5067188464b5f92a9d12a0dbc28 EBUILD gtk-update-icon-cache-3.24.31.ebuild 856 BLAKE2B 362f34449273fc9d8ea4ef46fd842a28a80da2c68f9e21459337ba0b931a3a8c368e3398667f38e564eb61d7bc6f1878997dcaf917b1a149e04d1656accb440d SHA512 558ff7a57c3d7b7a60a4c7763aaeb3d75374a2ea48961659afa800138df3e00fb931597ce4e0b7d30ff13475a61c2f246daeebe8e80bf7bbf7387106f397c76f EBUILD gtk-update-icon-cache-3.24.38.ebuild 834 BLAKE2B b364b4b6a5ac59ae87edbbf26b8f47dce272ab1adf511a90ee5bcc93726a544c31c5a330fb6ae45cd68e2142a88733ffd88369d639fb273f342439e09e42a8a8 SHA512 de032d08695509dc174fbd6eb7cf7e6577117f5f414ee8e4b5ae0c4492c3aba84a52345bd08e994dc7ce76c7acc93416337880f8046c1c487ac00aa6120b7755 EBUILD gtk-update-icon-cache-3.24.39.ebuild 833 BLAKE2B f74c3d4de6b2803c499aa611b69e80ecd75754a5c0d51305ac80d6d555ed02b107c49a392df5087581d74e886ef4aef1782fef4783000ce5727d80f44bf0f8f7 SHA512 84307219faa816e96905d92da12bb8054f7a71b277fd50b70ab987c8640a42208568558385c96b7dc3a6c7a597d2f35483b26d2fecbf739d4d8d1af7301de3a5 +EBUILD gtk-update-icon-cache-3.24.40.ebuild 834 BLAKE2B 2d34b538df178d72e6473e28858b07837ad26a9fe58d641c4bb01da0f367f9076b80455796a15d91e64714cdf16792e8137e38964e61b41a9abca2c1550f3f74 SHA512 a972400f60abbbe4509852da88b2d30220b7615a70dfe10939dc408bf59bc21aea9147d847d78429d80c4707f4c00fa856b37176f93254247735ef99de36ca6d MISC metadata.xml 664 BLAKE2B f281b9e20e66222f658bbf7d919fb1de6f95c3582b9c5193e82cecebda5083250ea9677b09d1f30d01a024027780d9d4fac803c6caab6e65c0f1783ee541be44 SHA512 a78afb049c25f2ccf70150d0c8160041c20cee3dc8fcc62e436d951d23c5e0b1a365082b7284d3b0fff95efac2521af1bd9cd81fcc4429b5791cbe8238b1165e diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.ebuild new file mode 100644 index 000000000000..69dbcb73822a --- /dev/null +++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.40.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="GTK update icon cache" +HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache" +SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1+" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +# man page was previously installed by gtk+:3 ebuild +RDEPEND=" + >=dev-libs/glib-2.53.4:2 + >=x11-libs/gdk-pixbuf-2.30:2 + !=dev-python/furo-2023.3.27" \ + ">=dev-python/recommonmark-0.7.1" \ + ">=dev-python/sphinxcontrib-apidoc-0.3.0" \ + ">=dev-python/sphinx-autodoc-typehints-1.12.0" + +python_test() { + cd "${T}" || die + epytest "${S}"/tests +} diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest index 9c881a60066e..392020501023 100644 --- a/dev-util/spirv-llvm-translator/Manifest +++ b/dev-util/spirv-llvm-translator/Manifest @@ -1,9 +1,10 @@ AUX spirv-llvm-translator-16.0.0-ld_library_path.patch 2545 BLAKE2B b0a361f430bf7abd3e3cc24a71b7df5a8feda3bfef0b2832462b68c005356c6437c75f0257b66a3add54d3b1999275ff20cedfe9480c0ae63e78d32427c835f5 SHA512 73a134b774ee772f809b55f3369f6007b0fd19c9ddf566e81387fff5b4498c47dc5e3ada6367e2ccf3498346027543034d75977cb78d365d1c99405b9323b4e6 AUX spirv-llvm-translator-16.0.0-llvm-link-llvm-dylib.patch 1755 BLAKE2B fa0465b04580a68258adc8aa3e73a9d66b75a7c0896e5b646a0e0860400c675a5ea09164d844f72a5a98933095e332c18e480833eb75c76e875f10105ea6dbea SHA512 b5e9a771c1b4b062777f7c7f994224bae54f036c46df0e275d276856d74f778843f6fa1cb77fb714e72b20704d5a22daeb0e83c93fb557d629809eb680f6c3a2 +AUX spirv-llvm-translator-17.0.0-intel-capability.patch 9322 BLAKE2B aa847ba0376fd78cd105b6dce4d785cb060f08a04da0ca52a12f689bbbb49b3eaec579669458e70c2b7f75b446752492e07cdc62c39e57e465532ce3f55b0cb4 SHA512 912ed2ffccb033c5bd7790e7d8e2f63437388375c17d8191a1fc4409daba9e2bd9e00ca3232ff4451f58fc430e040d7837f700f844c0a6fb14bfdccd61829a4a DIST spirv-llvm-translator-15.0.0.tar.gz 1515145 BLAKE2B 1f93b55f8934ce7dbc9416b82f7bd544d16e95be795047e914d0c303ec90965eae03ab3522b3c92d6cffb1fe00bed78a4bb74085d3da21c14b68ad3fbe53113c SHA512 8a6ddddf326dad96c1c5749ebf03e63e6be60592dccd307f7a35be668cec2b4f58c2f089854aeefa37398c3a97dad6bf92a6ceb892da27b5cf9d4ae1aa41dd06 DIST spirv-llvm-translator-16.0.0.tar.gz 1542060 BLAKE2B bee72a776062266e60c5237396434ecba4e4da959ed52292ad08388bdd08d7749fd86cfac5c25af424032a1ba19f59b2d8c7eac0eaf50db6a4945841abe0836f SHA512 0bacacb89aa2b03d1173d1bfbcdd83fdce7441ebc3fff65e14dc5e901fc983861365a54c029b2a65075b6fa45046c30aa7bbad4e6150cf3382e7d050c598de98 DIST spirv-llvm-translator-17.0.0.tar.gz 1601166 BLAKE2B c3e7a78fa55cd13ba61c024e2d3d82c47ac9dbf8c11bcbcf4ddc34a6838fb948885a263fd9af2d0f404b31f4c6e9226c9582e0f65b3220770e1af07cf85f4dac SHA512 ee54e597c678755cb48d677f81184d66616c7be934b570e04f0106e64c15f1cab124177b757f08a7713fa7fce981c74d61304d4554e6d198e6c14c53abf1e81c EBUILD spirv-llvm-translator-15.0.0-r1.ebuild 1160 BLAKE2B e743e55a4c13939b57e12e26d4a2dc5ca567f37560ce53283c1f7a032a31bbc8fd9cdc9c70ebad40fcc1fa412d77517ddbe6a9b4ace15a83007d96f1a1aaf051 SHA512 139b3d01c309b89559e416fa3d19926c545023020b2a284e7ba21f87bf1ba1c27dd57df0a05f7d971f33fd2d061914fc9e838cb9edcce54f1574b5b7bd6aecee EBUILD spirv-llvm-translator-16.0.0-r1.ebuild 1332 BLAKE2B bf8238a55518f2e57dd920938b5742aa9c1d75f06cccc3ab77314b9bf4f86d2645660936bb48f0bd1d6849e8cead4bfdf7636bd200cffa971f868f3559874058 SHA512 5bcccf3be4449e4c764ecede7a0052ce0f2e462f4f9d4d4ffaf6ebefeea9055eb9026f522764d4df97bbbbab89f9645c512047c504d7a9037d42791e50dcf45b -EBUILD spirv-llvm-translator-17.0.0.ebuild 1232 BLAKE2B 0f525d077710a4391dec8882185be865b9bd5f0c05d5f5c55a7d5cba77a0b77b070ff70fb663c9e8eee558e1027332dc7303348d8deeed6cc81e5e60f7b6bda8 SHA512 ff9c010e4fe37396f445bf630e1afc7f7908cbe2db927bdafde5ec166344380f9247100e077575725e38b85ec7d6ad1fdc4c6cc7d7800414099241315c76828e +EBUILD spirv-llvm-translator-17.0.0-r1.ebuild 1295 BLAKE2B bcaee23ef169e5c2f1f1b40405a579f18da309f6e9a4d60768e915e5635e8f00ddc84c6a8e1d97700bc1531d2ca207a0ebf1a0ebf35c004a92adf430124891b6 SHA512 3e68a2ea03f0c2b636860abb0c93dbc7d0a4a6b1f677e20deb6f010e245da0bd58bb49b4eefc26893cbf7d01197bd3bb927c564e9b4c2297a79900faf5e8075b MISC metadata.xml 445 BLAKE2B 11c5d6b6e94192c6fe1aa0cdce39ddb6e3e0aac1462533b5480136c415cc5d82ac77c4930a07a234d0ae987d3409c8dae590f0d5b99139282a89939d0b65cf4e SHA512 e58ae0f86f23be399eff43be9b90006f9be0f699af67f354f2e5434bc0fd43856863763192e0270fd06f7df65e0bdea2bd0b9d43b5b200d8a0399e0230c86e71 diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-intel-capability.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-intel-capability.patch new file mode 100644 index 000000000000..d7839367a2a1 --- /dev/null +++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-intel-capability.patch @@ -0,0 +1,181 @@ +diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVExtensions.inc +index eb98c7f..4e2eb0b 100644 +--- a/include/LLVMSPIRVExtensions.inc ++++ b/include/LLVMSPIRVExtensions.inc +@@ -41,7 +41,7 @@ EXT(SPV_INTEL_variable_length_array) + EXT(SPV_INTEL_fp_fast_math_mode) + EXT(SPV_INTEL_fpga_cluster_attributes) + EXT(SPV_INTEL_loop_fuse) +-EXT(SPV_INTEL_long_constant_composite) ++EXT(SPV_INTEL_long_composites) + EXT(SPV_INTEL_optnone) + EXT(SPV_INTEL_fpga_dsp_control) + EXT(SPV_INTEL_memory_access_aliasing) +diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp +index 807aa0c..0946dbe 100644 +--- a/lib/SPIRV/SPIRVWriter.cpp ++++ b/lib/SPIRV/SPIRVWriter.cpp +@@ -409,11 +409,10 @@ SPIRVType *LLVMToSPIRVBase::transType(Type *T) { + const size_t NumElements = ST->getNumElements(); + size_t SPIRVStructNumElements = NumElements; + // In case number of elements is greater than maximum WordCount and +- // SPV_INTEL_long_constant_composite is not enabled, the error will be ++ // SPV_INTEL_long_composites is not enabled, the error will be + // emitted by validate functionality of SPIRVTypeStruct class. + if (NumElements > MaxNumElements && +- BM->isAllowedToUseExtension( +- ExtensionID::SPV_INTEL_long_constant_composite)) { ++ BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) { + SPIRVStructNumElements = MaxNumElements; + } + +@@ -421,8 +420,7 @@ SPIRVType *LLVMToSPIRVBase::transType(Type *T) { + mapType(T, Struct); + + if (NumElements > MaxNumElements && +- BM->isAllowedToUseExtension( +- ExtensionID::SPV_INTEL_long_constant_composite)) { ++ BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) { + uint64_t NumOfContinuedInstructions = NumElements / MaxNumElements - 1; + for (uint64_t J = 0; J < NumOfContinuedInstructions; J++) { + auto *Continued = BM->addTypeStructContinuedINTEL(MaxNumElements); +@@ -1832,8 +1830,7 @@ LLVMToSPIRVBase::transValueWithoutDecoration(Value *V, SPIRVBasicBlock *BB, + } else + BVarInit = I->second; + } else if (Init && !isa(Init)) { +- if (!BM->isAllowedToUseExtension( +- ExtensionID::SPV_INTEL_long_constant_composite)) { ++ if (!BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) { + if (auto ArrTy = dyn_cast_or_null(Init->getType())) { + // First 3 words of OpConstantComposite encode: 1) word count & + // opcode, 2) Result Type and 3) Result Id. Max length of SPIRV +diff --git a/lib/SPIRV/libSPIRV/SPIRVEntry.h b/lib/SPIRV/libSPIRV/SPIRVEntry.h +index a3c9441..e188099 100644 +--- a/lib/SPIRV/libSPIRV/SPIRVEntry.h ++++ b/lib/SPIRV/libSPIRV/SPIRVEntry.h +@@ -908,11 +908,11 @@ public: + } + + SPIRVCapVec getRequiredCapability() const override { +- return getVec(CapabilityLongConstantCompositeINTEL); ++ return getVec(CapabilityLongCompositesINTEL); + } + + std::optional getRequiredExtension() const override { +- return ExtensionID::SPV_INTEL_long_constant_composite; ++ return ExtensionID::SPV_INTEL_long_composites; + } + + SPIRVWord getNumElements() const { return Elements.size(); } +diff --git a/lib/SPIRV/libSPIRV/SPIRVModule.cpp b/lib/SPIRV/libSPIRV/SPIRVModule.cpp +index 5ac7275..d8d06f6 100644 +--- a/lib/SPIRV/libSPIRV/SPIRVModule.cpp ++++ b/lib/SPIRV/libSPIRV/SPIRVModule.cpp +@@ -1175,10 +1175,10 @@ SPIRVValue *SPIRVModuleImpl::addCompositeConstant( + const int NumElements = Elements.size(); + + // In case number of elements is greater than maximum WordCount and +- // SPV_INTEL_long_constant_composite is not enabled, the error will be emitted ++ // SPV_INTEL_long_composites is not enabled, the error will be emitted + // by validate functionality of SPIRVCompositeConstant class. + if (NumElements <= MaxNumElements || +- !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_constant_composite)) ++ !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) + return addConstant(new SPIRVConstantComposite(this, Ty, getId(), Elements)); + + auto Start = Elements.begin(); +@@ -1213,7 +1213,7 @@ SPIRVValue *SPIRVModuleImpl::addSpecConstantComposite( + // SPV_INTEL_long_constant_composite is not enabled, the error will be emitted + // by validate functionality of SPIRVSpecConstantComposite class. + if (NumElements <= MaxNumElements || +- !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_constant_composite)) ++ !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) + return addConstant( + new SPIRVSpecConstantComposite(this, Ty, getId(), Elements)); + +diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h +index d450a43..a2a0ddb 100644 +--- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h ++++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h +@@ -610,7 +610,7 @@ template <> inline void SPIRVMap::init() { + add(CapabilityGroupNonUniformRotateKHR, "GroupNonUniformRotateKHR"); + add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT"); + add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT"); +- add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL"); ++ add(CapabilityLongCompositesINTEL, "LongCompositesINTEL"); + add(CapabilityOptNoneINTEL, "OptNoneINTEL"); + add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT"); + add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL"); +diff --git a/test/SpecConstants/long-spec-const-composite.ll b/test/SpecConstants/long-spec-const-composite.ll +index a45c895..e943296 100644 +--- a/test/SpecConstants/long-spec-const-composite.ll ++++ b/test/SpecConstants/long-spec-const-composite.ll +@@ -1,5 +1,5 @@ + ; RUN: llvm-as %s -o %t.bc +-; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite %t.bc -o %t.spv ++; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites %t.bc -o %t.spv + ; RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV + ; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc + ; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM +@@ -11,8 +11,8 @@ + target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64" + target triple = "spir64-unknown-unknown" + +-; CHECK-SPIRV: Capability LongConstantCompositeINTEL +-; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite" ++; CHECK-SPIRV: Capability LongCompositesINTEL ++; CHECK-SPIRV: Extension "SPV_INTEL_long_composites" + ; CHECK-SPIRV-DAG: Decorate [[First:[0-9]+]] SpecId 0 + ; CHECK-SPIRV-DAG: Decorate [[Last:[0-9]+]] SpecId 65548 + ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8 +diff --git a/test/long-constant-array.ll b/test/long-constant-array.ll +index 415a723..cfef59d 100644 +--- a/test/long-constant-array.ll ++++ b/test/long-constant-array.ll +@@ -1,16 +1,16 @@ + ; RUN: llvm-as %s -o %t.bc + ; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR + +-; Check that everything is fine if SPV_INTEL_long_constant_composite is enabled +-; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite %t.bc -o %t.spv ++; Check that everything is fine if SPV_INTEL_long_composites is enabled ++; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites %t.bc -o %t.spv + ; RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV + ; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc + ; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM + ; TODO: run validator once it supports the extension + ; RUNx: spirv-val %t.spv + +-; CHECK-SPIRV: Capability LongConstantCompositeINTEL +-; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite" ++; CHECK-SPIRV: Capability LongCompositesINTEL ++; CHECK-SPIRV: Extension "SPV_INTEL_long_composites" + ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8 + ; CHECK-SPIRV: Constant {{[0-9]+}} [[ArrSize:[0-9]+]] 78000 + ; CHECK-SPIRV: TypeArray [[TArr:[0-9]+]] [[TInt]] [[ArrSize]] +diff --git a/test/long-type-struct.ll b/test/long-type-struct.ll +index 9b83f62..de6352a 100644 +--- a/test/long-type-struct.ll ++++ b/test/long-type-struct.ll +@@ -1,8 +1,8 @@ + ; RUN: llvm-as %s -o %t.bc +-; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite %t.bc -o %t.spv ++; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites %t.bc -o %t.spv + ; RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV + ; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc +-; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite -spirv-text %t.rev.bc -o %t2.spt ++; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites -spirv-text %t.rev.bc -o %t2.spt + ; RUN: FileCheck --input-file=%t2.spt %s --check-prefix=CHECK-SPIRV + ; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM + ; TODO: run validator once it supports the extension +@@ -10,8 +10,8 @@ + + ; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR + +-; CHECK-SPIRV: Capability LongConstantCompositeINTEL +-; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite" ++; CHECK-SPIRV: Capability LongCompositesINTEL ++; CHECK-SPIRV: Extension "SPV_INTEL_long_composites" + ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8 + ; CHECK-SPIRV: TypePointer [[TIntPtr:[0-9]+]] 8 [[TInt]] + ; CHECK-SPIRV: TypeArray [[TArr:[0-9]+]] diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild new file mode 100644 index 000000000000..31e879a61af7 --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT="17" +MY_PN="SPIRV-LLVM-Translator" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic llvm multiprocessing + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/spirv-tools + sys-devel/llvm:${SLOT}= +" +DEPEND="${RDEPEND} + >=dev-util/spirv-headers-1.3.261 +" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-python/lit + sys-devel/clang:${SLOT} + ) +" + +PATCHES=( "${FILESDIR}/${PN}-17.0.0-intel-capability.patch" ) + +src_prepare() { + append-flags -fPIC + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv" + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + -Wno-dev + ) + + cmake_src_configure +} + +src_test() { + lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die +} diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0.ebuild deleted file mode 100644 index 5f258190d543..000000000000 --- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT="17" -MY_PN="SPIRV-LLVM-Translator" -MY_P="${MY_PN}-${PV}" - -inherit cmake flag-o-matic llvm multiprocessing - -DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" -SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="UoI-NCSA" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-util/spirv-tools - sys-devel/llvm:${SLOT}= -" -DEPEND="${RDEPEND} - >=dev-util/spirv-headers-1.3.261 -" -BDEPEND=" - virtual/pkgconfig - test? ( - dev-python/lit - sys-devel/clang:${SLOT} - ) -" - -src_prepare() { - append-flags -fPIC - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCCACHE_ALLOWED="OFF" - -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv" - -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") - -Wno-dev - ) - - cmake_src_configure -} - -src_test() { - lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die -} diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest index 9cfac9b04bb2..7591500604f2 100644 --- a/dev-util/uglifyjs/Manifest +++ b/dev-util/uglifyjs/Manifest @@ -1,7 +1,5 @@ DIST uglifyjs-3.16.1.tar.gz 519333 BLAKE2B 6e4978aa776256be575ea91fd6cd584fe8885886300db1b77cc889af5112615175cd40d527ac6356d653e60ab3ed404670355f80e0391da538313b494bb1104b SHA512 e0ef3e2b82cb6f211120b1d66132b5b5b13bc48dd946d7e7bbeddd1bee16330c9a3541d07f51b6eddf9036b0e520a527849ddc3cf6de467331b42f1fba37e66e -DIST uglifyjs-3.17.3.tar.gz 538773 BLAKE2B a54289f633906dcb399ca8175a43e9c4c704a78fab04e1821b2f5b056d21f1f5845f7ceab502cccad29db5255d7ba26f80a2b9ac34422fa43bfbf7ce27884010 SHA512 bd2b8460a2f2f915a44c68b14d53d37cf2bd644325705f895988a0afc13a31815e215195c1de01b3eeefe19ff350249b7d3907ab0c9672f5966c10f9ee99c0ca DIST uglifyjs-3.17.4.tar.gz 539533 BLAKE2B e6939d0c2127d4a3a13e0b3d1a8942b4241d01e72ab3813dafece63728c1250facf57cad36b1c14be8d799da99ca7f9b06b9d2dbb4afa87d6d9e1d1c96840b4a SHA512 1382332a65a5d3a093f701508d0e4a12b2d08a94d35f94d405f5357a2dd8ba8d3c96ee4389f3c2f4bc53c6b97cd79be81c84964e1e0daa5e5529909a676c2b70 EBUILD uglifyjs-3.16.1.ebuild 774 BLAKE2B 0dac93a1cdeaa2be8709cd6166296e30ef54be796913da4d66dd6e958be327f0adefe06f1da2d3ee1e8bffb0c5317a43bd6a49f1e1089042f5c87795ec9dabe5 SHA512 bc55f4cb8b52c17767e4a6608d654ebb1d4ad002b72b1e0e1dcca0e9928e30f502c9a0a1e34087500349e5764f821bdeab1c642585df9495173295756e292e14 -EBUILD uglifyjs-3.17.3.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5 EBUILD uglifyjs-3.17.4.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5 MISC metadata.xml 328 BLAKE2B 74d4d808f158dcb49e996da74b67d65fe12956d7486b91941b03f3bb237d7d13387ac629b9689ebce8bd0580b0ce24d359a788911134fef6f006546c5365f2d8 SHA512 3db3efc0f0f5f0f3c7d453d4edae27d0ddfc62aa7cb778684d58460cfd55187fdd90c06bfb2629fb0d84874ff378dbccbc7ef182a10e35fd4b85991c5777a213 diff --git a/dev-util/uglifyjs/uglifyjs-3.17.3.ebuild b/dev-util/uglifyjs/uglifyjs-3.17.3.ebuild deleted file mode 100644 index 1a44c1a32320..000000000000 --- a/dev-util/uglifyjs/uglifyjs-3.17.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="UglifyJS" -DESCRIPTION="JavaScript parser, minifier, compressor and beautifier toolkit" -HOMEPAGE="https://lisperator.net/uglifyjs/" -SRC_URI="https://github.com/mishoo/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="net-libs/nodejs[npm]" -RDEPEND="net-libs/nodejs" - -S="${WORKDIR}/${MY_PN}-${PV}" - -NPM_FLAGS=( - --audit false - --color false - --foreground-scripts - --global - --offline - --progress false - --save false - --verbose -) - -src_compile() { - npm "${NPM_FLAGS[@]}" pack || die -} - -src_install() { - npm "${NPM_FLAGS[@]}" \ - --prefix "${ED}"/usr \ - install \ - uglify-js-${PV}.tgz || die -} -- cgit v1.2.3