Skip to content

Commit fb2aed4

Browse files
authored
Update libdeflate version to 1.22 (#10658)
1 parent 8f91134 commit fb2aed4

3 files changed

Lines changed: 34 additions & 11 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"libdeflate-1.9.tar.gz": "a537ab6125c226b874c02b166488b326aece954930260dbf682d88fc339137e3"
3+
"libdeflate-1.22.tar.gz": "7f343c7bf2ba46e774d8a632bf073235e1fd27723ef0a12a90f8947b7fe851d6"
44
}
55
}

SPECS-EXTENDED/libdeflate/libdeflate.spec

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
Summary: Fast implementation of DEFLATE, gzip, and zlib
2+
23
Name: libdeflate
3-
Version: 1.9
4-
Release: 4%{?dist}
4+
Version: 1.22
5+
Release: 1%{?dist}
56
License: MIT
67
Vendor: Microsoft Corporation
78
Distribution: Azure Linux
89
URL: https://github.com/ebiggers/libdeflate
9-
Source0: https://github.com/ebiggers/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
10+
Source0: https://github.com/ebiggers/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
11+
12+
1013
BuildRequires: gcc
11-
BuildRequires: make
14+
BuildRequires: cmake
15+
BuildRequires: zlib-devel
1216

1317
%description
1418
libdeflate is a library for fast, whole-buffer DEFLATE-based compression and
@@ -28,16 +32,29 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
2832
%description utils
2933
Binaries from libdeflate.
3034

35+
3136
%prep
3237
%autosetup
33-
sed -r -i 's/-O2 -fomit-frame-pointer -std=c99/-std=c99/' Makefile
3438

3539
%build
36-
%make_build CFLAGS="%{optflags} -fpic -pie -g" USE_SHARED_LIB=1 LIBDIR=%{_libdir} PREFIX=%{_prefix}
40+
cmake_opts="\
41+
-DLIBDEFLATE_BUILD_STATIC_LIB:BOOL=OFF \
42+
-DLIBDEFLATE_BUILD_SHARED_LIB:BOOL=ON \
43+
-DLIBDEFLATE_COMPRESSION_SUPPORT:BOOL=ON \
44+
-DLIBDEFLATE_DECOMPRESSION_SUPPORT:BOOL=ON \
45+
-DLIBDEFLATE_ZLIB_SUPPORT:BOOL=ON \
46+
-DLIBDEFLATE_GZIP_SUPPORT:BOOL=ON \
47+
-DLIBDEFLATE_FREESTANDING:BOOL=OFF \
48+
-DLIBDEFLATE_BUILD_GZIP:BOOL=ON \
49+
-DLIBDEFLATE_BUILD_TESTS:BOOL=ON \
50+
-DLIBDEFLATE_USE_SHARED_LIBS:BOOL=ON"
51+
52+
%cmake $cmake_opts
53+
%cmake_build
3754

3855
%install
39-
%make_install CFLAGS="%{optflags} -fpic -pie -g" USE_SHARED_LIB=1 LIBDIR=%{_libdir} PREFIX=%{_prefix}
40-
rm %{buildroot}/%{_libdir}/*.a
56+
%cmake_install
57+
4158

4259
%files
4360
%doc NEWS.md README.md
@@ -48,12 +65,18 @@ rm %{buildroot}/%{_libdir}/*.a
4865
%{_includedir}/libdeflate.h
4966
%{_libdir}/libdeflate.so
5067
%{_libdir}/pkgconfig/*
68+
%{_libdir}/cmake/libdeflate/
5169

5270
%files utils
5371
%{_bindir}/libdeflate-gzip
5472
%{_bindir}/libdeflate-gunzip
5573

74+
5675
%changelog
76+
* Mon Oct 14 2024 Jyoti kanase <v-jykanase@microsoft.com> - 1.22-1
77+
- Update to version 1.22
78+
- License verified
79+
5780
* Wed Jan 18 2023 Suresh Thelkar <sthelkar@microsoft.com> - 1.9-4
5881
- Initial CBL-Mariner import from Fedora 36 (license: MIT)
5982
- License verified

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9101,8 +9101,8 @@
91019101
"type": "other",
91029102
"other": {
91039103
"name": "libdeflate",
9104-
"version": "1.9",
9105-
"downloadUrl": "https://github.com/ebiggers/libdeflate/archive/v1.9.tar.gz"
9104+
"version": "1.22",
9105+
"downloadUrl": "https://github.com/ebiggers/libdeflate/archive/refs/tags/v1.22.tar.gz"
91069106
}
91079107
}
91089108
},

0 commit comments

Comments
 (0)