From 615ca2632b2c8e70f12480a0ed7ac3d479c2b85d Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 20 Sep 2012 20:43:27 +0200
Subject: [PATCH] update package armadillo

---
 index.html                      |  2 +-
 src/armadillo-1-staticlib.patch | 29 +++++------------------------
 src/armadillo.mk                |  2 +-
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/index.html b/index.html
index 232fa86f..3d0fc3f1 100644
--- a/index.html
+++ b/index.html
@@ -925,7 +925,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
     </tr>
     <tr>
         <td id="armadillo-package">armadillo</td>
-        <td id="armadillo-version">3.4.0</td>
+        <td id="armadillo-version">3.4.1</td>
         <td id="armadillo-website"><a href="http://armadillo.sf.net/">Armadillo C++ linear algebra library</a></td>
     </tr>
     <tr>
diff --git a/src/armadillo-1-staticlib.patch b/src/armadillo-1-staticlib.patch
index d4be9a62..f316815c 100644
--- a/src/armadillo-1-staticlib.patch
+++ b/src/armadillo-1-staticlib.patch
@@ -1,37 +1,18 @@
 This file is part of MXE.
 See index.html for further information.
 
---- armadillo-3.4.0/CMakeLists.txt.orig	2012-09-06 09:43:16.000000000 +0200
-+++ armadillo-3.4.0/CMakeLists.txt	2012-09-09 16:18:57.000000000 +0200
+diff -urN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2012-09-14 16:43:20.000000000 +0200
++++ b/CMakeLists.txt	2012-09-20 20:39:05.073039124 +0200
 @@ -40,7 +40,7 @@
  set(ARMA_USE_ATLAS   false)
  set(ARMA_USE_BOOST   false)
  set(ARMA_USE_HDF5    false)
--set(ARMA_USE_WRAPPER true )
-+set(ARMA_USE_WRAPPER false)
+-set(ARMA_USE_WRAPPER true )  # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo
++set(ARMA_USE_WRAPPER false )  # set this to false if you prefer to directly link with LAPACK and/or BLAS (eg. -llapack -lblas) instead of -larmadillo
  
  
  if(WIN32)
-@@ -158,15 +158,15 @@
-   endif()
-   
- else()
-+
-+  if(ARMA_USE_LAPACK STREQUAL true)
-+    set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
-+  endif()
-   
-   if(ARMA_USE_BLAS STREQUAL true)
-     set(ARMA_LIBS ${ARMA_LIBS} ${BLAS_LIBRARIES})
-   endif()
-   
--  if(ARMA_USE_LAPACK STREQUAL true)
--    set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES})
--  endif()
--  
-   if(ARMA_USE_ATLAS STREQUAL true)
-     set(ARMA_LIBS ${ARMA_LIBS} ${CBLAS_LIBRARIES})
-     set(ARMA_LIBS ${ARMA_LIBS} ${CLAPACK_LIBRARIES})
 @@ -263,7 +263,7 @@
  #set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
  
diff --git a/src/armadillo.mk b/src/armadillo.mk
index 2b0b5d25..01641ae6 100644
--- a/src/armadillo.mk
+++ b/src/armadillo.mk
@@ -4,7 +4,7 @@
 # armadillo
 PKG             := armadillo
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := e7fdb6518172aabaa28c84412b52db7d86ef37a5
+$(PKG)_CHECKSUM := 16f11ee6e7a545581ab239e7f826e14d7d1c2e3a
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)