diff --git a/03f8270d6bb255ca6618505e83169ab9d95ccef1.patch b/03f8270d6bb255ca6618505e83169ab9d95ccef1.patch deleted file mode 100644 index b04faab..0000000 --- a/03f8270d6bb255ca6618505e83169ab9d95ccef1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 03f8270d6bb255ca6618505e83169ab9d95ccef1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= -Date: Tue, 21 Feb 2023 18:45:00 -0500 -Subject: [PATCH] Issue #12 - Include stdint.h where needed - -- This fixes an issue building with gcc 13 - -https://gitlab.freedesktop.org/libopenraw/libopenraw/-/issues/12 ---- - lib/trace.hpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/trace.hpp b/lib/trace.hpp -index d56c286e..9dae1181 100644 ---- a/lib/trace.hpp -+++ b/lib/trace.hpp -@@ -1,7 +1,7 @@ - /* - * libopenraw - trace.hpp - * -- * Copyright (C) 2006-2020 Hubert Figuière -+ * Copyright (C) 2006-2023 Hubert Figuière - * - * This library is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License -@@ -20,6 +20,8 @@ - - #pragma once - -+#include -+ - #include - #include - #include --- -GitLab - diff --git a/libopenraw-0.3.4.tar.bz2 b/libopenraw-0.3.4.tar.bz2 deleted file mode 100644 index 1d5e286..0000000 --- a/libopenraw-0.3.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30486a51f0db7d027475061f52ffa43d7911c650ceb7faf8f7e5e1cf29553951 -size 667538 diff --git a/libopenraw-0.3.4.tar.bz2.asc b/libopenraw-0.3.4.tar.bz2.asc deleted file mode 100644 index 782ae10..0000000 --- a/libopenraw-0.3.4.tar.bz2.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRsRNs+C/Pq9bQzI5pf7gXmpW4VowUCY+sBJAAKCRBf7gXmpW4V -owLqAJ4mF6ec6GypWHbFVIPbPdHyDdvZWwCcCZqebJsCQ5Og05avJh12OnC+/Uc= -=2VyV ------END PGP SIGNATURE----- diff --git a/libopenraw-0.3.7.tar.bz2 b/libopenraw-0.3.7.tar.bz2 new file mode 100644 index 0000000..d624be9 --- /dev/null +++ b/libopenraw-0.3.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5515b2610361ef34580b6b976635119f6dedb4f0a79d54662fa5fe6186a45ed5 +size 3026490 diff --git a/libopenraw-0.3.7.tar.bz2.asc b/libopenraw-0.3.7.tar.bz2.asc new file mode 100644 index 0000000..f78d1a2 --- /dev/null +++ b/libopenraw-0.3.7.tar.bz2.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRsRNs+C/Pq9bQzI5pf7gXmpW4VowUCZMfbggAKCRBf7gXmpW4V +oykHAKCuKMh9qVMYTLlyV61QwogFNM2HdgCfdtobhuxZqvd2lcpVIVDgZYEha6Q= +=BODA +-----END PGP SIGNATURE----- diff --git a/libopenraw.changes b/libopenraw.changes index 8217cc5..df9f263 100644 --- a/libopenraw.changes +++ b/libopenraw.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Aug 2 06:40:36 UTC 2023 - Dave Plater + +- Update to version 0.3.7 and remove incorporated patch: + 03f8270d6bb255ca6618505e83169ab9d95ccef1.patch +- Fix build using %prep from Gentoo and autoconf +- Upstream changes: + *Bug fixes: + Fix a crash when rendering Leica M Monochron DNG files. + Preserve the raw data photometric interpretation when + decompressing raw data. + Properly decode uncompressed big endian 16 bit raw data from + Pentax PEF. Issue #2. Including PENTAX *ist DS. #2 + Added missing MPL-2.0 license to tarball. #15 + Fix build issue with Rust 1.70. + Fix offline Rust build from tarball. + Fix a missing include with gcc 13. Issue #12. + *New features: + The Rust crates are vendored for the tarball. Note: resulting + tarball is bigger. + *Camera support: + [ a * denote that static WB coefficients have been included, unless DNG ] + Added Leica M11 Monochrom, Q3. + [ a * denote that static WB coefficients have been included, unless DNG ] + Added coefficients for Canon R8* and R50*. + Added coefficients for Panasonic S5M2*. + Added Panasonic GF8*. + Added Sony ZV-E1*, ILME-FX30*. + *Other: + Updated Exif tags. + ------------------------------------------------------------------- Mon Apr 10 21:06:06 UTC 2023 - Bjørn Lie diff --git a/libopenraw.spec b/libopenraw.spec index 9c97797..85c5529 100644 --- a/libopenraw.spec +++ b/libopenraw.spec @@ -17,7 +17,7 @@ Name: libopenraw -Version: 0.3.4 +Version: 0.3.7 Release: 0 Summary: A library to decode digital camera RAW files License: LGPL-2.1-or-later @@ -30,11 +30,12 @@ Source2: %{name}.keyring Source3: vendor.tar.xz Source99: baselibs.conf # PATCH-FIX-UPSTREAM 03f8270d6bb255ca6618505e83169ab9d95ccef1.patch -- Include stdint.h where needed -Patch0: 03f8270d6bb255ca6618505e83169ab9d95ccef1.patch +#Patch0: 03f8270d6bb255ca6618505e83169ab9d95ccef1.patch BuildRequires: autoconf >= 2.69 BuildRequires: cargo BuildRequires: gcc-c++ +BuildRequires: libboost_test-devel >= 1.60.0 BuildRequires: libjpeg-devel BuildRequires: pkgconfig BuildRequires: rust @@ -42,11 +43,6 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.21 BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0 -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_test-devel >= 1.60.0 -%else -BuildRequires: boost-devel >= 1.60.0 -%endif %description libopenraw is a library that aim at decoding digital camera RAW files. @@ -82,20 +78,24 @@ Requires: libopenraw9 = %{version}-%{release} libopenraw is a library that aim at decoding digital camera RAW files. %prep -%autosetup -a3 -p1 -mv vendor lib/mp4/ -cd lib/mp4 -sed -i 's/byteorder = "1.2.1"/byteorder = "1.2.2"/' mp4parse/Cargo.toml +%autosetup -p1 +%{? +pushd lib/mp4 +cargo vendor -s Cargo.toml -s mp4parse/Cargo.toml -s mp4parse_capi/Cargo.toml mkdir .cargo -cat <> .cargo/config.toml +cat << _EOF_ >> .cargo/config.toml [source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] directory = "vendor" -EOF +_EOF_ +tar -cf %_sourcedir/%name-%version-mp4.tar vendor .cargo +popd +} %build +autoconf -f %configure --disable-static %make_build