diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..282e16b --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..a18bb67 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,7 @@ +summary: CI Gating Plan +discover: + how: fmf + url: https://src.fedoraproject.org/tests/xxhash.git + filter: 'tag: Fedora-CI-gating' +execute: + how: tmt diff --git a/sources b/sources index 16f6761..c254118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xxhash-0.8.1.tar.gz) = 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193 +SHA512 (xxhash-0.8.3.tar.gz) = 8b5c8b9aad4e869f28310b12cc314037feda81d92f26c23eaecdb35dc65042ca2e65f2e9606033e62a31bcc737a9a950500ffcbdb8677d6ab20e820ea14f2b79 diff --git a/xxhash-epel7-ppc64le.patch b/xxhash-epel7-ppc64le.patch deleted file mode 100644 index bd67d2e..0000000 --- a/xxhash-epel7-ppc64le.patch +++ /dev/null @@ -1,43 +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 08ab794..7850622 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); - } - } - --- -2.33.1 - diff --git a/xxhash.spec b/xxhash.spec index 8b640f1..c2e18c9 100644 --- a/xxhash.spec +++ b/xxhash.spec @@ -1,17 +1,13 @@ Name: xxhash -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.8.3 +Release: 5%{?dist} Summary: Extremely fast hash algorithm -# The source for the library (xxhash.c and xxhash.h) is BSD -# The source for the command line tool (xxhsum.c) is GPLv2+ -License: BSD and GPLv2+ -URL: http://www.xxhash.com/ +# The source for the library (xxhash.c and xxhash.h) is BSD-2-Clause +# The source for the command line tool (xxhsum.c) is GPL-2.0-or-later +License: BSD-2-Clause AND GPL-2.0-or-later +URL: https://www.xxhash.com/ Source0: https://github.com/Cyan4973/xxHash/archive/v%{version}/%{name}-%{version}.tar.gz -# Fix compilation on RHEL 7 ppc64le (gcc 4.8) -# https://github.com/Cyan4973/xxHash/issues/622 -# https://github.com/Cyan4973/xxHash/pull/631 -Patch0: %{name}-epel7-ppc64le.patch BuildRequires: make BuildRequires: gcc @@ -26,7 +22,7 @@ platforms (little / big endian). %package libs Summary: Extremely fast hash algorithm - library -License: BSD +License: BSD-2-Clause %description libs xxHash is an Extremely fast Hash algorithm, running at RAM speed @@ -37,7 +33,7 @@ platforms (little / big endian). %package devel Summary: Extremely fast hash algorithm - development files -License: BSD +License: BSD-2-Clause Requires: %{name}-libs%{?_isa} = %{version}-%{release} # By setting XXH_INLINE_ALL, xxhash may be used as a header-only library. # Dependent packages that use xxhash this way must BR this virtual Provide: @@ -48,7 +44,7 @@ Development files for the xxhash library %package doc Summary: Extremely fast hash algorithm - documentation files -License: BSD +License: BSD-2-Clause BuildArch: noarch %description doc @@ -56,30 +52,37 @@ Documentation files for the xxhash library %prep %setup -q -n xxHash-%{version} -%patch0 -p1 %build # Enable runtime detection of sse2/avx2/avx512 on intel architectures %ifarch %{ix86} x86_64 %global dispatch 1 +# Some distribution variants build with -march=x86-64-v3. +# See xxh_x86dispatch.c. +%global moreflags_dispatch -DXXH_X86DISPATCH_ALLOW_AVX %else %global dispatch 0 +%global moreflags_dispatch %{nil} %endif -%make_build MOREFLAGS="%{__global_cflags} %{?__global_ldflags}" \ - DISPATCH=%{dispatch} +%make_build \ + MOREFLAGS="%{__global_cflags} %{?__global_ldflags} %{moreflags_dispatch}" \ + DISPATCH=%{dispatch} \ + LIBXXH_DISPATCH=%{dispatch} doxygen %install -%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir} +%make_install \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + DISPATCH=%{dispatch} \ + LIBXXH_DISPATCH=%{dispatch} rm %{buildroot}/%{_libdir}/libxxhash.a %check make check make test-xxhsum-c -%ldconfig_scriptlets libs - %files %{_bindir}/xxh*sum %{_mandir}/man1/xxh*sum.1* @@ -94,6 +97,9 @@ make test-xxhsum-c %files devel %{_includedir}/xxhash.h %{_includedir}/xxh3.h +%if %{?dispatch} +%{_includedir}/xxh_x86dispatch.h +%endif %{_libdir}/libxxhash.so %{_libdir}/pkgconfig/libxxhash.pc @@ -101,6 +107,47 @@ make test-xxhsum-c %doc doxygen/html %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.8.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 0.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 0.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jan 02 2025 Mattias Ellert - 0.8.3-1 +- Update to version 0.8.3 + +* Wed Sep 25 2024 Andreas Rogge - 0.8.2-4 +- add xxh_x86dispatch.h to devel package when dispatching is enabled (rhbz#2314193) + +* Sat Jul 20 2024 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Mattias Ellert - 0.8.2-1 +- Update to version 0.8.2 +- Drop patch xxhash-epel7-ppc64le.patch +- Use SPDX license identifiers + +* Sat Jul 22 2023 Fedora Release Engineering - 0.8.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 19 2023 Florian Weimer - 0.8.1-5 +- Enable building with -march=x86-64-v3 (#2215831) + +* Sat Jan 21 2023 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild