Hello community, here is the log from the commit of package exiv2 for openSUSE:Factory checked in at 2012-09-23 17:31:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exiv2 (Old) and /work/SRC/openSUSE:Factory/.exiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "exiv2", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/exiv2/exiv2.changes 2012-05-08 11:14:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.exiv2.new/exiv2.changes 2012-09-23 17:31:51.000000000 +0200 @@ -1,0 +2,23 @@ +Wed Sep 19 17:16:50 CEST 2012 - fcro...@suse.com + +- Add 90_changeset_r2743.diff: add support for additional Samgsung + EXIF tags (backport for upstream) +- Add 90_changeset_r2744.diff: add support for additional Pentax + EXIF tags (backport for upstream) +- Add more Canon models (5D Mark III, 600D, 60D, 1100D, WFT-E2 II, + WFT-E4 II, 650D) +- Add 90_changeset_r2756.diff: add support for EOS-M Sigma 12-24mm + f/4.5-5.6 DG HSM II lens (backport from upstream) +- Add 90_changeset_r2818_partial.diff: add support for additional + Canon camera (5D Mark III, 600D, 60D, 1100D, WFT-E2 II, WFT-E4 + II, 650D) and EF/EF-M lenses. (backport from upstream) +- Add 99_pending_canon_eos_m.diff: add support for some Canon EOS-M + lenses (pending upstream merge) +- Add 99_pending_minolta_manual_lens.diff: add support for Minolta + manual lens (pending upstream merge) +- Add 99_pending_pentax_da_35.diff: add support for PENTAX-DA 35mm + F2.4 AL lens (pending upstream merge) +- Add 99_pending_zeiss_planar_35_ze.diff: add support for Carl + Zeiss Planar T* 50mm f/1.4 ZE lens (pending upstream merge) + +------------------------------------------------------------------- New: ---- 90_changeset_r2743.diff 90_changeset_r2744.diff 90_changeset_r2756.diff 90_changeset_r2818_partial.diff 99_pending_canon_eos_m.diff 99_pending_minolta_manual_lens.diff 99_pending_pentax_da_35.diff 99_pending_zeiss_planar_35_ze.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exiv2.spec ++++++ --- /var/tmp/diff_new_pack.NwsJTx/_old 2012-09-23 17:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.NwsJTx/_new 2012-09-23 17:31:53.000000000 +0200 @@ -25,6 +25,16 @@ Url: http://www.exiv2.org/ Source0: http://www.exiv2.org/%{name}-%{version}.tar.gz Source1: baselibs.conf +# Patches from upstream +Patch0: 90_changeset_r2743.diff +Patch1: 90_changeset_r2744.diff +Patch2: 90_changeset_r2756.diff +Patch3: 90_changeset_r2818_partial.diff +# Patches pending upstream merge +Patch4: 99_pending_canon_eos_m.diff +Patch5: 99_pending_minolta_manual_lens.diff +Patch6: 99_pending_pentax_da_35.diff +Patch7: 99_pending_zeiss_planar_35_ze.diff BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -64,6 +74,14 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build %configure --disable-static --with-pic ++++++ 90_changeset_r2743.diff ++++++ --- a/src/exif.cpp (revision 2742) +++ b/src/exif.cpp (revision 2743) @@ -752,6 +752,8 @@ { pttLen, "Exif.Pentax.PreviewLength" }, { pttTag, "Exif.Pentax.PreviewOffset" }, { pttTag, "Exif.Pentax.PreviewResolution" }, + { pttLen, "Exif.SamsungPreview.JPEGInterchangeFormatLength" }, + { pttIfd, "SamsungPreview" }, { pttLen, "Exif.Thumbnail.StripByteCounts" }, { pttIfd, "Thumbnail" }, { pttLen, "Exif.Thumbnail.JPEGInterchangeFormatLength" }, ++++++ 90_changeset_r2744.diff ++++++ --- a/src/exif.cpp (revision 2743) +++ b/src/exif.cpp (revision 2744) @@ -752,6 +752,9 @@ { pttLen, "Exif.Pentax.PreviewLength" }, { pttTag, "Exif.Pentax.PreviewOffset" }, { pttTag, "Exif.Pentax.PreviewResolution" }, + { pttLen, "Exif.PentaxDng.PreviewLength" }, + { pttTag, "Exif.PentaxDng.PreviewOffset" }, + { pttTag, "Exif.PentaxDng.PreviewResolution" }, { pttLen, "Exif.SamsungPreview.JPEGInterchangeFormatLength" }, { pttIfd, "SamsungPreview" }, { pttLen, "Exif.Thumbnail.StripByteCounts" }, ++++++ 90_changeset_r2756.diff ++++++ Index: canonmn.cpp =================================================================== --- a/src/canonmn.cpp (revision 2755) +++ b/src/canonmn.cpp (revision 2756) @@ -525,7 +525,8 @@ { 137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM" }, // 6 { 137, "Sigma 17-50mm f/2.8 OS HSM" }, // 7 { 137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM" }, // 8 - { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD" }, // 9 + { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II" }, // 9 + { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD" }, // 10 { 138, "Canon EF 28-80mm f/2.8-4L" }, { 139, "Canon EF 400mm f/2.8L" }, { 140, "Canon EF 500mm f/4.5L" }, ++++++ 90_changeset_r2818_partial.diff ++++++ Index: canonmn.cpp =================================================================== --- a/src/canonmn.cpp (revision 2817) +++ a/src/canonmn.cpp (revision 2818) @@ -173,6 +173,13 @@ { 0x80000261, N_("EOS 50D") }, { 0x80000270, N_("EOS Rebel T2i / 550D / Kiss X4") }, { 0x80000281, N_("EOS-1D Mark IV") }, + { 0x80000285, N_("EOS 5D Mark III") }, + { 0x80000286, N_("EOS Rebel T3i / 600D / Kiss X5") }, + { 0x80000287, N_("EOS 60D") }, + { 0x80000288, N_("EOS Rebel T3 / 1100D / Kiss X50") }, + { 0x80000297, N_("WFT-E2 II") }, + { 0x80000298, N_("WFT-E4 II") }, + { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") }, }; //! SerialNumberFormat, tag 0x0015 @@ -652,11 +659,16 @@ { 249, "Canon EF 800mm f/5.6L IS" }, { 250, "Canon EF 24 f/1.4L II" }, { 251, "Canon EF 70-200mm f/2.8L IS II USM" }, + { 252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x" }, + { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" }, { 254, "Canon EF 100mm f/2.8L Macro IS USM" }, { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM" }, { 489, "Canon EF 70-300mm f/4-5.6L IS USM" }, { 490, "Canon EF 8-15mm f/4L USM" }, - { 491, "Canon EF 300mm f/2.8L IS II USM" } + { 491, "Canon EF 300mm f/2.8L IS II USM" }, + { 494, "Canon EF 600mm f/4.0L IS II USM" }, + { 495, "Canon EF 24-70mm f/2.8L II USM" }, + { 4144,"Canon EF 40mm f/2.8 STM" } }; //! A lens id and a pretty-print function for special treatment of the id. ++++++ 99_pending_canon_eos_m.diff ++++++ diff -Nurpd lensfun-r2853/src/canonmn.cpp lensfun-r2853-canon/src/canonmn.cpp --- lensfun-r2853/src/canonmn.cpp 2012-08-21 19:45:02.013828940 +0200 +++ lensfun-r2853-canon/src/canonmn.cpp 2012-08-21 19:50:59.017828642 +0200 @@ -669,7 +669,9 @@ namespace Exiv2 { { 491, "Canon EF 300mm f/2.8L IS II USM" }, { 494, "Canon EF 600mm f/4.0L IS II USM" }, { 495, "Canon EF 24-70mm f/2.8L II USM" }, - { 4144,"Canon EF 40mm f/2.8 STM" } + { 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM" }, + { 4144,"Canon EF 40mm f/2.8 STM" }, + { 4145,"Canon EF-M 22mm f/2 STM" } }; //! A lens id and a pretty-print function for special treatment of the id. ++++++ 99_pending_minolta_manual_lens.diff ++++++ diff -Nurpd trunk/src/minoltamn.cpp trunk-sony/src/minoltamn.cpp --- a/src/minoltamn.cpp 2012-08-01 14:52:28.324269147 +0200 +++ b/src/minoltamn.cpp 2012-08-01 14:51:52.812093031 +0200 @@ -1861,15 +1861,7 @@ namespace Exiv2 { "Tamron SP AF 90mm F2.5"}, { 45751, "1.4x Teleconverter " }, { 45851, "Tamron SP AF 300mm F2.8 LD IF" }, - { 65535, "T-Mount | " - "Arax MC 35mm F2.8 Tilt+Shift | " - "Arax MC 80mm F2.8 Tilt+Shift | " - "Zenitar MF 16mm F2.8 Fisheye M42 | " - "Samyang 500mm Mirror F8.0 | " - "Pentacon Auto 135mm F2.8 | " - "Pentacon Auto 29mm F2.8 | " - "Helios 44-2 58mm F2.0 | " - "No Lens" } + { 65535, "Manual Lens" } }; std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value& value, const ExifData* metadata) ++++++ 99_pending_pentax_da_35.diff ++++++ --- a/src/pentaxmn.cpp (révision 2790) +++ b/src/pentaxmn.cpp (copie de travail) @@ -666,6 +666,7 @@ { 0x060e, "smc PENTAX-FA* MACRO 200mm F4 ED[IF]" }, { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" }, { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" }, + { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" }, { 0x07d9, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" }, { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" }, { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]" }, ++++++ 99_pending_zeiss_planar_35_ze.diff ++++++ diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 1c0a73a..0326848 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -474,6 +474,7 @@ namespace Exiv2 { { 33, "Voigtlander or Zeiss Lens" }, // 0 { 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1 { 33, "Zeiss Distagon 35mm T* f/2 ZE" }, // 2 + { 33, "Carl Zeiss Planar T* 50mm f/1.4 ZE" }, // 3 { 35, "Canon EF 35-80mm f/4-5.6" }, { 36, "Canon EF 38-76mm f/4.5-5.6" }, { 37, "Canon EF 35-80mm f/4-5.6" }, // 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
