Skip to content

Commit

Permalink
Upgrade LibRaw version to 0.21.3 (#10618)
Browse files Browse the repository at this point in the history
Co-authored-by: Muhammad Falak R Wani <[email protected]>
  • Loading branch information
jykanase and mfrw authored Feb 4, 2025
1 parent 4260090 commit cb6ac00
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 190 deletions.
133 changes: 0 additions & 133 deletions SPECS-EXTENDED/LibRaw/CVE-2020-15503.patch

This file was deleted.

42 changes: 0 additions & 42 deletions SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch

This file was deleted.

25 changes: 25 additions & 0 deletions SPECS-EXTENDED/LibRaw/LibRaw-pkgconfig.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--- LibRaw-0.21.0/libraw.pc.in~ 2022-12-18 01:26:41.000000000 -0600
+++ LibRaw-0.21.0/libraw.pc.in 2022-12-19 10:27:02.793929537 -0600
@@ -6,7 +6,9 @@
Name: libraw
Description: Raw image decoder library (non-thread-safe)
Requires: @PACKAGE_REQUIRES@
+Requires.private: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw@PC_OPENMP@
+Libs.private: -lstdc++
Libs.private: @PACKAGE_LIBS_PRIVATE@
Cflags: -I${includedir}/libraw -I${includedir}
--- LibRaw-0.21.0/libraw_r.pc.in~ 2022-12-18 01:26:41.000000000 -0600
+++ LibRaw-0.21.0/libraw_r.pc.in 2022-12-19 10:28:30.620571338 -0600
@@ -6,7 +6,8 @@
Name: libraw
Description: Raw image decoder library (thread-safe)
Requires: @PACKAGE_REQUIRES@
+Requires.private: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
Libs.private: @PACKAGE_LIBS_PRIVATE@
Cflags: -I${includedir}/libraw -I${includedir}
4 changes: 2 additions & 2 deletions SPECS-EXTENDED/LibRaw/LibRaw.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"LibRaw-0.19.5.tar.gz": "40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5"
"LibRaw-0.21.3.tar.gz": "dba34b7fc1143503942fa32ad9db43e94f714e62a4a856e91617f8f3e1e0aa5c"
}
}
}
24 changes: 13 additions & 11 deletions SPECS-EXTENDED/LibRaw/LibRaw.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@ Distribution: Azure Linux

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

BuildRequires: gcc-c++
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(jasper)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: autoconf automake libtool
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool

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

%description
Expand Down Expand Up @@ -58,9 +59,6 @@ LibRaw sample programs
%prep
%setup -q

%patch 0 -p0 -b .pkgconfig
%patch 1 -p1 -b .cve-2020-15503

%build
autoreconf -if
%configure \
Expand Down Expand Up @@ -95,8 +93,8 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
%files
%doc Changelog.txt
%license LICENSE.CDDL LICENSE.LGPL COPYRIGHT
%{_libdir}/libraw.so.19*
%{_libdir}/libraw_r.so.19*
%{_libdir}/libraw.so.*
%{_libdir}/libraw_r.so.*

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


%changelog
* Mon Sept 30 2024 Jyoti Kanase <[email protected]> - 0.21.3-1
- Upgrade the version to 0.21.3
- License Verified

* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.19.5-5
- Initial CBL-Mariner import from Fedora 32 (license: MIT).

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10771,8 +10771,8 @@
"type": "other",
"other": {
"name": "LibRaw",
"version": "0.19.5",
"downloadUrl": "http://www.libraw.org/data/LibRaw-0.19.5.tar.gz"
"version": "0.21.3",
"downloadUrl": "https://www.libraw.org/data/LibRaw-0.21.3.tar.gz"
}
}
},
Expand Down

0 comments on commit cb6ac00

Please sign in to comment.