[digikam] - patch matrix.cpp for the ATLAS clapack API

[Kevin Kofler]

commit 2c8676517d9de45ca16acbfbc4a0ebb1b0d727e4
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Sep 23 08:52:30 2011 +0200

    - patch matrix.cpp for the ATLAS clapack API

 digikam-2.1.1-clapack-atlas.patch |   20 ++++++++++++++++++++
 digikam.spec                      |   18 +++++++++---------
 2 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/digikam-2.1.1-clapack-atlas.patch b/digikam-2.1.1-clapack-atlas.patch
index ac59659..403b485 100644
--- a/digikam-2.1.1-clapack-atlas.patch
+++ b/digikam-2.1.1-clapack-atlas.patch
@@ -10,3 +10,23 @@ diff -ur digikam-2.1.1/core/cmake/modules/FindCLAPACK.cmake digikam-2.1.1-clapac
    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 08:43:36.000000000 +0200
+@@ -36,7 +36,6 @@
+ 
+ extern "C"
+ {
+-#include "f2c.h"
+ #include "clapack.h"
+ }
+ 
+@@ -658,7 +657,7 @@
+     integer* ipiv = new integer[N];
+ 
+     // Clapack call.
+-    dgesv_ (&i_N, &i_NHRS, A, &i_lda, ipiv, B, &i_ldb, &info);
++    clapack_dgesv (CblasColMajor, &i_N, &i_NHRS, A, &i_lda, ipiv, B, &i_ldb, &info);
+ 
+     delete [] ipiv;
+     result = info;
diff --git a/digikam.spec b/digikam.spec
index 5867d5e..cb1ea65 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -13,22 +13,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: upstream me
 Source1: digikam-import.desktop
 
-## upstreamable patches
 # fix FindCLAPACK.cmake to search %%{_libdir}/atlas
-# This should be upstreamable, it just adds a possible libdir suffix to search.
-Patch50: digikam-2.1.1-clapack-atlas.patch
+# 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.1.1-clapack-atlas.patch
+
+## upstreamable patches
 
 ## upstream patches
 #https://projects.kde.org/projects/kdereview/libkvkontakte/repository/revisions/bf9ffc8d808676f0ed371fbe190e10e2f85888e0
 Patch100: digikam-2.1.0-libkvkontakte-libdir.patch
 
-# for clapack
+# for clapack, see also the clapack-atlas patch
 BuildRequires: atlas-devel
 BuildRequires: desktop-file-utils
 BuildRequires: doxygen
-# for f2c.h (undocumented dependency)
-# f2c.h is included in the bundled clapack, but not in atlas-devel
-BuildRequires: f2c
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: gphoto2-devel
@@ -203,7 +203,7 @@ Requires: kipi-plugins = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-%patch50 -p1 -b .clapack-atlas
+%patch0 -p1 -b .clapack-atlas
 
 pushd extra/libkvkontakte
 %patch100 -p1 -b .libkvkontakte-libdir
@@ -471,7 +471,7 @@ update-desktop-database -q &> /dev/null
 * Fri Sep 23 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-2
 - BuildRequires: atlas-devel (for clapack, instead of the bundled version)
 - fix FindCLAPACK.cmake to search %%{_libdir}/atlas
-- BuildRequires: f2c for f2c.h
+- patch matrix.cpp for the ATLAS clapack API
 
 * Wed Sep 14 2011 Alexey Kurov <nucleo at fedoraproject.org> - 2.1.1-1
 - digikam-2.1.1