Skip to content

Commit cb6ac00

Browse files
jykanasemfrw
andauthored
Upgrade LibRaw version to 0.21.3 (#10618)
Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
1 parent 4260090 commit cb6ac00

6 files changed

Lines changed: 42 additions & 190 deletions

File tree

SPECS-EXTENDED/LibRaw/CVE-2020-15503.patch

Lines changed: 0 additions & 133 deletions
This file was deleted.

SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--- LibRaw-0.21.0/libraw.pc.in~ 2022-12-18 01:26:41.000000000 -0600
2+
+++ LibRaw-0.21.0/libraw.pc.in 2022-12-19 10:27:02.793929537 -0600
3+
@@ -6,7 +6,9 @@
4+
Name: libraw
5+
Description: Raw image decoder library (non-thread-safe)
6+
Requires: @PACKAGE_REQUIRES@
7+
+Requires.private: @PACKAGE_REQUIRES@
8+
Version: @PACKAGE_VERSION@
9+
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
10+
+Libs: -L${libdir} -lraw@PC_OPENMP@
11+
+Libs.private: -lstdc++
12+
Libs.private: @PACKAGE_LIBS_PRIVATE@
13+
Cflags: -I${includedir}/libraw -I${includedir}
14+
--- LibRaw-0.21.0/libraw_r.pc.in~ 2022-12-18 01:26:41.000000000 -0600
15+
+++ LibRaw-0.21.0/libraw_r.pc.in 2022-12-19 10:28:30.620571338 -0600
16+
@@ -6,7 +6,8 @@
17+
Name: libraw
18+
Description: Raw image decoder library (thread-safe)
19+
Requires: @PACKAGE_REQUIRES@
20+
+Requires.private: @PACKAGE_REQUIRES@
21+
Version: @PACKAGE_VERSION@
22+
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
23+
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
24+
Libs.private: @PACKAGE_LIBS_PRIVATE@
25+
Cflags: -I${includedir}/libraw -I${includedir}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"LibRaw-0.19.5.tar.gz": "40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5"
3+
"LibRaw-0.21.3.tar.gz": "dba34b7fc1143503942fa32ad9db43e94f714e62a4a856e91617f8f3e1e0aa5c"
44
}
5-
}
5+
}

SPECS-EXTENDED/LibRaw/LibRaw.spec

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ Distribution: Azure Linux
88

99
Summary: Library for reading RAW files obtained from digital photo cameras
1010
Name: LibRaw
11-
Version: 0.19.5
12-
Release: 5%{?dist}
11+
Version: 0.21.3
12+
Release: 1%{?dist}
1313
License: BSD and (CDDL or LGPLv2)
1414
URL: http://www.libraw.org
15+
Source0: https://www.libraw.org/data/%{name}-%{version}.tar.gz
1516

1617
BuildRequires: gcc-c++
1718
BuildRequires: pkgconfig(lcms2)
1819
BuildRequires: pkgconfig(jasper)
1920
BuildRequires: pkgconfig(libjpeg)
20-
BuildRequires: autoconf automake libtool
21+
BuildRequires: autoconf
22+
BuildRequires: automake
23+
BuildRequires: libtool
2124

22-
Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz
23-
Patch0: LibRaw-0.6.0-pkgconfig.patch
24-
Patch1: CVE-2020-15503.patch
25+
Patch0: LibRaw-pkgconfig.patch
2526
Provides: bundled(dcraw) = 9.25
2627

2728
%description
@@ -58,9 +59,6 @@ LibRaw sample programs
5859
%prep
5960
%setup -q
6061

61-
%patch 0 -p0 -b .pkgconfig
62-
%patch 1 -p1 -b .cve-2020-15503
63-
6462
%build
6563
autoreconf -if
6664
%configure \
@@ -95,8 +93,8 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
9593
%files
9694
%doc Changelog.txt
9795
%license LICENSE.CDDL LICENSE.LGPL COPYRIGHT
98-
%{_libdir}/libraw.so.19*
99-
%{_libdir}/libraw_r.so.19*
96+
%{_libdir}/libraw.so.*
97+
%{_libdir}/libraw_r.so.*
10098

10199
%files static
102100
%{_libdir}/libraw.a
@@ -121,6 +119,10 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
121119

122120

123121
%changelog
122+
* Mon Sept 30 2024 Jyoti Kanase <v-jykanase@microsoft.com> - 0.21.3-1
123+
- Upgrade the version to 0.21.3
124+
- License Verified
125+
124126
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.19.5-5
125127
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
126128

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10771,8 +10771,8 @@
1077110771
"type": "other",
1077210772
"other": {
1077310773
"name": "LibRaw",
10774-
"version": "0.19.5",
10775-
"downloadUrl": "http://www.libraw.org/data/LibRaw-0.19.5.tar.gz"
10774+
"version": "0.21.3",
10775+
"downloadUrl": "https://www.libraw.org/data/LibRaw-0.21.3.tar.gz"
1077610776
}
1077710777
}
1077810778
},

0 commit comments

Comments
 (0)