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

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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc/, dev-libs/c-blosc/files/
@ 2016-10-25  0:08 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-10-25  0:08 UTC (permalink / raw
  To: gentoo-commits

commit:     a183cd2a914e830b91c97445f32ffd7d9a073536
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 23:38:39 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 00:08:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a183cd2a

dev-libs/c-blosc: Version bump to 1.11.1

* EAPI=6

Package-Manager: portage-2.3.2

 dev-libs/c-blosc/Manifest                          |  1 +
 dev-libs/c-blosc/c-blosc-1.11.1.ebuild             | 55 ++++++++++++++++++++++
 .../files/c-blosc-1.11.1-fix-build-system.patch    | 30 ++++++++++++
 dev-libs/c-blosc/metadata.xml                      | 37 ++++++++-------
 4 files changed, 105 insertions(+), 18 deletions(-)

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 8d8c475..2e4943a 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,3 +1,4 @@
+DIST c-blosc-1.11.1.tar.gz 622500 SHA256 d15937961d37b0780b8fb0641483eb9f6d4c379f88ac7ee84ff5dd06c2b72360 SHA512 75100cd8447c78c97b02ed8242d966c37c4050f216805d927b3d41367cb7899adfa13a9b61bc3bf3306be976f99f1a668c95f5a83f61929ccdf48f4edf630cb7 WHIRLPOOL db9226096078519002cfd3c93db92fa9ed71f2d6c3a9bca3cf267e63ea6c7d2f34ace6947af652a208e1b715e1aed53674733e67428381c04ff6c31f3a455b11
 DIST c-blosc-1.3.2.tar.gz 229790 SHA256 7c21c4484c1ad7d6beddd73f35379e0d980530466cd6d87402e035c931983697 SHA512 0488042628b8b3d02e8e7b58d3d942751a43567e99e1e89f452765ad1aeba395248322df6a37daf828571b3c262ebaa54d3ca49cfed78ab499994454faf6bbdb WHIRLPOOL 195232123fbbd4f76f3a209069e7895c3ba900e98c49ca8334e1975634770463d993ae36f99fefb680d7c78a28ca979c27cd4af4412e83c804315f6cf52420fe
 DIST c-blosc-1.3.5.tar.gz 231653 SHA256 60efbbd2ef613480d135dbb245260e7cd904cfd785cc2504458615d7b397675a SHA512 4c11309a3f5dd0e2ecb35f62480cf86a9ad8d8d84b0d744c0597a51d8f51010a2ed0ad868cc3aef1f674efc1c35ee3312ad727cb308b348026f08db0ac9ab04a WHIRLPOOL 58742b85bf1d9637492871cab0f0c0b87c96162b2dfbf196e91f62569f6a06077b901a202fab43f39472ccf728550340a85bd60f3fee1d6e0e76d655659db3f0
 DIST c-blosc-1.5.3.tar.gz 240821 SHA256 d6d7c72d8e49311618f5f1609df1a9b2ca070655b563b9f7b80d5dc92fceaf4f SHA512 92f0a47ff6af2b776795315fce52e49c12e947e9007f97d05182a8369831e0ba80ff7b2b116fdedc4ef2b984106b014c90f82e233d5aed85cd91e3256f4a7313 WHIRLPOOL 9178c1a4e8e476b2a0556106ecbf58eb10bd076e3c731048d988f1e3dcaefa593cea176c6f5ec391c54a651421cce40858f1eae4ba9fc91d60a0fc158fe9fbc7

diff --git a/dev-libs/c-blosc/c-blosc-1.11.1.ebuild b/dev-libs/c-blosc/c-blosc-1.11.1.ebuild
new file mode 100644
index 00000000..4c6ff57
--- /dev/null
+++ b/dev-libs/c-blosc/c-blosc-1.11.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="http://www.blosc.org/"
+SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
+
+RDEPEND="
+	lz4? ( >=app-arch/lz4-0_p120:= )
+	snappy? ( app-arch/snappy )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
+PATCHES=( "${FILESDIR}/${PN}-1.11.1-fix-build-system.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bundled libs
+	rm -rf internal-complibs || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+
+		-DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2)
+		-DDEACTIVATE_LZ4=$(usex !lz4)
+		-DDEACTIVATE_SNAPPY=$(usex !snappy)
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+
+		-DPREFER_EXTERNAL_LZ4=ON
+		-DPREFER_EXTERNAL_SNAPPY=ON
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+	)
+	cmake-utils_src_configure
+}

diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch
new file mode 100644
index 00000000..02c5fc2
--- /dev/null
+++ b/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch
@@ -0,0 +1,30 @@
+Make the build system respect CFLAGS
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,7 +195,7 @@
+    CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
+     if(CMAKE_C_COMPILER_ID STREQUAL GNU)
+         # We need C99 (GNU99 more exactly)
+-        SET(CMAKE_C_FLAGS "-std=gnu99")
++        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+         set(COMPILER_SUPPORT_SSE2 TRUE)
+         if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.7 OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL 4.7)
+             set(COMPILER_SUPPORT_AVX2 TRUE)
+@@ -244,16 +244,6 @@
+ endif()
+ 
+ # flags
+-# @TODO: set -Wall
+-# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release")
+-
+-# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set.
+-# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE.
+-if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
+-     if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
+-         set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE)
+-     endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
+-endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
+ 
+ if(MSVC)
+     if(NOT CMAKE_C_FLAGS)

diff --git a/dev-libs/c-blosc/metadata.xml b/dev-libs/c-blosc/metadata.xml
index 2838e03..6462112 100644
--- a/dev-libs/c-blosc/metadata.xml
+++ b/dev-libs/c-blosc/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Blosc is a compression library designed to transmit data to the
-  processor cache faster than the traditional non-compressed memory fetch. 
-  Compression ratios are not very high, but the decompression is very
-  fast. Blosc is meant not only to reduce the size of large datasets on-disk
-  or in-memory, but also to accelerate memory-bound computations.
-</longdescription>
-  <use>
-    <flag name="lz4">Enable lz4 compression</flag>
-    <flag name="snappy">Enable snappy compression</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">Blosc/c-blosc</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	Blosc is a compression library designed to transmit data to the
+	processor cache faster than the traditional non-compressed memory fetch. 
+	Compression ratios are not very high, but the decompression is very
+	fast. Blosc is meant not only to reduce the size of large datasets on-disk
+	or in-memory, but also to accelerate memory-bound computations.
+	</longdescription>
+	<use>
+		<flag name="lz4">Enable lz4 compression</flag>
+		<flag name="snappy">Enable snappy compression</flag>
+		<flag name="zstd">Enable zstd compression</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Blosc/c-blosc</remote-id>
+	</upstream>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc/, dev-libs/c-blosc/files/
@ 2017-02-16 16:54 Sebastien Fabbro
  0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro @ 2017-02-16 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     6d7aed71f5beb7f9859630b85c565c5dee2cd579
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 21:24:13 2017 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 16:54:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7aed71

dev-libs/c-blosc: version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/c-blosc/Manifest                          |  1 +
 dev-libs/c-blosc/c-blosc-1.11.2.ebuild             | 52 ++++++++++++++++++++++
 .../files/c-blosc-1.11.2-fix-build-system.patch    | 21 +++++++++
 3 files changed, 74 insertions(+)

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 2e4943a6d4..b29691a344 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,4 +1,5 @@
 DIST c-blosc-1.11.1.tar.gz 622500 SHA256 d15937961d37b0780b8fb0641483eb9f6d4c379f88ac7ee84ff5dd06c2b72360 SHA512 75100cd8447c78c97b02ed8242d966c37c4050f216805d927b3d41367cb7899adfa13a9b61bc3bf3306be976f99f1a668c95f5a83f61929ccdf48f4edf630cb7 WHIRLPOOL db9226096078519002cfd3c93db92fa9ed71f2d6c3a9bca3cf267e63ea6c7d2f34ace6947af652a208e1b715e1aed53674733e67428381c04ff6c31f3a455b11
+DIST c-blosc-1.11.2.tar.gz 633280 SHA256 f000bba88d17534fc18a10e11261127a9ab011557bed5fd0659624a3f3c03c5f SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b WHIRLPOOL b90564425993843e00ba5a92c2174b8c14646f9dc4adb3844d31876e715a7efb8ed3cfbe75a5b3ff8f6cde0e6d3e5f485b53c021cd85d77268d0b501b7a6387c
 DIST c-blosc-1.3.2.tar.gz 229790 SHA256 7c21c4484c1ad7d6beddd73f35379e0d980530466cd6d87402e035c931983697 SHA512 0488042628b8b3d02e8e7b58d3d942751a43567e99e1e89f452765ad1aeba395248322df6a37daf828571b3c262ebaa54d3ca49cfed78ab499994454faf6bbdb WHIRLPOOL 195232123fbbd4f76f3a209069e7895c3ba900e98c49ca8334e1975634770463d993ae36f99fefb680d7c78a28ca979c27cd4af4412e83c804315f6cf52420fe
 DIST c-blosc-1.3.5.tar.gz 231653 SHA256 60efbbd2ef613480d135dbb245260e7cd904cfd785cc2504458615d7b397675a SHA512 4c11309a3f5dd0e2ecb35f62480cf86a9ad8d8d84b0d744c0597a51d8f51010a2ed0ad868cc3aef1f674efc1c35ee3312ad727cb308b348026f08db0ac9ab04a WHIRLPOOL 58742b85bf1d9637492871cab0f0c0b87c96162b2dfbf196e91f62569f6a06077b901a202fab43f39472ccf728550340a85bd60f3fee1d6e0e76d655659db3f0
 DIST c-blosc-1.5.3.tar.gz 240821 SHA256 d6d7c72d8e49311618f5f1609df1a9b2ca070655b563b9f7b80d5dc92fceaf4f SHA512 92f0a47ff6af2b776795315fce52e49c12e947e9007f97d05182a8369831e0ba80ff7b2b116fdedc4ef2b984106b014c90f82e233d5aed85cd91e3256f4a7313 WHIRLPOOL 9178c1a4e8e476b2a0556106ecbf58eb10bd076e3c731048d988f1e3dcaefa593cea176c6f5ec391c54a651421cce40858f1eae4ba9fc91d60a0fc158fe9fbc7

diff --git a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
new file mode 100644
index 0000000000..8e4b7c3190
--- /dev/null
+++ b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="http://www.blosc.org/"
+SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
+
+RDEPEND="
+	lz4? ( >=app-arch/lz4-1.7.5:= )
+	snappy? ( app-arch/snappy )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
+PATCHES=( "${FILESDIR}/${PN}-1.11.2-fix-build-system.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# remove bundled libs
+	rm -rf internal-complibs || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+		-DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2)
+		-DDEACTIVATE_LZ4=$(usex !lz4)
+		-DDEACTIVATE_SNAPPY=$(usex !snappy)
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+		-DPREFER_EXTERNAL_LZ4=ON
+		-DPREFER_EXTERNAL_SNAPPY=ON
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+	)
+	cmake-utils_src_configure
+}

diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
new file mode 100644
index 0000000000..d385d52637
--- /dev/null
+++ b/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
@@ -0,0 +1,21 @@
+Make the build system respect CFLAGS
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,16 +244,6 @@
+ endif()
+ 
+ # flags
+-# @TODO: set -Wall
+-# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release")
+-
+-# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set.
+-# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE.
+-if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
+-     if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
+-         set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE)
+-     endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
+-endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
+ 
+ if(MSVC)
+     if(NOT CMAKE_C_FLAGS)


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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc/, dev-libs/c-blosc/files/
@ 2017-12-04  3:30 Benda XU
  0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2017-12-04  3:30 UTC (permalink / raw
  To: gentoo-commits

commit:     b684b52f051da7d2fdcbe8d0fe1dd6d38c2820a3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  4 03:29:49 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 03:29:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b684b52f

dev-libs/c-blosc: drop old versions.

Reported-by: Orivej Desh <orivej <AT> gmx.fr>
Closes: https://bugs.gentoo.org/590936
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-libs/c-blosc/Manifest                          |  6 +--
 dev-libs/c-blosc/c-blosc-1.11.1.ebuild             | 54 ----------------------
 dev-libs/c-blosc/c-blosc-1.3.2.ebuild              | 41 ----------------
 dev-libs/c-blosc/c-blosc-1.3.5.ebuild              | 41 ----------------
 dev-libs/c-blosc/c-blosc-1.5.3.ebuild              | 42 -----------------
 .../files/c-blosc-1.11.1-fix-build-system.patch    | 30 ------------
 .../c-blosc/files/c-blosc-1.3.2-shared-libs.patch  | 22 ---------
 .../c-blosc/files/c-blosc-1.5.3-shared-libs.patch  | 27 -----------
 8 files changed, 1 insertion(+), 262 deletions(-)

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index b29691a3447..711561b638c 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,5 +1 @@
-DIST c-blosc-1.11.1.tar.gz 622500 SHA256 d15937961d37b0780b8fb0641483eb9f6d4c379f88ac7ee84ff5dd06c2b72360 SHA512 75100cd8447c78c97b02ed8242d966c37c4050f216805d927b3d41367cb7899adfa13a9b61bc3bf3306be976f99f1a668c95f5a83f61929ccdf48f4edf630cb7 WHIRLPOOL db9226096078519002cfd3c93db92fa9ed71f2d6c3a9bca3cf267e63ea6c7d2f34ace6947af652a208e1b715e1aed53674733e67428381c04ff6c31f3a455b11
-DIST c-blosc-1.11.2.tar.gz 633280 SHA256 f000bba88d17534fc18a10e11261127a9ab011557bed5fd0659624a3f3c03c5f SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b WHIRLPOOL b90564425993843e00ba5a92c2174b8c14646f9dc4adb3844d31876e715a7efb8ed3cfbe75a5b3ff8f6cde0e6d3e5f485b53c021cd85d77268d0b501b7a6387c
-DIST c-blosc-1.3.2.tar.gz 229790 SHA256 7c21c4484c1ad7d6beddd73f35379e0d980530466cd6d87402e035c931983697 SHA512 0488042628b8b3d02e8e7b58d3d942751a43567e99e1e89f452765ad1aeba395248322df6a37daf828571b3c262ebaa54d3ca49cfed78ab499994454faf6bbdb WHIRLPOOL 195232123fbbd4f76f3a209069e7895c3ba900e98c49ca8334e1975634770463d993ae36f99fefb680d7c78a28ca979c27cd4af4412e83c804315f6cf52420fe
-DIST c-blosc-1.3.5.tar.gz 231653 SHA256 60efbbd2ef613480d135dbb245260e7cd904cfd785cc2504458615d7b397675a SHA512 4c11309a3f5dd0e2ecb35f62480cf86a9ad8d8d84b0d744c0597a51d8f51010a2ed0ad868cc3aef1f674efc1c35ee3312ad727cb308b348026f08db0ac9ab04a WHIRLPOOL 58742b85bf1d9637492871cab0f0c0b87c96162b2dfbf196e91f62569f6a06077b901a202fab43f39472ccf728550340a85bd60f3fee1d6e0e76d655659db3f0
-DIST c-blosc-1.5.3.tar.gz 240821 SHA256 d6d7c72d8e49311618f5f1609df1a9b2ca070655b563b9f7b80d5dc92fceaf4f SHA512 92f0a47ff6af2b776795315fce52e49c12e947e9007f97d05182a8369831e0ba80ff7b2b116fdedc4ef2b984106b014c90f82e233d5aed85cd91e3256f4a7313 WHIRLPOOL 9178c1a4e8e476b2a0556106ecbf58eb10bd076e3c731048d988f1e3dcaefa593cea176c6f5ec391c54a651421cce40858f1eae4ba9fc91d60a0fc158fe9fbc7
+DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b

diff --git a/dev-libs/c-blosc/c-blosc-1.11.1.ebuild b/dev-libs/c-blosc/c-blosc-1.11.1.ebuild
deleted file mode 100644
index 3403bc18c33..00000000000
--- a/dev-libs/c-blosc/c-blosc-1.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-0_p120:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
-PATCHES=( "${FILESDIR}/${PN}-1.11.1-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-
-		-DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2)
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-
-		-DPREFER_EXTERNAL_LZ4=ON
-		-DPREFER_EXTERNAL_SNAPPY=ON
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild b/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
deleted file mode 100644
index ade8c684c90..00000000000
--- a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="hdf5 +lz4 +snappy static-libs test zlib"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5 )
-	lz4? ( >=app-arch/lz4-0_p120 )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-shared-libs.patch )
-DOCS="RE* AN*"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BENCHMARKS=OFF
-		-DPREFER_EXTERNAL_COMPLIBS=ON
-		$(cmake-utils_use hdf5 BUILD_HDF5_FILTER)
-		$(cmake-utils_use !lz4 DEACTIVATE_LZ4)
-		$(cmake-utils_use !snappy DEACTIVATE_SNAPPY)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTS)
-		$(cmake-utils_use !zlib DEACTIVATE_ZLIB)
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-libs/c-blosc/c-blosc-1.3.5.ebuild b/dev-libs/c-blosc/c-blosc-1.3.5.ebuild
deleted file mode 100644
index 1223d976114..00000000000
--- a/dev-libs/c-blosc/c-blosc-1.3.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="hdf5 +lz4 +snappy static-libs test zlib"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5:0= )
-	lz4? ( >=app-arch/lz4-0_p120:0= )
-	snappy? ( app-arch/snappy:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.2-shared-libs.patch )
-DOCS="RE* AN*"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BENCHMARKS=OFF
-		-DPREFER_EXTERNAL_COMPLIBS=ON
-		$(cmake-utils_use hdf5 BUILD_HDF5_FILTER)
-		$(cmake-utils_use !lz4 DEACTIVATE_LZ4)
-		$(cmake-utils_use !snappy DEACTIVATE_SNAPPY)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTS)
-		$(cmake-utils_use !zlib DEACTIVATE_ZLIB)
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-libs/c-blosc/c-blosc-1.5.3.ebuild b/dev-libs/c-blosc/c-blosc-1.5.3.ebuild
deleted file mode 100644
index 80c7837bc72..00000000000
--- a/dev-libs/c-blosc/c-blosc-1.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="http://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="hdf5 +lz4 +snappy static-libs test zlib"
-
-RDEPEND="
-	hdf5? ( sci-libs/hdf5:0= )
-	lz4? ( >=app-arch/lz4-0_p120:0= )
-	snappy? ( app-arch/snappy:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-shared-libs.patch )
-
-DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BENCHMARKS=OFF
-		-DPREFER_EXTERNAL_COMPLIBS=ON
-		$(cmake-utils_use hdf5 BUILD_HDF5_FILTER)
-		$(cmake-utils_use !lz4 DEACTIVATE_LZ4)
-		$(cmake-utils_use !snappy DEACTIVATE_SNAPPY)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTS)
-		$(cmake-utils_use !zlib DEACTIVATE_ZLIB)
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch
deleted file mode 100644
index 02c5fc2d8ab..00000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.11.1-fix-build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Make the build system respect CFLAGS
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,7 +195,7 @@
-    CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
-     if(CMAKE_C_COMPILER_ID STREQUAL GNU)
-         # We need C99 (GNU99 more exactly)
--        SET(CMAKE_C_FLAGS "-std=gnu99")
-+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-         set(COMPILER_SUPPORT_SSE2 TRUE)
-         if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.7 OR CMAKE_C_COMPILER_VERSION VERSION_EQUAL 4.7)
-             set(COMPILER_SUPPORT_AVX2 TRUE)
-@@ -244,16 +244,6 @@
- endif()
- 
- # flags
--# @TODO: set -Wall
--# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release")
--
--# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set.
--# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE.
--if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
--     if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--         set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE)
--     endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
- 
- if(MSVC)
-     if(NOT CMAKE_C_FLAGS)

diff --git a/dev-libs/c-blosc/files/c-blosc-1.3.2-shared-libs.patch b/dev-libs/c-blosc/files/c-blosc-1.3.2-shared-libs.patch
deleted file mode 100644
index 484db1f6dd3..00000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.3.2-shared-libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- hdf5/CMakeLists.txt.orig	2014-02-05 16:55:55.001344161 -0800
-+++ hdf5/CMakeLists.txt	2014-02-05 16:57:03.767739650 -0800
-@@ -23,16 +23,16 @@
- 
- # install
- install(FILES blosc_filter.h DESTINATION include COMPONENT HDF5_FILTER_DEV)
--install(TARGETS blosc_filter_static DESTINATION lib COMPONENT HDF5_FILTER)
-+install(TARGETS blosc_filter_shared DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER)
- if(BUILD_STATIC)
-     install(
--        TARGETS blosc_filter_shared DESTINATION lib COMPONENT HDF5_FILTER_DEV)
-+        TARGETS blosc_filter_static DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER_DEV)
- endif(BUILD_STATIC)
- 
- 
- # test
- if(BUILD_TESTS)
-     add_executable(example example.c)
--    target_link_libraries(example blosc_filter_static ${HDF5_LIBRARIES})
-+    target_link_libraries(example blosc_filter_shared ${HDF5_LIBRARIES})
-     add_test(test_hdf5_filter example)
- endif(BUILD_TESTS)

diff --git a/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch b/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch
deleted file mode 100644
index c46f6698744..00000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- hdf5/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hdf5/CMakeLists.txt b/hdf5/CMakeLists.txt
-index d91194f..032a292 100644
---- a/hdf5/CMakeLists.txt
-+++ b/hdf5/CMakeLists.txt
-@@ -44,16 +44,16 @@ endif(MSVC)
- 
- # install
- install(FILES blosc_filter.h DESTINATION include COMPONENT HDF5_FILTER_DEV)
--install(TARGETS blosc_filter_shared DESTINATION lib COMPONENT HDF5_FILTER)
-+install(TARGETS blosc_filter_shared DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER)
- if(BUILD_STATIC)
-     install(
--        TARGETS blosc_filter_static DESTINATION lib COMPONENT HDF5_FILTER_DEV)
-+        TARGETS blosc_filter_static DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER_DEV)
- endif(BUILD_STATIC)
- 
- 
- # test
- if(BUILD_TESTS)
-     add_executable(example example.c)
--    target_link_libraries(example blosc_filter_static ${HDF5_LIBRARIES})
-+    target_link_libraries(example blosc_filter_shared ${HDF5_LIBRARIES})
-     add_test(test_hdf5_filter example)
- endif(BUILD_TESTS)


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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc/, dev-libs/c-blosc/files/
@ 2020-06-10 10:27 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-06-10 10:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2dd9d0a3daa9805a08bc7d92e45db53d33b49a48
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 10:21:54 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 10:27:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd9d0a3

dev-libs/c-blosc: Bump to 1.19.0

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

 dev-libs/c-blosc/Manifest                          |  1 +
 dev-libs/c-blosc/c-blosc-1.19.0.ebuild             | 50 ++++++++++++++++++++++
 dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch | 33 ++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 711561b638c..6894b7f68ab 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1 +1,2 @@
 DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
+DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c

diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
new file mode 100644
index 00000000000..71488e42738
--- /dev/null
+++ b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="https://www.blosc.org/"
+SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+lz4 +snappy test zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lz4? ( >=app-arch/lz4-1.7.5:= )
+	snappy? ( app-arch/snappy )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-xgetbv.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# remove bundled libs
+	rm -rf internal-complibs || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+		-DDEACTIVATE_LZ4=$(usex !lz4)
+		-DDEACTIVATE_SNAPPY=$(usex !snappy)
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+		-DPREFER_EXTERNAL_LZ4=ON
+		# snappy is always external
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+	)
+	cmake_src_configure
+}

diff --git a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
new file mode 100644
index 00000000000..045a234028b
--- /dev/null
+++ b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
@@ -0,0 +1,33 @@
+From 14d2d561795c276fc33c8cb54781dff76b398906 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 10 Jun 2020 12:13:39 +0200
+Subject: [PATCH] Redefine blosc_internal_xgetbv for platforms with immintrin.h
+
+Commit 2f2d876 renamed _xgetbv to blosc_internal_xgetbv.  Commit 0b8608b
+made it conditional to immintrin.h not being included, apparently
+in order to prevent _xgetbv collision.  However, since the block
+no longer defined _xgetbv but blosc_internal_xgetbv, it means that
+the latter is not defined if the condition is false.  #define it to
+_xgetbv to fix missing symbol.
+---
+ blosc/shuffle.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/blosc/shuffle.c b/blosc/shuffle.c
+index fc2ca64..7a03bf1 100644
+--- a/blosc/shuffle.c
++++ b/blosc/shuffle.c
+@@ -195,6 +195,10 @@ blosc_internal_xgetbv(uint32_t xcr) {
+   return ((uint64_t)edx << 32) | eax;
+ }
+ 
++#else
++
++#define blosc_internal_xgetbv _xgetbv
++
+ #endif  // !(defined(_IMMINTRIN_H_INCLUDED) && (BLOSC_GCC_VERSION >= 900))
+ #endif  /* defined(_MSC_FULL_VER) */
+ 
+-- 
+2.27.0
+


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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc/, dev-libs/c-blosc/files/
@ 2020-09-18  9:38 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-09-18  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f5fbe39656d72a7bc89fc504b2790f403ba8bd37
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 09:24:54 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 09:37:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5fbe396

dev-libs/c-blosc: Remove old

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

 dev-libs/c-blosc/Manifest                          |  2 -
 dev-libs/c-blosc/c-blosc-1.11.2.ebuild             | 52 ----------------------
 dev-libs/c-blosc/c-blosc-1.19.0.ebuild             | 50 ---------------------
 .../files/c-blosc-1.11.2-fix-build-system.patch    | 21 ---------
 dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch | 33 --------------
 5 files changed, 158 deletions(-)

diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 3a75b6b4ae3..da7cce1b2da 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,4 +1,2 @@
-DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
-DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c
 DIST c-blosc-1.20.0.tar.gz 878891 BLAKE2B 742619a5de9696646f8c434f25e736dc3662b8215c6397d9e23f7f86ae6df78c014c8b23bfa1cada72f31b99d81b6c9d99eeb28189c529fe692b88f95da1d67a SHA512 b3da9970542c389fce4acb6ffb866c066dfbf542fadb21ed3d6a7688f9cccf89425ccdc9253a1f7172eced224ff27b78be0c9ce111b4b69ec303a61fb7c1bc10
 DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475

diff --git a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
deleted file mode 100644
index 2dbf5d282b3..00000000000
--- a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
-PATCHES=( "${FILESDIR}/${PN}-1.11.2-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2)
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		-DPREFER_EXTERNAL_SNAPPY=ON
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
deleted file mode 100644
index 671a429da43..00000000000
--- a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-xgetbv.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}

diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
deleted file mode 100644
index d385d526371..00000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Make the build system respect CFLAGS
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,16 +244,6 @@
- endif()
- 
- # flags
--# @TODO: set -Wall
--# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release")
--
--# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set.
--# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE.
--if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
--     if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--         set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE)
--     endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
- 
- if(MSVC)
-     if(NOT CMAKE_C_FLAGS)

diff --git a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
deleted file mode 100644
index 045a234028b..00000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 14d2d561795c276fc33c8cb54781dff76b398906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 10 Jun 2020 12:13:39 +0200
-Subject: [PATCH] Redefine blosc_internal_xgetbv for platforms with immintrin.h
-
-Commit 2f2d876 renamed _xgetbv to blosc_internal_xgetbv.  Commit 0b8608b
-made it conditional to immintrin.h not being included, apparently
-in order to prevent _xgetbv collision.  However, since the block
-no longer defined _xgetbv but blosc_internal_xgetbv, it means that
-the latter is not defined if the condition is false.  #define it to
-_xgetbv to fix missing symbol.
----
- blosc/shuffle.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/blosc/shuffle.c b/blosc/shuffle.c
-index fc2ca64..7a03bf1 100644
---- a/blosc/shuffle.c
-+++ b/blosc/shuffle.c
-@@ -195,6 +195,10 @@ blosc_internal_xgetbv(uint32_t xcr) {
-   return ((uint64_t)edx << 32) | eax;
- }
- 
-+#else
-+
-+#define blosc_internal_xgetbv _xgetbv
-+
- #endif  // !(defined(_IMMINTRIN_H_INCLUDED) && (BLOSC_GCC_VERSION >= 900))
- #endif  /* defined(_MSC_FULL_VER) */
- 
--- 
-2.27.0
-


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

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc/, dev-libs/c-blosc/files/
@ 2022-11-22  3:23 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-11-22  3:23 UTC (permalink / raw
  To: gentoo-commits

commit:     41b2f30603e84538266b0a5035f1315ac0a2b0c8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 03:23:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 03:23:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b2f306

dev-libs/c-blosc: backport GNUInstallDirs patch (fix .pc file location)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...losc-1.21.1.ebuild => c-blosc-1.21.1-r1.ebuild} |  4 ++
 .../files/c-blosc-1.21.1-gnuinstalldirs.patch      | 71 ++++++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild
similarity index 95%
rename from dev-libs/c-blosc/c-blosc-1.21.1.ebuild
rename to dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild
index c0b7e51199f0..7ff161dd1390 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.1-r1.ebuild
@@ -22,6 +22,10 @@ RDEPEND="
 	zstd? ( app-arch/zstd:= )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gnuinstalldirs.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# remove bundled libs

diff --git a/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch b/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch
new file mode 100644
index 000000000000..d90a2fc50cee
--- /dev/null
+++ b/dev-libs/c-blosc/files/c-blosc-1.21.1-gnuinstalldirs.patch
@@ -0,0 +1,71 @@
+https://github.com/Blosc/c-blosc/commit/5a2907c75ee1e43be90f58f2be7f8c856004a3bf
+
+From 5a2907c75ee1e43be90f58f2be7f8c856004a3bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?H=C3=A5vard=20Flaget=20Aasen?= <haavard_aasen@yahoo.no>
+Date: Sun, 5 Dec 2021 07:52:54 +0100
+Subject: [PATCH] CMake: Use GNUInstallDirs when installing files.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ option(PREFER_EXTERNAL_ZSTD
+     "Find and use external Zstd library instead of included sources." OFF)
+ 
+ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+-
++include(GNUInstallDirs)
+ 
+ if(NOT DEACTIVATE_LZ4)
+     if(PREFER_EXTERNAL_LZ4)
+@@ -342,7 +342,7 @@ if (BLOSC_INSTALL)
+         "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc"
+         @ONLY)
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/blosc.pc"
+-            DESTINATION lib/pkgconfig COMPONENT DEV)
++            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT DEV)
+ 
+     configure_file(
+         "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+--- a/blosc.pc.in
++++ b/blosc.pc.in
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+ sharedlibdir=${libdir}
+-includedir=${prefix}/include
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: blosc
+ Description: A blocking, shuffling and lossless compression library
+--- a/blosc/CMakeLists.txt
++++ b/blosc/CMakeLists.txt
+@@ -61,8 +61,6 @@ if(COMPILER_SUPPORT_AVX2)
+ endif(COMPILER_SUPPORT_AVX2)
+ set(SOURCES ${SOURCES} shuffle.c)
+ 
+-# library install directory
+-set(lib_dir lib${LIB_SUFFIX})
+ set(version_string ${BLOSC_VERSION_MAJOR}.${BLOSC_VERSION_MINOR}.${BLOSC_VERSION_PATCH})
+ 
+ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) # pre 3.1
+@@ -219,11 +217,15 @@ endif(BUILD_STATIC)
+ 
+ # install
+ if(BLOSC_INSTALL)
+-    install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV)
++    install(FILES blosc.h blosc-export.h
++            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT DEV)
+     if(BUILD_SHARED)
+-        install(TARGETS blosc_shared LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT LIB)
++        install(TARGETS blosc_shared
++                LIBRARY COMPONENT LIB
++                ARCHIVE COMPONENT DEV
++                RUNTIME COMPONENT LIB)
+     endif(BUILD_SHARED)
+     if(BUILD_STATIC)
+-        install(TARGETS blosc_static LIBRARY DESTINATION ${lib_dir} ARCHIVE DESTINATION ${lib_dir} RUNTIME DESTINATION bin COMPONENT DEV)
++        install(TARGETS blosc_static COMPONENT DEV)
+     endif(BUILD_STATIC)
+ endif(BLOSC_INSTALL)
+


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

end of thread, other threads:[~2022-11-22  3:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-10 10:27 [gentoo-commits] repo/gentoo:master commit in: dev-libs/c-blosc/, dev-libs/c-blosc/files/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2022-11-22  3:23 Sam James
2020-09-18  9:38 Michał Górny
2017-12-04  3:30 Benda XU
2017-02-16 16:54 Sebastien Fabbro
2016-10-25  0:08 David Seifert

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