From e440f1b567ce13efd1adc184449f29e998c66a9f Mon Sep 17 00:00:00 2001 From: nucleo Date: Apr 08 2013 17:52:01 +0000 Subject: digikam-3.2.0-beta1 - BR: eigen3-devel instead of atlas-devel, drop clapack patch --- diff --git a/.gitignore b/.gitignore index 8b18cb6..8eba386 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /digikam-3.0.0-rc.tar.bz2 /digikam-3.0.0.tar.bz2 /digikam-3.1.0.tar.bz2 +/digikam-3.2.0-beta1.tar.bz2 diff --git a/digikam-2.5.0-clapack-atlas.patch b/digikam-2.5.0-clapack-atlas.patch deleted file mode 100644 index 1e66733..0000000 --- a/digikam-2.5.0-clapack-atlas.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake digikam-2.1.1-clapack-atlas/core/cmake/modules/FindCLAPACK.cmake ---- digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake 2011-09-14 08:22:02.000000000 +0200 -+++ digikam-2.1.1-clapack-atlas/core/cmake/modules/FindCLAPACK.cmake 2011-09-23 07:09:37.000000000 +0200 -@@ -27,7 +27,7 @@ - endif(CLAPACK_INCLUDE_DIR) - endif(CLAPACK_INCLUDE_DIR) - -- find_library(CLAPACK_LIBRARY clapack) -+ find_library(CLAPACK_LIBRARY clapack PATH_SUFFIXES atlas) - if(CLAPACK_LIBRARY) - message(STATUS "Found clapack library: ${CLAPACK_LIBRARY}") - endif(CLAPACK_LIBRARY) -diff -ur digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp digikam-2.1.1-clapack-atlas/core/libs/dimg/filters/sharp/matrix.cpp ---- digikam-2.1.1/core/libs/dimg/filters/sharp/matrix.cpp 2011-09-14 08:22:03.000000000 +0200 -+++ digikam-2.1.1-clapack-atlas/core/libs/dimg/filters/sharp/matrix.cpp 2011-09-23 10:19:09.000000000 +0200 -@@ -36,7 +36,6 @@ - - extern "C" - { --#include "f2c.h" - #include "clapack.h" - } - -@@ -653,14 +653,12 @@ - - int RefocusMatrix::dgesv(const int N, const int NRHS, double* A, const int lda, double* B, const int ldb) - { -- int result = 0; -- integer i_N = N, i_NHRS = NRHS, i_lda = lda, i_ldb = ldb, info; -- QScopedArrayPointer ipiv(new integer[N]); -+ int result; -+ QScopedArrayPointer ipiv(new int[N]); - - // Clapack call. -- dgesv_(&i_N, &i_NHRS, A, &i_lda, ipiv.data(), B, &i_ldb, &info); -+ result = clapack_dgesv (CblasColMajor, N, NRHS, A, lda, ipiv.data(), B, ldb); - -- result = info; - return (result); - } - diff --git a/digikam-3.1.0-htmlexport.patch b/digikam-3.1.0-htmlexport.patch deleted file mode 100644 index c9e2ff3..0000000 --- a/digikam-3.1.0-htmlexport.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-11 10:24:11.000000000 +0200 -+++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-13 00:15:05.539275132 +0200 -@@ -468,9 +468,9 @@ - # Currently the cmake module distributed w/ cmake uses a different variable - # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule - # distributed w/ kdelibs LIBEXSLT_LIBRARIES. -- if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -- set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES}) -- endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -+ if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) -+ set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES}) -+ endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) - IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) - ADD_SUBDIRECTORY(htmlexport) - ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) diff --git a/digikam-3.1.0-opencv20.patch b/digikam-3.1.0-opencv20.patch index 37e654c..ee613c6 100644 --- a/digikam-3.1.0-opencv20.patch +++ b/digikam-3.1.0-opencv20.patch @@ -1,6 +1,6 @@ diff -up digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h.opencv20 digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h ---- digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h.opencv20 2013-03-11 03:24:28.000000000 -0500 -+++ digikam-3.1.0/core/libs/dimg/filters/nr/libopencv.h 2013-03-24 20:15:32.499498390 -0500 +--- digikam-3.1.0/core/digikam/utils/libopencv.h.opencv20 2013-03-11 03:24:28.000000000 -0500 ++++ digikam-3.1.0/core/digikam/utils/libopencv.h 2013-03-24 20:15:32.499498390 -0500 @@ -28,7 +28,7 @@ // OpenCV includes diff --git a/digikam.spec b/digikam.spec index f8e2e70..7ee6176 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,12 +1,12 @@ -#define pre rc +%define pre beta1 %if 0%{?fedora} || 0%{?rhel} > 6 %define videoslideshow 1 %endif Name: digikam -Version: 3.1.0 -Release: 2%{?pre}%{?dist} +Version: 3.2.0 +Release: 0.1.%{?pre}%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ @@ -17,21 +17,14 @@ Source0: http://download.kde.org/stable/digikam/digikam-%{version}%{?pre:-%{pre} # TODO: upstream me Source1: digikam-import.desktop -# fix FindCLAPACK.cmake to search %%{_libdir}/atlas -# also patch matrix.cpp for the ATLAS clapack API -# The latter part is probably not upstreamable as is, and the former on its own -# isn't helpful. -Patch0: digikam-2.5.0-clapack-atlas.patch ## upstreamable patches -Patch50: digikam-3.1.0-htmlexport.patch # fix build against opencv-2.0 Patch51: digikam-3.1.0-opencv20.patch ## upstream patches -# for clapack, see also the clapack-atlas patch -BuildRequires: atlas-devel +BuildRequires: eigen3-devel BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: gettext @@ -228,9 +221,6 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} -%patch0 -p1 -b .clapack-atlas -%patch50 -p1 -b .htmlexport - %if 0%{?rhel} == 6 %patch51 -p1 -b .opencv20 %endif @@ -244,7 +234,7 @@ mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} -DENABLE_LCMS2=ON -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF .. +%{cmake_kde4} -DENABLE_LCMS2=ON .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -534,6 +524,10 @@ update-desktop-database -q &> /dev/null %changelog +* Mon Apr 8 2013 Alexey Kurov - 3.2.0-0.1.beta1 +- digikam-3.2.0-beta1 +- BR: eigen3-devel instead of atlas-devel, drop clapack patch + * Sun Mar 17 2013 Alexey Kurov - 3.1.0-2 - rebuild for ImageMagick-6.8.3.9 diff --git a/sources b/sources index 1b8cee5..0b25629 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b51de5ae2fc0a4b0aa97b1c43d83ee30 digikam-3.1.0.tar.bz2 +b316d23d5da611aa2d43907166befefb digikam-3.2.0-beta1.tar.bz2