From fb3e435cd120d1b72d276975d736207703129867b021db2ddf406707f5cad29e Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 7 Nov 2023 05:06:20 +0000 Subject: [PATCH] Accepting request 1123192 from home:jengelh:branches:science - Update to release 0.8.2 OBS-URL: https://build.opensuse.org/request/show/1123192 OBS-URL: https://build.opensuse.org/package/show/science/xxhash?expand=0&rev=20 --- ...80f9f2760609d8cc68cea76d3f3217ab70e1.patch | 40 ------ ...4e735cf368542f14005e41d2f84ec29dfd60.patch | 126 ------------------ xxHash-0.8.1.tar.gz | 3 - xxHash-0.8.2.tar.gz | 3 + xxhash-avoid-armv6-unaligned-access.patch | 13 -- xxhash.changes | 13 ++ xxhash.spec | 5 +- 7 files changed, 17 insertions(+), 186 deletions(-) delete mode 100644 15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch delete mode 100644 836f4e735cf368542f14005e41d2f84ec29dfd60.patch delete mode 100644 xxHash-0.8.1.tar.gz create mode 100644 xxHash-0.8.2.tar.gz delete mode 100644 xxhash-avoid-armv6-unaligned-access.patch diff --git a/15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch b/15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch deleted file mode 100644 index 96527f9..0000000 --- a/15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15ce80f9f2760609d8cc68cea76d3f3217ab70e1 Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Tue, 30 Nov 2021 23:19:38 +0100 -Subject: [PATCH] Fix compilation on RHEL 7 ppc64le (gcc 4.8) - ---- - xxhash.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/xxhash.h b/xxhash.h -index 08ab7945..7850622a 100644 ---- a/xxhash.h -+++ b/xxhash.h -@@ -4129,7 +4129,7 @@ XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc, - const void* XXH_RESTRICT secret) - { - /* presumed aligned */ -- unsigned long long* const xacc = (unsigned long long*) acc; -+ unsigned int* const xacc = (unsigned int*) acc; - xxh_u64x2 const* const xinput = (xxh_u64x2 const*) input; /* no alignment restriction */ - xxh_u64x2 const* const xsecret = (xxh_u64x2 const*) secret; /* no alignment restriction */ - xxh_u64x2 const v32 = { 32, 32 }; -@@ -4145,7 +4145,7 @@ XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc, - /* product = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)shuffled & 0xFFFFFFFF); */ - xxh_u64x2 const product = XXH_vec_mulo((xxh_u32x4)data_key, shuffled); - /* acc_vec = xacc[i]; */ -- xxh_u64x2 acc_vec = vec_xl(0, xacc + 2 * i); -+ xxh_u64x2 acc_vec = (xxh_u64x2)vec_xl(0, xacc + 4 * i); - acc_vec += product; - - /* swap high and low halves */ -@@ -4155,7 +4155,7 @@ XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc, - acc_vec += vec_xxpermdi(data_vec, data_vec, 2); - #endif - /* xacc[i] = acc_vec; */ -- vec_xst(acc_vec, 0, xacc + 2 * i); -+ vec_xst((xxh_u32x4)acc_vec, 0, xacc + 4 * i); - } - } - diff --git a/836f4e735cf368542f14005e41d2f84ec29dfd60.patch b/836f4e735cf368542f14005e41d2f84ec29dfd60.patch deleted file mode 100644 index 9ceb29c..0000000 --- a/836f4e735cf368542f14005e41d2f84ec29dfd60.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 836f4e735cf368542f14005e41d2f84ec29dfd60 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Sat, 4 Dec 2021 10:29:49 -0800 -Subject: [PATCH] fix man page installation - -for variant redirectors (`xxh32sum`, `xxh64sum` and `xxh128sum`). -fix #647, reported by @jpalus. - -Also : slightly updated man page text, for clarity and accuracy. ---- - Makefile | 14 ++++++++------ - cli/xxhsum.1 | 8 ++++---- - cli/xxhsum.1.md | 8 +++++--- - 3 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 2fbefbc6..63273e16 100644 ---- a/Makefile -+++ b/Makefile -@@ -457,6 +457,7 @@ endif - - INSTALL_PROGRAM ?= $(INSTALL) - INSTALL_DATA ?= $(INSTALL) -m 644 -+INSTALL_DIR ?= $(INSTALL) -d -m 755 - - - # Escape special symbols by putting each character into its separate class -@@ -496,7 +497,7 @@ libxxhash.pc: libxxhash.pc.in - .PHONY: install - install: lib libxxhash.pc xxhsum ## install libraries, CLI, links and man page - @echo Installing libxxhash -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR) -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_DATA) libxxhash.a $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) - $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) -@@ -508,19 +509,20 @@ ifeq ($(DISPATCH),1) - $(Q)$(INSTALL_DATA) xxh_x86dispatch.h $(DESTDIR)$(INCLUDEDIR) - endif - @echo Installing pkgconfig -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGCONFIGDIR)/ - $(Q)$(INSTALL_DATA) libxxhash.pc $(DESTDIR)$(PKGCONFIGDIR)/ - @echo Installing xxhsum -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ - $(Q)$(INSTALL_PROGRAM) xxhsum $(DESTDIR)$(BINDIR)/xxhsum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh32sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum - @echo Installing man pages -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ - $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 - @echo xxhash installation completed - - .PHONY: uninstall -diff --git a/cli/xxhsum.1 b/cli/xxhsum.1 -index 27e6808e..715fc4be 100644 ---- a/cli/xxhsum.1 -+++ b/cli/xxhsum.1 -@@ -1,14 +1,14 @@ --.TH "XXHSUM" "1" "November 2021" "xxhsum 0.8.1" "User Commands" -+.TH "XXHSUM" "1" "December 2021" "xxhsum 0.8.1" "User Commands" - .SH "NAME" - \fBxxhsum\fR \- print or check xxHash non\-cryptographic checksums - .SH "SYNOPSIS" - \fBxxhsum [