Hello community, here is the log from the commit of package rawstudio for openSUSE:Factory checked in at 2019-04-09 20:18:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rawstudio (Old) and /work/SRC/openSUSE:Factory/.rawstudio.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rawstudio" Tue Apr 9 20:18:38 2019 rev:5 rq:692473 version:2.0+git20170413.003dd4f3 Changes: -------- --- /work/SRC/openSUSE:Factory/rawstudio/rawstudio.changes 2017-09-14 21:19:56.702636425 +0200 +++ /work/SRC/openSUSE:Factory/.rawstudio.new.3908/rawstudio.changes 2019-04-09 20:18:39.533840226 +0200 @@ -1,0 +2,18 @@ +Mon Apr 8 22:17:10 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add exiv2-0.27-buildfix.patch to fix build issues with Exiv2 0.27. + +------------------------------------------------------------------- +Mon Apr 08 21:35:53 UTC 2019 - christo...@krop.fr + +- Update to version 2.0+git20170413.003dd4f3: + * + Panasonic GH4 + GH5 + * Remove plugin load-dcraw + * Update rawspeed to last version (Feb 8, 2016). + * Fix a crash when we don't have select lens. + * Removed rawstudio.org from readme. + * Do not link to defunct website. This fixes #22. + * Do more relaxed matching when displying camera profile choices. + * Removed debug printf. + +------------------------------------------------------------------- New: ---- exiv2-0.27-buildfix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rawstudio.spec ++++++ --- /var/tmp/diff_new_pack.NAoE3m/_old 2019-04-09 20:18:40.121841027 +0200 +++ /var/tmp/diff_new_pack.NAoE3m/_new 2019-04-09 20:18:40.125841032 +0200 @@ -1,7 +1,7 @@ # # spec file for package rawstudio # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,10 +21,12 @@ Version: 2.0+git20170413.003dd4f3 Release: 0 Summary: Converter for RAW image files -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Graphics/Other -Url: http://rawstudio.org/ +URL: http://rawstudio.org/ Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: exiv2-0.27-buildfix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -75,6 +77,7 @@ %prep %setup -q +%patch0 -p1 %build ./autogen.sh --no-configure @@ -98,7 +101,8 @@ %postun -n lib%{name}-%{sover} -p /sbin/ldconfig %files -%doc AUTHORS COPYING NEWS README.md +%license COPYING +%doc AUTHORS NEWS README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %dir %{_datadir}/appdata ++++++ exiv2-0.27-buildfix.patch ++++++ diff --git a/librawstudio/rs-exif.cc b/librawstudio/rs-exif.cc index 8ad23a16..810d2aba 100644 --- a/librawstudio/rs-exif.cc +++ b/librawstudio/rs-exif.cc @@ -19,19 +19,22 @@ #include <iostream> #include <iomanip> -#include <exiv2/image.hpp> -#include <exiv2/exif.hpp> +#include <exiv2/exiv2.hpp> #include "rs-exif.h" #include <assert.h> #include "rs-library.h" +#ifdef EXIV2_VERSION #ifndef EXIV2_TEST_VERSION -# define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION((major),(minor),(patch)) ) +#define EXIV2_TEST_VERSION(major,minor,patch) \ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) +#endif +#else +#define EXIV2_TEST_VERSION(major,minor,patch) (false) #endif -#if EXIV2_TEST_VERSION(0,17,0) -#include <exiv2/convert.hpp> +#if EXIV2_TEST_VERSION(0,27,0) +#define EXV_PACKAGE "exiv2" #endif extern "C" { diff --git a/plugins/load-gdk/exiv2-colorspace.cpp b/plugins/load-gdk/exiv2-colorspace.cpp index a34ea0b7..9a5f51de 100644 --- a/plugins/load-gdk/exiv2-colorspace.cpp +++ b/plugins/load-gdk/exiv2-colorspace.cpp @@ -20,23 +20,25 @@ #include <gtk/gtk.h> #include <iostream> #include <iomanip> -#include <exiv2/image.hpp> -#include <exiv2/exif.hpp> +#include <exiv2/exiv2.hpp> #include <assert.h> #include "exiv2-colorspace.h" #include <math.h> #include <png.h> #include <jpeglib.h> +#ifdef EXIV2_VERSION #ifndef EXIV2_TEST_VERSION -# define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION((major),(minor),(patch)) ) +#define EXIV2_TEST_VERSION(major,minor,patch) \ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) #endif - -#if EXIV2_TEST_VERSION(0,17,0) -#include <exiv2/convert.hpp> +#else +#define EXIV2_TEST_VERSION(major,minor,patch) (false) #endif +#if EXIV2_TEST_VERSION(0,27,0) +#define EXV_PACKAGE "exiv2" +#endif extern "C" { diff --git a/plugins/load-png/exiv2-colorspace.cpp b/plugins/load-png/exiv2-colorspace.cpp index a34ea0b7..10d3413c 100644 --- a/plugins/load-png/exiv2-colorspace.cpp +++ b/plugins/load-png/exiv2-colorspace.cpp @@ -20,8 +20,7 @@ #include <gtk/gtk.h> #include <iostream> #include <iomanip> -#include <exiv2/image.hpp> -#include <exiv2/exif.hpp> +#include <exiv2/exiv2.hpp> #include <assert.h> #include "exiv2-colorspace.h" #include <math.h> @@ -33,10 +32,18 @@ ( EXIV2_VERSION >= EXIV2_MAKE_VERSION((major),(minor),(patch)) ) #endif -#if EXIV2_TEST_VERSION(0,17,0) -#include <exiv2/convert.hpp> +#ifdef EXIV2_VERSION +#ifndef EXIV2_TEST_VERSION +#define EXIV2_TEST_VERSION(major,minor,patch) \ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) +#endif +#else +#define EXIV2_TEST_VERSION(major,minor,patch) (false) #endif +#if EXIV2_TEST_VERSION(0,27,0) +#define EXV_PACKAGE "exiv2" +#endif extern "C" { diff --git a/plugins/meta-exiv2/exiv2-metadata.cpp b/plugins/meta-exiv2/exiv2-metadata.cpp index 8a2fc762..9c7fdcdb 100644 --- a/plugins/meta-exiv2/exiv2-metadata.cpp +++ b/plugins/meta-exiv2/exiv2-metadata.cpp @@ -20,23 +20,22 @@ #include <gtk/gtk.h> #include <iostream> #include <iomanip> -#include <exiv2/image.hpp> -#include <exiv2/exif.hpp> +#include <exiv2/exiv2.hpp> #include <assert.h> #include "exiv2-metadata.h" #include <math.h> +#ifdef EXIV2_VERSION #ifndef EXIV2_TEST_VERSION -# define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION((major),(minor),(patch)) ) +#define EXIV2_TEST_VERSION(major,minor,patch) \ + ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) #endif - -#if EXIV2_TEST_VERSION(0,17,0) -#include <exiv2/convert.hpp> +#else +#define EXIV2_TEST_VERSION(major,minor,patch) (false) #endif -#if EXIV2_TEST_VERSION(0,19,0) -#include <exiv2/easyaccess.hpp> +#if EXIV2_TEST_VERSION(0,27,0) +#define EXV_PACKAGE "exiv2" #endif extern "C" {
