diff -Nru digikam-5.7.0/debian/changelog digikam-5.7.0/debian/changelog --- digikam-5.7.0/debian/changelog 2017-11-14 02:45:48.000000000 +0000 +++ digikam-5.7.0/debian/changelog 2018-04-11 21:03:20.000000000 +0000 @@ -1,3 +1,13 @@ +digikam (4:5.7.0-2+rpi1) buster-staging; urgency=medium + + * Reduce dependency versioning on libexiv2-dev from (>= 0.26) to (>= 0.25) + in both debian/control and in core/CMakelists.txt + * Fix clean target + * Apply some upstream commits to fix build with new kcalcore. + * rename powf64 to libraw_powf64 to fix conflict with kernel headers. + + -- Peter Michael Green Wed, 11 Apr 2018 21:03:20 +0000 + digikam (4:5.7.0-2) experimental; urgency=medium * Build with qtav, for video playback functionality. diff -Nru digikam-5.7.0/debian/control digikam-5.7.0/debian/control --- digikam-5.7.0/debian/control 2017-11-14 02:45:48.000000000 +0000 +++ digikam-5.7.0/debian/control 2018-04-11 21:03:20.000000000 +0000 @@ -14,7 +14,7 @@ help2man, libboost-graph-dev, libeigen3-dev (>= 3.1.2), - libexiv2-dev (>= 0.26), + libexiv2-dev (>= 0.25), libexpat1-dev | libexpat-dev, libgphoto2-dev, libjpeg-dev, diff -Nru digikam-5.7.0/debian/patches/kcalcore-fixes.patch digikam-5.7.0/debian/patches/kcalcore-fixes.patch --- digikam-5.7.0/debian/patches/kcalcore-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ digikam-5.7.0/debian/patches/kcalcore-fixes.patch 2018-04-11 21:03:20.000000000 +0000 @@ -0,0 +1,106 @@ +This patch combines upstream commits 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 dad750fadc926b62603cc9d64009ee5072a46d97 and d204022e191d9377874689bfe4c89f7b83998188 + +Modified to apply to the Debian package by Peter Michael Green. + +Hopefully it will fix the build with the new kcalcore. + +commit 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 +Author: Simon Frei +Date: Wed Sep 13 15:43:49 2017 +0200 + + calendar: Adjust to new KCalCore API (fixes CI) + +commit dad750fadc926b62603cc9d64009ee5072a46d97 +Author: Daniel Vrátil +Date: Wed Sep 13 16:51:14 2017 +0200 + + Adapt to KCalCore API changes + + This change supports both old (pre-QDateTime) and new version. + + Differential Revision: https://phabricator.kde.org/D7802 + +commit d204022e191d9377874689bfe4c89f7b83998188 +Author: Simon Frei +Date: Wed Sep 13 18:44:39 2017 +0200 + + fix calendar warning (build will pass when CI gets new version of calendar) + +Index: digikam-5.7.0/core/utilities/assistants/calendar/print/calsettings.cpp +=================================================================== +--- digikam-5.7.0.orig/core/utilities/assistants/calendar/print/calsettings.cpp ++++ digikam-5.7.0/core/utilities/assistants/calendar/print/calsettings.cpp +@@ -31,12 +31,17 @@ + #include "digikam_debug.h" + #include "calsystem.h" + +-// KCalCore includes + + #ifdef HAVE_KCALENDAR ++ // KCalCore includes ++ + # include + # include + # include ++ ++ // Qt includes ++ ++# include + #endif // HAVE_KCALENDAR + + namespace Digikam +@@ -290,7 +295,13 @@ void CalSettings::loadSpecial(const QUrl + return; + } + ++#ifdef HAVE_KCALENDAR_QDATETIME ++ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone::utc())); ++ using DateTime = QDateTime; ++#else + KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC"))); ++ using DateTime = KDateTime; ++#endif + KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat)); + + qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile(); +@@ -308,9 +319,9 @@ void CalSettings::loadSpecial(const QUrl + qLast = calSys.date(params.year + 1, 1, 1); + qLast = qLast.addDays(-1); + +- KDateTime dtFirst(qFirst); +- KDateTime dtLast(qLast); +- KDateTime dtCurrent; ++ DateTime dtFirst(qFirst, QTime(0, 0)); ++ DateTime dtLast(qLast, QTime(0, 0)); ++ DateTime dtCurrent; + + int counter = 0; + KCalCore::Event::List list = memCal->rawEvents(qFirst, qLast); +Index: digikam-5.7.0/core/CMakeLists.txt +=================================================================== +--- digikam-5.7.0.orig/core/CMakeLists.txt ++++ digikam-5.7.0/core/CMakeLists.txt +@@ -174,6 +174,9 @@ find_package(KF5 ${CALENDAR_MIN_VERSION} + OPTIONAL_COMPONENTS + CalendarCore # For Calendar tool. + ) ++if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) ++ set(HAVE_KCALENDAR_QDATETIME TRUE) ++endif() + + if(ENABLE_AKONADICONTACTSUPPORT AND NOT KF5AkonadiContact_FOUND) + set(ENABLE_KFILEMETADATASUPPORT OFF) +Index: digikam-5.7.0/core/app/utils/digikam_config.h.cmake.in +=================================================================== +--- digikam-5.7.0.orig/core/app/utils/digikam_config.h.cmake.in ++++ digikam-5.7.0/core/app/utils/digikam_config.h.cmake.in +@@ -75,6 +75,9 @@ + /* Define to 1 if you have KCalendar core shared libraries installed */ + #cmakedefine HAVE_KCALENDAR 1 + ++/* Define to 1 if you have KCalendar core shared libraries with QDateTime support installed */ ++#cmakedefine HAVE_KCALENDAR_QDATETIME 1 ++ + /* Define to 1 if Panorama tool is supported */ + #cmakedefine HAVE_PANORAMA 1 + diff -Nru digikam-5.7.0/debian/patches/libraw_powf64.patch digikam-5.7.0/debian/patches/libraw_powf64.patch --- digikam-5.7.0/debian/patches/libraw_powf64.patch 1970-01-01 00:00:00.000000000 +0000 +++ digikam-5.7.0/debian/patches/libraw_powf64.patch 2018-04-11 21:03:20.000000000 +0000 @@ -0,0 +1,337 @@ +Description: rename powf64 to libraw_powf64 + Replace powf64 by libraw_powf64 to avoid a conflict with recent kernel headers. + + This mirrors what upstream did, but I did not bother to search for the upstream commit, + I just did my own search and replace. +Author: Peter Michael Green +Last-Update: 2018-04-12 + +--- digikam-5.7.0.orig/core/libs/rawengine/libraw/internal/dcraw_common.cpp ++++ digikam-5.7.0/core/libs/rawengine/libraw/internal/dcraw_common.cpp +@@ -5749,7 +5749,7 @@ static float powf_lim(float a, float b, + { + return (b>limup || b < -limup)?0.f:powf(a,b); + } +-static float powf64(float a, float b) ++static float libraw_powf64(float a, float b) + { + return powf_lim(a,b,64.f); + } +@@ -5773,7 +5773,7 @@ static float my_roundf(float x) { + static float _CanonConvertAperture(ushort in) + { + if ((in == (ushort)0xffe0) || (in == (ushort)0x7fff)) return 0.0f; +- return powf64(2.0, in/64.0); ++ return libraw_powf64(2.0, in/64.0); + } + + static float _CanonConvertEV (short in) +@@ -6235,21 +6235,21 @@ void CLASS processNikonLensData (uchar * + if (fabsf(imgdata.lens.makernotes.MinFocal) < 1.1f) + { + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 2]) +- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f); ++ imgdata.lens.makernotes.MinFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 2] / 24.0f); + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 3]) +- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f); ++ imgdata.lens.makernotes.MaxFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 3] / 24.0f); + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 4]) +- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f); ++ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(2.0f, (float)LensData[i + 4] / 24.0f); + if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 5]) +- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f); ++ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(2.0f, (float)LensData[i + 5] / 24.0f); + } + imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6]; + if (i != 2) + { + if ((LensData[i - 1]) && + (fabsf(imgdata.lens.makernotes.CurFocal) < 1.1f)) +- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f); +- if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f); ++ imgdata.lens.makernotes.CurFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i - 1] / 24.0f); ++ if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = libraw_powf64(2.0f, (float)LensData[i + 7] / 24.0f); + } + imgdata.lens.makernotes.LensID = + (unsigned long long) LensData[i] << 56 | +@@ -6726,13 +6726,13 @@ void CLASS PentaxLensInfo (unsigned id, + if (table_buf[iLensData+9] && + (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) + imgdata.lens.makernotes.CurFocal = +- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); ++ 10*(table_buf[iLensData+9]>>2) * libraw_powf64(4, (table_buf[iLensData+9] & 0x03)-2); + if (table_buf[iLensData+10] & 0xf0) + imgdata.lens.makernotes.MaxAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); + if (table_buf[iLensData+10] & 0x0f) + imgdata.lens.makernotes.MinAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); + + if (iLensData != 12) + { +@@ -6753,14 +6753,14 @@ void CLASS PentaxLensInfo (unsigned id, + if ((table_buf[iLensData+14] > 1) && + (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) + imgdata.lens.makernotes.MaxAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); + } + else if ((id != 0x12e76) && // K-5 + (table_buf[iLensData+15] > 1) && + (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) + { + imgdata.lens.makernotes.MaxAp4CurFocal = +- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); ++ libraw_powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); + } + } + free(table_buf); +@@ -7248,11 +7248,11 @@ void CLASS process_Sony_0x9050 (uchar * + { + if (buf[0]) + imgdata.lens.makernotes.MaxAp4CurFocal = +- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; ++ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; + + if (buf[1]) + imgdata.lens.makernotes.MinAp4CurFocal = +- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; ++ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; + } + + if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens) +@@ -7262,7 +7262,7 @@ void CLASS process_Sony_0x9050 (uchar * + lid = SonySubstitution[buf[0x3d]] << 8 | + SonySubstitution[buf[0x3c]]; + imgdata.lens.makernotes.CurAp = +- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); ++ libraw_powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); + } + if (buf[0x105] && + (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF) && +@@ -7648,7 +7648,7 @@ void CLASS parse_makernote_0xc634(int ba + { + unsigned char cc; + fread(&cc, 1, 1, ifp); +- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0)); ++ iso_speed = (int)(100.0 * libraw_powf64(2.0, (double)(cc) / 12.0 - 5.0)); + break; + } + } +@@ -7693,7 +7693,7 @@ void CLASS parse_makernote_0xc634(int ba + } + break; + case 0x1002: +- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); ++ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); + break; + case 0x20100102: + stmread(imgdata.shootinginfo.InternalBodySerial, len, ifp); +@@ -7720,10 +7720,10 @@ void CLASS parse_makernote_0xc634(int ba + stmread(imgdata.lens.makernotes.Lens,len, ifp); + break; + case 0x20100205: +- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100206: +- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100207: + imgdata.lens.makernotes.MinFocal = (float)get2(); +@@ -7734,7 +7734,7 @@ void CLASS parse_makernote_0xc634(int ba + imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; + break; + case 0x2010020a: +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100301: + imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; +@@ -8043,7 +8043,7 @@ void CLASS parse_makernote_0xc634(int ba + lid = (((ushort)table_buf[2])<<8) | + ((ushort)table_buf[3]); + imgdata.lens.makernotes.CurAp = +- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); ++ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); + } + break; + case 1536: +@@ -8574,7 +8574,7 @@ void CLASS parse_makernote (int base, in + } + break; + case 0x1002: +- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); ++ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); + break; + case 0x20401112: + imgdata.makernotes.olympus.OlympusCropID = get2(); +@@ -8608,10 +8608,10 @@ void CLASS parse_makernote (int base, in + stmread(imgdata.lens.makernotes.Lens, len, ifp); + break; + case 0x20100205: +- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100206: +- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100207: + imgdata.lens.makernotes.MinFocal = (float)get2(); +@@ -8622,7 +8622,7 @@ void CLASS parse_makernote (int base, in + imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; + break; + case 0x2010020a: +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); + break; + case 0x20100301: + imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; +@@ -9049,7 +9049,7 @@ void CLASS parse_makernote (int base, in + lid = (((ushort)table_buf[2])<<8) | + ((ushort)table_buf[3]); + imgdata.lens.makernotes.CurAp = +- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); ++ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); + } + break; + case 1536: +@@ -9147,19 +9147,19 @@ void CLASS parse_makernote (int base, in + { + unsigned char cc; + fread(&cc,1,1,ifp); +- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0)); ++ iso_speed = int(100.0 * libraw_powf64(2.0f,float(cc)/12.0-5.0)); + } + if (tag == 4 && len > 26 && len < 35) { + if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535)) +- iso_speed = 50 * powf64(2.0, i/32.0 - 4); ++ iso_speed = 50 * libraw_powf64(2.0, i/32.0 - 4); + #ifdef LIBRAW_LIBRARY_BUILD + get4(); + #else + if ((i=(get2(),get2())) != 0x7fff && !aperture) +- aperture = powf64(2.0, i/64.0); ++ aperture = libraw_powf64(2.0, i/64.0); + #endif + if ((i=get2()) != 0xffff && !shutter) +- shutter = powf64(2.0, (short) i/-32.0); ++ shutter = libraw_powf64(2.0, (short) i/-32.0); + wbi = (get2(),get2()); + shot_order = (get2(),get2()); + } +@@ -9753,7 +9753,7 @@ void CLASS parse_exif (int base) + imgdata.lens.Lens[0] = 0; + break; + case 0x9205: +- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + break; + #endif + case 33434: tiff_ifd[tiff_nifds-1].t_shutter = +@@ -9768,11 +9768,11 @@ void CLASS parse_exif (int base) + case 36868: get_timestamp(0); break; + case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.) + tiff_ifd[tiff_nifds-1].t_shutter = +- shutter = powf64(2.0, expo); ++ shutter = libraw_powf64(2.0, expo); + break; + case 37378: // 0x9202 ApertureValue + if ((fabs(ape = getreal(type))<256.0) && (!aperture)) +- aperture = powf64(2.0, ape/2); ++ aperture = libraw_powf64(2.0, ape/2); + break; + case 37385: flash_used = getreal(type); break; + case 37386: focal_len = getreal(type); break; +@@ -10668,7 +10668,7 @@ int CLASS parse_tiff_ifd (int base) + imgdata.lens.Lens[0] = 0; + break; + case 0x9205: +- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + break; + // IB end + #endif +@@ -11703,22 +11703,22 @@ void CLASS parse_ciff (int offset, int l + thumb_length = len; + } + if (type == 0x1818) { +- shutter = powf64(2.0f, -int_to_float((get4(),get4()))); +- aperture = powf64(2.0f, int_to_float(get4())/2); ++ shutter = libraw_powf64(2.0f, -int_to_float((get4(),get4()))); ++ aperture = libraw_powf64(2.0f, int_to_float(get4())/2); + #ifdef LIBRAW_LIBRARY_BUILD + imgdata.lens.makernotes.CurAp = aperture; + #endif + } + if (type == 0x102a) { + // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50; +- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; ++ iso_speed = libraw_powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; + #ifdef LIBRAW_LIBRARY_BUILD + aperture = _CanonConvertAperture((get2(),get2())); + imgdata.lens.makernotes.CurAp = aperture; + #else +- aperture = powf64(2.0, (get2(),(short)get2())/64.0); ++ aperture = libraw_powf64(2.0, (get2(),(short)get2())/64.0); + #endif +- shutter = powf64(2.0,-((short)get2())/32.0); ++ shutter = libraw_powf64(2.0,-((short)get2())/32.0); + wbi = (get2(),get2()); + if (wbi > 17) wbi = 0; + fseek (ifp, 32, SEEK_CUR); +@@ -11923,8 +11923,8 @@ void CLASS parse_phase_one (int base) + setPhaseOneFeatures(unique_id); + break; + case 0x0401: +- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f)); +- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f)); ++ if (type == 4) imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); ++ else imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (getreal(type)/2.0f)); + break; + case 0x0403: + if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data); +@@ -11938,16 +11938,16 @@ void CLASS parse_phase_one (int base) + break; + case 0x0414: + if (type == 4) { +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); + } else { +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + } + break; + case 0x0415: + if (type == 4) { +- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); ++ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); + } else { +- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); ++ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); + } + break; + case 0x0416: +@@ -14127,15 +14127,15 @@ void CLASS identify() + case 18: iso_speed = 320; break; + case 19: iso_speed = 400; break; + } +- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; ++ shutter = libraw_powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; + FORC4 cam_mul[c ^ (c >> 1)] = get4(); + fseek (ifp, 88, SEEK_SET); +- aperture = powf64(2.0f, ((float)get4())/16.0f); ++ aperture = libraw_powf64(2.0f, ((float)get4())/16.0f); + fseek (ifp, 112, SEEK_SET); + focal_len = get4(); + #ifdef LIBRAW_LIBRARY_BUILD + fseek (ifp, 104, SEEK_SET); +- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f); ++ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, ((float)get4())/16.0f); + fseek (ifp, 124, SEEK_SET); + stmread(imgdata.lens.makernotes.Lens, 32, ifp); + imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N; diff -Nru digikam-5.7.0/debian/patches/reduce-exiv-dependency.patch digikam-5.7.0/debian/patches/reduce-exiv-dependency.patch --- digikam-5.7.0/debian/patches/reduce-exiv-dependency.patch 1970-01-01 00:00:00.000000000 +0000 +++ digikam-5.7.0/debian/patches/reduce-exiv-dependency.patch 2018-04-11 21:03:20.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Reduce dependency versioning on exiv2 from 0.26 to 0.25 in core/CMakelists.txt +Author: Peter Michael Green +Last-Update: 2018-04-11 + +--- digikam-5.7.0.orig/core/CMakeLists.txt ++++ digikam-5.7.0/core/CMakeLists.txt +@@ -58,7 +58,7 @@ set(QT_MIN_VERSION "5.6.0") + set(KIPI_MIN_VERSION "5.0.0") + set(KSANE_MIN_VERSION "5.0.0") + set(LENSFUN_MIN_VERSION "0.2.6.0") +-set(EXIV2_MIN_VERSION "0.26") ++set(EXIV2_MIN_VERSION "0.25") + set(AKONADI_MIN_VERSION "4.89.0") # Akonadi Contact dependency + set(CALENDAR_MIN_VERSION "4.81.0") # Calendar Core dependency + set(QTAV_MIN_VERSION "1.12.0") diff -Nru digikam-5.7.0/debian/patches/series digikam-5.7.0/debian/patches/series --- digikam-5.7.0/debian/patches/series 2017-10-02 00:55:44.000000000 +0000 +++ digikam-5.7.0/debian/patches/series 2018-04-11 21:03:20.000000000 +0000 @@ -1,2 +1,5 @@ cmake-disable-jasper.patch cmake-add-quotes +reduce-exiv-dependency.patch +kcalcore-fixes.patch +libraw_powf64.patch diff -Nru digikam-5.7.0/debian/rules digikam-5.7.0/debian/rules --- digikam-5.7.0/debian/rules 2017-08-29 02:40:26.000000000 +0000 +++ digikam-5.7.0/debian/rules 2018-04-11 21:03:20.000000000 +0000 @@ -16,6 +16,7 @@ override_dh_clean: rm -f core/data/about/js/bootstrap.min.js core/data/about/js/jquery.min.js + rm -f extra/libkface dh_clean override_dh_auto_configure: