From 8ea6e43d2f65acbfda614dbd4635823d7605b6d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 18 May 2023 10:12:16 +0100 Subject: gentoo auto-resync : 18:05:2023 - 10:12:16 --- dev-libs/c-blosc2/Manifest | 3 +- dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild | 65 ++++++++++++++++++++++ dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild | 60 -------------------- .../c-blosc2/files/c-blosc2-2.9.1-header.patch | 26 +++++++++ 4 files changed, 93 insertions(+), 61 deletions(-) create mode 100644 dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild delete mode 100644 dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild create mode 100644 dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch (limited to 'dev-libs/c-blosc2') diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index af424bf7dee8..d3ae8fed85b7 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -1,5 +1,6 @@ +AUX c-blosc2-2.9.1-header.patch 882 BLAKE2B e1537c56f56aba3ba7012c1bad8460514e4d41cccf73394986fc4389b431d51934380d0ce674922c5c3c6f7c43f626ee2dce41ed7dca0f72aef52fb8cba6f735 SHA512 645c6e3ee1178b292341eb6758e9c49377ad1571cb222dd270eb88c8664ed3c290c6295733c265a3397008899f67b407a0af330a65d0e9f86fdf5c2cc5ba1842 DIST c-blosc2-2.6.1.gh.tar.gz 2365300 BLAKE2B a3fdc8798eb70e97791b7b708ef872142d38b9c4fdb8efc6d5da2010149fa61f4115f27af630a43edd5f351cb8693fbb79457f19ccf1a518f057902b93196b3d SHA512 9f5daa59d5191784ee91deb18ed15a3b36504b05061ca8b1532eaf8e402c793944059894b277843e8da19f00af05615e0865d9fdb80decd83aa07867b0e661a0 DIST c-blosc2-2.9.1.gh.tar.gz 2793299 BLAKE2B 1853611566f081f5c6236ade1882b07aa6d596f65bb303823f418faaf0e971c1850e3e78ca501650880d4611110200c302896e81a5b13cdf05bc43c81b81dd3a SHA512 9430c026f9d7a98e38915e3d308402989073aa6fa1e8e1d5b9bdb155c70c5cc24ca118cdb5b3584647f72ae80a13be0a8467250af7ef336a1ac72eb8ec8a67f5 EBUILD c-blosc2-2.6.1.ebuild 1391 BLAKE2B 2b44bfc10ec112298f66cbf8d681ff7396b37378c021d4c43492c6ec02a5483c3e04971b9c4d8aa21ec6fea0b96cefc7918c71dfef1381ef0daab64e2c400afc SHA512 bd4aee3783cc1fac740df283629054fdb83a5c98406b7f39efb9aff412aac0387a1adfbed9c3506e66bf5d826df2cddd89350a7b54fc15f8af91aeff53841fac -EBUILD c-blosc2-2.9.1.ebuild 1394 BLAKE2B 8a147114436734249aee396ab2f0e0a57e84d741fa104baf21b88bd79daae253018e19713628eaa4caae86fa74c0dee7e3e9f9efd6ff14bae1f11ca2d4ae6778 SHA512 232708c46657997be859a9a1f545fc4235165a371633ae09dd4aac9e4a87bfab706741471904ff3e9537b4917c9ccb29fd1fb9b039667e12dd1bd8f83b8a01fa +EBUILD c-blosc2-2.9.1-r1.ebuild 1474 BLAKE2B 72fc3e552d5a38bac4fe8e0b81ef8295dda1c1de8a470a8652a745e42f480b5d642856ea9e242a656ed4d8a5591e4e65f7f51106ea2ce988b6cb10238cd07afa SHA512 bbfe7a2bdd3a7effe2ba2b6b30cdd0d7d016f7b1829373315d8b522b53f4d9b21c04c07a3b80d82464ddb2174b48b26543b9c5aa87b7d883d2231bb8f84bec31 MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0 diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild new file mode 100644 index 000000000000..842752b8909c --- /dev/null +++ b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Blocking, shuffling and lossless compression library" +HOMEPAGE=" + https://www.blosc.org/c-blosc2/c-blosc2.html + https://github.com/Blosc/c-blosc2/ +" +SRC_URI=" + https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="BSD" +SLOT="0/1" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test zlib zstd" +REQUIRED_USE="test? ( zlib zstd )" +RESTRICT="!test? ( test )" + +DEPEND=" + >=app-arch/lz4-1.7.5:= + zlib? ( sys-libs/zlib:= ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND=" + ${DEPEND} +" + +PATCHES=( + # https://bugs.gentoo.org/906644 + "${FILESDIR}/${P}-header.patch" +) + +src_configure() { + # remove bundled libs (just in case) + rm -rf internal-complibs || die + + local mycmakeargs=( + -DBUILD_STATIC=OFF + -DBUILD_TESTS=$(usex test) + -DBUILD_BENCHMARKS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_FUZZERS=OFF + -DDEACTIVATE_ZLIB=$(usex !zlib) + -DDEACTIVATE_ZSTD=$(usex !zstd) + -DPREFER_EXTERNAL_LZ4=ON + -DPREFER_EXTERNAL_ZLIB=ON + -DPREFER_EXTERNAL_ZSTD=ON + + # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults + # from applying, https://github.com/Blosc/c-blosc2/issues/433 + -DCMAKE_C_FLAGS="${CFLAGS}" + ) + cmake_src_configure +} + +src_test() { + # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 + MAKEOPTS=-j1 cmake_src_test +} diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild deleted file mode 100644 index 1a7c40ef0f55..000000000000 --- a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Blocking, shuffling and lossless compression library" -HOMEPAGE=" - https://www.blosc.org/c-blosc2/c-blosc2.html - https://github.com/Blosc/c-blosc2/ -" -SRC_URI=" - https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test zlib zstd" -REQUIRED_USE="test? ( zlib zstd )" -RESTRICT="!test? ( test )" - -DEPEND=" - >=app-arch/lz4-1.7.5:= - zlib? ( sys-libs/zlib:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} -" - -src_configure() { - # remove bundled libs (just in case) - rm -rf internal-complibs || die - - local mycmakeargs=( - -DBUILD_STATIC=OFF - -DBUILD_TESTS=$(usex test) - -DBUILD_BENCHMARKS=OFF - -DBUILD_EXAMPLES=OFF - -DBUILD_FUZZERS=OFF - -DDEACTIVATE_ZLIB=$(usex !zlib) - -DDEACTIVATE_ZSTD=$(usex !zstd) - -DPREFER_EXTERNAL_LZ4=ON - -DPREFER_EXTERNAL_ZLIB=ON - -DPREFER_EXTERNAL_ZSTD=ON - - # upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults - # from applying, https://github.com/Blosc/c-blosc2/issues/433 - -DCMAKE_C_FLAGS="${CFLAGS}" - ) - cmake_src_configure -} - -src_test() { - # Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432 - MAKEOPTS=-j1 cmake_src_test -} diff --git a/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch new file mode 100644 index 000000000000..5ec28e936de7 --- /dev/null +++ b/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch @@ -0,0 +1,26 @@ +From 04035a3759b8c100e4808918e44a3eaef4969875 Mon Sep 17 00:00:00 2001 +From: Dimitri Papadopoulos + <3234522+DimitriPapadopoulos@users.noreply.github.com> +Date: Sat, 13 May 2023 21:40:32 +0200 +Subject: [PATCH] BLOSC_STUNE is not defined in c-blosc + +Therefore, do not guard it with BLOSC_H, the include guard of blosc.h +from previous version c-blosc. +--- + include/blosc2.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/blosc2.h b/include/blosc2.h +index dc6d1fc7..ef035f07 100644 +--- a/include/blosc2.h ++++ b/include/blosc2.h +@@ -211,9 +211,7 @@ enum { + * @brief Codes for the different tunes shipped with Blosc + */ + enum { +-#ifndef BLOSC_H + BLOSC_STUNE = 0, +-#endif // BLOSC_H + BLOSC_LAST_TUNE = 1, + //!< Determine the last tune defined by Blosc. + BLOSC_LAST_REGISTERED_TUNE = BLOSC2_GLOBAL_REGISTERED_TUNE_START + BLOSC2_GLOBAL_REGISTERED_TUNES - 1, -- cgit v1.2.3