Hello community,
here is the log from the commit of package armadillo for openSUSE:Factory
checked in at 2014-10-14 07:12:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/armadillo (Old)
and /work/SRC/openSUSE:Factory/.armadillo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo"
Changes:
--------
--- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2014-10-11
19:27:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2014-10-14
07:13:31.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 13 18:12:52 UTC 2014 - badshah...@gmail.com
+
+- Update to version 4.450.4:
+ + No list of changes documented upstream.
+
+-------------------------------------------------------------------
Old:
----
armadillo-4.450.3.tar.gz
New:
----
armadillo-4.450.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armadillo.spec ++++++
--- /var/tmp/diff_new_pack.OxZ013/_old 2014-10-14 07:13:32.000000000 +0200
+++ /var/tmp/diff_new_pack.OxZ013/_new 2014-10-14 07:13:32.000000000 +0200
@@ -19,7 +19,7 @@
%define soname libarmadillo4
Name: armadillo
-Version: 4.450.3
+Version: 4.450.4
Release: 0
Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS
License: MPL-2.0
++++++ armadillo-4.450.3.tar.gz -> armadillo-4.450.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.450.3/CMakeLists.txt
new/armadillo-4.450.4/CMakeLists.txt
--- old/armadillo-4.450.3/CMakeLists.txt 2014-10-07 16:03:47.000000000
+0200
+++ new/armadillo-4.450.4/CMakeLists.txt 2014-10-12 13:40:24.000000000
+0200
@@ -14,7 +14,7 @@
set(ARMA_MAJOR 4)
set(ARMA_MINOR 450)
-set(ARMA_PATCH 3)
+set(ARMA_PATCH 4)
set(ARMADILLO_VERSION ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH})
message(STATUS "Configuring Armadillo ${ARMADILLO_VERSION}")
@@ -31,7 +31,7 @@
set(ARMA_USE_LAPACK false)
set(ARMA_USE_BLAS false)
set(ARMA_USE_ATLAS false)
-set(ARMA_USE_HDF5 false)
+set(ARMA_USE_HDF5_ALT false)
set(ARMA_USE_ARPACK false)
set(ARMA_USE_CXX11_RNG false)
set(ARMA_USE_WRAPPER true )
@@ -232,7 +232,7 @@
# message(STATUS "HDF5_FOUND = ${HDF5_FOUND}")
#
# if(HDF5_FOUND)
-# set(ARMA_USE_HDF5 true)
+# set(ARMA_USE_HDF5_ALT true)
# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES}
${HDF5_INCLUDE_DIRS})
# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
# endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.450.3/README.txt
new/armadillo-4.450.4/README.txt
--- old/armadillo-4.450.3/README.txt 2014-10-07 16:03:47.000000000 +0200
+++ new/armadillo-4.450.4/README.txt 2014-10-12 13:40:24.000000000 +0200
@@ -187,10 +187,10 @@
If you want to use Armadillo without installation,
or you're getting linking errors, compile along these lines:
- g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-4.450.3/include
-DARMA_USE_BLAS -DARMA_USE_LAPACK -DARMA_DONT_USE_WRAPPER -lblas -llapack
+ g++ example1.cpp -o example1 -O2 -I /home/blah/armadillo-4.450.4/include
-DARMA_USE_BLAS -DARMA_USE_LAPACK -DARMA_DONT_USE_WRAPPER -lblas -llapack
The above command line assumes that you have unpacked the armadillo archive
-(armadillo-4.450.3.tar.gz in this case) into /home/blah/
+(armadillo-4.450.4.tar.gz in this case) into /home/blah/
You will need to adjust this for later versions of Armadillo,
and/or if you have unpacked into a different directory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.450.3/include/armadillo_bits/arma_version.hpp
new/armadillo-4.450.4/include/armadillo_bits/arma_version.hpp
--- old/armadillo-4.450.3/include/armadillo_bits/arma_version.hpp
2014-10-07 16:03:47.000000000 +0200
+++ new/armadillo-4.450.4/include/armadillo_bits/arma_version.hpp
2014-10-12 13:40:24.000000000 +0200
@@ -13,7 +13,7 @@
#define ARMA_VERSION_MAJOR 4
#define ARMA_VERSION_MINOR 450
-#define ARMA_VERSION_PATCH 3
+#define ARMA_VERSION_PATCH 4
#define ARMA_VERSION_NAME "Spring Hill Fort"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.450.3/include/armadillo_bits/config.hpp
new/armadillo-4.450.4/include/armadillo_bits/config.hpp
--- old/armadillo-4.450.3/include/armadillo_bits/config.hpp 2014-08-17
17:14:57.000000000 +0200
+++ new/armadillo-4.450.4/include/armadillo_bits/config.hpp 2014-10-12
13:40:24.000000000 +0200
@@ -90,6 +90,12 @@
//// and you will need to link with the hdf5 library (eg. -lhdf5)
#endif
+// #define ARMA_USE_HDF5_ALT
+#if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER)
+ #undef ARMA_USE_HDF5
+ #define ARMA_USE_HDF5
+#endif
+
#if !defined(ARMA_MAT_PREALLOC)
#define ARMA_MAT_PREALLOC 16
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.450.3/include/armadillo_bits/config.hpp.cmake
new/armadillo-4.450.4/include/armadillo_bits/config.hpp.cmake
--- old/armadillo-4.450.3/include/armadillo_bits/config.hpp.cmake
2014-08-17 17:14:57.000000000 +0200
+++ new/armadillo-4.450.4/include/armadillo_bits/config.hpp.cmake
2014-10-12 13:40:24.000000000 +0200
@@ -90,6 +90,12 @@
//// and you will need to link with the hdf5 library (eg. -lhdf5)
#endif
+#cmakedefine ARMA_USE_HDF5_ALT
+#if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER)
+ #undef ARMA_USE_HDF5
+ #define ARMA_USE_HDF5
+#endif
+
#if !defined(ARMA_MAT_PREALLOC)
#define ARMA_MAT_PREALLOC 16
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-4.450.3/include/armadillo_bits/hdf5_bones.hpp
new/armadillo-4.450.4/include/armadillo_bits/hdf5_bones.hpp
--- old/armadillo-4.450.3/include/armadillo_bits/hdf5_bones.hpp 2014-04-15
02:39:40.000000000 +0200
+++ new/armadillo-4.450.4/include/armadillo_bits/hdf5_bones.hpp 2014-10-12
13:40:24.000000000 +0200
@@ -1,19 +1,16 @@
// Copyright (C) 2014 Ryan Curtin
-//
+//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-// This defines all the names of the HDF5 functions Armadillo will use.
#if defined(ARMA_USE_HDF5)
-// These macros only need to be defined if the wrapper is not being used.
-// Otherwise, the function names and type names as they appear in hdf5_misc.hpp
-// will work just fine, but we need to define prototypes for the wrapper
-// functions that will appear in wrapper.cpp.
-#if !defined(ARMA_USE_WRAPPER)
-
+#if !defined(ARMA_USE_HDF5_ALT)
+
+ // macros needed if the wrapper run-time library is not being used
+
#define arma_H5Tcopy H5Tcopy
#define arma_H5Tcreate H5Tcreate
#define arma_H5Tinsert H5Tinsert
@@ -58,6 +55,8 @@
#else
+// prototypes for the wrapper functions defined in the wrapper run-time
library (src/wrapper.cpp)
+
extern "C"
{
// Wrapper functions for H5* functions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-4.450.3/src/wrapper.cpp
new/armadillo-4.450.4/src/wrapper.cpp
--- old/armadillo-4.450.3/src/wrapper.cpp 2014-08-15 10:15:44.000000000
+0200
+++ new/armadillo-4.450.4/src/wrapper.cpp 2014-10-12 13:40:24.000000000
+0200
@@ -25,12 +25,12 @@
}
#endif
-#if defined(ARMA_USE_HDF5)
+#if defined(ARMA_USE_HDF5_ALT)
#include <hdf5.h>
#if defined(H5_USE_16_API_DEFAULT) || defined(H5_USE_16_API)
// #pragma message ("disabling use of HDF5 due to its incompatible
configuration")
- #undef ARMA_USE_HDF5
+ #undef ARMA_USE_HDF5_ALT
#endif
#endif
@@ -41,10 +41,10 @@
#include "armadillo_bits/blas_bones.hpp"
#include "armadillo_bits/lapack_bones.hpp"
#include "armadillo_bits/arpack_bones.hpp"
-// no need to include hdf5_bones.hpp -- it only contains #defines for when
ARMA_USE_WRAPPER is false.
+// no need to include hdf5_bones.hpp -- it only contains #defines for when
ARMA_USE_HDF5_ALT is not defined.
-#if defined(ARMA_USE_HDF5)
+#if defined(ARMA_USE_HDF5_ALT)
// Wrapper functions: arma::H5open() and arma::H5check_version(), to hijack
// calls to H5open() and H5check_version().
herr_t H5open()
@@ -864,7 +864,7 @@
- #if defined(ARMA_USE_HDF5)
+ #if defined(ARMA_USE_HDF5_ALT)
hid_t arma_H5Tcopy(hid_t dtype_id)
{
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
