diff -Nru lensfun-0.3.3/apps/lensfun-update-data lensfun-0.3.4/apps/lensfun-update-data
--- lensfun-0.3.3/apps/lensfun-update-data 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/apps/lensfun-update-data 2023-07-12 18:24:04.000000000 +0000
@@ -116,8 +116,8 @@
print("Reading {} …".format(base_url + "versions.json"))
try:
response = urllib.request.urlopen(base_url + "versions.json")
- except (urllib.error.HTTPError, ValueError):
- print(" Error: URL could not be opened.")
+ except (urllib.error.HTTPError, urllib.error.URLError, ValueError) as e:
+ print(" Error: URL could not be opened, skipping: " + str(e))
else:
try:
timestamp, versions, alternatives = json.loads(response.read().decode("utf-8"))
diff -Nru lensfun-0.3.3/apps/setup.py.in lensfun-0.3.4/apps/setup.py.in
--- lensfun-0.3.3/apps/setup.py.in 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/apps/setup.py.in 2023-07-12 18:24:04.000000000 +0000
@@ -3,7 +3,7 @@
"""This setup script installs the “lensfun” package."""
-from distutils.core import setup
+from setuptools import setup
setup(name="lensfun",
diff -Nru lensfun-0.3.3/ChangeLog lensfun-0.3.4/ChangeLog
--- lensfun-0.3.3/ChangeLog 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/ChangeLog 2023-07-12 18:24:04.000000000 +0000
@@ -1,3 +1,307 @@
+=======================================
+ 0.3.4-rc1 --> 0.3.4 (2023-07-12)
+=======================================
+
+Includes all new cameras and lenses up to master commit
+645bfdd5df50da92023a4f9158b0717ebcc47e81 (Wed Jul 12 18:45:25 2023 +0200)
+
+
+New cameras (19):
+
+* Canon EOS 200D II
+* Canon EOS M50 Mark II
+* Canon EOS R8
+* Fujifilm GFX100S
+* Fujifilm GFX 50S
+* Fujifilm X-S20
+* Leica Camera AG Leica M11 Monochrom
+* Leica Camera AG Leica Q3
+* Nikon Corporation Z 8
+* Olympus Corporation E-M10 III S
+* Panasonic DC-GH5M2
+* Panasonic DC-S5M2
+* Panasonic DMC-FZ330
+* Panasonic DMC-GF8
+* Ricoh Imaging Company, Ltd. KP
+* Sony Alpha 6700
+* Sony FX3
+* Sony FX30
+* Sony ZV-E1
+
+
+New lenses (50):
+
+* Canon Canon EF 28-80mm f/3.5-5.6 USM
+* Canon Canon EF 70-210mm f/4
+* Canon Canon RF 24-70mm F2.8L IS USM
+* Fujifilm GF110mmF2 R LM WR
+* Fujifilm GF23mmF4 R LM WR
+* Fujifilm XF 23mm f/1.4 R LM WR
+* Fujifilm XF 90mm f/2 R LM WR
+* Leica Camera AG APO-SUMMICRON-SL 1:2/50 ASPH.
+* Leica Camera AG VARIO-ELMARIT-SL 1:2.8/24-70 ASPH.
+* Meike Meike 28mm f/2.8
+* Meike Meike 50mm F1.2
+* Nikon Nikkor AF 10.5mm f/2.8G DX ED Fisheye
+* Nikon Nikkor AF-S 400mm f/2.8G ED + converter TC-14EIII
+* Nikon Nikkor AF-S 400mm f/2.8G ED + converter TC-20EIII
+* Nikon NIKKOR Z 100-400mm f/4.5-5.6 VR S
+* Nikon NIKKOR Z 50mm f/1.2 S
+* Olympus Olympus M.Zuiko Digital ED 12-200mm f/3.5-6.3
+* Olympus Olympus M.Zuiko Digital ED 12-45mm f/4.0 Pro
+* Olympus Olympus M.Zuiko Digital ED 30mm f/3.5 Macro
+* Olympus Olympus M.Zuiko Digital ED 40-150mm F2.8 Pro
+* Panasonic Lumix G Vario 100-300mm F4-5.6 II Power O.I.S.
+* Pentax HD PENTAX-DA* 11-18mm f/2.8 ED DC AW
+* Pentax HD PENTAX DA* 16-50mm f/2.8 ED PLM AW
+* Pentax HD Pentax-D FA* 70-200mm f/2.8 ED DC AW
+* Pentax smc PENTAX-F 35-80mm f/4-5.6
+* Samsung Samsung NX 16-50mm f/2-2.8 S
+* Samsung Samsung NX 50-150mm F2.8 S
+* Samsung Samsung NX-M 9-27mm f/3.5-5.6 ED OIS
+* Samsung Samsung NX-M 9mm f/3.5 ED
+* Sigma 100-400mm F5-6.3 DG OS HSM | C
+* Sigma 105mm F2.8 DG DN MACRO | Art 020
+* Sigma 70-200mm F2.8 DG OS HSM | S
+* Sigma Sigma 60-600mm F4.5-6.3 DG OS HSM | Sports 018 + 1.4x ext.
+* Sony E 11mm f/1.8
+* Sony E 16-55mm f/2.8 G
+* Sony E 70-350mm f/4.5-6.3 G OSS
+* Sony FE 14mm f/1.8 GM
+* Sony FE 200-600mm f/5.6-6.3 G OSS
+* Sony FE 20-70mm f/4 G
+* Sony FE 20mm f/1.8 G
+* Sony FE 24-70mm f/2.8 GM II
+* Sony FE 24mm f/1.4 GM
+* Sony FE 28-60mm f/4-5.6
+* Sony FE 35mm f/1.4 GM (SEL35F14GM)
+* Sony FE 35mm f/1.8
+* Sony FE 40mm f/2.5 G
+* Sony FE 50mm f/1.2 GM
+* Sony FE 50mm f/2.8 Macro
+* Sony FE 50mm f/2.8 Macro
+* Yongnuo Yongnuo YN 50mm f/1.8 II
+
+
+
+=======================================
+ 0.3.3 --> 0.3.4-rc1 (2023-01-01)
+=======================================
+
+Includes all new cameras and lenses up to master commit
+ec9412d27d5fa8f377848a59c768b12c243cb80d (Wed Dec 28 16:24:48 2022 +0100)
+
+Changes / bugfixes (4):
+
+ * Fix C++11 issues to enable compilation with Clang (#1954)
+ * Port apps/setup.py from Python distutils (deprecated) to setuptools (#1956)
+ * CMake: Bump CMake minimum version to 2.8.12 (#1958)
+ * CMake: Numerous backports from master (#1959)
+
+
+New cameras (54):
+
+ * Canon Canon PowerShot G9 X Mark II
+ * Canon EOS M6 Mark II
+ * Canon EOS R10
+ * Canon EOS R3
+ * Canon EOS R6 Mark II
+ * Canon EOS R7
+ * Canon PowerShot G7 X Mark III (3:2)
+ * DJI Air 2S
+ * Fujifilm GFX 100S
+ * Fujifilm XF10
+ * Fujifilm X-H2
+ * Fujifilm X-H2S
+ * Fujifilm X-T30 II
+ * Fujifilm X-T5
+ * Hasselblad DJI Mavic 3
+ * Leica Camera AG Digilux 3
+ * Leica Camera AG Leica C-Lux (Typ 1546)
+ * Leica Camera AG Leica M10
+ * Leica Camera AG Leica M10 Monochrom
+ * Leica Camera AG Leica M10-P
+ * Leica Camera AG Leica M10-R
+ * Leica Camera AG Leica M11
+ * Leica Camera AG Leica M Monochrom (Typ 246)
+ * Leica Camera AG Leica M (Typ 240)
+ * Leica Camera AG Leica Q2
+ * Leica Camera AG Leica Q2 Mono
+ * Leica Camera AG Leica SL2
+ * Leica Camera AG Leica SL2-S
+ * Leica Camera AG M9 Digital Camera
+ * Leica D-LUX2
+ * Leica D-LUX 3
+ * Leica D-LUX 4
+ * Nikon Corporation Z 30
+ * OM Digital Solutions OM-1
+ * OM Digital Solutions OM-5
+ * Panasonic DC-G100
+ * Panasonic DC-G110
+ * Panasonic DC-GH5S
+ * Panasonic DC-GH6
+ * Panasonic DC-GX7MK3
+ * Panasonic DC-S1H
+ * Panasonic DC-TZ220
+ * Panasonic DC-ZS220
+ * Panasonic DMC-FZ2000
+ * Panasonic DMC-FZ2500
+ * Panasonic DMC-ZS110
+ * Ricoh Imaging Company, Ltd. K-3 III
+ * Ricoh Imaging Company, Ltd. Ricoh GR IIIx
+ * Samsung Galaxy S21
+ * Sony Alpha 7R IIIA
+ * Sony Alpha 7R IV A
+ * Sony Alpha 7R V
+ * Sony RX0
+ * Sony ZV-E10
+
+
+New lenses (140):
+
+ * Canon Canon EF 28mm f/2.8
+ * Canon Canon EF 35-105mm f/3.5-4.5
+ * Canon Canon EF 75-300mm F4-5.6 III
+ * Canon Canon EF 85mm f/1.4L IS USM
+ * Canon Canon EF-M 32mm f/1.4 STM
+ * Canon Canon RF 100-400mm F5.6-8 IS USM
+ * Canon Canon RF 100mm F2.8L Macro IS USM
+ * Canon Canon RF 14-35mm F4 L IS USM
+ * Canon Canon RF 15-35mm F2.8L IS USM
+ * Canon Canon RF 16mm F2.8 STM
+ * Canon Canon RF 35mm F1.8 MACRO IS STM
+ * Canon Canon RF 800mm F11 IS STM
+ * Canon Canon RF-S 18-150mm F3.5-6.3 IS STM
+ * DJI FC3411 fixed lens
+ * Fujifilm XF 10-24mm f/4 R OIS WR
+ * Fujifilm XF10 & compatibles (Standard)
+ * Fujifilm XF 33mm f/1.4 R LM WR
+ * Hasselblad fixed lens
+ * Kipon Elegant 35mm F/2.4
+ * Leica Camera AG Elmarit-M 28mm f/2.8 ASPH
+ * Leica Camera AG Elmarit-M 90mm f/2.8
+ * Leica Camera AG Elmarit-TL 1:2.8/18 ASPH.
+ * LEICA CAMERA AG fixed lens
+ * LEICA CAMERA AG fixed lens
+ * Leica Camera AG Summicron-M 1:2/28 ASPH.
+ * Leica Camera AG Summicron-M 50mm f/2
+ * Leica Camera AG Summicron TL 1:2 23 ASPH.
+ * Leica Camera AG Summilux-TL 1:1.4/35 ASPH.
+ * Leica fixed lens
+ * Meyer Optik Görlitz Meyer Optik Görlitz 3.5/30mm
+ * Minolta Minolta AF 50mm f/1.7
+ * Minolta Minolta AF 70-210mm f/4 Macro
+ * Mitakon Mitakon Speedmaster 50mm f/0.95 III
+ * Nikon Nikkor AF 18-35mm f/3.5-4.5D IF-ED
+ * Nikon Nikkor AF-S 600mm f/4E FL ED VR + converter TC-14EIII
+ * Nikon Nikkor AI-S 135mm f/3.5
+ * Nikon NIKKOR Z 24-120mm f/4 S
+ * Nikon NIKKOR Z 28-75mm f/2.8
+ * Nikon NIKKOR Z MC 105mm f/2.8 VR S
+ * Nikon Nikkor Z MC 50mm f/2.8
+ * Nikon Nikon AF-S Nikkor 500mm f/5.6E PF ED VR
+ * Nikon Nikon AF-S Nikkor 600mm f/4E FL ED VR
+ * Nikon Nikon AF-S VR Nikkor 400mm f/2.8G ED
+ * Nikon Nikon AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED
+ * Nikon Nikon AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED
+ * Nikon Nikon AF Zoom-Nikkor 70-210mm f/4
+ * Nikon Nikon Zoom-NIKKOR Auto 43-86mm F3.5
+ * Olympus Olympus M.Zuiko Digital ED 8-25mm f/4.0 PRO
+ * OM Digital Solutions OM 20mm F1.4
+ * Panasonic Leica DG Macro-Elmarit 45mm f/2.8
+ * Panasonic Leica DG Summilux 15mm f/1.7 Asph.
+ * Panasonic Leica DG Summilux 25mm f/1.4 Asph.
+ * Panasonic Leica DG Summilux 25mm f/1.4 II
+ * Panasonic Leica DG Summilux 9mm f/1.7
+ * Panasonic Leica DG Vario-Elmarit 12-60mm f/2.8-4.0 Asph. Power OIS
+ * Panasonic Leica DG Vario-Elmarit 50-200 mm F2.8-4 Asph OIS
+ * Panasonic Leica D Summilux 25mm F1.4 Asph.
+ * Panasonic Leica D Vario-Elmar 14-150mm f/3.5-5.6 Asph. OIS
+ * Panasonic Lumix G Vario 14-140mm f/3.5-5.6 Asph. II Power OIS
+ * Panasonic Lumix G Vario 14-140mm f/3.5-5.6 Asph. Power OIS
+ * Panasonic Lumix G Vario 45-200mm f/4.0-5.6 II power OIS
+ * Panasonic Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS
+ * Panasonic Lumix G X Vario 12-35mm f/2.8 II
+ * Panasonic LUMIX G X VARIO 35-100 mm f/2.8 II Power OIS
+ * Panasonic Lumix G X Vario 35-100mm f/2.8 Power OIS
+ * Panasonic LUMIX S 16-35/F4
+ * Panasonic Lumix S 20-60/F3.5-5.6
+ * Panasonic Lumix S 24/F1.8
+ * Panasonic Lumix S 50/F1.8
+ * Panasonic LUMIX S 70-300/F4.5-5.6
+ * Panasonic Lumix S 85/F1.8
+ * Pentacon Pentacon electric 2.8/29mm
+ * Pentax HD PENTAX-DA* 11-18mm F2.8 ED DC AW
+ * Pentax smc PENTAX-F 35-80mm F4-5.6
+ * Ricoh imaging company, ltd. fixed lens
+ * Rollei Rollei Rolleinar MC f/2.8 28mm
+ * Rollei Rollei Rolleinar MC f/4 21mm
+ * Samsung Samsung Galaxy S21 ultrawide
+ * Samsung Samsung NX 50-200mm f/4-5.6
+ * Samyang Samyang AF 12mm f/2.0
+ * Samyang Samyang AF 18mm f/2.8
+ * Samyang Samyang AF 24mm f/1.8
+ * Samyang Samyang AF 35mm f/1.8
+ * Samyang Samyang AF 45mm f/1.8
+ * Samyang Samyang AF 75mm f/1.8
+ * Samyang Samyang AF 85mm f/1.4
+ * Samyang Samyang XP 10mm f/3.5
+ * Sigma 16-28mm F2.8 DG DN | Contemporary 022
+ * Sigma 20mm F2 DG DN | Contemporary 022
+ * Sigma 24-70mm F2.8 DG DN | Art 019
+ * Sigma 24mm F2 DG DN | Contemporary 021
+ * Sigma 28-70mm F2.8 DG DN | Contemporary 021
+ * Sigma 35mm F2 DG DN | Contemporary 020
+ * Sigma 45mm F2.8 DG DN | Contemporary 019
+ * Sigma 65mm F2 DG DN | Contemporary 020
+ * Sigma 90mm F2.8 DG DN | Contemporary 021
+ * Sigma Sigma 105 mm F1.4 DG HSM Art
+ * Sigma Sigma 16mm f/1.4 DC DN Contemporary
+ * Sigma Sigma 24mm f/1.4 DG HSM | A
+ * Sigma Sigma 40mm F1.4 DG HSM | Art
+ * Sigma Sigma 56 mm F1.4 DC DN | C 018
+ * Sigma Sigma 56mm F1.4 DC DN | C 018
+ * Sigma Sigma 60-600mm F4.5-6.3 DG OS HSM | Sports 018
+ * Sony E 11mm F1.8
+ * Sony FE 14mm F1.8 GM
+ * Sony FE 40mm F2.5 G
+ * Sony FE 50mm F1.2 GM
+ * Sony FE 50mm F2.8 Macro
+ * Sony FE 50mm F2.8 Macro
+ * Sony Sony 85mm F2.8 SAM (SAL85F28)
+ * Tamron 18-300mm F3.5-6.3 DiIII-A VC VXD B061X
+ * Tamron E 24mm F2.8
+ * Tamron TAMRON 100-400mm F/4.5-6.3 Di VC USD A035
+ * Tamron Tamron 11-20 mm F2.8 Di III-A RXD (B060)
+ * Tamron Tamron 150-500mm F5-6.7 Di III VC VXD
+ * Tamron Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro B016
+ * Tamron Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro B016
+ * Tamron Tamron 17-35mm f/2.8-4 Di OSD (A037)
+ * Tamron Tamron 35-150mm f/2.8-4 Di VC OSD (A043)
+ * Tamron Tamron SP 45mm F/1.8 Di VC USD
+ * Tamron Tamron SP AF 150-600mm F/5-6.3 Di VC USD G2 (A022)
+ * Tokina Tokina atx-i 11-16mm F2.8 CF
+ * Tokina Tokina AT-X M35 PRO DX (AF 35mm f/2.8 Macro)
+ * TTArtisan TTArtisan APS-C 23mm F1.4
+ * Venus Laowa 17mm f/1.8 C-Dreamer
+ * Voigtländer 15mm F4,5 Super Wide Heliar aspherical III
+ * Voigtländer Voigtlander APO-LANTHAR 50mm F2 Aspherical
+ * Voigtländer Voigtlander Color Skopar 20mm F3.5 SLII Aspherical
+ * Voigtländer Voigtländer HELIAR-HYPER WIDE 10mm F5.6
+ * Voigtländer Voigtländer Nokton 25mm f/0.95 Type II
+ * Zeiss Carl Zeiss Jena 135mm f/3.5
+ * Zeiss Carl Zeiss Jena Flektogon 4/20mm
+ * Zeiss Carl Zeiss Planar T* 1,4/50 ZF.2
+ * Zeiss Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)
+ * Zeiss Distagon 18mm f/4
+ * Zeiss Distagon 28mm f/2.8 MMJ
+ * Zeiss Makro-Planar T* 2/100
+ * Zeiss Planar 50mm f/1.7 AEJ
+ * Zeiss Sonnar 85mm f/2.8 AEJ
+ * Zeiss Touit 2.8/12
+
+
+
=======================================
0.3.3-rc1 --> 0.3.3 (2022-02-22)
=======================================
diff -Nru lensfun-0.3.3/cmake/modules/FindGLIB2.cmake lensfun-0.3.4/cmake/modules/FindGLIB2.cmake
--- lensfun-0.3.3/cmake/modules/FindGLIB2.cmake 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/cmake/modules/FindGLIB2.cmake 2023-07-12 18:24:04.000000000 +0000
@@ -1,6 +1,6 @@
IF (NOT MSVC)
- INCLUDE(FindPkgConfig)
- PKG_SEARCH_MODULE( GLIB2 glib-2.0 )
+ FIND_PACKAGE(PkgConfig)
+ PKG_SEARCH_MODULE(GLIB2 glib-2.0)
IF(WIN32 AND NOT BUILD_STATIC)
FIND_FILE(GLIB2_DLL
NAMES glib-2.dll glib-2-vs9.dll libglib-2.0-0.dll
@@ -18,6 +18,7 @@
/usr/lib64
/opt/local/lib
${GLIB2_BASE_DIR}/lib
+ ${GLIB2_BASE_DIR}/include
${CMAKE_LIBRARY_PATH}
PATH_SUFFIXES glib-2.0/include
)
diff -Nru lensfun-0.3.3/CMakeLists.txt lensfun-0.3.4/CMakeLists.txt
--- lensfun-0.3.3/CMakeLists.txt 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/CMakeLists.txt 2023-07-12 18:24:04.000000000 +0000
@@ -1,5 +1,5 @@
-# require at least cmake 2.8
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR )
+# require at least cmake 2.8.12
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR )
# path for helper modules
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake/modules")
@@ -8,10 +8,20 @@
# global setup
project(lensfun C CXX)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+IF (MSVC)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+ELSE()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wformat-security")
+ENDIF()
+
# version
SET(VERSION_MAJOR 0)
SET(VERSION_MINOR 3)
-SET(VERSION_MICRO 3)
+SET(VERSION_MICRO 4)
SET(VERSION_BUGFIX 0)
SET(VERSION_API 1)
# This is the version of the *shipped* database, which is not necessarily the
@@ -39,11 +49,13 @@
# options controlling the build process
OPTION(BUILD_STATIC "Build static library" OFF)
+OPTION(BUILD_WITH_MSVC_STATIC_RUNTIME "Build using static MSVC runtime" OFF)
OPTION(BUILD_TESTS "Build test suite" OFF)
OPTION(BUILD_LENSTOOL "Build the lenstool (requires libpng)" OFF)
OPTION(BUILD_FOR_SSE "Build with support for SSE" ${X86_ON})
OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ${X86_ON})
OPTION(BUILD_DOC "Build documentation with doxygen" OFF)
+OPTION(INSTALL_PYTHON_MODULE "Install Python module for the helper scripts" ON)
OPTION(INSTALL_HELPER_SCRIPTS "Install various helper scripts" ON)
IF(NOT CMAKE_BUILD_TYPE)
@@ -53,10 +65,21 @@
)
ENDIF()
+# place all .exe and .dll files in same folder to avoid issues with tests
+IF(WIN32)
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+ENDIF()
+
# set local install prefix on windows
-IF(WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install" CACHE PATH "Install prefix for Lensfun" FORCE)
+IF(WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install" CACHE PATH "Install prefix for Lensfun" FORCE)
ENDIF()
+
+# overwrite some folders before GNUInstallDirs is loaded
+IF (WIN32 AND NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
+ SET(CMAKE_INSTALL_DATAROOTDIR "$ENV{ALLUSERSPROFILE}" CACHE PATH "read-only architecture-independent data root (share)")
+ENDIF()
+
# get standard GNU install directories for the current platform
INCLUDE(GNUInstallDirs)
IF(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
@@ -113,10 +136,9 @@
# some windows and MSVC specific settings
IF(WIN32)
- SET(PLATFORM_WINDOWS 1)
-
+
IF (MSVC)
- IF(BUILD_STATIC)
+ IF(BUILD_WITH_MSVC_STATIC_RUNTIME)
# compile everything for the static C runtime
FOREACH(TYPE C CXX)
# makefiles use blank configuration
@@ -142,6 +164,7 @@
ENDIF(MSVC)
ENDIF(WIN32)
+
# create config.h file
CONFIGURE_FILE(include/lensfun/config.h.in.cmake ${CMAKE_BINARY_DIR}/config.h)
# create lensfun.h file
@@ -157,6 +180,9 @@
ENDIF()
# apps subdir
+IF(BUILD_LENSTOOL)
+ FIND_PACKAGE(PNG REQUIRED)
+ENDIF()
ADD_SUBDIRECTORY(apps)
# install include files
@@ -167,17 +193,21 @@
# install db files
FILE(GLOB DATABASE_FILES data/db/*.xml)
+
INSTALL(FILES ${DATABASE_FILES} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/lensfun/version_${LENSFUN_DB_VERSION})
INSTALL(FILES data/db/timestamp.txt DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/lensfun/version_${LENSFUN_DB_VERSION})
+FILE(GLOB DATABASE_DTD data/db/*.dtd data/db/*.xsd)
+INSTALL(FILES ${DATABASE_DTD} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/lensfun/version_${LENSFUN_DB_VERSION})
+
# build documentation
IF(BUILD_DOC)
ADD_SUBDIRECTORY(docs)
ENDIF()
IF(WIN32 AND NOT BUILD_STATIC)
- FIND_FILE(GLIB2_DLL
- NAMES glib-2.dll glib-2-vs9.dll
+ FIND_FILE(GLIB2_DLL
+ NAMES glib-2.0-0.dll glib-2.dll glib-2-vs9.dll
PATHS "${GLIB2_BASE_DIR}/bin"
NO_SYSTEM_ENVIRONMENT_PATH)
INSTALL(FILES ${GLIB2_DLL} DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -206,11 +236,11 @@
IF(GLIB2_DLL)
MESSAGE(STATUS "GLIB2 DLL: ${GLIB2_DLL}")
ENDIF()
-IF(BUILD_APPS)
-MESSAGE(STATUS "libpng include dir: ${PNG_INCLUDE_DIR}")
-MESSAGE(STATUS "libpng lib: ${PNG_LIBRARY}")
-MESSAGE(STATUS "zlib include dir: ${ZLIB_INCLUDE_DIR}")
-MESSAGE(STATUS "zlib lib: ${ZLIB_LIBRARY}")
+IF(BUILD_LENSTOOL)
+MESSAGE(STATUS "libpng include dir: ${PNG_INCLUDE_DIRS}")
+MESSAGE(STATUS "libpng lib: ${PNG_LIBRARIES}")
+MESSAGE(STATUS "zlib include dir: ${ZLIB_INCLUDE_DIRS}")
+MESSAGE(STATUS "zlib lib: ${ZLIB_LIBRARIES}")
ENDIF()
# Package
diff -Nru lensfun-0.3.3/data/db/actioncams.xml lensfun-0.3.4/data/db/actioncams.xml
--- lensfun-0.3.3/data/db/actioncams.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/actioncams.xml 2023-07-12 18:24:04.000000000 +0000
@@ -71,6 +71,13 @@
2.73
+ DJI
+ FC3411
+ Air 2S
+ djiFC3411
+ 2.73
+
+
Hasselblad
L1D-20c
DJI Mavic 2 Pro
@@ -78,6 +85,13 @@
2.8
+ Hasselblad
+ L2D-20c
+ DJI Mavic 3
+ l2d20c
+ 1.953
+
+
DJI
Mavic Air FC2103
djiMavicAirFC2103
@@ -233,6 +247,18 @@
+ Hasselblad
+ L2D-20c & compatibles
+ fixed lens
+ festes Objektiv
+ l2d20c
+ 1.953
+ 4:3
+
+
+
+
+
DJI
FC2103 & compatibles
fixed lens
@@ -246,4 +272,19 @@
+
+ DJI
+ FC3411 & compatibles
+ FC3411 fixed lens
+ FC3411 festes Objektiv
+ djiFC3411
+ 2.63
+ 3:2
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/compact-canon.xml lensfun-0.3.4/data/db/compact-canon.xml
--- lensfun-0.3.3/data/db/compact-canon.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/compact-canon.xml 2023-07-12 18:24:04.000000000 +0000
@@ -127,6 +127,13 @@
Canon
+ Canon PowerShot G7 X Mark III
+ PowerShot G7 X Mark III (3:2)
+ canonG7X
+ 2.72
+
+
+ Canon
Canon PowerShot G9
PowerShot G9
canonG9
@@ -141,6 +148,13 @@
Canon
+ Canon PowerShot G9 X Mark II
+ Canon PowerShot G9 X Mark II
+ canonG9X
+ 2.72
+
+
+ Canon
Canon PowerShot G10
PowerShot G10
canonG10
@@ -179,7 +193,7 @@
Canon PowerShot G1 X Mark III
PowerShot G1 X Mark III
canonG1X3
- 1.608
+ 1.613
Canon
@@ -2538,7 +2552,7 @@
fixed lens
festes Objektiv
canonG1X3
- 1.608
+ 1.613
3:2
diff -Nru lensfun-0.3.3/data/db/compact-fujifilm.xml lensfun-0.3.4/data/db/compact-fujifilm.xml
--- lensfun-0.3.3/data/db/compact-fujifilm.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/compact-fujifilm.xml 2023-07-12 18:24:04.000000000 +0000
@@ -158,6 +158,12 @@
Fujifilm
+ XF10
+ fujixf10
+ 1.53
+
+
+ Fujifilm
X70
fujix70
1.5375
@@ -1029,4 +1035,26 @@
+
+ Fujifilm
+ XF10 & compatibles (Standard)
+ fujixf10
+ 1.53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/compact-leica.xml lensfun-0.3.4/data/db/compact-leica.xml
--- lensfun-0.3.3/data/db/compact-leica.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/compact-leica.xml 2023-07-12 18:24:04.000000000 +0000
@@ -8,15 +8,21 @@
Leica
D-LUX2
- Digilux 2
panasonicLX1
4.45
+ Leica Camera AG
+ C-Lux
+ Leica C-Lux (Typ 1546)
+
+ panasonicZS200
+ 2.73
+
+
Leica
D-LUX 4
- Digilux 4
panasonicLX4
4.33
@@ -24,7 +30,6 @@
Leica
D-LUX 3
- Digilux 3
panasonicLX3
4.33
@@ -37,8 +42,20 @@
Leica Camera AG
- LEICA Q2
- LeicaQ2
+ Leica Q2
+ leicaQ2
+ 1
+
+
+ Leica Camera AG
+ Leica Q2 Mono
+ leicaQ2
+ 1
+
+
+ Leica Camera AG
+ Leica Q3
+ leicaQ2
1
@@ -73,9 +90,10 @@
- Leica Camera AG
- Leica
- 28.0mm f/1.7
+ LEICA CAMERA AG
+ LEICA Q (Typ 116) & compatibles
+ fixed lens
+ festes Objektiv
leicaQTyp116
1
@@ -86,8 +104,10 @@
LEICA CAMERA AG
- SUMMILUX 1:1.7/28 ASPH.
- LeicaQ2
+ LEICA Q2 & compatibles
+ fixed lens
+ festes Objektiv
+ leicaQ2
1
diff -Nru lensfun-0.3.3/data/db/compact-panasonic.xml lensfun-0.3.4/data/db/compact-panasonic.xml
--- lensfun-0.3.3/data/db/compact-panasonic.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/compact-panasonic.xml 2023-07-12 18:24:04.000000000 +0000
@@ -244,6 +244,13 @@
Panasonic
+ DMC-FZ330
+
+ panasonicDMCFZ200
+ 5.56
+
+
+ Panasonic
DMC-LX100
panasonicDMCLX100
2.21
@@ -263,6 +270,18 @@
Panasonic
+ DMC-FZ2000
+ panasonicFZ2000
+ 2.73
+
+
+ Panasonic
+ DMC-FZ2500
+ panasonicFZ2000
+ 2.73
+
+
+ Panasonic
DC-FZ10002
panasonicFZ1000
@@ -287,7 +306,7 @@
5.58
-
+
Panasonic
DMC-TZ61
panasonicTZ70
@@ -314,7 +333,7 @@
5.58
-
+
Panasonic
DMC-ZS50
panasonicTZ70
@@ -402,6 +421,13 @@
Panasonic
+ DMC-ZS110
+
+ panasonicTZ100
+ 2.75
+
+
+ Panasonic
DC-ZS200
panasonicZS200
@@ -409,6 +435,13 @@
Panasonic
+ DC-ZS220
+
+ panasonicZS200
+ 2.73
+
+
+ Panasonic
DC-TZ200
panasonicZS200
@@ -416,6 +449,13 @@
Panasonic
+ DC-TZ220
+
+ panasonicZS200
+ 2.73
+
+
+ Panasonic
DC-TZ202
panasonicZS200
@@ -905,6 +945,33 @@
+ Leica
+ FZ2000 & compatibles
+ fixed lens
+ festes Objektiv
+ panasonicFZ2000
+ 2.73
+ 3:2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Leica
FZ150 & compatibles
fixed lens
diff -Nru lensfun-0.3.3/data/db/compact-ricoh.xml lensfun-0.3.4/data/db/compact-ricoh.xml
--- lensfun-0.3.3/data/db/compact-ricoh.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/compact-ricoh.xml 2023-07-12 18:24:04.000000000 +0000
@@ -36,6 +36,12 @@
ricohGRIII
1.53
+
+ Ricoh Imaging Company, Ltd.
+ Ricoh GR IIIx
+ ricohGRIIIx
+ 1.53
+
Ricoh
GR Digital & compatibles (Standard)
@@ -171,4 +177,27 @@
+
+ Ricoh imaging company, ltd.
+ Ricoh GR IIIx & compatibles
+ fixed lens
+ festes Objektiv
+ ricohGRIIIx
+ 1.53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/compact-samsung.xml lensfun-0.3.4/data/db/compact-samsung.xml
--- lensfun-0.3.3/data/db/compact-samsung.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/compact-samsung.xml 2023-07-12 18:24:04.000000000 +0000
@@ -34,6 +34,13 @@
samsungS8wide
6.047
+
+ Samsung
+ SM-G991B
+ Galaxy S21
+ samsungS21uw
+ 6.0
+
Samsung
WB2000 & compatibles (Standard)
@@ -159,4 +166,16 @@
+
+ Samsung
+ Samsung Galaxy S21 ultrawide
+ samsungS21uw
+ 6.0
+ 4:3
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/compact-sony.xml lensfun-0.3.4/data/db/compact-sony.xml
--- lensfun-0.3.3/data/db/compact-sony.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/compact-sony.xml 2023-07-12 18:24:04.000000000 +0000
@@ -263,6 +263,13 @@
Sony
+ DSC-RX0
+ RX0
+ sonyRX0M2
+ 2.70
+
+
+ Sony
DSC-RX0M2
RX0 II
sonyRX0M2
@@ -1214,6 +1221,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-canon.xml lensfun-0.3.4/data/db/mil-canon.xml
--- lensfun-0.3.3/data/db/mil-canon.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-canon.xml 2023-07-12 18:24:04.000000000 +0000
@@ -56,6 +56,13 @@
Canon
+ Canon EOS M6 Mark II
+ EOS M6 Mark II
+ Canon EF-M
+ 1.613
+
+
+ Canon
Canon EOS M10
EOS M10
Canon EF-M
@@ -70,6 +77,13 @@
Canon
+ Canon EOS M50m2
+ EOS M50 Mark II
+ Canon EF-M
+ 1.613
+
+
+ Canon
Canon EOS KISS M
EOS KISS M
Canon EF-M
@@ -91,6 +105,20 @@
Canon
+ Canon EOS R7
+ EOS R7
+ Canon RF
+ 1.613
+
+
+ Canon
+ Canon EOS R10
+ EOS R10
+ Canon RF
+ 1.613
+
+
+ Canon
Canon EOS R
EOS R
Canon RF
@@ -105,6 +133,13 @@
Canon
+ Canon EOS R3
+ EOS R3
+ Canon RF
+ 1
+
+
+ Canon
Canon EOS R5
EOS R5
Canon RF
@@ -117,6 +152,20 @@
Canon RF
1
+
+ Canon
+ Canon EOS R6m2
+ EOS R6 Mark II
+ Canon RF
+ 1
+
+
+ Canon
+ Canon EOS R8
+ EOS R8
+ Canon RF
+ 1
+
Canon
Canon EF-M 18-55mm f/3.5-5.6 IS STM
@@ -370,6 +419,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -560,6 +620,60 @@
Canon
+ Canon EF-M 32mm f/1.4 STM
+ Canon EF-M
+ 1.613
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
Canon RF 24-105mm F4L IS USM
Canon RF
1.0
@@ -660,6 +774,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -821,4 +946,282 @@
+
+ Canon
+ Canon RF 100-400mm F5.6-8 IS USM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon RF 100mm F2.8L Macro IS USM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon RF 15-35mm F2.8L IS USM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon RF 800mm F11 IS STM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+
+ Canon
+ Canon RF 16mm F2.8 STM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon RF 14-35mm F4 L IS USM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon RF 35mm F1.8 MACRO IS STM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+ Canon
+ Canon RF-S 18-150mm F3.5-6.3 IS STM
+ Canon RF
+ 1.613
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon RF 24-70mm F2.8L IS USM
+ Canon RF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-fujifilm.xml lensfun-0.3.4/data/db/mil-fujifilm.xml
--- lensfun-0.3.3/data/db/mil-fujifilm.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-fujifilm.xml 2023-07-12 18:24:04.000000000 +0000
@@ -75,6 +75,12 @@
Fujifilm
+ X-T5
+ Fujifilm X
+ 1.534
+
+
+ Fujifilm
X-Pro3
Fujifilm X
1.534
@@ -87,6 +93,18 @@
Fujifilm
+ X-H2
+ Fujifilm X
+ 1.528
+
+
+ Fujifilm
+ X-H2S
+ Fujifilm X
+ 1.528
+
+
+ Fujifilm
X-M1
Fujifilm X
1.529
@@ -123,12 +141,24 @@
Fujifilm
+ X-T30 II
+ Fujifilm X
+ 1.534
+
+
+ Fujifilm
X-S10
Fujifilm X
1.534
Fujifilm
+ X-S20
+ Fujifilm X
+ 1.534
+
+
+ Fujifilm
X-T100
Fujifilm X
1.529
@@ -155,7 +185,19 @@
Fujifilm
GFX 50R
Fujifilm G
- 0.8
+ 0.79
+
+
+ Fujifilm
+ GFX 50S
+ Fujifilm G
+ 0.79
+
+
+ Fujifilm
+ GFX100S
+ Fujifilm G
+ 0.79
Fujifilm
@@ -991,6 +1033,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1090,6 +1150,102 @@
Fujifilm
+
+ XF10-24mmF4 R OIS WR
+ XF 10-24mm f/4 R OIS WR
+ Fujifilm X
+ 1.529
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fujifilm
XF18-135mmF3.5-5.6R LM OIS WR
XF 18-135mm f/3.5-5.6R LM OIS WR
Fujifilm X
@@ -1446,7 +1602,7 @@
Fujifilm X
1.528
-
+
@@ -1584,13 +1740,154 @@
Fujifilm
+ GF23mmF4 R LM WR
+ Fujifilm G
+ 0.79
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fujifilm
GF45mmF2.8 R WR
Fujifilm G
- 0.8
- 4:3
+ 0.79
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fujifilm
+ GF110mmF2 R LM WR
+ Fujifilm G
+ 0.79
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fujifilm
+ XF33mmF1.4 R LM WR
+ XF 33mm f/1.4 R LM WR
+ Fujifilm X
+ 1.534
+
+
+
+
+
+
+ Fujifilm
+ XF90mmF2 R LM WR
+ XF 90mm f/2 R LM WR
+ Fujifilm X
+ 1.534
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fujifilm
+ XF23mmF1.4 R LM WR
+ XF 23mm f/1.4 R LM WR
+ Fujifilm X
+ 1.53
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-leica.xml lensfun-0.3.4/data/db/mil-leica.xml
--- lensfun-0.3.3/data/db/mil-leica.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-leica.xml 2023-07-12 18:24:04.000000000 +0000
@@ -16,6 +16,18 @@
Leica Camera AG
+ Leica SL2
+ Leica L
+ 1
+
+
+ Leica Camera AG
+ Leica SL2-S
+ Leica L
+ 1
+
+
+ Leica Camera AG
Leica T (Typ 701)
Leica L
1.53
@@ -38,8 +50,14 @@
Leica L
1.53
+
+ Leica Camera AG
+ Digilux 3
+ Micro 4/3 System
+ 2
+
- LEICA CAMERA AG
+ Leica Camera AG
Summicron TL 1:2 23 ASPH.
Leica L
1.53
@@ -59,7 +77,7 @@
- LEICA CAMERA AG
+ Leica Camera AG
Summilux-TL 1:1.4/35 ASPH.
Leica L
1.53
@@ -68,4 +86,38 @@
+
+ Leica Camera AG
+ Elmarit-TL 1:2.8/18 ASPH.
+ Leica L
+ 1.53
+
+
+
+
+
+
+ Leica Camera AG
+ VARIO-ELMARIT-SL 1:2.8/24-70 ASPH.
+ Leica L
+ 1
+
+
+
+
+
+
+
+
+
+
+ Leica Camera AG
+ APO-SUMMICRON-SL 1:2/50 ASPH.
+ Leica L
+ 1
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-nikon.xml lensfun-0.3.4/data/db/mil-nikon.xml
--- lensfun-0.3.3/data/db/mil-nikon.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-nikon.xml 2023-07-12 18:24:04.000000000 +0000
@@ -154,6 +154,14 @@
Nikon Corporation
Nikon
+ Nikon Z 8
+ Z 8
+ Nikon Z
+ 1
+
+
+ Nikon Corporation
+ Nikon
Nikon Z 9
Z 9
Nikon Z
@@ -162,6 +170,14 @@
Nikon Corporation
Nikon
+ Nikon Z 30
+ Z 30
+ Nikon Z
+ 1.531
+
+
+ Nikon Corporation
+ Nikon
Nikon Z 50
Z 50
Nikon Z
@@ -301,6 +317,27 @@
Nikon
+ Nikkor Z MC 50mm f/2.8
+ Nikon Z
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
NIKKOR Z 14-24mm f/2.8 S
Nikon Z
1.0
@@ -378,11 +415,9 @@
-
-
-
-
-
+
+
+
@@ -592,6 +627,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -625,6 +679,20 @@
Nikon Z
1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -720,6 +788,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -752,6 +891,29 @@
1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -763,6 +925,290 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ NIKKOR Z MC 105mm f/2.8 VR S
+ Nikon Z
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ NIKKOR Z 28-75mm f/2.8
+ Nikon Z
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ NIKKOR Z 24-120mm f/4 S
+ Nikon Z
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ NIKKOR Z 100-400mm f/4.5-5.6 VR S
+ Nikon Z
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ NIKKOR Z 50mm f/1.2 S
+ Nikon Z
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-olympus.xml lensfun-0.3.4/data/db/mil-olympus.xml
--- lensfun-0.3.3/data/db/mil-olympus.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-olympus.xml 2023-07-12 18:24:04.000000000 +0000
@@ -180,6 +180,14 @@
Olympus Corporation
Olympus
+ E-M10MarkIIIS
+ E-M10 III S
+ Micro 4/3 System
+ 2
+
+
+ Olympus Corporation
+ Olympus
E-M10MarkIV
E-M10 IV
Micro 4/3 System
@@ -1002,8 +1010,9 @@
-
+
+
@@ -1161,6 +1170,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1309,7 +1333,6 @@
Olympus
OLYMPUS M.40-150mm F2.8
- Olympus M.Zuiko ED 40-150mm F2.8 PRO
Olympus M.Zuiko Digital ED 40-150mm F2.8 Pro
Micro 4/3 System
2.0
@@ -1420,7 +1443,7 @@
Olympus
OLYMPUS M.12-200mm F3.5-6.3
- Olympus M.Zuiko ED 12-200mm f/3.5-6.3
+ Olympus M.Zuiko Digital ED 12-200mm f/3.5-6.3
Micro 4/3 System
2
4:3
@@ -1522,7 +1545,7 @@
Olympus
OLYMPUS M.30mm F3.5 Macro
- Olympus M.Zuiko ED 30mm f/3.5 Macro
+ Olympus M.Zuiko Digital ED 30mm f/3.5 Macro
Micro 4/3 System
2
4:3
@@ -1548,7 +1571,7 @@
Olympus
OLYMPUS M.12-45mm F4.0
- Olympus M.Zuiko ED 12-45mm f/4.0 Pro
+ Olympus M.Zuiko Digital ED 12-45mm f/4.0 Pro
Micro 4/3 System
2
4:3
@@ -1650,4 +1673,25 @@
+
+ Olympus
+ OLYMPUS M.8-25mm F4.0
+ Olympus M.Zuiko Digital ED 8-25mm f/4.0 PRO
+ Micro 4/3 System
+ 2.0
+ 4:3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-panasonic.xml lensfun-0.3.4/data/db/mil-panasonic.xml
--- lensfun-0.3.3/data/db/mil-panasonic.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-panasonic.xml 2023-07-12 18:24:04.000000000 +0000
@@ -79,6 +79,24 @@
Panasonic
+ DC-GH5M2
+ Micro 4/3 System
+ 2
+
+
+ Panasonic
+ DC-GH5S
+ Micro 4/3 System
+ 2
+
+
+ Panasonic
+ DC-GH6
+ Micro 4/3 System
+ 2
+
+
+ Panasonic
DMC-G5
Micro 4/3 System
2
@@ -97,6 +115,24 @@
Panasonic
+ DC-GX7MK3
+ Micro 4/3 System
+ 2
+
+
+ Panasonic
+ DC-G100
+ Micro 4/3 System
+ 2
+
+
+ Panasonic
+ DC-G110
+ Micro 4/3 System
+ 2
+
+
+ Panasonic
DMC-GF5
Micro 4/3 System
2
@@ -151,6 +187,12 @@
Panasonic
+ DMC-GF8
+ Micro 4/3 System
+ 2
+
+
+ Panasonic
DMC-GX8
Micro 4/3 System
2
@@ -244,6 +286,12 @@
Panasonic
+ DC-S1H
+ Leica L
+ 1
+
+
+ Panasonic
DC-S1R
Leica L
1
@@ -254,6 +302,12 @@
Leica L
1
+
+ Panasonic
+ DC-S5M2
+ Leica L
+ 1
+
Panasonic
Lumix G 14mm f/2.5 Asph.
@@ -510,6 +564,14 @@
+
+
+
+
+
+
+
+
@@ -1028,7 +1090,109 @@
Panasonic
Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS
- Lumix G Vario 45-200mm f/4.0-5.6
+ Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS
+ Micro 4/3 System
+ 2
+ 4:3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ Lumix G Vario 45-200mm f/4.0-5.6 II
+ Lumix G Vario 45-200mm f/4.0-5.6 II power OIS
Micro 4/3 System
2
4:3
@@ -1250,7 +1414,128 @@
- Leica
+
+ Panasonic
+ LUMIX G VARIO 100-300/F4.0-5.6II
+ Lumix G Vario 100-300mm F4-5.6 II Power O.I.S.
+ Micro 4/3 System
+ 2
+ 4:3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
Leica DG Summilux 25mm f/1.4 Asph.
Micro 4/3 System
2
@@ -1278,7 +1563,7 @@
- Leica
+ Panasonic
Leica DG Summilux 25mm f/1.4 II
Micro 4/3 System
2
@@ -1306,8 +1591,26 @@
Panasonic
- Lumix G X Vario 35-100mm f/2.8 Power OIS
- Lumix G X Vario 35-100mm f/2.8
+ LUMIX G VARIO 35-100/F2.8
+ Lumix G X Vario 35-100mm f/2.8 Power OIS
+ Micro 4/3 System
+ 2
+ 4:3
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ LUMIX G VARIO 35-100/F2.8II
+
+ LUMIX G X VARIO 35-100 mm f/2.8 II Power OIS
Micro 4/3 System
2
4:3
@@ -1355,6 +1658,40 @@
+
+ Panasonic
+ Lumix G X Vario 12-35mm f/2.8 II Asph. Power OIS
+ Lumix G X Vario 12-35mm f/2.8 II
+ Micro 4/3 System
+ 2
+ 4:3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Panasonic
Lumix G 20mm f/1.7 II Asph.
Micro 4/3 System
@@ -1488,6 +1825,14 @@
+
+
+
+
+
+
+
+
@@ -1597,7 +1942,7 @@
- Leica
+ Panasonic
Leica DG Macro-Elmarit 45mm f/2.8
Micro 4/3 System
2
@@ -1633,7 +1978,7 @@
- Leica
+ Panasonic
Leica DG Summilux 15mm f/1.7 Asph.
Micro 4/3 System
2
@@ -1789,6 +2134,7 @@
Panasonic
Lumix G Vario 14-140mm f/3.5-5.6
+ Lumix G Vario 14-140mm f/3.5-5.6 Asph. Power OIS
Micro 4/3 System
2
4:3
@@ -1879,6 +2225,7 @@
Panasonic
Lumix G Vario 14-140mm f/3.5-5.6 II
+ Lumix G Vario 14-140mm f/3.5-5.6 Asph. II Power OIS
Micro 4/3 System
2
4:3
@@ -1996,7 +2343,7 @@
- Leica
+ Panasonic
Leica DG 12-60mm f/2.8-4.0
Leica DG Vario-Elmarit 12-60mm f/2.8-4.0 Asph. Power OIS
Micro 4/3 System
@@ -2280,11 +2627,22 @@
+
+
+
+
+
+
+
+
+
+
+
Panasonic
- LUMIX S 20-60/F3.5-5.6
+ Lumix S 20-60/F3.5-5.6
Leica L
1
@@ -2303,27 +2661,279 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ LUMIX S 70-300/F4.5-5.6
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ Lumix S 24/F1.8
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ Lumix S 50/F1.8
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ Lumix S 85/F1.8
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ Leica D Summilux 25mm F1.4 Asph.
+ Micro 4/3 System
+ 2.0
+
+
+
+
+
+
+ Panasonic
+ LEICA DG 50-200/F2.8-4.0
+ Leica DG Vario-Elmarit 50-200 mm F2.8-4 Asph OIS
+ Micro 4/3 System
+ 2.0
+ 4:3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ Leica D Vario-Elmar 14-150mm f/3.5-5.6 Asph. OIS
+ 4/3 System
+ 2
+ 4:3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Panasonic
+ LEICA DG SUMMILUX 9/F1.7
+ Leica DG Summilux 9mm f/1.7
+ Micro 4/3 System
+ 2
+ 4:3
+
+
+
+
+
+
+
+ Panasonic
+ LUMIX S 16-35/F4
+ Leica L
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-samsung.xml lensfun-0.3.4/data/db/mil-samsung.xml
--- lensfun-0.3.3/data/db/mil-samsung.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-samsung.xml 2023-07-12 18:24:04.000000000 +0000
@@ -233,4 +233,83 @@
+
+ Samsung
+ Samsung NX 50-200mm f/4-5.6
+ Samsung NX
+ 1.531
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Samsung
+ Samsung NX 16-50mm f/2-2.8 S
+ Samsung NX
+ 1.531
+
+
+
+
+
+
+
+
+
+
+
+
+ Samsung
+ Samsung NX 50-150mm F2.8 S
+ Samsung NX
+ 1.531
+
+
+
+
+
+
+
+
+
+
+ Samsung
+ NX-M 9mm F3.53.5-5.6
+ Samsung NX-M 9mm f/3.5 ED
+ Samsung NX mini
+ 2.727
+
+
+
+
+
+
+ Samsung
+ NX-M 9-27mm F3.5-5.6
+ Samsung NX-M 9-27mm f/3.5-5.6 ED OIS
+ Samsung NX mini
+ 2.727
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-samyang.xml lensfun-0.3.4/data/db/mil-samyang.xml
--- lensfun-0.3.3/data/db/mil-samyang.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-samyang.xml 2023-07-12 18:24:04.000000000 +0000
@@ -134,7 +134,7 @@
Samyang
- SAMYANG AF 14mm F2.8
+ Samyang AF 14mm f/2.8
Samyang AF 14mm f/2.8
Sony E
1
@@ -145,7 +145,7 @@
Samyang
- SAMYANG AF 24mm F2.8
+ Samyang AF 24mm f/2.8
Samyang AF 24mm f/2.8
Sony E
1
@@ -183,7 +183,7 @@
Samyang
- SAMYANG AF 45mm F1.8
+ Samyang AF 45mm f/1.8
Sony E
1
@@ -224,7 +224,7 @@
Samyang
- SAMYANG AF 85mm F1.4
+ Samyang AF 85mm f/1.4
Sony E
1
@@ -242,7 +242,7 @@
Samyang
- SAMYANG AF 24mm F1.8
+ Samyang AF 24mm f/1.8
Sony E
1
@@ -253,7 +253,7 @@
Samyang
- SAMYANG AF 12mm F2.0
+ Samyang AF 12mm f/2.0
Sony E
Fujifilm X
1.534
@@ -265,12 +265,55 @@
Samyang
- SAMYANG AF 18mm F2.8
+ Samyang AF 18mm f/2.8
Sony E
1
-
+
+
+ Samyang
+ Samyang AF 75mm f/1.8
+ Sony E
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+ Samyang
+ Samyang AF 35mm f/1.8
+ Sony E
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+ Samyang
+ Samyang XP 10mm f/3.5
+ Canon EF
+ 1.005
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-sigma.xml lensfun-0.3.4/data/db/mil-sigma.xml
--- lensfun-0.3.3/data/db/mil-sigma.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-sigma.xml 2023-07-12 18:24:04.000000000 +0000
@@ -76,6 +76,63 @@
Sigma
+ Sigma 56mm F1.4 DC DN | C 018
+ Micro 4/3 System
+ 2.0
+
+
+
+
+
+
+ Sigma
+ Sigma 56mm F1.4 DC DN | Contemporary 018
+ Sigma 56 mm F1.4 DC DN | C 018
+ Sony E
+ Fujifilm X
+ Leica L
+ Canon EF-M
+ 1.534
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
Sigma 60mm f/2.8 DN
Sony E
Micro 4/3 System
@@ -228,20 +285,55 @@
Sigma
- Sigma 16mm f/1.4 DC DN | Contemporary C 017
- Sigma 16mm f/1.4 DC DN C
+ Sigma 16mm f/1.4 DC DN | Contemporary 017
+ Sigma 16mm f/1.4 DC DN Contemporary
Micro 4/3 System
Sony E
+ Fujifilm X
+ Leica L
+ Canon EF-M
1.534
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Sigma
105mm F1.4 DG HSM | Art 018
+ Sigma 105 mm F1.4 DG HSM Art
Sony E
+ Canon EF
+ Leica L
+ Nikon F AF
+ Sigma SA
1
@@ -376,6 +468,7 @@
Sigma
14-24mm F2.8 DG DN | Art 019
Sony E
+ Leica L
1
@@ -394,12 +487,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Sigma
85mm F1.4 DG DN | Art 020
Sony E
+ Leica L
1
@@ -428,6 +583,27 @@
Sigma
+ 105mm F2.8 DG DN MACRO | Art 020
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
18-50mm F2.8 DC DN | Contemporary 021
Sony E
Leica L
@@ -443,6 +619,277 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
+ 45mm F2.8 DG DN | Contemporary 019
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
+ 40mm F1.4 DG HSM | Art 018
+ Sigma 40mm F1.4 DG HSM | Art
+ Canon EF
+ Leica L
+ Sony E
+ Nikon F AF
+ Sigma SA
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
+ 20mm F2 DG DN | Contemporary 022
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+ Sigma
+ 24mm F2 DG DN | Contemporary 021
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+ Sigma
+ 24-70mm F2.8 DG DN | Art 019
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
+ 35mm F2 DG DN | Contemporary 020
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+ Sigma
+ 65mm F2 DG DN | Contemporary 020
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+ Sigma
+ 90mm F2.8 DG DN | Contemporary 021
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+ Sigma
+ 28-70mm F2.8 DG DN | Contemporary 021
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
+ 16-28mm F2.8 DG DN | Contemporary 022
+ Sony E
+ Leica L
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-sony.xml lensfun-0.3.4/data/db/mil-sony.xml
--- lensfun-0.3.3/data/db/mil-sony.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-sony.xml 2023-07-12 18:24:04.000000000 +0000
@@ -132,6 +132,13 @@
Sony
+ ILCE-7RM3A
+ Alpha 7R IIIA
+ Sony E
+ 1
+
+
+ Sony
ILCE-7M4
Alpha 7 IV
Sony E
@@ -146,6 +153,20 @@
Sony
+ ILCE-7RM4A
+ Alpha 7R IV A
+ Sony E
+ 1
+
+
+ Sony
+ ILCE-7RM5
+ Alpha 7R V
+ Sony E
+ 1
+
+
+ Sony
ILCE-7S
Alpha 7S
Sony E
@@ -216,6 +237,13 @@
Sony
+ ILCE-6700
+ Alpha 6700
+ Sony E
+ 1.534
+
+
+ Sony
ILCE-9
Alpha 9
Sony E
@@ -228,6 +256,32 @@
Sony E
1
+
+ Sony
+ ILME-FX3
+ FX3
+ Sony E
+ 1
+
+
+ Sony
+ ILME-FX30
+ FX30
+ Sony E
+ 1.546
+
+
+ Sony
+ ZV-E1
+ Sony E
+ 1
+
+
+ Sony
+ ZV-E10
+ Sony E
+ 1.534
+
Sony
E 16mm f/2.8
@@ -1099,7 +1153,7 @@
Sony
- FE 35mm F1.8
+ FE 35mm f/1.8
Sony E
1
@@ -2227,7 +2281,7 @@
Sony
- E 16-55mm F2.8 G
+ E 16-55mm f/2.8 G
Sony E
1.534
@@ -2251,11 +2305,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Sony
- E 70-350mm F4.5-6.3 G OSS
+ E 70-350mm f/4.5-6.3 G OSS
Sony E
1.534
@@ -2275,11 +2429,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Sony
- FE 200-600mm F5.6-6.3 G OSS
+ FE 200-600mm f/5.6-6.3 G OSS
Sony E
1
@@ -2430,7 +2634,7 @@
Sony
- FE 20mm F1.8 G
+ FE 20mm f/1.8 G
Sony E
1
@@ -2480,7 +2684,7 @@
Sony
- FE 35mm F1.4 GM (SEL35F14GM)
+ FE 35mm f/1.4 GM (SEL35F14GM)
Sony E
1
@@ -2491,7 +2695,7 @@
Sony
- FE 24mm F1.4 GM
+ FE 24mm f/1.4 GM
Sony E
1
@@ -2519,4 +2723,281 @@
+
+ Sony
+ FE 50mm f/2.8 Macro
+ Sony E
+ 1.0
+
+
+
+
+
+
+
+ Sony
+ FE 50mm f/2.8 Macro
+ Sony E
+ 1.534
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sony
+ E 11mm f/1.8
+ Sony E
+ 1.534
+
+
+
+
+
+
+
+ Sony
+ FE 14mm f/1.8 GM
+ Sony E
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sony
+ FE 40mm f/2.5 G
+ Sony E
+ 1.0
+
+
+
+
+
+
+
+ Sony
+ FE 50mm f/1.2 GM
+ Sony E
+ 1.0
+
+
+
+
+
+
+
+ Sony
+ FE 28-60mm f/4-5.6
+ Sony E
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sony
+ FE 20-70mm f/4 G
+ Sony E
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sony
+ FE 24-70mm f/2.8 GM II
+ Sony E
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-tamron.xml lensfun-0.3.4/data/db/mil-tamron.xml
--- lensfun-0.3.3/data/db/mil-tamron.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-tamron.xml 2023-07-12 18:24:04.000000000 +0000
@@ -220,7 +220,8 @@
1
-
+
+
@@ -241,6 +242,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -381,6 +437,28 @@
Tamron
+ 18-300mm F3.5-6.3 DiIII-A VC VXD B061X
+ Fujifilm X
+ 1.534
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tamron
E 70-180mm F2.8 A056
Tamron 70-180mm f/2.8 Di III VXD A056
Sony E
@@ -404,9 +482,96 @@
Sony E
1.0
-
+
+
+ Tamron
+ E 24mm F2.8
+ Sony E
+ 1.5
+
+
+
+
+
+
+
+ Tamron
+ E 150-500mm F5-6.7 A057
+ Tamron 150-500mm F5-6.7 Di III VC VXD
+ Sony E
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tamron
+ E 11-20mm F2.8 B060
+ Tamron 11-20 mm F2.8 Di III-A RXD (B060)
+ Sony E
+ 1.534
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-tokina.xml lensfun-0.3.4/data/db/mil-tokina.xml
--- lensfun-0.3.3/data/db/mil-tokina.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-tokina.xml 2023-07-12 18:24:04.000000000 +0000
@@ -10,4 +10,16 @@
+
+ Tokina
+ Tokina AT-X M35 PRO DX (AF 35mm f/2.8 Macro)
+ Nikon F AF
+ Canon EF
+ 1.534
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/mil-zeiss.xml lensfun-0.3.4/data/db/mil-zeiss.xml
--- lensfun-0.3.3/data/db/mil-zeiss.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/mil-zeiss.xml 2023-07-12 18:24:04.000000000 +0000
@@ -1,14 +1,34 @@
Zeiss
- E 32mm f/1.8
+ Touit 1.8/32
Touit 32mm f/1.8
+ Fujifilm X
Sony E
1.534
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -168,4 +188,70 @@
+
+ Zeiss
+ Touit 2.8/12
+ Fujifilm X
+ Sony E
+ 1.53
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Zeiss
+ Distagon 18mm f/4
+ Sony E
+ 1
+
+
+
+
+
+
+ Zeiss
+ Distagon 28mm f/2.8 MMJ
+ Sony E
+ 1
+
+
+
+
+
+
+ Zeiss
+ Planar 50mm f/1.7 AEJ
+ Sony E
+ 1
+
+
+
+
+
+
+ Zeiss
+ Sonnar 85mm f/2.8 AEJ
+ Sony E
+ 1
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/misc.xml lensfun-0.3.4/data/db/misc.xml
--- lensfun-0.3.3/data/db/misc.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/misc.xml 2023-07-12 18:24:04.000000000 +0000
@@ -224,6 +224,16 @@
+ Mitakon
+ Mitakon Speedmaster 50mm f/0.95 III
+ Sony E
+ 1
+
+
+
+
+
+
Zenit
Zenitar MC 16mm f/2.8
M42
@@ -400,6 +410,35 @@
+ Voigtländer
+ Nokton 25mm f/0.95 II
+ Voigtländer Nokton 25mm f/0.95 Type II
+ Micro 4/3 System
+ 2.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
LG
LG G4 & compatibles
fixed lens
@@ -498,6 +537,18 @@
+
+ Yongnuo
+ Yongnuo YN 50mm f/1.8 II
+ Canon EF
+ 1
+
+
+
+
+
+
+
Irix
Irix 15mm f/2.4
Canon EF
@@ -592,6 +643,50 @@
Meike
+ Meike 50mm F1.2
+ Nikon Z
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Meike
Meike 50mm f/2.0
Fujifilm X
Micro 4/3 System
@@ -607,7 +702,7 @@
Meike
- Meike MK-F 28mm f/2.8
+ Meike 28mm f/2.8
Fujifilm X
Micro 4/3 System
Sony E
@@ -687,11 +782,29 @@
Fujifilm X
Sony E
Canon EF-M
+ Micro 4/3 System
+ Nikon Z
+ Leica L
+
1.529
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -717,6 +830,17 @@
Venus
+ Laowa 17mm f/1.8 C-Dreamer
+ Micro 4/3 System
+ 2.0
+
+
+
+
+
+
+
+ Venus
Laowa 60mm f/2.8 2X Ultra-Macro
Canon EF
Nikon F
@@ -751,6 +875,24 @@
+ TTArtisan
+ TTArtisan APS-C 23mm F1.4
+ Sony E
+ Fujifilm X
+ Canon EF-M
+ Canon RF
+ Nikon Z
+ Micro 4/3 System
+ Leica L
+
+
+ 1.534
+
+
+
+
+
+
Chinon
Auto Chinon 35mm f/2.8
M42
@@ -853,7 +995,8 @@
Voigtländer
- Voigtländer Super Wide-Heliar 15mm f/4.5 III
+ Voigtlander Super Wide-Heliar 15mm f/4.5 III
+ 15mm F4,5 Super Wide Heliar aspherical III
Sony E
1
@@ -919,7 +1062,7 @@
- Voigtlander
+ Voigtländer
Voigtlander HELIAR-HYPER WIDE 10mm F5.6
Voigtländer HELIAR-HYPER WIDE 10mm F5.6
Sony E
@@ -994,4 +1137,112 @@
+
+ Pentacon
+ Pentacon electric 2.8/29mm
+ Sony E
+ 1
+
+
+
+
+
+
+
+ Meyer Optik Görlitz
+ Meyer Optik Görlitz 3.5/30mm
+ Sony E
+ 1
+
+
+
+
+
+
+
+ Voigtländer
+ Voigtlander APO-LANTHAR 50mm F2 Aspherical
+ Sony E
+ Nikon Z
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Voigtländer
+ Voigtlander Color Skopar 20mm F3.5 SLII Aspherical
+ Pentax KAF4
+ Canon EF
+ Nikon F AF
+ 1
+
+
+
+
+
+
+
+ Rollei
+ Rollei Rolleinar MC f/4 21mm
+ Sony E
+ 1
+
+
+
+
+
+
+
+ Rollei
+ Rollei Rolleinar MC f/2.8 28mm
+ Sony E
+ 1
+
+
+
+
+
+
+
+ Kipon
+ Elegant 35mm F/2.4
+ Nikon Z
+ 1
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/om-system.xml lensfun-0.3.4/data/db/om-system.xml
--- lensfun-0.3.3/data/db/om-system.xml 1970-01-01 00:00:00.000000000 +0000
+++ lensfun-0.3.4/data/db/om-system.xml 2023-07-12 18:24:04.000000000 +0000
@@ -0,0 +1,36 @@
+
+
+ OM Digital Solutions
+ OM System
+ OM-1
+ Micro 4/3 System
+ 2
+
+
+ OM Digital Solutions
+ OM System
+ OM-5
+ Micro 4/3 System
+ 2
+
+
+ OM Digital Solutions
+ OM System
+ OM 20mm F1.4
+ Micro 4/3 System
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/rf-leica.xml lensfun-0.3.4/data/db/rf-leica.xml
--- lensfun-0.3.3/data/db/rf-leica.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/rf-leica.xml 2023-07-12 18:24:04.000000000 +0000
@@ -8,14 +8,62 @@
Generic
- Leica
+ Leica Camera AG
Leica M (Typ 240)
Leica M
1
+
+ Leica Camera AG
+ Leica M Monochrom (Typ 246)
+ Leica M
+ 1
+
+
+ Leica Camera AG
+ M9 Digital Camera
+ Leica M
+ 1
+
+
+ Leica Camera AG
+ Leica M10
+ Leica M
+ 1
+
+
+ Leica Camera AG
+ Leica M10 Monochrom
+ Leica M
+ 1
+
+
+ Leica Camera AG
+ Leica M10-P
+ Leica M
+ 1
+
+
+ Leica Camera AG
+ Leica M10-R
+ Leica M
+ 1
+
+
+ Leica Camera AG
+ Leica M11
+ Leica M
+ 1
+
+
+ Leica Camera AG
+ Leica M11 Monochrom
+ Leica M
+ 1
+
- Leica
- Elmarit-M 1:2.8/28
+ Leica Camera AG
+ Elmarit-M 1:2.8/28 ASPH.
Elmarit-M 28mm f/2.8 ASPH
Leica M
1
@@ -25,7 +73,7 @@
- Leica
+ Leica Camera AG
Elmarit-M 1:2.8/90
Elmarit-M 90mm f/2.8
Leica M
@@ -36,7 +84,7 @@
- Leica
+ Leica Camera AG
Summicron-M 1:2/50
Summicron-M 50mm f/2
@@ -48,4 +96,15 @@
+
+ Leica Camera AG
+ Summicron-M 1:2/28 ASPH.
+ Leica M
+ 1
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-canon.xml lensfun-0.3.4/data/db/slr-canon.xml
--- lensfun-0.3.3/data/db/slr-canon.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-canon.xml 2023-07-12 18:24:04.000000000 +0000
@@ -605,6 +605,13 @@
Canon
+ Canon EOS 200D II
+ EOS 200D II
+ Canon EF-S
+ 1.613
+
+
+ Canon
Canon EOS Kiss X9
EOS Kiss X9
Canon EF-S
@@ -1031,6 +1038,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2002,7 +2060,7 @@
Canon
EF35mm f/1.4L II USM (750)
Canon EF 35mm f/1.4L II USM
- Canon EF-S
+ Canon EF
1.605
@@ -2072,6 +2130,482 @@
Canon
Canon EF 35-105mm f/3.5-4.5
Canon EF
+ 1.005
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon EF 35-105mm f/3.5-4.5
+ Canon EF
1.611
@@ -4058,6 +4592,25 @@
1.611
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5213,6 +5766,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5251,7 +5855,7 @@
Canon
Canon EF 70-300mm f/4-5.6L IS USM
- Canon EF-S
+ Canon EF
1.605
@@ -6544,7 +7148,7 @@
Canon
Canon EF 24mm f/2.8 IS USM
- Canon EF-S
+ Canon EF
1.613
@@ -6639,7 +7243,7 @@
Canon
Canon EF 22-55mm f/4-5.6 USM
- Canon EF-S
+ Canon EF
1.613
@@ -6791,7 +7395,7 @@
Canon
- Canon EF85mm f/1.4L IS USM
+ Canon EF 85mm f/1.4L IS USM
Canon EF
1
@@ -6839,7 +7443,7 @@
Canon
- EF28mm f/2.8
+ Canon EF 28mm f/2.8
Canon EF
1.0
@@ -6847,4 +7451,377 @@
+
+ Canon
+ Canon EF 75-300mm F4-5.6 III
+ Canon EF-S
+ 1.613
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon EF 70-210mm f/4
+ Canon EF
+ 1.005
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Canon
+ Canon EF 28-80mm f/3.5-5.6 USM
+ Canon EF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-konica-minolta.xml lensfun-0.3.4/data/db/slr-konica-minolta.xml
--- lensfun-0.3.3/data/db/slr-konica-minolta.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-konica-minolta.xml 2023-07-12 18:24:04.000000000 +0000
@@ -482,6 +482,27 @@
Minolta
+ Minolta AF 50mm f/1.7
+ Minolta AF
+ 1.523
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Minolta
Minolta AF 17-35mm f/2.8-4 (D)
Minolta AF
1
@@ -518,4 +539,23 @@
+
+ Minolta
+ Minolta AF 70-210mm f/4 Macro
+ Minolta AF
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-leica.xml lensfun-0.3.4/data/db/slr-leica.xml
--- lensfun-0.3.3/data/db/slr-leica.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-leica.xml 2023-07-12 18:24:04.000000000 +0000
@@ -12,30 +12,4 @@
Leica S
Generic
-
- Leica
- Digilux 3
- 4/3 System
- 2
-
-
- Leica
- Leica D Vario-Elmar 14-150mm f/3.5-5.6 Asph. OIS
- 4/3 System
- 2
- 4:3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru lensfun-0.3.3/data/db/slr-nikon.xml lensfun-0.3.4/data/db/slr-nikon.xml
--- lensfun-0.3.3/data/db/slr-nikon.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-nikon.xml 2023-07-12 18:24:04.000000000 +0000
@@ -897,6 +897,70 @@
Nikon AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED
Nikkor AF 18-35mm f/3.5-4.5D IF-ED
Nikon F AF
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ Nikon AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED
+ Nikkor AF 18-35mm f/3.5-4.5D IF-ED
+ Nikon F AF
1.528
@@ -1990,6 +2054,69 @@
Nikon
Nikon AF Zoom-Nikkor 70-210mm f/4
+ Nikon F
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ Nikon AF Zoom-Nikkor 70-210mm f/4
Nikkor AF 70-210mm f/4
Nikon F AF
@@ -3063,6 +3190,77 @@
Nikon
+ Nikon Zoom-NIKKOR Auto 43-86mm F3.5
+ Nikon F
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
Nikon AI Nikkor 45mm f/2.8 GN
Nikkor AI 45mm f/2.8 GN
Nikon F AI
@@ -4097,6 +4295,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4291,6 +4511,19 @@
Nikon
+ Nikon AF DX Fisheye-Nikkor 10.5mm f/2.8G ED
+ Nikkor AF 10.5mm f/2.8G DX ED Fisheye
+ Nikon F AF
+ fisheye
+ 1
+
+
+
+
+
+
+
+ Nikon
Nikon AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR
Nikkor AF-S 18-300mm f/3.5-6.3G DX ED VR
Nikon F AF
@@ -5104,6 +5337,33 @@
Nikon
+ Nikon AI-S Nikkor 135mm f/3.5
+ Nikkor AI-S 135mm f/3.5
+ Nikon F AI-S
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
Nikon AF Nikkor 180mm f/2.8D IF-ED
Nikkor AF 180mm f/2.8D IF-ED
Nikon F AF
@@ -5162,8 +5422,8 @@
Nikon
- Nikon AF-S VR Nikkor 400mm f_2.8G ED
- Nikon AF F
+ Nikon AF-S VR Nikkor 400mm f/2.8G ED
+ Nikon F AF
1.0
@@ -5183,6 +5443,50 @@
Nikon
+ Nikon AF-S VR Nikkor 400mm f/2.8G ED + converter TC-14EIII
+ Nikkor AF-S 400mm f/2.8G ED + converter TC-14EIII
+ Nikon F AF
+
+
+ rectilinear
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ Nikon AF-S VR Nikkor 400mm f/2.8G ED + converter TC-20EIII
+ Nikkor AF-S 400mm f/2.8G ED + converter TC-20EIII
+ Nikon F AF
+
+
+ rectilinear
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
Nikon AI-S Nikkor 400mm f/3.5
Nikkor AI-S 400mm f/3.5
Nikon F AI-S
@@ -5257,20 +5561,22 @@
1
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5586,4 +5892,199 @@
+
+ Nikon
+ Nikon AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED
+ Nikon F AF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ Nikon AF-S Nikkor 500mm f/5.6E PF ED VR
+ Nikon F AF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ Nikon AF-S Nikkor 600mm f/4E FL ED VR
+ Nikon F AF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ Nikon AF-S Nikkor 600mm f/4E FL ED VR + converter TC-14EIII
+ Nikkor AF-S 600mm f/4E FL ED VR + converter TC-14EIII
+ Nikon F AF
+
+
+ rectilinear
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nikon
+ Nikon AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED
+ Nikon F AF
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-pentax.xml lensfun-0.3.4/data/db/slr-pentax.xml
--- lensfun-0.3.3/data/db/slr-pentax.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-pentax.xml 2023-07-12 18:24:04.000000000 +0000
@@ -245,6 +245,14 @@
Ricoh Imaging Company, Ltd.
Pentax
+ Pentax K-3 Mark III
+ K-3 III
+ Pentax KAF2
+ 1.546
+
+
+ Ricoh Imaging Company, Ltd.
+ Pentax
Pentax K-1
K-1
Pentax KAF4
@@ -318,7 +326,8 @@
1.522
- Pentax
+ Ricoh Imaging Company, Ltd.
+ Pentax
Pentax KP
KP
Pentax KAF2
@@ -824,7 +833,7 @@
Pentax
- HD Pentax-D FA 70-200mm f/2.8 ED DC AW
+ HD Pentax-D FA* 70-200mm f/2.8 ED DC AW
Pentax KAF3
1
@@ -2452,7 +2461,7 @@
Pentax
- smc PENTAX DA* 60-250mm F4 [IF] SDM
+ smc PENTAX DA* 60-250mm f/4 [IF] SDM
smc PENTAX DA* 60-250mm f/4 IF SDM
Pentax KAF2
1.534
@@ -2484,4 +2493,62 @@
+
+ Pentax
+ smc PENTAX-F 35-80mm f/4-5.6
+ Pentax KAF2
+ 1.531
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pentax
+ HD PENTAX-DA* 11-18mm f/2.8 ED DC AW
+ Pentax KAF2
+ 1.534
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pentax
+ HD PENTAX DA* 16-50mm f/2.8 ED PLM AW
+ Pentax KAF2
+ 1.546
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-sigma.xml lensfun-0.3.4/data/db/slr-sigma.xml
--- lensfun-0.3.3/data/db/slr-sigma.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-sigma.xml 2023-07-12 18:24:04.000000000 +0000
@@ -680,26 +680,41 @@
Sigma
Sigma 18-50mm f/2.8 EX DC
Sigma SA
- Canon EF
Nikon F AF
Pentax KAF
1.53
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Sigma
Sigma 18-50mm f/2.8 EX DC
- Sigma SA
Canon EF
- Nikon F AF
- Pentax KAF
1.611
@@ -2073,7 +2088,8 @@
Sigma
- Sigma 24mm f/1.4 DG HSM [A]
+ Sigma 24mm f/1.4 DG HSM | [A] Art 015
+ Sigma 24mm f/1.4 DG HSM | A
Nikon F AF
Sigma SA
Canon EF
@@ -2463,6 +2479,8 @@
Nikon F AF
Sony Alpha
Canon EF
+ Pentax KAF2
+ 4/3 System
1.534
@@ -2835,6 +2853,7 @@
Sigma
Sigma 105mm f/2.8 EX DG OS HSM Macro
Nikon F AF
+ Canon EF
1
@@ -3709,6 +3728,7 @@
Sigma
100-400mm F5-6.3 DG OS HSM | Contemporary 017
+ 100-400mm F5-6.3 DG OS HSM | C
Sony E
1
@@ -3726,6 +3746,7 @@
Sigma
70-200mm F2.8 DG OS HSM | Sports 018
+ 70-200mm F2.8 DG OS HSM | S
Canon EF
Sigma SA
Nikon F
@@ -4009,4 +4030,488 @@
+
+ Sigma
+ Sigma 60-600mm f/4.5-6.3 DG OS HSM | S
+ Sigma 60-600mm F4.5-6.3 DG OS HSM | Sports 018
+ Canon EF-S
+ Nikon F AF
+ Sigma SA
+ 1.605
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sigma
+ 60-600mm f/4.5-6.3 DG OS HSM | Sports 018 +1.4x extender
+ Sigma 60-600mm F4.5-6.3 DG OS HSM | Sports 018 + 1.4x ext.
+ Canon EF-S
+ 1.605
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-sony.xml lensfun-0.3.4/data/db/slr-sony.xml
--- lensfun-0.3.3/data/db/slr-sony.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-sony.xml 2023-07-12 18:24:04.000000000 +0000
@@ -1099,4 +1099,23 @@
+
+ Sony
+ Sony 85mm F2.8 SAM (SAL85F28)
+ Sony Alpha
+ 1.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-tamron.xml lensfun-0.3.4/data/db/slr-tamron.xml
--- lensfun-0.3.3/data/db/slr-tamron.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-tamron.xml 2023-07-12 18:24:04.000000000 +0000
@@ -72,7 +72,7 @@
Tamron
- Tamron 17-35mm F/2.8-4 Di OSD
+ Tamron 17-35mm f/2.8-4 Di OSD (A037)
Canon EF
Nikon F AF
1
@@ -1072,10 +1072,8 @@
Tamron
Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro
- Tamron 16-300mm f/3.5-6.3 Di II VC PZD
+ Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro B016
Canon EF
- Nikon F AF
- Sony Alpha
1.613
@@ -1092,9 +1090,8 @@
Tamron
- Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro
- Tamron 16-300mm f/3.5-6.3 Di II VC PZD
- Canon EF
+ Tamron AF 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro
+ Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro B016
Nikon F AF
Sony Alpha
1.534
@@ -1140,6 +1137,125 @@
Tamron
+ Tamron SP AF 150-600mm F/5-6.3 Di VC USD G2 (A022)
+ Canon EF
+ Nikon F AF
+ Sony Alpha
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tamron
Tamron SP AF 60mm f/2 Di II LD (IF) Macro 1:1
Tamron SP AF 60mm f/2 Di II LD (IF) Macro
Canon EF
@@ -1667,18 +1783,102 @@
Tamron
Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)
Canon EF
+ Nikon F AF
1.53
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1702,4 +1902,54 @@
+
+ Tamron
+ TAMRON 100-400mm F/4.5-6.3 Di VC USD A035
+ Nikon F AF
+ Canon EF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tamron
+ Tamron 35-150mm f/2.8-4.0 Di VC OSD A043
+ Tamron 35-150mm f/2.8-4 Di VC OSD (A043)
+ Nikon F AF
+ Canon EF
+ 1.0
+
+
+
+
+
+
+
+
+
+
+ Tamron
+ Tamron SP 45mm F/1.8 Di VC USD
+ Nikon F AF
+ Canon EF
+ Sony Alpha
+ 1.0
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-tokina.xml lensfun-0.3.4/data/db/slr-tokina.xml
--- lensfun-0.3.3/data/db/slr-tokina.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-tokina.xml 2023-07-12 18:24:04.000000000 +0000
@@ -156,6 +156,7 @@
Tokina
Tokina AT-X 14-20 F2 PRO DX
Nikon F AF
+ Canon EF
1.523
@@ -170,6 +171,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -452,6 +554,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -487,4 +689,19 @@
+
+ Tokina
+ Tokina atx-i 11-16mm F2.8 CF
+ Nikon F AF
+ Canon EF-S
+ 1.523
+
+
+
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/data/db/slr-zeiss.xml lensfun-0.3.4/data/db/slr-zeiss.xml
--- lensfun-0.3.3/data/db/slr-zeiss.xml 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/data/db/slr-zeiss.xml 2023-07-12 18:24:04.000000000 +0000
@@ -118,6 +118,17 @@
Zeiss
+ Carl Zeiss Planar T* 1,4/50 ZF.2
+ Nikon F AF
+ 1.0
+
+
+
+
+
+
+
+ Zeiss
Carl Zeiss Distagon T* 3,5/18 ZF.2
Nikon F AF
1.523
@@ -157,4 +168,62 @@
+
+ Zeiss
+ Zeiss Makro-Planar T* 2/100 ZF.2
+ Makro-Planar T* 2/100
+ Nikon F AF
+ Canon EF
+ Pentax KAF4
+ 1.0
+
+
+
+
+
+
+
+ Zeiss
+ Carl Zeiss Jena 135mm f/3.5
+ Sony E
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Zeiss
+ Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)
+ Sony Alpha
+ 1
+
+
+
+
+
+
+
+ Zeiss
+ Carl Zeiss Jena Flektogon 4/20mm
+ Sony E
+ 1
+
+
+
+
+
+
diff -Nru lensfun-0.3.3/debian/changelog lensfun-0.3.4/debian/changelog
--- lensfun-0.3.3/debian/changelog 2022-12-13 21:06:02.000000000 +0000
+++ lensfun-0.3.4/debian/changelog 2023-10-27 20:45:01.000000000 +0000
@@ -1,23 +1,30 @@
-lensfun (0.3.3-1~22.04.sav2) jammy; urgency=medium
-
- * Updated lensfun database (debian/patches/lensfun-lensdb-update.patch)
-
- -- Rob Savoury Tue, 13 Dec 2022 13:06:02 -0800
-
-lensfun (0.3.3-1~22.04.sav1) jammy; urgency=medium
+lensfun (0.3.4-1~22.04.sav0) jammy; urgency=medium
+ * Backport to Jammy
+ * Revert "Drop unused Build-Depends: libpng-dev" and build lenstool:
+ - debian/liblensfun-bin.install: Add usr/bin/lenstool
+ - debian/rules: Add BUILD_LENSTOOL=ON config flag
* Updated lensfun database (debian/patches/lensfun-lensdb-update.patch)
- -- Rob Savoury Tue, 07 Jun 2022 13:35:12 -0700
+ -- Rob Savoury Fri, 27 Oct 2023 13:45:01 -0700
-lensfun (0.3.3-1~22.04.sav0) jammy; urgency=medium
+lensfun (0.3.4-1) unstable; urgency=medium
- * Backport to Jammy
- * Revert "Drop unused Build-Depends: libpng-dev" and build lenstool:
- - d/liblensfun-bin.install: Add usr/bin/lenstool
- - d/rules: Add BUILD_LENSTOOL=ON config flag
+ * New upstream release.
+ * Update standards version to 4.6.2, no changes needed.
+ * Update the build dependencies according to the upstream build system:
+ - bump cmake to 2.8.12
+ - add python3-setuptools
+ * Fix the setuptools-based installation of the Python module:
+ - export DEB_PYTHON_INSTALL_LAYOUT=deb so that the Python bits are installed
+ in the expected way for Debian builds (see #1041633)
+ - tweak the arguments for 'setup.py install'; patch python-setuptools.diff
+ * Remove inactive Uploaders.
+ * Update lintian overrides.
+ * Fix the handling of min/max float limits for comparisons, fixing the lens
+ search on certain architectures (e.g. i386); patch fix-float.diff.
- -- Rob Savoury Tue, 07 Jun 2022 13:16:02 -0700
+ -- Pino Toscano Sat, 12 Aug 2023 08:02:34 +0200
lensfun (0.3.3-1) unstable; urgency=medium
diff -Nru lensfun-0.3.3/debian/control lensfun-0.3.4/debian/control
--- lensfun-0.3.3/debian/control 2022-06-07 19:49:59.000000000 +0000
+++ lensfun-0.3.4/debian/control 2023-10-27 20:45:01.000000000 +0000
@@ -1,14 +1,14 @@
Source: lensfun
Priority: optional
Maintainer: Debian KDE Extras Team
-Uploaders: Mark Purcell ,
- Pino Toscano
-Build-Depends: debhelper-compat (= 13), cmake, pkg-config, python3:any, libglib2.0-dev,
+Uploaders: Pino Toscano
+Build-Depends: debhelper-compat (= 13), cmake (>= 2.8.12~), pkg-config, python3:any, libglib2.0-dev,
dh-python,
libpng-dev,
doxygen,
python3-docutils,
-Standards-Version: 4.6.0
+ python3-setuptools,
+Standards-Version: 4.6.2
Section: libs
Rules-Requires-Root: no
Homepage: https://lensfun.github.io/
diff -Nru lensfun-0.3.3/debian/liblensfun-data-v1.lintian-overrides lensfun-0.3.4/debian/liblensfun-data-v1.lintian-overrides
--- lensfun-0.3.3/debian/liblensfun-data-v1.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ lensfun-0.3.4/debian/liblensfun-data-v1.lintian-overrides 2023-08-12 05:52:35.000000000 +0000
@@ -0,0 +1,2 @@
+# timestamp file of the database
+liblensfun-data-v1: package-contains-documentation-outside-usr-share-doc [usr/share/lensfun/version_1/timestamp.txt]
diff -Nru lensfun-0.3.3/debian/patches/fix-float.diff lensfun-0.3.4/debian/patches/fix-float.diff
--- lensfun-0.3.3/debian/patches/fix-float.diff 1970-01-01 00:00:00.000000000 +0000
+++ lensfun-0.3.4/debian/patches/fix-float.diff 2023-08-12 05:53:07.000000000 +0000
@@ -0,0 +1,50 @@
+Author: Pino Toscano
+Description: Stop using INT_MIN/INT_MAX for floats
+ .
+ INT_MIN/INT_MAX are meant for the int type, and thus casting them to a
+ different type (float) means loss of precision which may lead to failed
+ comparisons later on.
+ .
+ Instead use the proper limits using std::numeric_limits.
+Forwarded: https://github.com/lensfun/lensfun/pull/2094
+Last-Update: 2023-08-12
+
+--- a/libs/lensfun/lens.cpp
++++ b/libs/lensfun/lens.cpp
+@@ -14,6 +14,7 @@
+ #include
+ #include "windows/mathconstants.h"
+ #include
++#include
+
+ static struct
+ {
+@@ -245,8 +246,8 @@ void lfLens::AddMount (const char *val)
+
+ void lfLens::GuessParameters ()
+ {
+- float minf = float (INT_MAX), maxf = float (INT_MIN);
+- float mina = float (INT_MAX), maxa = float (INT_MIN);
++ float minf = std::numeric_limits::max(), maxf = std::numeric_limits::min();
++ float mina = std::numeric_limits::max(), maxa = std::numeric_limits::min();
+
+ char *old_numeric = setlocale (LC_NUMERIC, NULL);
+ old_numeric = strdup (old_numeric);
+@@ -325,13 +326,13 @@ void lfLens::GuessParameters ()
+
+ }
+
+- if (minf != INT_MAX && !MinFocal)
++ if (minf != std::numeric_limits::max() && !MinFocal)
+ MinFocal = minf;
+- if (maxf != INT_MIN && !MaxFocal)
++ if (maxf != std::numeric_limits::min() && !MaxFocal)
+ MaxFocal = maxf;
+- if (mina != INT_MAX && !MinAperture)
++ if (mina != std::numeric_limits::max() && !MinAperture)
+ MinAperture = mina;
+- if (maxa != INT_MIN && !MaxAperture)
++ if (maxa != std::numeric_limits::min() && !MaxAperture)
+ MaxAperture = maxa;
+
+ if (!MaxFocal)
diff -Nru lensfun-0.3.3/debian/patches/lensfun-lensdb-update.patch lensfun-0.3.4/debian/patches/lensfun-lensdb-update.patch
--- lensfun-0.3.3/debian/patches/lensfun-lensdb-update.patch 2022-12-13 21:03:06.000000000 +0000
+++ lensfun-0.3.4/debian/patches/lensfun-lensdb-update.patch 2023-10-27 20:41:04.000000000 +0000
@@ -5,6249 +5,1389 @@
Created by running lensfun-update-data and comparing source data/db
directory with ~/.local/share/lensfun/updates/version_1 directory.
-Last-Update: 2022-12-13
+Last-Update: 2023-10-27
---
- data/db/actioncams.xml | 41 +++
- data/db/compact-canon.xml | 18 +-
- data/db/compact-fujifilm.xml | 28 ++
- data/db/compact-leica.xml | 34 ++-
- data/db/compact-panasonic.xml | 60 ++++
- data/db/compact-samsung.xml | 19 ++
- data/db/compact-sony.xml | 51 ++++
- data/db/mil-canon.xml | 262 ++++++++++++++++
- data/db/mil-fujifilm.xml | 155 ++++++++++
- data/db/mil-leica.xml | 32 +-
- data/db/mil-nikon.xml | 299 +++++++++++++++++-
- data/db/mil-olympus.xml | 39 ++-
- data/db/mil-panasonic.xml | 512 +++++++++++++++++++++++++++++--
- data/db/mil-samsung.xml | 23 ++
- data/db/mil-samyang.xml | 57 +++-
- data/db/mil-sigma.xml | 431 +++++++++++++++++++++++++-
- data/db/mil-sony.xml | 218 +++++++++++++
- data/db/mil-tamron.xml | 167 +++++++++-
- data/db/mil-tokina.xml | 12 +
- data/db/mil-zeiss.xml | 90 +++++-
- data/db/misc.xml | 201 +++++++++++-
- /dev/null => b/data/db/om-system.xml | 36 +++
- data/db/rf-leica.xml | 63 +++-
- data/db/slr-canon.xml | 679 ++++++++++++++++++++++++++++++++++++++++-
- data/db/slr-konica-minolta.xml | 40 +++
- data/db/slr-leica.xml | 26 --
- data/db/slr-nikon.xml | 450 ++++++++++++++++++++++++++-
- data/db/slr-pentax.xml | 47 +++
- data/db/slr-sigma.xml | 361 +++++++++++++++++++++-
- data/db/slr-sony.xml | 19 ++
- data/db/slr-tamron.xml | 284 +++++++++++++++--
- data/db/slr-tokina.xml | 217 +++++++++++++
- data/db/slr-zeiss.xml | 69 +++++
- data/db/timestamp.txt | 2 +-
- 34 files changed, 4898 insertions(+), 144 deletions(-)
+ data/db/actioncams.xml | 39 +++++++++
+ data/db/compact-leica.xml | 24 ++++--
+ data/db/compact-ricoh.xml | 4 +
+ data/db/mil-canon.xml | 201 ++++++++++++++++++++++++++++++++++++++++++++++
+ data/db/mil-fujifilm.xml | 43 +++++++++-
+ data/db/mil-leica.xml | 23 +++++-
+ data/db/mil-nikon.xml | 82 +++++++++++++++++++
+ data/db/mil-olympus.xml | 7 ++
+ data/db/mil-panasonic.xml | 16 ++++
+ data/db/mil-sigma.xml | 9 +++
+ data/db/mil-sony.xml | 14 ++++
+ data/db/mil-tamron.xml | 131 ++++++++++++++++++++++++++++++
+ data/db/misc.xml | 151 ++++++++++++++++++++++++++++++++++
+ data/db/rf-leica.xml | 44 ++++++++++
+ data/db/slr-canon.xml | 24 ++++++
+ data/db/slr-pentax.xml | 8 ++
+ data/db/slr-samyang.xml | 17 ++++
+ data/db/slr-sigma.xml | 15 ++++
+ data/db/timestamp.txt | 2 +-
+ 19 files changed, 844 insertions(+), 10 deletions(-)
diff --git a/data/db/actioncams.xml b/data/db/actioncams.xml
-index c034fe3..420ef07 100644
+index 420ef07..3163e6a 100644
--- a/data/db/actioncams.xml
+++ b/data/db/actioncams.xml
-@@ -70,6 +70,13 @@
- djiFC6310
- 2.73
+@@ -29,6 +29,12 @@
+ goProHero4black
+ 5
+
-+ DJI
-+ FC3411
-+ Air 2S
-+ djiFC3411
-+ 2.73
++ GoPro
++ Hero10 black
++ goProHero10bl
++ 5.5
+
- Hasselblad
- L1D-20c
-@@ -77,6 +84,13 @@
- l1d20c
- 2.8
+ DJI
+ Phantom Vision FC200
+@@ -97,6 +103,13 @@
+ djiMavicAirFC2103
+ 5.6
+
-+ Hasselblad
-+ L2D-20c
-+ DJI Mavic 3
-+ l2d20c
-+ 1.953
++ DJI
++ FC3582
++ Mini 3 Pro
++ djiFC3582
++ 3.6
+
-
- DJI
- Mavic Air FC2103
-@@ -232,6 +246,18 @@
-
+
+ GoPro
+ HD2 & compatibles
+@@ -287,4 +300,30 @@
+
+
-+ Hasselblad
-+ L2D-20c & compatibles
++ GoPro
++ HERO10 Black & compatibles
+ fixed lens
+ festes Objektiv
-+ l2d20c
-+ 1.953
++ goProHero10bl
++ 5.5
+ 4:3
+
-+
++
+
+
-
- DJI
- FC2103 & compatibles
-@@ -246,4 +272,19 @@
-
-
-
+
+ DJI
-+ FC3411 & compatibles
-+ FC3411 fixed lens
-+ FC3411 festes Objektiv
-+ djiFC3411
-+ 2.63
-+ 3:2
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/compact-canon.xml b/data/db/compact-canon.xml
-index 06e3c9b..fd4f6a4 100644
---- a/data/db/compact-canon.xml
-+++ b/data/db/compact-canon.xml
-@@ -125,6 +125,13 @@
- canonG7X
- 2.85
-
-+
-+ Canon
-+ Canon PowerShot G7 X Mark III
-+ PowerShot G7 X Mark III (3:2)
-+ canonG7X
-+ 2.72
-+
-
- Canon
- Canon PowerShot G9
-@@ -139,6 +146,13 @@
- canonG9X
- 2.72
-
-+
-+ Canon
-+ Canon PowerShot G9 X Mark II
-+ Canon PowerShot G9 X Mark II
-+ canonG9X
-+ 2.72
-+
-
- Canon
- Canon PowerShot G10
-@@ -179,7 +193,7 @@
- Canon PowerShot G1 X Mark III
- PowerShot G1 X Mark III
- canonG1X3
-- 1.608
-+ 1.613
-
-
- Canon
-@@ -2538,7 +2552,7 @@
- fixed lens
- festes Objektiv
- canonG1X3
-- 1.608
-+ 1.613
- 3:2
-
-
-diff --git a/data/db/compact-fujifilm.xml b/data/db/compact-fujifilm.xml
-index 566d115..afbcd64 100644
---- a/data/db/compact-fujifilm.xml
-+++ b/data/db/compact-fujifilm.xml
-@@ -156,6 +156,12 @@
- fujix10
- 3.93
-
-+
-+ Fujifilm
-+ XF10
-+ fujixf10
-+ 1.53
-+
-
- Fujifilm
- X70
-@@ -1029,4 +1035,26 @@
-
-
-
-+
-+ Fujifilm
-+ XF10 & compatibles (Standard)
-+ fujixf10
-+ 1.53
++ FC3582 & compatibles
++ FC3582 fixed lens
++ djiFC3582
++ 3.6
++ 4:3
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
+
+
diff --git a/data/db/compact-leica.xml b/data/db/compact-leica.xml
-index e9847df..1747c2b 100644
+index f6b8490..e85be4d 100644
--- a/data/db/compact-leica.xml
+++ b/data/db/compact-leica.xml
-@@ -8,15 +8,21 @@
+@@ -7,60 +7,72 @@
+
Leica
- D-LUX2
-- Digilux 2
+- D-LUX2
++ D-Lux2
++ D-Lux 2
panasonicLX1
4.45
-+
-+ Leica Camera AG
-+ C-Lux
-+ Leica C-Lux (Typ 1546)
-+
-+ panasonicZS200
-+ 2.73
-+
+
+ Leica Camera AG
++ Leica
+ C-Lux
+- Leica C-Lux (Typ 1546)
++ C-Lux (Typ 1546)
+
+ panasonicZS200
+ 2.73
+
Leica
- D-LUX 4
-- Digilux 4
+- D-LUX 4
++ D-Lux 4
panasonicLX4
4.33
-@@ -24,7 +30,6 @@
+
Leica
- D-LUX 3
-- Digilux 3
+- D-LUX 3
++ D-Lux 3
panasonicLX3
4.33
-@@ -37,8 +42,14 @@
Leica Camera AG
-- LEICA Q2
-- LeicaQ2
-+ Leica Q2
-+ leicaQ2
-+ 1
-+
-+
-+ Leica Camera AG
-+ Leica Q2 Mono
-+ leicaQ2
++ Leica
+ Leica Q (Typ 116)
++ Q (Typ 116)
+ leicaQTyp116
1
-@@ -73,9 +84,10 @@
-
-
-
-- Leica Camera AG
-- Leica
-- 28.0mm f/1.7
-+ LEICA CAMERA AG
-+ LEICA Q (Typ 116) & compatibles
-+ fixed lens
-+ festes Objektiv
- leicaQTyp116
- 1
-
-@@ -86,8 +98,10 @@
-
-
- LEICA CAMERA AG
-- SUMMILUX 1:1.7/28 ASPH.
-- LeicaQ2
-+ LEICA Q2 & compatibles
-+ fixed lens
-+ festes Objektiv
-+ leicaQ2
+ Leica Camera AG
++ Leica
+ Leica Q2
++ Q2
+ leicaQ2
1
-
-
-diff --git a/data/db/compact-panasonic.xml b/data/db/compact-panasonic.xml
-index 16470cd..b3ac8a3 100644
---- a/data/db/compact-panasonic.xml
-+++ b/data/db/compact-panasonic.xml
-@@ -261,6 +261,18 @@
- panasonicFZ1000
- 2.73
-+
-+ Panasonic
-+ DMC-FZ2000
-+ panasonicFZ2000
-+ 2.73
-+
-+
-+ Panasonic
-+ DMC-FZ2500
-+ panasonicFZ2000
-+ 2.73
-+
- Panasonic
- DC-FZ10002
-@@ -400,6 +412,13 @@
- panasonicTZ100
- 2.75
+ Leica Camera AG
++ Leica
+ Leica Q2 Mono
++ Q2 Monochrom
+ leicaQ2
+ 1
-+
-+ Panasonic
-+ DMC-ZS110
-+
-+ panasonicTZ100
-+ 2.75
-+
- Panasonic
- DC-ZS200
-@@ -407,6 +426,13 @@
- panasonicZS200
- 2.73
+ Leica Camera AG
++ Leica
+ Leica Q3
++ Q3
+ leicaQ2
+ 1
-+
-+ Panasonic
-+ DC-ZS220
-+
-+ panasonicZS200
-+ 2.73
-+
- Panasonic
- DC-TZ200
-@@ -414,6 +440,13 @@
- panasonicZS200
- 2.73
+- Leica
++ Leica Camera AG
++ Leica
+ Leica X Vario (Typ 107)
++ X Vario (Typ 107)
+ leicaXVario107
+ 1.53
-+
-+ Panasonic
-+ DC-TZ220
-+
-+ panasonicZS200
-+ 2.73
-+
-
- Panasonic
- DC-TZ202
-@@ -904,6 +937,33 @@
-
-
+@@ -91,6 +103,7 @@
-+
-+ Leica
-+ FZ2000 & compatibles
-+ fixed lens
-+ festes Objektiv
-+ panasonicFZ2000
-+ 2.73
-+ 3:2
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Leica
- FZ150 & compatibles
-diff --git a/data/db/compact-samsung.xml b/data/db/compact-samsung.xml
-index 9b5316d..8668632 100644
---- a/data/db/compact-samsung.xml
-+++ b/data/db/compact-samsung.xml
-@@ -34,6 +34,13 @@
- samsungS8wide
- 6.047
-
-+
-+ Samsung
-+ SM-G991B
-+ Galaxy S21
-+ samsungS21uw
-+ 6.0
-+
- Samsung
- WB2000 & compatibles (Standard)
-@@ -159,4 +166,16 @@
-
-
+ LEICA CAMERA AG
++ Leica
+ LEICA Q (Typ 116) & compatibles
+ fixed lens
+ festes Objektiv
+@@ -104,6 +117,7 @@
-+
-+ Samsung
-+ Samsung Galaxy S21 ultrawide
-+ samsungS21uw
-+ 6.0
-+ 4:3
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/compact-sony.xml b/data/db/compact-sony.xml
-index 488ad3f..f40f066 100644
---- a/data/db/compact-sony.xml
-+++ b/data/db/compact-sony.xml
-@@ -261,6 +261,13 @@
- sonyRX1
- 1
+
+ LEICA CAMERA AG
++ Leica
+ LEICA Q2 & compatibles
+ fixed lens
+ festes Objektiv
+diff --git a/data/db/compact-ricoh.xml b/data/db/compact-ricoh.xml
+index ae8b62b..d0fc147 100644
+--- a/data/db/compact-ricoh.xml
++++ b/data/db/compact-ricoh.xml
+@@ -32,13 +32,17 @@
-+
-+ Sony
-+ DSC-RX0
-+ RX0
-+ sonyRX0M2
-+ 2.70
-+
- Sony
- DSC-RX0M2
-@@ -1214,6 +1221,50 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
+ Ricoh Imaging Company, Ltd.
++ Ricoh
+ Ricoh GR III
++ GR III
+ ricohGRIII
+ 1.53
+
+
+ Ricoh Imaging Company, Ltd.
++ Ricoh
+ Ricoh GR IIIx
++ GR IIIx
+ ricohGRIIIx
+ 1.53
+
diff --git a/data/db/mil-canon.xml b/data/db/mil-canon.xml
-index 584d827..d111b90 100644
+index 7991c2f..2dcae0b 100644
--- a/data/db/mil-canon.xml
+++ b/data/db/mil-canon.xml
-@@ -54,6 +54,13 @@
- Canon EF-M
- 1.613
-
-+
-+ Canon
-+ Canon EOS M6 Mark II
-+ EOS M6 Mark II
-+ Canon EF-M
-+ 1.613
-+
-
- Canon
- Canon EOS M10
-@@ -89,6 +96,20 @@
- Canon EF-M
+@@ -117,6 +117,20 @@
+ Canon RF
1.613
+
+ Canon
-+ Canon EOS R7
-+ EOS R7
++ Canon EOS R50
++ EOS R50
+ Canon RF
+ 1.613
+
+
+ Canon
-+ Canon EOS R10
-+ EOS R10
++ Canon EOS R100
++ EOS R100
+ Canon RF
+ 1.613
+
Canon
Canon EOS R
-@@ -103,6 +124,13 @@
- Canon RF
- 1
-
-+
-+ Canon
-+ Canon EOS R3
-+ EOS R3
-+ Canon RF
-+ 1
-+
-
- Canon
- Canon EOS R5
-@@ -117,6 +145,13 @@
- Canon RF
- 1
-
-+
-+ Canon
-+ Canon EOS R6m2
-+ EOS R6 Mark II
-+ Canon RF
-+ 1
-+
-
- Canon
- Canon EF-M 18-55mm f/3.5-5.6 IS STM
-@@ -370,6 +405,17 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+@@ -690,6 +704,150 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
-@@ -558,6 +604,60 @@
-
+@@ -1224,4 +1382,47 @@
+
+
+ Canon
-+ Canon EF-M 32mm f/1.4 STM
-+ Canon EF-M
++ Canon RF 24mm F1.8 MACRO IS STM
++ Canon RF
+ 1.613
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
+
+
-
- Canon
- Canon RF 24-105mm F4L IS USM
-@@ -821,4 +921,166 @@
-
-
-
+
+ Canon
-+ Canon RF 100-400mm F5.6-8 IS USM
++ Canon RF 28mm F2.8 STM
+ Canon RF
+ 1.0
+
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Canon
-+ Canon RF 100mm F2.8L Macro IS USM
-+ Canon RF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Canon
-+ Canon RF 15-35mm F2.8L IS USM
-+ Canon RF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Canon
-+ Canon RF 800mm F11 IS STM
-+ Canon RF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+ Canon
-+ Canon RF 16mm F2.8 STM
-+ Canon RF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Canon
-+ Canon RF 14-35mm F4 L IS USM
-+ Canon RF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
+
+
+
+ Canon
-+ Canon RF 35mm F1.8 MACRO IS STM
++ Canon RF 15-30mm F4.5-6.3 IS STM
+ Canon RF
+ 1.0
+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
diff --git a/data/db/mil-fujifilm.xml b/data/db/mil-fujifilm.xml
-index da4e75b..7be27a4 100644
+index 5ef4849..83b612d 100644
--- a/data/db/mil-fujifilm.xml
+++ b/data/db/mil-fujifilm.xml
-@@ -73,6 +73,12 @@
- Fujifilm X
- 1.534
-
-+
-+ Fujifilm
-+ X-T5
-+ Fujifilm X
-+ 1.534
-+
-
- Fujifilm
- X-Pro3
-@@ -85,6 +91,18 @@
- Fujifilm X
- 1.528
+@@ -193,12 +193,30 @@
+ Fujifilm G
+ 0.79
+
+ Fujifilm
-+ X-H2
-+ Fujifilm X
-+ 1.528
-+
-+
-+ Fujifilm
-+ X-H2S
-+ Fujifilm X
-+ 1.528
++ GFX50S II
++ Fujifilm G
++ 0.79
+
-
- Fujifilm
- X-M1
-@@ -121,6 +139,12 @@
- Fujifilm X
- 1.534
-
+
+ Fujifilm
-+ X-T30 II
-+ Fujifilm X
-+ 1.534
++ GFX 100
++ Fujifilm G
++ 0.79
+
Fujifilm
- X-S10
-@@ -157,6 +181,12 @@
+ GFX100S
Fujifilm G
- 0.8
+ 0.79
+
+ Fujifilm
-+ GFX 100S
++ GFX100 II
+ Fujifilm G
-+ 0.8
++ 0.79
+
Fujifilm
XF18-55mmF2.8-4 R LM OIS
-@@ -991,6 +1021,24 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
+@@ -646,8 +664,8 @@
-@@ -1088,6 +1136,102 @@
-
-
-
-+
+ Fujifilm
+- XF27mmF2.8
+- XF 27mm f/2.8
++ XF27mmF2.8 R WR
++ XF 27mm f/2.8 R WR
+ Fujifilm X
+ 1.529
+
+@@ -1890,4 +1908,25 @@
+
+
+
++
+ Fujifilm
-+
-+ XF10-24mmF4 R OIS WR
-+ XF 10-24mm f/4 R OIS WR
-+ Fujifilm X
-+ 1.529
++ GF80mmF1.7 R WR
++ Fujifilm G
++ 0.79
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
+
+
-
- Fujifilm
- XF18-135mmF3.5-5.6R LM OIS WR
-@@ -1593,4 +1737,15 @@
-
-
-
+
+ Fujifilm
-+ XF33mmF1.4 R LM WR
-+ XF 33mm f/1.4 R LM WR
-+ Fujifilm X
-+ 1.534
++ GF55mmF1.7 R WR
++ Fujifilm G
++ 0.79
+
-+
-+
++
++
+
+
diff --git a/data/db/mil-leica.xml b/data/db/mil-leica.xml
-index 71cbe64..85dd82f 100644
+index a5cffca..e531bc0 100644
--- a/data/db/mil-leica.xml
+++ b/data/db/mil-leica.xml
-@@ -14,6 +14,18 @@
+@@ -10,54 +10,69 @@
+
+
+ Leica Camera AG
++ Leica
+ Leica SL (Typ 601)
++ SL (Typ 601)
+ Leica L
+ 1
+
+
+ Leica Camera AG
++ Leica
+ Leica SL2
++ SL2
+ Leica L
+ 1
+
+
+ Leica Camera AG
++ Leica
+ Leica SL2-S
++ SL2-S
Leica L
1
-+
-+ Leica Camera AG
-+ Leica SL2
-+ Leica L
-+ 1
-+
-+
-+ Leica Camera AG
-+ Leica SL2-S
-+ Leica L
-+ 1
-+
Leica Camera AG
++ Leica
Leica T (Typ 701)
-@@ -38,8 +50,14 @@
++ T (Typ 701)
Leica L
1.53
-+
-+ Leica Camera AG
-+ Digilux 3
-+ Micro 4/3 System
-+ 2
-+
+
+ Leica Camera AG
++ Leica
+ Leica TL
++ TL
+ Leica L
+ 1.53
+
+
+ Leica Camera AG
++ Leica
+ Leica TL2
++ TL2
+ Leica L
+ 1.53
+
+
+ Leica Camera AG
+- Leica CL (Typ 7323)
++ Leica
++ Leica CL
++ CL (Typ 7323)
+ Leica L
+ 1.53
+
+
+- Leica Camera AG
++ Leica
+ Digilux 3
+ Micro 4/3 System
+ 2
+
-- LEICA CAMERA AG
-+ Leica Camera AG
+ Leica Camera AG
++ Leica
Summicron TL 1:2 23 ASPH.
Leica L
1.53
-@@ -59,7 +77,7 @@
-
+@@ -78,6 +93,7 @@
-- LEICA CAMERA AG
-+ Leica Camera AG
+ Leica Camera AG
++ Leica
Summilux-TL 1:1.4/35 ASPH.
Leica L
1.53
-@@ -68,4 +86,14 @@
-
-
+@@ -88,6 +104,7 @@
-+
-+ Leica Camera AG
-+ Elmarit-TL 1:2.8/18 ASPH.
-+ Leica L
-+ 1.53
-+
-+
-+
-+
-+
-
+
+ Leica Camera AG
++ Leica
+ Elmarit-TL 1:2.8/18 ASPH.
+ Leica L
+ 1.53
+@@ -98,6 +115,7 @@
+
+
+ Leica Camera AG
++ Leica
+ VARIO-ELMARIT-SL 1:2.8/24-70 ASPH.
+ Leica L
+ 1
+@@ -112,6 +130,7 @@
+
+
+ Leica Camera AG
++ Leica
+ APO-SUMMICRON-SL 1:2/50 ASPH.
+ Leica L
+ 1
diff --git a/data/db/mil-nikon.xml b/data/db/mil-nikon.xml
-index 81463be..21149fd 100644
+index 22e1813..c02a475 100644
--- a/data/db/mil-nikon.xml
+++ b/data/db/mil-nikon.xml
-@@ -159,6 +159,14 @@
+@@ -167,6 +167,14 @@
Nikon Z
1
+
+ Nikon Corporation
+ Nikon
-+ Nikon Z 30
-+ Z 30
++ Nikon Z f
++ Z f
+ Nikon Z
-+ 1.531
++ 1
+
Nikon Corporation
Nikon
-@@ -299,6 +307,27 @@
-
-
-
-+
-+ Nikon
-+ Nikkor Z MC 50mm f/2.8
-+ Nikon Z
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Nikon
- NIKKOR Z 14-24mm f/2.8 S
-@@ -378,11 +407,9 @@
-
-
-
--
--
--
--
--
-+
-+
-+
-
-
-
-@@ -592,6 +619,25 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -625,6 +671,20 @@
- Nikon Z
- 1.0
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -720,6 +780,77 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+@@ -1211,4 +1219,78 @@
+
-
-@@ -763,6 +894,164 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Nikon
-+ NIKKOR Z MC 105mm f/2.8 VR S
-+ Nikon Z
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+
+ Nikon
-+ NIKKOR Z 28-75mm f/2.8
++ NIKKOR Z DX 50-250mm f/4.5-6.3 VR
+ Nikon Z
-+ 1.0
++ 1.5
+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
-+
-+ Nikon
-+ NIKKOR Z 24-120mm f/4 S
-+ Nikon Z
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
diff --git a/data/db/mil-olympus.xml b/data/db/mil-olympus.xml
-index b40cd96..d740784 100644
+index 5979b96..eedbab9 100644
--- a/data/db/mil-olympus.xml
+++ b/data/db/mil-olympus.xml
-@@ -1002,8 +1002,9 @@
-
-
-
--
-+
-
-+
-
-
-
-@@ -1161,6 +1162,21 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -1650,4 +1666,25 @@
-
-
-
-+
-+ Olympus
-+ OLYMPUS M.8-25mm F4.0
-+ Olympus M.Zuiko Digital ED 8-25mm f/4.0 PRO
-+ Micro 4/3 System
-+ 2.0
-+ 4:3
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/mil-panasonic.xml b/data/db/mil-panasonic.xml
-index 6f1e134..5ee336a 100644
---- a/data/db/mil-panasonic.xml
-+++ b/data/db/mil-panasonic.xml
-@@ -77,6 +77,18 @@
+@@ -35,6 +35,13 @@
Micro 4/3 System
2
+
-+ Panasonic
-+ DC-GH5S
-+ Micro 4/3 System
-+ 2
-+
-+
-+ Panasonic
-+ DC-GH6
++ Olympus Imaging Corp.
++ Olympus
++ E-P7
+ Micro 4/3 System
+ 2
+
- Panasonic
- DMC-G5
-@@ -95,6 +107,24 @@
+ Olympus Imaging Corp.
+ Olympus
+diff --git a/data/db/mil-panasonic.xml b/data/db/mil-panasonic.xml
+index ec71fed..5ae8246 100644
+--- a/data/db/mil-panasonic.xml
++++ b/data/db/mil-panasonic.xml
+@@ -107,6 +107,12 @@
Micro 4/3 System
2
+
+ Panasonic
-+ DC-GX7MK3
++ DC-G9M2
+ Micro 4/3 System
+ 2
+
-+
+
+ Panasonic
+ DC-GX9
+@@ -2936,4 +2942,14 @@
+
+
+
++
+ Panasonic
-+ DC-G100
-+ Micro 4/3 System
-+ 2
-+
++ LUMIX S 35/F1.8
++ Leica L
++ 1
++
++
++
++
++
+
+diff --git a/data/db/mil-sigma.xml b/data/db/mil-sigma.xml
+index afd2b9e..05eea50 100644
+--- a/data/db/mil-sigma.xml
++++ b/data/db/mil-sigma.xml
+@@ -19,6 +19,12 @@
+ Sigma SA
+ 1.523
+
+
-+ Panasonic
-+ DC-G110
-+ Micro 4/3 System
-+ 2
++ Sigma
++ sd Quattro H
++ Sigma SA
++ 1.346
+
-
- Panasonic
- DMC-GF5
-@@ -242,6 +272,12 @@
+
+ Sigma
+ E 30mm f/2.8
+@@ -92,6 +98,7 @@
+ Fujifilm X
+ Leica L
+ Canon EF-M
++ Nikon Z
+ 1.534
+
+
+@@ -248,6 +255,7 @@
+ 30mm f/1.4 DC DN
+ Sony E
+ Micro 4/3 System
++ Nikon Z
+ 1.534
+
+
+@@ -292,6 +300,7 @@
+ Fujifilm X
Leica L
+ Canon EF-M
++ Nikon Z
+ 1.534
+
+
+diff --git a/data/db/mil-sony.xml b/data/db/mil-sony.xml
+index b674bba..59c27a5 100644
+--- a/data/db/mil-sony.xml
++++ b/data/db/mil-sony.xml
+@@ -186,6 +186,20 @@
+ Sony E
1
+
-+ Panasonic
-+ DC-S1H
-+ Leica L
++ Sony
++ ILCE-7CM2
++ Alpha 7C II
++ Sony E
++ 1
++
++
++ Sony
++ ILCE-7CR
++ Alpha 7CR
++ Sony E
+ 1
+
- Panasonic
- DC-S1R
-@@ -510,6 +546,14 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -1028,7 +1072,109 @@
-
- Panasonic
- Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS
-- Lumix G Vario 45-200mm f/4.0-5.6
-+ Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS
-+ Micro 4/3 System
-+ 2
-+ 4:3
+ Sony
+ ILCE-7SM2
+diff --git a/data/db/mil-tamron.xml b/data/db/mil-tamron.xml
+index 6a5a524..e896f31 100644
+--- a/data/db/mil-tamron.xml
++++ b/data/db/mil-tamron.xml
+@@ -503,6 +503,7 @@
+ E 150-500mm F5-6.7 A057
+ Tamron 150-500mm F5-6.7 Di III VC VXD
+ Sony E
++ Nikon Z
+ 1.0
+
+
+@@ -574,4 +575,134 @@
+
+
+
++
++ Tamron
++ E 28-75mm F2.8 A063
++ Tamron 28-75mm F2.8 Di III VXD G2 (A063S)
++ Sony E
++ 1.0
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
-+ Panasonic
-+ Lumix G Vario 45-200mm f/4.0-5.6 II
-+ Lumix G Vario 45-200mm f/4.0-5.6 II power OIS
- Micro 4/3 System
- 2
- 4:3
-@@ -1250,7 +1396,7 @@
++ Tamron
++ E 50-400mm F4.5-6.3 A067
++ Tamron 50-400 mm F4.5-6.3 Di III VC VXD (A067)
++ Sony E
++ 1.0
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+diff --git a/data/db/misc.xml b/data/db/misc.xml
+index 9aa4353..f4b3439 100644
+--- a/data/db/misc.xml
++++ b/data/db/misc.xml
+@@ -759,6 +759,7 @@
+ Pentax KAF3
+ Sony Alpha
+ Sony E
++ Nikon Z
+ 1
+
+
+@@ -837,6 +838,17 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
-- Leica
-+ Panasonic
- Leica DG Summilux 25mm f/1.4 Asph.
- Micro 4/3 System
- 2
-@@ -1278,7 +1424,7 @@
-
-
-
-- Leica
-+ Panasonic
- Leica DG Summilux 25mm f/1.4 II
- Micro 4/3 System
- 2
-@@ -1306,8 +1452,26 @@
-
-
- Panasonic
-- Lumix G X Vario 35-100mm f/2.8 Power OIS
-- Lumix G X Vario 35-100mm f/2.8
-+ LUMIX G VARIO 35-100/F2.8
-+ Lumix G X Vario 35-100mm f/2.8 Power OIS
-+ Micro 4/3 System
-+ 2
-+ 4:3
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Panasonic
-+ LUMIX G VARIO 35-100/F2.8II
-+
-+ LUMIX G X VARIO 35-100 mm f/2.8 II Power OIS
- Micro 4/3 System
- 2
- 4:3
-@@ -1354,6 +1518,40 @@
-
+@@ -1245,4 +1257,143 @@
+
+
-+
-+ Panasonic
-+ Lumix G X Vario 12-35mm f/2.8 II Asph. Power OIS
-+ Lumix G X Vario 12-35mm f/2.8 II
++ Venus
++ LAOWA C&D-Dreamer MFT 10mm F2.0
+ Micro 4/3 System
+ 2
-+ 4:3
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Panasonic
- Lumix G 20mm f/1.7 II Asph.
-@@ -1488,6 +1686,14 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -1597,7 +1803,7 @@
-
-
-
-- Leica
-+ Panasonic
- Leica DG Macro-Elmarit 45mm f/2.8
- Micro 4/3 System
- 2
-@@ -1633,7 +1839,7 @@
-
-
-
-- Leica
-+ Panasonic
- Leica DG Summilux 15mm f/1.7 Asph.
- Micro 4/3 System
- 2
-@@ -1789,6 +1995,7 @@
-
- Panasonic
- Lumix G Vario 14-140mm f/3.5-5.6
-+ Lumix G Vario 14-140mm f/3.5-5.6 Asph. Power OIS
- Micro 4/3 System
- 2
- 4:3
-@@ -1879,6 +2086,7 @@
-
- Panasonic
- Lumix G Vario 14-140mm f/3.5-5.6 II
-+ Lumix G Vario 14-140mm f/3.5-5.6 Asph. II Power OIS
- Micro 4/3 System
- 2
- 4:3
-@@ -1996,7 +2204,7 @@
-
-
-
-- Leica
-+ Panasonic
- Leica DG 12-60mm f/2.8-4.0
- Leica DG Vario-Elmarit 12-60mm f/2.8-4.0 Asph. Power OIS
- Micro 4/3 System
-@@ -2280,11 +2488,22 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
- Panasonic
-- LUMIX S 20-60/F3.5-5.6
-+ Lumix S 20-60/F3.5-5.6
- Leica L
- 1
-
-@@ -2303,27 +2522,260 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Panasonic
-+ LUMIX S 70-300/F4.5-5.6
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Panasonic
-+ Lumix S 24/F1.8
-+ Leica L
-+ 1.0
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
-+ Panasonic
-+ Lumix S 50/F1.8
++ 7Artisans
++ 7Artisans APS-C 60mm f/2.8 II
++ Nikon Z
++ Fujifilm X
++ Sony E
+ Leica L
-+ 1.0
++ Canon EF-M
++ Canon RF
++ Micro 4/3 System
++ 1.5
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
-+ Panasonic
-+ Lumix S 85/F1.8
++ 7Artisans
++ 7Artisans 35mm f/1.4 APS-C
++ Sony E
++ Nikon Z
++ Fujifilm X
++ Canon EF-M
+ Leica L
-+ 1.0
++ Canon RF
++ Micro 4/3 System
++ 1.534
++
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
+
+
+
-+ Panasonic
-+ Leica D Summilux 25mm F1.4 Asph.
-+ Micro 4/3 System
-+ 2.0
++ Viltrox
++ Viltrox 16mm F1.8 FE
++ Viltrox AF 16mm F1.8 FE
++ Sony E
++ 1
+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
-+ Panasonic
-+ LEICA DG 50-200/F2.8-4.0
-+ Leica DG Vario-Elmarit 50-200 mm F2.8-4 Asph OIS
-+ Micro 4/3 System
-+ 2.0
-+ 4:3
++ Viltrox
++ Viltrox AF 50mm f/1.8 Z
++ Nikon Z
++ Sony E
++ 1
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
+
+
+
-+ Panasonic
-+ Leica D Vario-Elmar 14-150mm f/3.5-5.6 Asph. OIS
-+ 4/3 System
-+ 2
-+ 4:3
++ Viltrox
++ AF 13mm f/1.4 XF
++ Viltrox AF 13mm F1.4
++ Fujifilm X
++ Sony E
++ Nikon Z
++ 1.529
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
-+ Panasonic
-+ LEICA DG SUMMILUX 9/F1.7
-+ Leica DG Summilux 9mm f/1.7
-+ Micro 4/3 System
-+ 2
-+ 4:3
-+
-+
-+
-+
-
-
-
-diff --git a/data/db/mil-samsung.xml b/data/db/mil-samsung.xml
-index e140d25..4186141 100644
---- a/data/db/mil-samsung.xml
-+++ b/data/db/mil-samsung.xml
-@@ -233,4 +233,27 @@
-
-
-
-+
-+ Samsung
-+ Samsung NX 50-200mm f/4-5.6
-+ Samsung NX
-+ 1.531
++ Venus
++ Laowa 9mm f/5.6 FF RL
++ Nikon Z
++ Sony E
++ Leica L
++ 1.529
+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
+
+
-diff --git a/data/db/mil-samyang.xml b/data/db/mil-samyang.xml
-index 7ed4b1d..825285c 100644
---- a/data/db/mil-samyang.xml
-+++ b/data/db/mil-samyang.xml
-@@ -134,7 +134,7 @@
-
-
- Samyang
-- SAMYANG AF 14mm F2.8
-+ Samyang AF 14mm f/2.8
- Samyang AF 14mm f/2.8
- Sony E
+diff --git a/data/db/rf-leica.xml b/data/db/rf-leica.xml
+index e3cc5a1..6f3da3e 100644
+--- a/data/db/rf-leica.xml
++++ b/data/db/rf-leica.xml
+@@ -9,60 +9,101 @@
+
+
+ Leica Camera AG
++ Leica
+ Leica M (Typ 240)
++ M (Typ 240)
+ Leica M
1
-@@ -145,7 +145,7 @@
-
-
- Samyang
-- SAMYANG AF 24mm F2.8
-+ Samyang AF 24mm f/2.8
- Samyang AF 24mm f/2.8
- Sony E
+
+
+ Leica Camera AG
++ Leica
+ Leica M Monochrom (Typ 246)
++ M Monochrom (Typ 246)
+ Leica M
1
-@@ -183,7 +183,7 @@
-
-
- Samyang
-- SAMYANG AF 45mm F1.8
-+ Samyang AF 45mm f/1.8
- Sony E
+
+
+ Leica Camera AG
++ Leica
++ M8 Digital Camera
++ Leica M
++ 1
++
++
++ Leica Camera AG
++ Leica
+ M9 Digital Camera
+ Leica M
1
-
-@@ -224,7 +224,7 @@
-
-
- Samyang
-- SAMYANG AF 85mm F1.4
-+ Samyang AF 85mm f/1.4
- Sony E
+
+
+ Leica Camera AG
++ Leica
+ Leica M10
++ M10
+ Leica M
1
-
-@@ -242,7 +242,7 @@
+
+
+ Leica Camera AG
++ Leica
+ Leica M10 Monochrom
++ M10 Monochrom
+ Leica M
+ 1
+
+
+ Leica Camera AG
++ Leica
++ Leica M10-D
++ M10-D
++ Leica M
++ 1
++
++
++ Leica Camera AG
++ Leica
+ Leica M10-P
++ M10-P
+ Leica M
+ 1
+
+
+ Leica Camera AG
++ Leica
+ Leica M10-R
++ M10-R
+ Leica M
+ 1
+
+
+ Leica Camera AG
++ Leica
+ Leica M11
++ M11
+ Leica M
+ 1
+
+
+ Leica Camera AG
++ Leica
+ Leica M11 Monochrom
++ M11 Monochrom
++ Leica M
++ 1
++
++
++ Leica Camera AG
++ Leica
++ Leica M11-P
++ M11-P
+ Leica M
+ 1
+
+
+ Leica Camera AG
++ Leica
+ Elmarit-M 1:2.8/28 ASPH.
+ Elmarit-M 28mm f/2.8 ASPH
+ Leica M
+@@ -74,6 +115,7 @@
- Samyang
-- SAMYANG AF 24mm F1.8
-+ Samyang AF 24mm f/1.8
- Sony E
- 1
-
-@@ -253,7 +253,7 @@
+ Leica Camera AG
++ Leica
+ Elmarit-M 1:2.8/90
+ Elmarit-M 90mm f/2.8
+ Leica M
+@@ -85,6 +127,7 @@
- Samyang
-- SAMYANG AF 12mm F2.0
-+ Samyang AF 12mm f/2.0
- Sony E
- Fujifilm X
- 1.534
-@@ -265,7 +265,7 @@
+ Leica Camera AG
++ Leica
+ Summicron-M 1:2/50
+
+ Summicron-M 50mm f/2
+@@ -98,6 +141,7 @@
- Samyang
-- SAMYANG AF 18mm F2.8
-+ Samyang AF 18mm f/2.8
- Sony E
+ Leica Camera AG
++ Leica
+ Summicron-M 1:2/28 ASPH.
+ Leica M
1
-
-@@ -273,4 +273,47 @@
-
+diff --git a/data/db/slr-canon.xml b/data/db/slr-canon.xml
+index 3b238fa..5d52810 100644
+--- a/data/db/slr-canon.xml
++++ b/data/db/slr-canon.xml
+@@ -7824,4 +7824,28 @@
+
+
-+ Samyang
-+ Samyang AF 75mm f/1.8
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Samyang
-+ Samyang AF 35mm f/1.8
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Samyang
-+ Samyang XP 10mm f/3.5
++ Canon
++ Canon EF 11-24mm f/4L USM
+ Canon EF
-+ 1.005
++ 1.0
+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/mil-sigma.xml b/data/db/mil-sigma.xml
-index 65c6c73..a92701a 100644
---- a/data/db/mil-sigma.xml
-+++ b/data/db/mil-sigma.xml
-@@ -74,6 +74,63 @@
-
-
-
-+
-+ Sigma
-+ Sigma 56mm F1.4 DC DN | C 018
-+ Micro 4/3 System
-+ 2.0
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ Sigma 56mm F1.4 DC DN | Contemporary 018
-+ Sigma 56 mm F1.4 DC DN | C 018
-+ Sony E
-+ Fujifilm X
-+ Leica L
-+ Canon EF-M
-+ 1.534
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Sigma
- Sigma 60mm f/2.8 DN
-@@ -228,20 +285,55 @@
-
-
- Sigma
-- Sigma 16mm f/1.4 DC DN | Contemporary C 017
-- Sigma 16mm f/1.4 DC DN C
-+ Sigma 16mm f/1.4 DC DN | Contemporary 017
-+ Sigma 16mm f/1.4 DC DN Contemporary
- Micro 4/3 System
- Sony E
-+ Fujifilm X
-+ Leica L
-+ Canon EF-M
- 1.534
-
-+
-+
-+
-
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
- Sigma
- 105mm F1.4 DG HSM | Art 018
-+ Sigma 105 mm F1.4 DG HSM Art
- Sony E
-+ Canon EF
-+ Leica L
-+ Nikon F AF
-+ Sigma SA
- 1
-
-
-@@ -376,6 +468,7 @@
- Sigma
- 14-24mm F2.8 DG DN | Art 019
- Sony E
-+ Leica L
- 1
-
-
-@@ -394,6 +487,67 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -443,6 +597,277 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 45mm F2.8 DG DN | Contemporary 019
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 40mm F1.4 DG HSM | Art 018
-+ Sigma 40mm F1.4 DG HSM | Art
-+ Canon EF
-+ Leica L
-+ Sony E
-+ Nikon F AF
-+ Sigma SA
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 20mm F2 DG DN | Contemporary 022
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 24mm F2 DG DN | Contemporary 021
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 24-70mm F2.8 DG DN | Art 019
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 35mm F2 DG DN | Contemporary 020
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 65mm F2 DG DN | Contemporary 020
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 90mm F2.8 DG DN | Contemporary 021
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 28-70mm F2.8 DG DN | Contemporary 021
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Sigma
-+ 16-28mm F2.8 DG DN | Contemporary 022
-+ Sony E
-+ Leica L
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-diff --git a/data/db/mil-sony.xml b/data/db/mil-sony.xml
-index 12a7488..bcf83dd 100644
---- a/data/db/mil-sony.xml
-+++ b/data/db/mil-sony.xml
-@@ -130,6 +130,13 @@
- Sony E
- 1
-
-+
-+ Sony
-+ ILCE-7RM3A
-+ Alpha 7R IIIA
-+ Sony E
-+ 1
-+
-
- Sony
- ILCE-7M4
-@@ -144,6 +151,20 @@
- Sony E
- 1
-
-+
-+ Sony
-+ ILCE-7RM4A
-+ Alpha 7R IV A
-+ Sony E
-+ 1
-+
-+
-+ Sony
-+ ILCE-7RM5
-+ Alpha 7R V
-+ Sony E
-+ 1
-+
-
- Sony
- ILCE-7S
-@@ -228,6 +249,12 @@
- Sony E
- 1
-
-+
-+ Sony
-+ ZV-E10
-+ Sony E
-+ 1.534
-+
-
- Sony
- E 16mm f/2.8
-@@ -2251,6 +2278,106 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -2519,4 +2646,95 @@
-
-
-
-+
-+ Sony
-+ FE 50mm F2.8 Macro
-+ Sony E
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Sony
-+ FE 50mm F2.8 Macro
-+ Sony E
-+ 1.534
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Sony
-+ E 11mm F1.8
-+ Sony E
-+ 1.534
-+
-+
-+
-+
-+
-+
-+
-+ Sony
-+ FE 14mm F1.8 GM
-+ Sony E
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Sony
-+ FE 40mm F2.5 G
-+ Sony E
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Sony
-+ FE 50mm F1.2 GM
-+ Sony E
-+ 1.0
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/mil-tamron.xml b/data/db/mil-tamron.xml
-index 366e27d..97b15ff 100644
---- a/data/db/mil-tamron.xml
-+++ b/data/db/mil-tamron.xml
-@@ -220,7 +220,8 @@
- 1
-
-
--
-+
-+
-
-
-
-@@ -241,6 +242,61 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -379,6 +435,28 @@
-
-
-
-+
-+ Tamron
-+ 18-300mm F3.5-6.3 DiIII-A VC VXD B061X
-+ Fujifilm X
-+ 1.534
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Tamron
- E 70-180mm F2.8 A056
-@@ -409,4 +487,91 @@
-
-
-
-+
-+ Tamron
-+ E 24mm F2.8
-+ Sony E
-+ 1.5
-+
-+
-+
-+
-+
-+
-+
-+ Tamron
-+ E 150-500mm F5-6.7 A057
-+ Tamron 150-500mm F5-6.7 Di III VC VXD
-+ Sony E
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Tamron
-+ E 11-20mm F2.8 B060
-+ Tamron 11-20 mm F2.8 Di III-A RXD (B060)
-+ Sony E
-+ 1.534
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/mil-tokina.xml b/data/db/mil-tokina.xml
-index 329308e..a868690 100644
---- a/data/db/mil-tokina.xml
-+++ b/data/db/mil-tokina.xml
-@@ -10,4 +10,16 @@
-
-
-
-+
-+ Tokina
-+ Tokina AT-X M35 PRO DX (AF 35mm f/2.8 Macro)
-+ Nikon F AF
-+ Canon EF
-+ 1.534
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/mil-zeiss.xml b/data/db/mil-zeiss.xml
-index 0efc0ac..70eb24c 100644
---- a/data/db/mil-zeiss.xml
-+++ b/data/db/mil-zeiss.xml
-@@ -1,14 +1,34 @@
-
-
- Zeiss
-- E 32mm f/1.8
-+ Touit 1.8/32
- Touit 32mm f/1.8
-+ Fujifilm X
- Sony E
- 1.534
-
-
-
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -168,4 +188,70 @@
-
-
-
-+
-+ Zeiss
-+ Touit 2.8/12
-+ Fujifilm X
-+ Sony E
-+ 1.53
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Zeiss
-+ Distagon 18mm f/4
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+ Zeiss
-+ Distagon 28mm f/2.8 MMJ
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+ Zeiss
-+ Planar 50mm f/1.7 AEJ
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+ Zeiss
-+ Sonnar 85mm f/2.8 AEJ
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-
-diff --git a/data/db/misc.xml b/data/db/misc.xml
-index 8d6bd23..91e0ad4 100644
---- a/data/db/misc.xml
-+++ b/data/db/misc.xml
-@@ -223,6 +223,16 @@
-
-
-
-+
-+ Mitakon
-+ Mitakon Speedmaster 50mm f/0.95 III
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-
- Zenit
- Zenitar MC 16mm f/2.8
-@@ -399,6 +409,35 @@
-
-
-
-+
-+ Voigtländer
-+ Nokton 25mm f/0.95 II
-+ Voigtländer Nokton 25mm f/0.95 Type II
-+ Micro 4/3 System
-+ 2.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- LG
- LG G4 & compatibles
-@@ -687,11 +726,29 @@
- Fujifilm X
- Sony E
- Canon EF-M
-+ Micro 4/3 System
-+ Nikon Z
-+ Leica L
-+
- 1.529
-
--
-+
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -715,6 +772,17 @@
-
-
-
-+
-+ Venus
-+ Laowa 17mm f/1.8 C-Dreamer
-+ Micro 4/3 System
-+ 2.0
-+
-+
-+
-+
-+
-+
-
- Venus
- Laowa 60mm f/2.8 2X Ultra-Macro
-@@ -750,6 +818,24 @@
-
-
-
-+
-+ TTArtisan
-+ TTArtisan APS-C 23mm F1.4
-+ Sony E
-+ Fujifilm X
-+ Canon EF-M
-+ Canon RF
-+ Nikon Z
-+ Micro 4/3 System
-+ Leica L
-+
-+
-+ 1.534
-+
-+
-+
-+
-+
-
- Chinon
- Auto Chinon 35mm f/2.8
-@@ -853,7 +939,8 @@
-
-
- Voigtländer
-- Voigtländer Super Wide-Heliar 15mm f/4.5 III
-+ Voigtlander Super Wide-Heliar 15mm f/4.5 III
-+ 15mm F4,5 Super Wide Heliar aspherical III
- Sony E
- 1
-
-@@ -919,7 +1006,7 @@
-
-
-
-- Voigtlander
-+ Voigtländer
- Voigtlander HELIAR-HYPER WIDE 10mm F5.6
- Voigtländer HELIAR-HYPER WIDE 10mm F5.6
- Sony E
-@@ -994,4 +1081,112 @@
-
-
-
-+
-+ Pentacon
-+ Pentacon electric 2.8/29mm
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+ Meyer Optik Görlitz
-+ Meyer Optik Görlitz 3.5/30mm
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+ Voigtländer
-+ Voigtlander APO-LANTHAR 50mm F2 Aspherical
-+ Sony E
-+ Nikon Z
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Voigtländer
-+ Voigtlander Color Skopar 20mm F3.5 SLII Aspherical
-+ Pentax KAF4
-+ Canon EF
-+ Nikon F AF
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+ Rollei
-+ Rollei Rolleinar MC f/4 21mm
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+ Rollei
-+ Rollei Rolleinar MC f/2.8 28mm
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+ Kipon
-+ Elegant 35mm F/2.4
-+ Nikon Z
-+ 1
-+
-+
-+
-+
-+
-+
-
-diff --git b/data/db/om-system.xml b/data/db/om-system.xml
-new file mode 100644
-index 0000000..ae29bdc
---- /dev/null
-+++ b/data/db/om-system.xml
-@@ -0,0 +1,36 @@
-+
-+
-+ OM Digital Solutions
-+ OM System
-+ OM-1
-+ Micro 4/3 System
-+ 2
-+
-+
-+ OM Digital Solutions
-+ OM System
-+ OM-5
-+ Micro 4/3 System
-+ 2
-+
-+
-+ OM Digital Solutions
-+ OM System
-+ OM 20mm F1.4
-+ Micro 4/3 System
-+ 2
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-diff --git a/data/db/rf-leica.xml b/data/db/rf-leica.xml
-index 2349b22..c20fb40 100644
---- a/data/db/rf-leica.xml
-+++ b/data/db/rf-leica.xml
-@@ -8,14 +8,56 @@
- Generic
-
-
-- Leica
-+ Leica Camera AG
- Leica M (Typ 240)
- Leica M
- 1
-
-+
-+ Leica Camera AG
-+ Leica M Monochrom (Typ 246)
-+ Leica M
-+ 1
-+
-+
-+ Leica Camera AG
-+ M9 Digital Camera
-+ Leica M
-+ 1
-+
-+
-+ Leica Camera AG
-+ Leica M10
-+ Leica M
-+ 1
-+
-+
-+ Leica Camera AG
-+ Leica M10 Monochrom
-+ Leica M
-+ 1
-+
-+
-+ Leica Camera AG
-+ Leica M10-P
-+ Leica M
-+ 1
-+
-+
-+ Leica Camera AG
-+ Leica M10-R
-+ Leica M
-+ 1
-+
-+
-+ Leica Camera AG
-+ Leica M11
-+ Leica M
-+ 1
-+
-
-- Leica
-- Elmarit-M 1:2.8/28
-+ Leica Camera AG
-+ Elmarit-M 1:2.8/28 ASPH.
- Elmarit-M 28mm f/2.8 ASPH
- Leica M
- 1
-@@ -25,7 +67,7 @@
-
-
-
-- Leica
-+ Leica Camera AG
- Elmarit-M 1:2.8/90
- Elmarit-M 90mm f/2.8
- Leica M
-@@ -36,7 +78,7 @@
-
-
-
-- Leica
-+ Leica Camera AG
- Summicron-M 1:2/50
-
- Summicron-M 50mm f/2
-@@ -48,4 +90,15 @@
-
-
-
-+
-+ Leica Camera AG
-+ Summicron-M 1:2/28 ASPH.
-+ Leica M
-+ 1
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/slr-canon.xml b/data/db/slr-canon.xml
-index 9fedd67..033bee2 100644
---- a/data/db/slr-canon.xml
-+++ b/data/db/slr-canon.xml
-@@ -1031,6 +1031,57 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -2002,7 +2053,7 @@
- Canon
- EF35mm f/1.4L II USM (750)
- Canon EF 35mm f/1.4L II USM
-- Canon EF-S
-+ Canon EF
- 1.605
-
-
-@@ -2068,6 +2119,482 @@
-
-
-
-+
-+ Canon
-+ Canon EF 35-105mm f/3.5-4.5
-+ Canon EF
-+ 1.005
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Canon
- Canon EF 35-105mm f/3.5-4.5
-@@ -4058,6 +4585,25 @@
- 1.611
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -5213,6 +5759,57 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -5251,7 +5848,7 @@
-
- Canon
- Canon EF 70-300mm f/4-5.6L IS USM
-- Canon EF-S
-+ Canon EF
- 1.605
-
-
-@@ -6544,7 +7141,7 @@
-
- Canon
- Canon EF 24mm f/2.8 IS USM
-- Canon EF-S
-+ Canon EF
- 1.613
-
-
-@@ -6639,7 +7236,7 @@
-
- Canon
- Canon EF 22-55mm f/4-5.6 USM
-- Canon EF-S
-+ Canon EF
- 1.613
-
-
-@@ -6791,7 +7388,7 @@
-
-
- Canon
-- Canon EF85mm f/1.4L IS USM
-+ Canon EF 85mm f/1.4L IS USM
- Canon EF
- 1
-
-@@ -6839,7 +7436,7 @@
-
-
- Canon
-- EF28mm f/2.8
-+ Canon EF 28mm f/2.8
- Canon EF
- 1.0
-
-@@ -6847,4 +7444,74 @@
-
-
-
-+
-+ Canon
-+ Canon EF 75-300mm F4-5.6 III
-+ Canon EF-S
-+ 1.613
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/slr-konica-minolta.xml b/data/db/slr-konica-minolta.xml
-index 3f222ec..d8076d5 100644
---- a/data/db/slr-konica-minolta.xml
-+++ b/data/db/slr-konica-minolta.xml
-@@ -480,6 +480,27 @@
-
-
-
-+
-+ Minolta
-+ Minolta AF 50mm f/1.7
-+ Minolta AF
-+ 1.523
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Minolta
- Minolta AF 17-35mm f/2.8-4 (D)
-@@ -518,4 +539,23 @@
-
-
-
-+
-+ Minolta
-+ Minolta AF 70-210mm f/4 Macro
-+ Minolta AF
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/slr-leica.xml b/data/db/slr-leica.xml
-index 436270b..3d166be 100644
---- a/data/db/slr-leica.xml
-+++ b/data/db/slr-leica.xml
-@@ -12,30 +12,4 @@
- Leica S
- Generic
-
--
-- Leica
-- Digilux 3
-- 4/3 System
-- 2
--
--
-- Leica
-- Leica D Vario-Elmar 14-150mm f/3.5-5.6 Asph. OIS
-- 4/3 System
-- 2
-- 4:3
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-diff --git a/data/db/slr-nikon.xml b/data/db/slr-nikon.xml
-index 8fc6954..5139772 100644
---- a/data/db/slr-nikon.xml
-+++ b/data/db/slr-nikon.xml
-@@ -892,6 +892,70 @@
-
-
-
-+
-+ Nikon
-+ Nikon AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED
-+ Nikkor AF 18-35mm f/3.5-4.5D IF-ED
-+ Nikon F AF
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Nikon
- Nikon AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED
-@@ -1987,6 +2051,69 @@
-
-
-
-+
-+ Nikon
-+ Nikon AF Zoom-Nikkor 70-210mm f/4
-+ Nikon F
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Nikon
- Nikon AF Zoom-Nikkor 70-210mm f/4
-@@ -3061,6 +3188,77 @@
-
-
-
-+
-+ Nikon
-+ Nikon Zoom-NIKKOR Auto 43-86mm F3.5
-+ Nikon F
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Nikon
- Nikon AI Nikkor 45mm f/2.8 GN
-@@ -5102,6 +5300,33 @@
-
-
-
-+
-+ Nikon
-+ Nikon AI-S Nikkor 135mm f/3.5
-+ Nikkor AI-S 135mm f/3.5
-+ Nikon F AI-S
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Nikon
- Nikon AF Nikkor 180mm f/2.8D IF-ED
-@@ -5162,7 +5387,7 @@
-
-
- Nikon
-- Nikon AF-S VR Nikkor 400mm f_2.8G ED
-+ Nikon AF-S VR Nikkor 400mm f/2.8G ED
- Nikon AF F
- 1.0
-
-@@ -5257,20 +5482,22 @@
- 1
-
-
--
-+
-
--
--
--
--
--
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -5586,4 +5813,199 @@
-
-
-
-+
-+ Nikon
-+ Nikon AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED
-+ Nikon F AF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Nikon
-+ Nikon AF-S Nikkor 500mm f/5.6E PF ED VR
-+ Nikon F AF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Nikon
-+ Nikon AF-S Nikkor 600mm f/4E FL ED VR
-+ Nikon F AF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Nikon
-+ Nikon AF-S Nikkor 600mm f/4E FL ED VR + converter TC-14EIII
-+ Nikkor AF-S 600mm f/4E FL ED VR + converter TC-14EIII
-+ Nikon F AF
-+
-+
-+ rectilinear
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Nikon
-+ Nikon AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED
-+ Nikon F AF
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
diff --git a/data/db/slr-pentax.xml b/data/db/slr-pentax.xml
-index c7f41ee..407b067 100644
+index 6ee88ed..32fadaa 100644
--- a/data/db/slr-pentax.xml
+++ b/data/db/slr-pentax.xml
-@@ -242,6 +242,14 @@
+@@ -250,6 +250,14 @@
Pentax KAF2
- 1.534
+ 1.546
+
+ Ricoh Imaging Company, Ltd.
+ Pentax
-+ Pentax K-3 Mark III
-+ K-3 III
++ Pentax K-3 Mark III Monochrome
++ K-3 III Monochrome
+ Pentax KAF2
+ 1.546
+
Ricoh Imaging Company, Ltd.
Pentax
-@@ -2484,4 +2492,43 @@
-
+diff --git a/data/db/slr-samyang.xml b/data/db/slr-samyang.xml
+index d7e8f56..d5135ff 100644
+--- a/data/db/slr-samyang.xml
++++ b/data/db/slr-samyang.xml
+@@ -137,6 +137,23 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
-+
-+ Pentax
-+ smc PENTAX-F 35-80mm F4-5.6
-+ Pentax KAF2
-+ 1.531
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Pentax
-+ HD PENTAX-DA* 11-18mm F2.8 ED DC AW
-+ Pentax KAF2
-+ 1.534
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
+
diff --git a/data/db/slr-sigma.xml b/data/db/slr-sigma.xml
-index 77cfb1c..f28d687 100644
+index 7d089d9..37ade39 100644
--- a/data/db/slr-sigma.xml
+++ b/data/db/slr-sigma.xml
-@@ -680,26 +680,41 @@
- Sigma
- Sigma 18-50mm f/2.8 EX DC
- Sigma SA
-- Canon EF
- Nikon F AF
- Pentax KAF
-
- 1.53
-
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
- Sigma
- Sigma 18-50mm f/2.8 EX DC
-- Sigma SA
- Canon EF
-- Nikon F AF
-- Pentax KAF
-
- 1.611
-
-@@ -2463,6 +2478,8 @@
- Nikon F AF
- Sony Alpha
- Canon EF
-+ Pentax KAF2
-+ 4/3 System
- 1.534
-
-
-@@ -4009,4 +4026,330 @@
-
+@@ -4514,4 +4514,19 @@
+
+
+ Sigma
-+ Sigma 60-600mm f/4.5-6.3 DG OS HSM | S
-+ Sigma 60-600mm F4.5-6.3 DG OS HSM | Sports 018
-+ Canon EF-S
-+ Nikon F AF
-+ Sigma SA
-+ 1.605
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/slr-sony.xml b/data/db/slr-sony.xml
-index 7611c1a..ff72da5 100644
---- a/data/db/slr-sony.xml
-+++ b/data/db/slr-sony.xml
-@@ -1099,4 +1099,23 @@
-
-
-
-+
-+ Sony
-+ Sony 85mm F2.8 SAM (SAL85F28)
-+ Sony Alpha
-+ 1.5
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/slr-tamron.xml b/data/db/slr-tamron.xml
-index f940729..4c13d52 100644
---- a/data/db/slr-tamron.xml
-+++ b/data/db/slr-tamron.xml
-@@ -72,7 +72,7 @@
-
-
- Tamron
-- Tamron 17-35mm F/2.8-4 Di OSD
-+ Tamron 17-35mm f/2.8-4 Di OSD (A037)
- Canon EF
- Nikon F AF
- 1
-@@ -1072,10 +1072,8 @@
-
- Tamron
- Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro
-- Tamron 16-300mm f/3.5-6.3 Di II VC PZD
-+ Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro B016
- Canon EF
-- Nikon F AF
-- Sony Alpha
- 1.613
-
-
-@@ -1092,9 +1090,8 @@
-
-
- Tamron
-- Tamron 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro
-- Tamron 16-300mm f/3.5-6.3 Di II VC PZD
-- Canon EF
-+ Tamron AF 16-300mm f/3.5-6.3 Di II VC PZD B016 Macro
-+ Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro B016
- Nikon F AF
- Sony Alpha
- 1.534
-@@ -1138,6 +1135,125 @@
-
-
-
-+
-+ Tamron
-+ Tamron SP AF 150-600mm F/5-6.3 Di VC USD G2 (A022)
-+ Canon EF
-+ Nikon F AF
-+ Sony Alpha
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
- Tamron
- Tamron SP AF 60mm f/2 Di II LD (IF) Macro 1:1
-@@ -1667,18 +1783,102 @@
- Tamron
- Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)
- Canon EF
-+ Nikon F AF
- 1.53
-
--
--
--
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -1702,4 +1902,54 @@
-
-
-
-+
-+ Tamron
-+ TAMRON 100-400mm F/4.5-6.3 Di VC USD A035
-+ Nikon F AF
-+ Canon EF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Tamron
-+ Tamron 35-150mm f/2.8-4.0 Di VC OSD A043
-+ Tamron 35-150mm f/2.8-4 Di VC OSD (A043)
-+ Nikon F AF
-+ Canon EF
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Tamron
-+ Tamron SP 45mm F/1.8 Di VC USD
-+ Nikon F AF
-+ Canon EF
-+ Sony Alpha
-+ 1.0
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/slr-tokina.xml b/data/db/slr-tokina.xml
-index 6005402..5ce39e7 100644
---- a/data/db/slr-tokina.xml
-+++ b/data/db/slr-tokina.xml
-@@ -156,6 +156,7 @@
- Tokina
- Tokina AT-X 14-20 F2 PRO DX
- Nikon F AF
-+ Canon EF
- 1.523
-
-
-@@ -170,6 +171,107 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -452,6 +554,106 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
-
-@@ -487,4 +689,19 @@
-
-
-
-+
-+ Tokina
-+ Tokina atx-i 11-16mm F2.8 CF
-+ Nikon F AF
-+ Canon EF-S
-+ 1.523
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-diff --git a/data/db/slr-zeiss.xml b/data/db/slr-zeiss.xml
-index 8db4726..50c65dc 100644
---- a/data/db/slr-zeiss.xml
-+++ b/data/db/slr-zeiss.xml
-@@ -116,6 +116,17 @@
-
-
-
-+
-+ Zeiss
-+ Carl Zeiss Planar T* 1,4/50 ZF.2
-+ Nikon F AF
-+ 1.0
-+
-+
-+
-+
-+
-+
-
- Zeiss
- Carl Zeiss Distagon T* 3,5/18 ZF.2
-@@ -157,4 +168,62 @@
-
-
-
-+
-+ Zeiss
-+ Zeiss Makro-Planar T* 2/100 ZF.2
-+ Makro-Planar T* 2/100
-+ Nikon F AF
++ Sigma 14mm f/2.8 EX Aspherical HSM
+ Canon EF
-+ Pentax KAF4
-+ 1.0
-+
-+
-+
-+
-+
-+
-+
-+ Zeiss
-+ Carl Zeiss Jena 135mm f/3.5
-+ Sony E
-+ 1
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ Zeiss
-+ Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)
++ Nikon F
++ Sigma SA
+ Sony Alpha
++ Pentax KAF
+ 1
+
-+
-+
-+
-+
-+
-+
-+ Zeiss
-+ Carl Zeiss Jena Flektogon 4/20mm
-+ Sony E
-+ 1
-+
-+
-+
-+
++
++
++
+
+
diff --git a/data/db/timestamp.txt b/data/db/timestamp.txt
-index 2cb1a07..a351200 100644
+index 2cb1a07..51d4b9c 100644
--- a/data/db/timestamp.txt
+++ b/data/db/timestamp.txt
@@ -1 +1 @@
-1645386247
-+1670957771
++1698414886
\ No newline at end of file
diff -Nru lensfun-0.3.3/debian/patches/python-setuptools.diff lensfun-0.3.4/debian/patches/python-setuptools.diff
--- lensfun-0.3.3/debian/patches/python-setuptools.diff 1970-01-01 00:00:00.000000000 +0000
+++ lensfun-0.3.4/debian/patches/python-setuptools.diff 2023-07-23 15:23:51.000000000 +0000
@@ -0,0 +1,17 @@
+Author: Pino Toscano
+Description: Fix the installation of the Python module
+ - move the installation root ($DESTDIR) as --root parameter
+ - specify --single-version-externally-managed, so the module is not installed
+ as single egg file
+Forwarded: not-needed
+Last-Update: 2023-07-23
+
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -42,5 +42,5 @@ IF(PYTHON)
+ IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX)
+ SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+ ENDIF()
+- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})")
++ INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX} --single-version-externally-managed --root=\$ENV{DESTDIR})")
+ ENDIF(PYTHON)
diff -Nru lensfun-0.3.3/debian/patches/series lensfun-0.3.4/debian/patches/series
--- lensfun-0.3.3/debian/patches/series 2022-06-07 20:34:44.000000000 +0000
+++ lensfun-0.3.4/debian/patches/series 2023-10-27 20:36:59.000000000 +0000
@@ -1,2 +1,4 @@
local-mathjax.diff
+python-setuptools.diff
+fix-float.diff
lensfun-lensdb-update.patch
diff -Nru lensfun-0.3.3/debian/rules lensfun-0.3.4/debian/rules
--- lensfun-0.3.3/debian/rules 2022-06-07 19:50:47.000000000 +0000
+++ lensfun-0.3.4/debian/rules 2023-10-27 20:45:01.000000000 +0000
@@ -8,6 +8,9 @@
EXTRA_CMAKE_ARGS += -DBUILD_FOR_SSE=OFF -DBUILD_FOR_SSE2=OFF
endif
+# needed to install the Python bits to /usr
+export DEB_PYTHON_INSTALL_LAYOUT=deb
+
%:
dh $@ --with=python3
diff -Nru lensfun-0.3.3/docs/make-release-0.3.x.txt lensfun-0.3.4/docs/make-release-0.3.x.txt
--- lensfun-0.3.3/docs/make-release-0.3.x.txt 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/docs/make-release-0.3.x.txt 2023-07-12 18:24:04.000000000 +0000
@@ -113,10 +113,11 @@
git tag v0.3.3
```
-13. Push the `release_0.3.x` branch to GitHub.
+13. Push the `release_0.3.x` branch and the new tag to GitHub.
```
git push
+git push origin v0.3.3
```
14. Make a new release on GitHub.
diff -Nru lensfun-0.3.3/libs/lensfun/cpuid.cpp lensfun-0.3.4/libs/lensfun/cpuid.cpp
--- lensfun-0.3.3/libs/lensfun/cpuid.cpp 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/libs/lensfun/cpuid.cpp 2023-07-12 18:24:04.000000000 +0000
@@ -92,9 +92,9 @@
{
#define cpuid(cmd) \
__asm volatile ( \
- "push %%"R_BX"\n" \
+ "push %%" R_BX "\n" \
"cpuid\n" \
- "pop %%"R_BX"\n" \
+ "pop %%" R_BX "\n" \
: "=a" (ax), "=c" (cx), "=d" (dx) \
: "0" (cmd))
diff -Nru lensfun-0.3.3/tests/test_modifier.cpp lensfun-0.3.4/tests/test_modifier.cpp
--- lensfun-0.3.3/tests/test_modifier.cpp 2022-02-22 20:49:04.000000000 +0000
+++ lensfun-0.3.4/tests/test_modifier.cpp 2023-07-12 18:24:04.000000000 +0000
@@ -78,8 +78,8 @@
// check if output becomes NaN when processing geometry conversion
void test_mod_projection_borders(lfFixture* lfFix, gconstpointer data)
{
- float in[2] = {lfFix->img_width, lfFix->img_height};
- float in2[2] = {(lfFix->img_width-1)/2, (lfFix->img_height-1)/2};
+ float in[2] = {(float) lfFix->img_width, (float) lfFix->img_height};
+ float in2[2] = {(float) (lfFix->img_width-1)/2, (float) (lfFix->img_height-1)/2};
float res[2] = {0, 0};
lfLensType geom_types [] = {LF_RECTILINEAR, LF_PANORAMIC, LF_EQUIRECTANGULAR, LF_FISHEYE_STEREOGRAPHIC, LF_FISHEYE, LF_FISHEYE_EQUISOLID, LF_FISHEYE_ORTHOGRAPHIC, LF_FISHEYE_THOBY, LF_UNKNOWN};