From 01b26e2dedc03a8bdb6d97833cba00fb0993586d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sat, 25 Jan 2025 16:36:12 +0100 Subject: [PATCH] xxhash: bump version --- ...8.1~git.patchset => xxhash-0.8.3.patchset} | 42 ++++--------------- ...h-0.8.1~git.recipe => xxhash-0.8.3.recipe} | 14 +++---- 2 files changed, 16 insertions(+), 40 deletions(-) rename dev-libs/xxhash/patches/{xxhash-0.8.1~git.patchset => xxhash-0.8.3.patchset} (52%) rename dev-libs/xxhash/{xxhash-0.8.1~git.recipe => xxhash-0.8.3.recipe} (83%) diff --git a/dev-libs/xxhash/patches/xxhash-0.8.1~git.patchset b/dev-libs/xxhash/patches/xxhash-0.8.3.patchset similarity index 52% rename from dev-libs/xxhash/patches/xxhash-0.8.1~git.patchset rename to dev-libs/xxhash/patches/xxhash-0.8.3.patchset index f0e5a76d3..230937b08 100644 --- a/dev-libs/xxhash/patches/xxhash-0.8.1~git.patchset +++ b/dev-libs/xxhash/patches/xxhash-0.8.3.patchset @@ -1,61 +1,37 @@ -From 9f45d75e40253a23b88eb8a49f307daa70a8d124 Mon Sep 17 00:00:00 2001 +From 380bf2d37495f46ec223751cac873987afc59cfa Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 27 Dec 2020 11:59:31 +0000 Subject: Remove -pthread for the test diff --git a/tests/collisions/Makefile b/tests/collisions/Makefile -index 7191b70..3f05073 100644 +index eee4b59..58983f9 100644 --- a/tests/collisions/Makefile +++ b/tests/collisions/Makefile @@ -30,7 +30,7 @@ CFLAGS += -Wall -Wextra -Wconversion \ - -std=c99 + -std=c11 CXXFLAGS += -Wall -Wextra -Wconversion \ -std=c++11 -LDFLAGS += -pthread +#LDFLAGS += -pthread - TESTHASHES = 110000000 + TESTHASHES = 3200000 HASH_SRC := $(sort $(wildcard allcodecs/*.c allcodecs/*.cc)) -- -2.30.2 +2.45.2 -From b9d85ce7b19c1da58eed5118ebe47309de1d60e2 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Tue, 29 Mar 2022 11:59:37 +0000 -Subject: Fix, error: unused parameter 'stream' - - -diff --git a/cli/xsum_os_specific.c b/cli/xsum_os_specific.c -index a568b56..4f6f00f 100644 ---- a/cli/xsum_os_specific.c -+++ b/cli/xsum_os_specific.c -@@ -42,7 +42,8 @@ - #if (defined(__linux__) && (XSUM_PLATFORM_POSIX_VERSION >= 1)) \ - || (XSUM_PLATFORM_POSIX_VERSION >= 200112L) \ - || defined(__DJGPP__) \ -- || defined(__MSYS__) -+ || defined(__MSYS__) \ -+ || defined(__HAIKU__) - # include /* isatty */ - # define XSUM_IS_CONSOLE(stdStream) isatty(fileno(stdStream)) - #elif defined(MSDOS) || defined(OS2) --- -2.30.2 - - -From 0294335ff690aea92036bde617ac78e3644bb48b Mon Sep 17 00:00:00 2001 +From e1637a08438b61da2926110ff2bd94ee747cbfb6 Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 27 Dec 2020 12:47:45 +0000 Subject: Fix linking against -lubsan (needed for the clang tests) diff --git a/Makefile b/Makefile -index be631b1..da2f978 100644 +index 5b7b8ff..99f21cd 100644 --- a/Makefile +++ b/Makefile -@@ -368,7 +368,7 @@ usan: CXX=clang++ +@@ -421,7 +421,7 @@ usan: CXX=clang++ usan: ## check CLI runtime for undefined behavior, using clang's sanitizer @echo ---- check undefined behavior - sanitize ---- $(MAKE) clean @@ -65,5 +41,5 @@ index be631b1..da2f978 100644 .PHONY: staticAnalyze SCANBUILD ?= scan-build -- -2.30.2 +2.45.2 diff --git a/dev-libs/xxhash/xxhash-0.8.1~git.recipe b/dev-libs/xxhash/xxhash-0.8.3.recipe similarity index 83% rename from dev-libs/xxhash/xxhash-0.8.1~git.recipe rename to dev-libs/xxhash/xxhash-0.8.3.recipe index 013f8bca3..93a7dc1e1 100644 --- a/dev-libs/xxhash/xxhash-0.8.1~git.recipe +++ b/dev-libs/xxhash/xxhash-0.8.3.recipe @@ -5,22 +5,22 @@ HOMEPAGE="https://cyan4973.github.io/xxHash/ http://www.xxhash.com/" COPYRIGHT="2014-2022 Yann Collet" LICENSE="BSD (2-clause)" -REVISION="2" -srcGitRev="aa7ac8bd1f31172937069efe7557600593ffe871" -SOURCE_URI="http://github.com/Cyan4973/xxHash/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="342c0c20046e108f4cddf2163b3bc371439f8188fceefaa9c859df13c53f4a08" -SOURCE_FILENAME="xxHash-$portVersion-$srcGitRev.tar.gz" -SOURCE_DIR="xxHash-$srcGitRev" +REVISION="1" +SOURCE_URI="http://github.com/Cyan4973/xxHash/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80" +SOURCE_DIR="xxHash-$portVersion" +SOURCE_FILENAME="xxHash-$portVersion.tar.gz" PATCHES="xxhash-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="0.8.1" +libVersion="$portVersion" libVersionCompat="$portVersion compat >= ${portVersion%%.*}" PROVIDES=" xxhash$secondaryArchSuffix = $portVersion + cmd:xxh3sum$commandSuffix = $portVersion cmd:xxh32sum$commandSuffix = $portVersion cmd:xxh64sum$commandSuffix = $portVersion cmd:xxh128sum$commandSuffix = $portVersion