Hello community, here is the log from the commit of package lensfun for openSUSE:Factory checked in at 2020-04-04 12:20:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lensfun (Old) and /work/SRC/openSUSE:Factory/.lensfun.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lensfun" Sat Apr 4 12:20:45 2020 rev:47 rq:790794 version:0.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lensfun/lensfun.changes 2020-03-24 22:29:51.701014515 +0100 +++ /work/SRC/openSUSE:Factory/.lensfun.new.3248/lensfun.changes 2020-04-04 12:20:49.923696710 +0200 @@ -1,0 +2,66 @@ +Thu Apr 2 07:30:58 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update the license tag. The data files are under CC-BY-SA-3.0. + +------------------------------------------------------------------- +Wed Apr 1 10:14:33 UTC 2020 - Marcus Rueckert <[email protected]> + +- update lensfun data to 48775126: + - Add Olympus OM-D E-M5 Mark III camera. + - Add Olympus E-M1 Mark III + - Build-Test failed - fix + - commit 3f1289b44afb1b6f2ee22a8e87c7d1fb074be0f1 doubled entry + for canon 15mm fisheye. Removed the one without data + - Add 24-105mm f/3.5-5.6, 15mm f/2.8 Fisheye #1088 + - Improve Iphone XS profiles. + - Move X100F from mil-fujifilm.xml + - Move X100F to compact-fujifilm.xml + - Add Iphone XS profiles contributed in #982 + - Merge pull request #1044 from EdgarLux/master + - Add DC-S1 and DC-S1R per #1099 + - Add DMC-TZ96 per #1094 + - Added Canon EOS KISS M camera (it's actually the same as the + Canon EOS M50, just a version of it released for the Japanese + market) + - data:lens: Improve TCA and vignetting for Sony FE 85mm f/1.4 GM + - data:lens: Improve TCA and vignetting for Sony FE 16-35mm f/2.8 + GM + - Upload 7471de #1072. Distortion and TCA corrections for Pentax + HD PENTAX-DA 55-300mm f/4.5-6.3 ED PLM WR RE (×1,534). + - Upload 3ed26e #479. Dostortion and TCA, Minolta AF 24-105mm + f/3.5-4.5 (D). + - Upload d4bd55 #478. Distortion and TCA for Minolta AF 17-35mm + f/2.8-4 (D). + - Upload fba583 #477. Minolta lens 50mm F1.4, distortion and TCA. + - Upload 3a647c #1075. NIKKOR Z 24-70mm f2,8 S, distortion and + TCA. + - Upload 75f392 #476. Minolta AF 50mm f/2.8 Macro distortion and + TCA. + - The SM-N950U is the Galaxy Note 8 + - Add an alias for another name of the Samsung Galaxy S8 + - Upload 34eb2e #1047. Better correction for Leica 12-60mm µ4/3. + - Upload 6180fa #468. Add TCA corrections for Canon PowerShot + A640. + - Upload 52e6be #465. Distortion and vignetting for Canon FD 50mm + f/1.4 SCC. + - Upload 5f1aab #454. Distortion and TCA corrections for Sony FE + 100-400 on full frame. + - Upload cb3f38. New camera Canon Powershot SX50 HS with fixed + lens. Distortion and TCA corrections for the lens. String + corrections for SX60 HS for better automatic recognition. + - Distortion & TCA data for the Panasonic Leica DG 10-25mm f/1.7 + - Add Sony E mount for Meike 35mm f/1.7 + - Added camera entry for Canon EOS EOS Rebel T6s + +------------------------------------------------------------------- +Tue Mar 31 08:55:02 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Revert lensfun to 0.3.2. Git snapshots cause + build and runtime issues in different packages (boo#1168150) +- Add patches back: + * lensfun-respect-DESTDIR.patch + * lensfun-test-database.patch + * 0060-Various-CMake-patches-from-the-mailing-list.patch + * lensfun_fix_memory_leak.patch + +------------------------------------------------------------------- @@ -16,0 +83,11 @@ + +------------------------------------------------------------------- +Thu Jan 2 15:04:34 UTC 2020 - Adrian Schröter <[email protected]> + +- update lensdatabase to curent state (post 0.3.95) + +------------------------------------------------------------------- +Wed Sep 11 09:45:39 UTC 2019 - Adrian Schröter <[email protected]> + +- adapt to github hosting +- update lens database Old: ---- _servicedata lensfun-0.3.95.1584325617.48775126.tar.gz New: ---- 0060-Various-CMake-patches-from-the-mailing-list.patch data-master.obscpio data.obsinfo lensfun-0.3.2.tar.gz lensfun-respect-DESTDIR.patch lensfun-test-database.patch lensfun_fix_memory_leak.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lensfun.spec ++++++ --- /var/tmp/diff_new_pack.urkQ8M/_old 2020-04-04 12:20:51.791698316 +0200 +++ /var/tmp/diff_new_pack.urkQ8M/_new 2020-04-04 12:20:51.795698319 +0200 @@ -16,20 +16,31 @@ # -%define sonum 2 +%define sonum 1 Name: lensfun -Version: 0.3.95.1584325617.48775126 +Version: 0.3.2 Release: 0 Summary: A photographic lens database and a library for accessing it -License: LGPL-3.0-only +License: LGPL-3.0-only AND CC-BY-SA-3.0 Group: Development/Libraries/C and C++ URL: https://lensfun.github.io/ -Source: %{name}-%{version}.tar.gz +Source: https://github.com/lensfun/lensfun/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# updated lens database, use "osc service dr" to update it. +Source2: data-master.tar.xz + +# PATCH-FIX-UPSTREAM respect DESTDIR in python call +Patch0: lensfun-respect-DESTDIR.patch +# PATCH-FIX-UPSTREAM use local database when running tests +Patch1: lensfun-test-database.patch +# PATCH-FIX-UPSTREAM 0060-Various-CMake-patches-from-the-mailing-list.patch +Patch2: 0060-Various-CMake-patches-from-the-mailing-list.patch +# PATCH-FIX-UPSTREAM lensfun_fix_memory_leak.patch +Patch3: lensfun_fix_memory_leak.patch BuildRequires: cmake BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libpng-devel -BuildRequires: libxml2-tools BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: python3-docutils @@ -122,21 +133,19 @@ that use the %{name} library/database. %prep -%setup -q +%setup -q -a 2 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 echo 'HTML_TIMESTAMP=NO' >> docs/doxyfile.in.cmake # fix python shebangs sed -i \ - -e "s|^#!%{_bindir}/env python3$|#!%{_bindir}/python3|g" \ + -e "s|^#!/usr/bin/env python3$|#!/usr/bin/python3|g" \ apps/lensfun-add-adapter \ apps/lensfun-update-data \ - apps/lensfun-convert-lcp \ apps/lensfun/__init__.py.in -# fix shell shebang -sed -i \ - -e "s|^#!%{_bindir}/env sh$|#!%{_bindir}/sh|g" \ - apps/g-lensfun-update-data - %build %cmake \ -DBUILD_STATIC=OFF \ @@ -146,7 +155,7 @@ -DCMAKE_INSTALL_DOCDIR=%{_defaultdocdir}/%{name} \ -DINSTALL_HELPER_SCRIPTS=ON \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 -%make_build lensfun doc +make %{?_smp_mflags} lensfun doc %install %cmake_install @@ -154,9 +163,11 @@ rm -rf %{buildroot}%{_datadir}/lensfun/tests # Create udate folder for lensfun data mkdir -p %{buildroot}%{_localstatedir}/lib/lensfun-updates -# Regererate pyc files to not contain buildroot +# Regererate pyc files to not contain %{buildroot} %py3_compile %{buildroot}/%{python3_sitelib}/lensfun/ +%fdupes %{buildroot} + %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} %ctest @@ -166,6 +177,7 @@ %files doc %doc README.md +%doc docs/* %doc %{_defaultdocdir}/%{name} %files data @@ -187,7 +199,6 @@ %files tools %{_bindir}/g-lensfun-update-data %{_bindir}/lensfun-add-adapter -%{_bindir}/lensfun-convert-lcp %{_bindir}/lensfun-update-data %{_mandir}/man?/g-lensfun-update-data* %{_mandir}/man?/lensfun-add-adapter* ++++++ 0060-Various-CMake-patches-from-the-mailing-list.patch ++++++ >From bba9aa37c899999fca01101a8ed271a3aa9d82b7 Mon Sep 17 00:00:00 2001 From: Sebastian Kraft <[email protected]> Date: Sat, 16 Jan 2016 15:42:57 +0100 Subject: [PATCH 060/113] Various CMake patches from the mailing list - Add GLIB2 libray path to link directories - Enable -msseX compiler switch for Clang - Set -mseeX switch only for files with SSE code - Do not enable SSE optimizations on non-x86 hardware by default --- CMakeLists.txt | 19 +++++++++++++------ libs/lensfun/CMakeLists.txt | 5 +++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21f082b..b85656c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,12 +31,18 @@ IF(NOT HAVE_REGEX_H) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/regex) ENDIF() +IF(CMAKE_SYSTEM_PROCESSOR MATCHES "[XxIi][0-9]?86|[Aa][Mm][Dd]64") + SET(X86_ON ON) +else() + SET(X86_ON OFF) +ENDIF() + # options controlling the build process OPTION(BUILD_STATIC "Build static library" 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" ON) -OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" ON) +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_HELPER_SCRIPTS "Install various helper scripts" ON) @@ -62,14 +68,14 @@ ENDIF() IF(BUILD_FOR_SSE) SET(VECTORIZATION_SSE 1) - IF(CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") + IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + SET(VECTORIZATION_SSE_FLAGS "-msse") ENDIF() ENDIF() IF(BUILD_FOR_SSE2) SET(VECTORIZATION_SSE2 1) - IF(CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2") + IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + SET(VECTORIZATION_SSE2_FLAGS "-msse2") ENDIF() ENDIF() @@ -91,6 +97,7 @@ ELSE() FIND_PACKAGE(GLIB2 REQUIRED 2.40) INCLUDE_DIRECTORIES(SYSTEM ${GLIB2_INCLUDE_DIRS}) +LINK_DIRECTORIES(${GLIB2_LIBRARY_DIRS}) IF(BUILD_STATIC) diff --git a/libs/lensfun/CMakeLists.txt b/libs/lensfun/CMakeLists.txt index 6beadec..b0ca638 100644 --- a/libs/lensfun/CMakeLists.txt +++ b/libs/lensfun/CMakeLists.txt @@ -9,6 +9,11 @@ IF(WIN32) LIST(APPEND LENSFUN_SRC windows/auxfun.cpp) ENDIF() +SET_SOURCE_FILES_PROPERTIES(mod-color-sse.cpp mod-coord-sse.cpp + PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE_FLAGS}") +SET_SOURCE_FILES_PROPERTIES(mod-color-sse2.cpp + PROPERTIES COMPILE_FLAGS "${VECTORIZATION_SSE2_FLAGS}") + IF(BUILD_STATIC) ADD_LIBRARY(lensfun STATIC ${LENSFUN_SRC}) ELSE() -- 2.7.4 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.urkQ8M/_old 2020-04-04 12:20:51.831698350 +0200 +++ /var/tmp/diff_new_pack.urkQ8M/_new 2020-04-04 12:20:51.831698350 +0200 @@ -1,15 +1,14 @@ <services> - <service name="tar_scm" mode="disabled"> - <param name="url">git://github.com/lensfun/lensfun.git</param> + <service name="obs_scm" mode="disabled" > + <param name="url">https://github.com/lensfun/lensfun</param> <param name="scm">git</param> - <param name="versionprefix">0.3.95</param> - <param name="changesgenerate">enable</param> + <param name="subdir">data</param> + <param name="filename">data</param> + <param name="version">master</param> </service> - <service name="set_version" mode="disabled"> - <param name="basename">lensfun</param> - </service> - <service name="recompress" mode="disabled"> + <service mode="buildtime" name="tar" /> + <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> - <param name="compression">gz</param> + <param name="compression">xz</param> </service> </services> ++++++ data.obsinfo ++++++ name: data version: master mtime: 1585475945 commit: df5a2af4b8088be67591db5215f8df3573e9511b ++++++ lensfun-0.3.95.1584325617.48775126.tar.gz -> lensfun-0.3.2.tar.gz ++++++ ++++ 131847 lines of diff (skipped) ++++++ lensfun-respect-DESTDIR.patch ++++++ >From 9ec857bb403accc262a9b5a9c2921b5c064fc9c8 Mon Sep 17 00:00:00 2001 From: Sebastian Kraft <[email protected]> Date: Sat, 9 Jan 2016 20:55:21 +0100 Subject: [PATCH] Patch #47: respect DESTDIR when installing python stuff --- apps/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 70c77fd..2f6f8f1 100644 --- 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=${SETUP_PY_INSTALL_PREFIX})") + INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})") ENDIF(PYTHON) -- 2.6.4 ++++++ lensfun-test-database.patch ++++++ >From 3f74b78e4ee9f1d400ebbf2b9093a0f9c48c6307 Mon Sep 17 00:00:00 2001 From: Sebastian Kraft <[email protected]> Date: Sat, 9 Jan 2016 20:48:16 +0100 Subject: [PATCH] Use database in source directory while running tests. Fixes bug #46. --- tests/CMakeLists.txt | 4 ++-- tests/test_database.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b79fda6..4056072 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_EXECUTABLE(test_database test_database.cpp) TARGET_LINK_LIBRARIES(test_database lensfun ${COMMON_LIBS}) -ADD_TEST(Database test_database) +ADD_TEST(NAME Database WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND test_database) ADD_EXECUTABLE(test_modifier test_modifier.cpp) TARGET_LINK_LIBRARIES(test_modifier lensfun ${COMMON_LIBS}) @@ -30,4 +30,4 @@ TARGET_LINK_LIBRARIES(test_modifier_coord_geometry lensfun ${COMMON_LIBS}) ADD_TEST(Modifier_coord_geometry test_modifier_coord_geometry) FIND_PACKAGE(PythonInterp REQUIRED) -ADD_TEST(NAME Database_integrity COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/check_database/check_database.py ../../data/db) +ADD_TEST(NAME Database_integrity COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/check_database/check_database.py ${CMAKE_SOURCE_DIR}/data/db) diff --git a/tests/test_database.cpp b/tests/test_database.cpp index 45dc38f..49a2644 100644 --- a/tests/test_database.cpp +++ b/tests/test_database.cpp @@ -10,7 +10,7 @@ typedef struct { void db_setup(lfFixture *lfFix, gconstpointer data) { lfFix->db = lf_db_new (); - lfFix->db->Load(); + lfFix->db->LoadDirectory("data/db"); } -- 2.6.4 ++++++ lensfun_fix_memory_leak.patch ++++++ commit 3226f7589f476b291e8baad2fcf3593db6f14cf9 Author: Sebastian Kraft <[email protected]> AuthorDate: Sat Jul 22 19:34:34 2017 +0200 Commit: Sebastian Kraft <[email protected]> CommitDate: Sat Jul 22 19:34:34 2017 +0200 Add a virtual destructor to lfCallbackData to avoid memory leak in derived classes --- include/lensfun/lensfun.h.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/lensfun/lensfun.h.in b/include/lensfun/lensfun.h.in index ee9cf41..ec87b3c 100644 --- a/include/lensfun/lensfun.h.in +++ b/include/lensfun/lensfun.h.in @@ -1909,18 +1909,22 @@ typedef void (*lfModifyColorFunc) (void *data, float x, float y, typedef void (*lfModifyCoordFunc) (void *data, float *iocoord, int count); // @cond - +#ifdef __cplusplus + /// Common ancestor for lfCoordCallbackData and lfColorCallbackData struct lfCallbackData { int priority; void *data; size_t data_size; + + virtual ~lfCallbackData() {}; }; // A test point in the autoscale algorithm typedef struct { float angle, dist; } lfPoint; +#endif // @endcond /**
