[gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc2/, dev-libs/c-blosc2/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc2/, dev-libs/c-blosc2/files/
@ 2023-05-18  3:14 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-05-18  3:14 UTC (permalink / raw
  To: gentoo-commits

commit:     2d98ac7635f457e5f1c74fa9f7cd8227cb059c35
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 02:50:40 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 18 03:14:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d98ac76

dev-libs/c-blosc2: Backport a header fix

Closes: https://bugs.gentoo.org/906644
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...losc2-2.9.1.ebuild => c-blosc2-2.9.1-r1.ebuild} |  5 +++++
 .../c-blosc2/files/c-blosc2-2.9.1-header.patch     | 26 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
similarity index 94%
rename from dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild
rename to dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
index 1a7c40ef0f55..842752b8909c 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.9.1.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
@@ -31,6 +31,11 @@ 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

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,


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc2/, dev-libs/c-blosc2/files/
@ 2023-08-21  6:29 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-08-21  6:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ef513ae9a7ed27ce30f5c5567fd13900a447c823
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  4 16:16:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 06:28:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef513ae9

dev-libs/c-blosc2: disable unaligned access

Causes SIGBUS on armv7 (at least in jiji's arm32-on-arm64 chroot) in Pandas test
suite. Unaligned access is UB anyway.

Bug: https://bugs.gentoo.org/911619
Bug: https://bugs.gentoo.org/911660
Bug: https://bugs.gentoo.org/911102
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...sc2-2.10.2.ebuild => c-blosc2-2.10.2-r1.ebuild} |  4 +++
 ...losc2-2.9.3.ebuild => c-blosc2-2.9.3-r1.ebuild} |  4 +++
 .../files/c-blosc2-2.9.3-no-unaligned.patch        | 32 ++++++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/dev-libs/c-blosc2/c-blosc2-2.10.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.10.2-r1.ebuild
similarity index 96%
rename from dev-libs/c-blosc2/c-blosc2-2.10.2.ebuild
rename to dev-libs/c-blosc2/c-blosc2-2.10.2-r1.ebuild
index 88d0b21a8768..8233d6b96755 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.10.2.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.10.2-r1.ebuild
@@ -31,6 +31,10 @@ RDEPEND="
 	${DEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.3-no-unaligned.patch
+)
+
 src_configure() {
 	# remove bundled libs (just in case)
 	rm -rf internal-complibs || die

diff --git a/dev-libs/c-blosc2/c-blosc2-2.9.3.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.3-r1.ebuild
similarity index 95%
rename from dev-libs/c-blosc2/c-blosc2-2.9.3.ebuild
rename to dev-libs/c-blosc2/c-blosc2-2.9.3-r1.ebuild
index 689aaad308a6..e986007f2d29 100644
--- a/dev-libs/c-blosc2/c-blosc2-2.9.3.ebuild
+++ b/dev-libs/c-blosc2/c-blosc2-2.9.3-r1.ebuild
@@ -31,6 +31,10 @@ RDEPEND="
 	${DEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.3-no-unaligned.patch
+)
+
 src_configure() {
 	# remove bundled libs (just in case)
 	rm -rf internal-complibs || die

diff --git a/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch
new file mode 100644
index 000000000000..5e6ca9c9ee9a
--- /dev/null
+++ b/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch
@@ -0,0 +1,32 @@
+Causes SIGBUS on armv7 (at least in jiji's arm32-on-arm64 chroot) in Pandas test
+suite. Unaligned access is UB anyway.
+--- a/include/blosc2/blosc2-common.h
++++ b/include/blosc2/blosc2-common.h
+@@ -47,27 +47,6 @@
+  */
+ #if !defined(BLOSC_STRICT_ALIGN)
+ #define BLOSC_STRICT_ALIGN
+-#if defined(__i386__) || defined(__386) || defined (__amd64)  /* GNU C, Sun Studio */
+-#undef BLOSC_STRICT_ALIGN
+-#elif defined(__i486__) || defined(__i586__) || defined(__i686__)  /* GNU C */
+-#undef BLOSC_STRICT_ALIGN
+-#elif defined(_M_IX86) || defined(_M_X64)   /* Intel, MSVC */
+-#undef BLOSC_STRICT_ALIGN
+-#elif defined(__386)
+-#undef BLOSC_STRICT_ALIGN
+-#elif defined(_X86_) /* MinGW */
+-#undef BLOSC_STRICT_ALIGN
+-#elif defined(__I86__) /* Digital Mars */
+-#undef BLOSC_STRICT_ALIGN
+-/* Modern ARM systems (like ARM64) should support unaligned access
+-   quite efficiently. */
+-#elif defined(__ARM_FEATURE_UNALIGNED)   /* ARM, GNU C */
+-#undef BLOSC_STRICT_ALIGN
+-#elif defined(_ARCH_PPC) || defined(__PPC__)
+-/* Modern PowerPC systems (like POWER8) should support unaligned access
+-   quite efficiently. */
+-#undef BLOSC_STRICT_ALIGN
+-#endif
+ #endif
+ 
+ #if defined(__SSE2__)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc2/, dev-libs/c-blosc2/files/
@ 2023-09-02 14:11 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-09-02 14:11 UTC (permalink / raw
  To: gentoo-commits

commit:     1ff4fa3cb78226396ad5503baedb350ee4c9b2df
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 14:07:39 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 14:10:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff4fa3c

dev-libs/c-blosc2: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/c-blosc2/Manifest                         |  5 --
 dev-libs/c-blosc2/c-blosc2-2.10.0.ebuild           | 60 --------------------
 dev-libs/c-blosc2/c-blosc2-2.10.1.ebuild           | 64 ---------------------
 dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild            | 60 --------------------
 dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild         | 65 ----------------------
 dev-libs/c-blosc2/c-blosc2-2.9.2.ebuild            | 60 --------------------
 .../c-blosc2/files/c-blosc2-2.9.1-header.patch     | 26 ---------
 7 files changed, 340 deletions(-)

diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
index e228ae422384..3ce3b9a475a3 100644
--- a/dev-libs/c-blosc2/Manifest
+++ b/dev-libs/c-blosc2/Manifest
@@ -1,7 +1,2 @@
-DIST c-blosc2-2.10.0.gh.tar.gz 3140563 BLAKE2B c3469b38196efab099ee117b74e864de06ed9619e53b8a895ac761876bafff944d1315e1a51064b6b92198a22691018e0ce25ee4485d2e36b7017ec642224b6d SHA512 1d7588cc8e1ffbb4cee4549e0f913e0671e02b405c918eb0bebde7a6af35005c1e7c6c95142cd80abd7175542e9f91e8454fd88262f668c3a24982b69f1644fa
-DIST c-blosc2-2.10.1.gh.tar.gz 3142877 BLAKE2B de7e3479ff6255da235c08926563b2236de086edba51a2949de3537fd7c224de1007053747867ebe8aa6ce70a969816271850b695bc8168747639514fea8b6de SHA512 1c1d1db77f2091059e0c6cc6edb578d29d6970e319acd21eb9fb6b0610c3e206eee2c464c9690cd609a5e53da17eb27cfd1469f6a531b0d5f9a9d8a5c9f00a92
 DIST c-blosc2-2.10.2.gh.tar.gz 3142525 BLAKE2B 1bd3f4c10c9c2b9d228499d41e5f3ea2c751f6271946de0857487ef71ec32bfe2d450aaff39d27f14b1b2f4dbec4b4e545f26d99a7494e39950627f55664fe40 SHA512 2e4344a6fb905fc7c8e3de2db3a59469b2ea27d2f17777e476d08247cb3793880f3c5db786857c0afd33371868e4fcd713b6913d5502424821f20c9870e1e4bb
-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
-DIST c-blosc2-2.9.2.gh.tar.gz 2790821 BLAKE2B c47c59b7db8c3fbe04e6f63a2474ad325d7c59f5508c42dfc005a690a3020c6479927d5884f909ad106ff4c2aa04523786133a407ec8a54ee92887b24a214428 SHA512 f44346bf3ce8824dbe23d33b688d6b2063406011c066cc14ea3319537c17ecc5c1250c30d77e50696aad9932e0dd10fc95ab4f2c295208808446525636314522
 DIST c-blosc2-2.9.3.gh.tar.gz 3139809 BLAKE2B 740bfbc3cd1416d0863f6939ba4b5e27b2ae7947a407838e4061ef42c005ee255abdd8bbcbecb25123b7ff50ece62493ad3b5a84d4e02a65e1791c9007cf5b5d SHA512 30e792ba982d66936813c2dc56f85ee17a1a73ec475c15d6448cc1f5ac88f917f7a823e4b7b59c1271b1a9ee1ddd1f15fb74d6c0fa61d653b16d1a05209dfde4

diff --git a/dev-libs/c-blosc2/c-blosc2-2.10.0.ebuild b/dev-libs/c-blosc2/c-blosc2-2.10.0.ebuild
deleted file mode 100644
index 1a7c40ef0f55..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.10.0.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/c-blosc2-2.10.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.10.1.ebuild
deleted file mode 100644
index cf19b9c403dd..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.10.1.ebuild
+++ /dev/null
@@ -1,64 +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
-
-		# force regular zlib, zlib-ng support is broken anyway
-		# https://bugs.gentoo.org/911566
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=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.6.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild
deleted file mode 100644
index e5125d6eca4c..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.6.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/c-blosc2-2.9.1-r1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
deleted file mode 100644
index 842752b8909c..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,65 +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}
-"
-
-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.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.9.2.ebuild
deleted file mode 100644
index 1a7c40ef0f55..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.9.2.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
deleted file mode 100644
index 5ec28e936de7..000000000000
--- a/dev-libs/c-blosc2/files/c-blosc2-2.9.1-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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,


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc2/, dev-libs/c-blosc2/files/
@ 2024-06-21 16:59 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2024-06-21 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     24866c4e0926901dda440a224ab34ed5ce119833
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 15:40:47 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 16:59:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24866c4e

dev-libs/c-blosc2: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/c-blosc2/Manifest                         |  4 --
 dev-libs/c-blosc2/c-blosc2-2.10.5.ebuild           | 67 ----------------------
 dev-libs/c-blosc2/c-blosc2-2.13.2.ebuild           | 63 --------------------
 dev-libs/c-blosc2/c-blosc2-2.14.0.ebuild           | 63 --------------------
 dev-libs/c-blosc2/c-blosc2-2.14.1.ebuild           | 63 --------------------
 .../files/c-blosc2-2.9.3-no-unaligned.patch        | 32 -----------
 6 files changed, 292 deletions(-)

diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
index 48335995ab69..ef422d19c29a 100644
--- a/dev-libs/c-blosc2/Manifest
+++ b/dev-libs/c-blosc2/Manifest
@@ -1,5 +1 @@
-DIST c-blosc2-2.10.5.gh.tar.gz 3144174 BLAKE2B a680def405f2383636185ab1b71a42e042dd0c71025bfc898b48f148f4a6bf27cbd38f29512caae9ff5b58f70cb35289b609c84b132c0795915d1fe6c71b3feb SHA512 bc004fe2132a8e36963437d5279506c2f79dcbf11ee1a768954c20d1265d120dc85e67952b567e716105c5716922da8ee8cffd0a5d44bc67093a4cab3075e322
-DIST c-blosc2-2.13.2.gh.tar.gz 3152011 BLAKE2B 1bf9826e6eb1babacb0fe6f7f90c5ca6617cf1cf4df269af95c94e175d0a1cc2015905b9cf6a48107f0b10431feb646ec5de095e00dc29f3bab8d53564e7d4fe SHA512 441df73dca3fe210b0df68bfc3da037a05393f80044f5e2c816000a244ade4cf8e223b2fce2127c034c27a35f2742b05fe06c08861e93c02bc7598d5a4b8a917
-DIST c-blosc2-2.14.0.gh.tar.gz 3155739 BLAKE2B 2607ea3e842fce469f04d31b2d92503f270409e952968e7217ca87ebccd64b25aa38282743f7fdb3ba199f71acc246f7ef9fa0b24e33417e6bdf69a68aba62a6 SHA512 74f0df844c722248a1743fa6ce4b20ae526831f29cc66baf6f487e743c9fc65713e089ebab63ebcf43ac7b1201e82f9c7049dfb68cff17116de93f36d9482557
-DIST c-blosc2-2.14.1.gh.tar.gz 3155751 BLAKE2B 6967914214603af724ab523e91cef2c720018c75002402a5d3ac1bf064af27069ee12db80f7ac37ad5136a30a280b37b829fda7c03b87e2a027599d235ed6021 SHA512 952e2331be4747005e82cabdda310f96031dcfe54f9fe92f68ff2efb42aa8dfb3aa9d6c3ab9ce9f94ea52c34322047447db98d530a58eddc9fca6f62872fd272
 DIST c-blosc2-2.14.4.gh.tar.gz 3155712 BLAKE2B 1af67562150b7b0b87fa076114bab0cccfbd12417c13dfae4fbd40e15531ed54f3a315588ac81b15e137f0272ac6c610c48205608be0b9e98ce44218dd200a27 SHA512 4173c7b0cf4f0399a3d36c987d265aacf766f54dc871ca87ebd98d4ecd4fbd24d4b923ffb2d0b59bda359e1fbba29f088d78816d375904b1945e8c40c29dccce

diff --git a/dev-libs/c-blosc2/c-blosc2-2.10.5.ebuild b/dev-libs/c-blosc2/c-blosc2-2.10.5.ebuild
deleted file mode 100644
index be1da45c49b8..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.10.5.ebuild
+++ /dev/null
@@ -1,67 +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}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.3-no-unaligned.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
-
-		# force regular zlib, at least for  the time being
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=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.13.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.13.2.ebuild
deleted file mode 100644
index 1da262c2e9ea..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.13.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 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 ~loong ~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
-
-		# force regular zlib, at least for  the time being
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=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.14.0.ebuild b/dev-libs/c-blosc2/c-blosc2-2.14.0.ebuild
deleted file mode 100644
index 83ec7fc645ac..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.14.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 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 ~loong ~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
-
-		# force regular zlib, at least for  the time being
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=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.14.1.ebuild b/dev-libs/c-blosc2/c-blosc2-2.14.1.ebuild
deleted file mode 100644
index 83ec7fc645ac..000000000000
--- a/dev-libs/c-blosc2/c-blosc2-2.14.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 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 ~loong ~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
-
-		# force regular zlib, at least for  the time being
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=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.3-no-unaligned.patch b/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch
deleted file mode 100644
index 5e6ca9c9ee9a..000000000000
--- a/dev-libs/c-blosc2/files/c-blosc2-2.9.3-no-unaligned.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Causes SIGBUS on armv7 (at least in jiji's arm32-on-arm64 chroot) in Pandas test
-suite. Unaligned access is UB anyway.
---- a/include/blosc2/blosc2-common.h
-+++ b/include/blosc2/blosc2-common.h
-@@ -47,27 +47,6 @@
-  */
- #if !defined(BLOSC_STRICT_ALIGN)
- #define BLOSC_STRICT_ALIGN
--#if defined(__i386__) || defined(__386) || defined (__amd64)  /* GNU C, Sun Studio */
--#undef BLOSC_STRICT_ALIGN
--#elif defined(__i486__) || defined(__i586__) || defined(__i686__)  /* GNU C */
--#undef BLOSC_STRICT_ALIGN
--#elif defined(_M_IX86) || defined(_M_X64)   /* Intel, MSVC */
--#undef BLOSC_STRICT_ALIGN
--#elif defined(__386)
--#undef BLOSC_STRICT_ALIGN
--#elif defined(_X86_) /* MinGW */
--#undef BLOSC_STRICT_ALIGN
--#elif defined(__I86__) /* Digital Mars */
--#undef BLOSC_STRICT_ALIGN
--/* Modern ARM systems (like ARM64) should support unaligned access
--   quite efficiently. */
--#elif defined(__ARM_FEATURE_UNALIGNED)   /* ARM, GNU C */
--#undef BLOSC_STRICT_ALIGN
--#elif defined(_ARCH_PPC) || defined(__PPC__)
--/* Modern PowerPC systems (like POWER8) should support unaligned access
--   quite efficiently. */
--#undef BLOSC_STRICT_ALIGN
--#endif
- #endif
- 
- #if defined(__SSE2__)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-06-21 17:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-18  3:14 [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc2/, dev-libs/c-blosc2/files/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2023-08-21  6:29 Sam James
2023-09-02 14:11 Michał Górny
2024-06-21 16:59 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox