Find BLAS using pkgconfig, bug 373557

Package-Manager: portage-2.1.10.5/cvs/Linux x86_64

4 files changed, 66 insertions, 4 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 43246ade9e92..395e009fcb99 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.40 2011/06/26 14:56:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.41 2011/07/13 20:03:06 dilfridge Exp $
+
+  13 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencv-2.2.0-r10.ebuild, +files/opencv-2.2.0-findblas.patch:
+  Find BLAS using pkgconfig, bug 373557
 
   26 Jun 2011; Brent Baude <ranger@gentoo.org> opencv-2.1.0.ebuild:
   Marking opencv-2.1.0 ppc for bug 365273
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index d6fcd626e58c..0ad1dc820673 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
 AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
 AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b96288605600 SHA1 167358eb0b32112c2a877a27015b2b7fb04c69b8 SHA256 25280be148a410af8f8cf79dcdcba4d2ae24ddce041af7712f1d76cf0cd863a6
 AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
 AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
 AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
+AUX opencv-2.2.0-findblas.patch 1381 RMD160 117b3774ce42e73fc375da79b653c6bf69114be9 SHA1 5e34a74d79b3ec8f53759e3120ff85f054e05e51 SHA256 16f69a37283fb3e8ec3ab5435edd0a800e506c1f25997ecbbd4f7a02fa99aa8c
 AUX opencv-2.2.0-findnpp.patch 3783 RMD160 90d0ad6f5163c26014365539cdae234dd949f711 SHA1 a8d289f12886dc90d7048bf0011a8b5e962deb83 SHA256 9fcf34f285db106ba282aeaa955d6d8e0f0e9f410ebe6410eb49ab2cc705b439
 AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76
 AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25
@@ -15,7 +19,24 @@ AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81
 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
 EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f
-EBUILD opencv-2.2.0-r10.ebuild 4413 RMD160 e185d65c7824abcfda4d89609d0691fb260c8e1f SHA1 f547db7b227c975f750b3de8798e351a0f517d11 SHA256 bcba386994bacda21749fd718b02d8a1009e85714013cf353d1cd8db4858a627
+EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7
 EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-MISC ChangeLog 6956 RMD160 5f606028347f525aa51493f8bd2c12c3a379f7a9 SHA1 74f5bdc29fe6b5941cef63e1c5056e7aef7bae55 SHA256 48d820ad7e26040ab7db78bfc002e6d3f26dad9aeb014809327fb7df3da9a257
+MISC ChangeLog 7120 RMD160 c3717e6faaa295fc84f7f86d96173402adf51dcf SHA1 246b2b92d83fe69ded6dbce603d967b4b9d31670 SHA256 676bc8a975a9f29307f0a849034eb9ffaeff9b473016e86eed8a90bfcc9ea721
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOHfoJAAoJEEb+UGWnxTyHk/YP/RTNXfFGGlVKVqqMgDbFDgPR
+doUhaYd1UCW3P91Q3IagQqbw51bKeKhtc/ox5I6FwtsmZPk+kdmo1jfqj8p3k0tI
+jU8FDyTj8PZXUtmS+kc6gHLWBBqcDy9uLKmfqDs7GfECQhF5II/EwCueMhFNH/BQ
+yubiyx7gO9A2UesfxxEF6p0ze7G3gQ7PjuUaWUPGKYlTyIYSAZqFEODV63Z582TO
+c1BwA/bXDLDMjSHKEeEU8WPfVbt7PgIlF/sqWPqjM1bgdOig6AGbC8btJ3soR1hs
+UyCILcgvaDAuYhZPKvtgctwj0bPOjvAsnt+lkS0o4sko6eUCX5RTpwsJRt748vb6
+XfGE+g9J858VGUMBJ+SBaG63uUmZsEaLPDmXQr9oKeNTqGcW8k2sziFjh8MmQzh6
+u87r+asvN1CWZrccIteJnjtfcOTn2dRt8VRELV2R8n+JsfCm8cYTCONHkwfxfiXO
+01I3cs7eUSAgCxJmL0oNdZEtdd9pMNW9SeKgDnrfl7oBId8OsapNxNJEE/S6QIzh
+67XovZ6RAygzkrFdGp/0ctRdEZ9Ntx3WH/u8DUe682Z9m2G3MKY8K12sVXw4z7pI
+mQi9TYQErm9I9eyav1sCSK6Xj8bmS5wdR4fa/p/b/FRLAljEPvPPHfQCBEXZY4X3
+43oYk8rQWt/YyPFFgrCh
+=kYZf
+-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.2.0-findblas.patch b/media-libs/opencv/files/opencv-2.2.0-findblas.patch
new file mode 100644
index 000000000000..0c205f5781af
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-findblas.patch
@@ -0,0 +1,36 @@
+diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0.orig/CMakeLists.txt	2011-07-13 21:49:54.474595691 +0200
++++ OpenCV-2.2.0/CMakeLists.txt	2011-07-13 21:51:01.917595716 +0200
+@@ -196,10 +196,30 @@
+ # ----------------------------------------------------------------------------

+ #       CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..

+ # ----------------------------------------------------------------------------

++find_package(PkgConfig REQUIRED)

++

++if(BLAS_LIBRARIES)

++  include(CheckFortranFunctionExists)

++  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})

++  CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)

++  unset( CMAKE_REQUIRED_LIBRARIES )

++  if(BLAS_FOUND)

++    message(STATUS "BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")

++  else(BLAS_FOUND)

++    message(FATAL_ERROR "BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")

++  endif(BLAS_FOUND)

++else(BLAS_LIBRARIES)

++   # User did not provide a BLAS Library

++   pkg_check_modules(BLAS blas)

++endif (BLAS_LIBRARIES)

++

++if(NOT BLAS_FOUND)

++    message(FATAL_ERROR "BLAS libraries not found.")

++endif(NOT BLAS_FOUND)

++

+ find_package(LAPACK REQUIRED)

+-find_package(BLAS REQUIRED)

+ find_package(ZLIB REQUIRED)

+-find_package(PkgConfig REQUIRED)

++

+ pkg_check_modules(FLANN REQUIRED flann)

+ 

+ # Build/install (or not) some apps:

diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
index 26554a0b051a..47ee381eaf05 100644
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.5 2011/06/21 16:12:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.6 2011/07/13 20:03:06 dilfridge Exp $
 
 EAPI=3
 
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-use_system_libs.patch"
 	"${FILESDIR}/${P}-v4l_2.6.38.patch"
 	"${FILESDIR}/${P}-findnpp.patch"
+	"${FILESDIR}/${P}-findblas.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"