Accepting request 1233943 from science

- Update to release 0.8.3

OBS-URL: https://build.opensuse.org/request/show/1233943
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xxhash?expand=0&rev=13

_scmsync.obsinfo

@@ -1,4 +1,4 @@
-mtime: 1725462627
+mtime: 1735588856
-commit: 679f82e202407e8aea6eb1514bbeb3f5024ded59fc3a4a33a1607268d40dbfb1
+commit: dd117a6fc33399c22f6e7352b8796f91ebe3cc436fa84f61556b5e66266b5976
 url: https://src.opensuse.org/jengelh/xxhash
 revision: master

inline.patch

@@ -17,16 +17,16 @@ In function 'void XXH3_hashLong_internal_loop(xxh_u64*, const xxh_u8*, size_t, c
  xxhash.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: xxHash-0.8.2/xxhash.h
+Index: xxHash-0.8.3/xxhash.h
 ===================================================================
---- xxHash-0.8.2.orig/xxhash.h
+--- xxHash-0.8.3.orig/xxhash.h
-+++ xxHash-0.8.2/xxhash.h
++++ xxHash-0.8.3/xxhash.h
-@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, cons
+@@ -2421,7 +2421,7 @@ static void* XXH_memcpy(void* dest, cons
  #  define XXH_NO_INLINE static
  /* enable inlining hints */
  #elif defined(__GNUC__) || defined(__clang__)
--#  define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused))
+-#  define XXH_FORCE_INLINE static __inline__ __attribute__((__always_inline__, __unused__))
-+#  define XXH_FORCE_INLINE static __inline__ __attribute__((unused))
++#  define XXH_FORCE_INLINE static __inline__ __attribute__((__unused__))
- #  define XXH_NO_INLINE static __attribute__((noinline))
+ #  define XXH_NO_INLINE static __attribute__((__noinline__))
  #elif defined(_MSC_VER)  /* Visual Studio */
  #  define XXH_FORCE_INLINE static __forceinline

test-tools-do-not-override-cflags.patch

@@ -1,16 +1,22 @@
 From: Bruno Pitrus <brunopitrus@hotmail.com>
 Date: 2024-05-05 19:35:03+0000
 
---- xxHash-0.8.2/Makefile.old	2023-07-21 12:01:35.000000000 +0200
+---
-+++ xxHash-0.8.2/Makefile	2024-05-05 21:19:32.265851133 +0200
+ Makefile |    4 ++--
-@@ -450,8 +450,8 @@ test-all: test test32 test-unicode clang
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: xxHash-0.8.3/Makefile
+===================================================================
+--- xxHash-0.8.3.orig/Makefile
++++ xxHash-0.8.3/Makefile
+@@ -483,8 +483,8 @@ test-all: test test32 test-unicode clang
  
  .PHONY: test-tools
  test-tools:
 -	CFLAGS=-Werror $(MAKE) -C tests/bench
--	CFLAGS=-Werror $(MAKE) -C tests/collisions
+-	CFLAGS=-Werror $(MAKE) -C tests/collisions check
 +	$(MAKE) -C tests/bench
-+	$(MAKE) -C tests/collisions
++	$(MAKE) -C tests/collisions check
  
  .PHONY: test-xxh-nnn-sums
  test-xxh-nnn-sums: xxhsum_and_links

xxhash.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Dec 30 19:52:02 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 0.8.3
+  * Corrects an edge case in ``XXH3_128bits_withSecretandSeed``
+    that could generate invalid results.
+  * xxhash now knows command-line arguments ``--filelist``,
+    ``--files-from``.
+
 -------------------------------------------------------------------
 Tue Sep  3 02:11:09 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

xxhash.spec

@@ -17,17 +17,18 @@
 
 
 Name:           xxhash
-Version:        0.8.2
+Version:        0.8.3
 Release:        0
 Summary:        Non-cryptographic hash algorithm
 License:        BSD-2-Clause AND GPL-2.0-only
 Group:          Productivity/Security
 URL:            https://github.com/Cyan4973/xxHash
-Source0:        https://github.com/Cyan4973/xxHash/archive/v%{version}.tar.gz#/xxHash-%{version}.tar.gz
+Source:         https://github.com/Cyan4973/xxHash/archive/v%version.tar.gz
 Patch1:         test-tools-do-not-override-cflags.patch
 Patch2:         inline.patch
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
+BuildRequires:  time
 %{?suse_build_hwcaps_libs}
 
 %description
@@ -49,36 +50,36 @@ Hashes are identical on all platforms.
 Summary:        Headers for xxHash, a non-cryptographic hash algorithm
 License:        BSD-2-Clause
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       %name = %version
-Requires:       libxxhash0 = %{version}
+Requires:       libxxhash0 = %version
 
 %description devel
 Headers and other development files for xxHash.
 
 %prep
-%autosetup -p1 -n xxHash-%{version}
+%autosetup -p1 -n xxHash-%version
 
 %build
 # ALLOW_AVX just means "we guarantee we policed our %%optflags".
-export CFLAGS="%{optflags} -DXXH_X86DISPATCH_ALLOW_AVX=1"
+export CFLAGS="%optflags -DXXH_X86DISPATCH_ALLOW_AVX=1"
 export CXXFLAGS="$CFLAGS"
 export LDFLAGS="%{?build_ldflags}"
 # DISPATCH=1 if you want AVX2/AVX512. But it does not seem to perform any
 # better than the lowest-denomimation code on at least the 1135G7 and 5950X
 # CPUs, and for both LP64 as well as ILP32 — it seems to be all within margin
 # of error.
-%make_build prefix=%{_prefix} libdir=%{_libdir}
+%make_build prefix=%_prefix libdir=%_libdir
 
 %install
-export CFLAGS="%{optflags} -DXXH_X86DISPATCH_ALLOW_AVX=1"
+export CFLAGS="%optflags -DXXH_X86DISPATCH_ALLOW_AVX=1"
-export CXXFLAGS="%{optflags}"
+export CXXFLAGS="%optflags"
 export LDFLAGS="%{?build_ldflags}"
-%make_install prefix=%{_prefix} libdir=%{_libdir}
+%make_install prefix=%_prefix libdir=%_libdir
-rm -rf %{buildroot}%{_libdir}/libxxhash.a
+rm -rf %buildroot%_libdir/libxxhash.a
 
 %check
-export CFLAGS="%{optflags}"
+export CFLAGS="%optflags"
-export CXXFLAGS="%{optflags}"
+export CXXFLAGS="%optflags"
 export LDFLAGS="%{?build_ldflags}"
 # not safe for parallel execution as it removes xxhash.o and recreates it with different flags
 # the list is taken from test-all with non-working/irrelevant ones (such as ones that change the toolchain) removed
@@ -89,22 +90,15 @@ export LDFLAGS="%{?build_ldflags}"
 %files
 %license LICENSE
 %doc README.md
-%{_bindir}/xxhsum
+%_bindir/xxh*
-%{_bindir}/xxh32sum
+%_mandir/man1/xxh*
-%{_bindir}/xxh64sum
-%{_bindir}/xxh128sum
-%{_mandir}/man1/xxh32sum.*
-%{_mandir}/man1/xxh64sum.*
-%{_mandir}/man1/xxh128sum.*
-%{_mandir}/man1/xxhsum.*
 
 %files -n libxxhash0
-%{_libdir}/libxxhash.so.*
+%_libdir/libxxhash.so.*
 
 %files devel
-%{_includedir}/xxhash.h
+%_includedir/*.h
-%{_includedir}/xxh3.h
+%_libdir/pkgconfig/*.pc
-%{_libdir}/pkgconfig/libxxhash.pc
+%_libdir/libxxhash.so
-%{_libdir}/libxxhash.so
 
 %changelog