summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-11-14 01:49:10 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-11-14 01:49:10 +0000
commit706194b79cae46edf2e3c222bd6d28f6384cf65e (patch)
tree39b75d08169aa2eaad4ac44827bfe375cc07eacf /sci-libs/ceres-solver
parentInitial version. (diff)
downloadhistorical-706194b79cae46edf2e3c222bd6d28f6384cf65e.tar.gz
historical-706194b79cae46edf2e3c222bd6d28f6384cf65e.tar.bz2
historical-706194b79cae46edf2e3c222bd6d28f6384cf65e.zip
Version bump. Separate cxsparse (simpler library) from sparse flag, add lapack flag, adapt changes upstream to be more cmake friendly
Package-Manager: portage-2.2.7-prefix/cvs/Linux x86_64 Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-libs/ceres-solver')
-rw-r--r--sci-libs/ceres-solver/ChangeLog11
-rw-r--r--sci-libs/ceres-solver/Manifest18
-rw-r--r--sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild95
-rw-r--r--sci-libs/ceres-solver/ceres-solver-1.8.0.ebuild (renamed from sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild)50
-rw-r--r--sci-libs/ceres-solver/files/ceres-solver-1.4.0-respect-libdir.patch41
-rw-r--r--sci-libs/ceres-solver/files/ceres-solver-1.4.0-test-no-suitesparse.patch15
-rw-r--r--sci-libs/ceres-solver/metadata.xml2
7 files changed, 41 insertions, 191 deletions
diff --git a/sci-libs/ceres-solver/ChangeLog b/sci-libs/ceres-solver/ChangeLog
index f7f124559078..0cff93daa551 100644
--- a/sci-libs/ceres-solver/ChangeLog
+++ b/sci-libs/ceres-solver/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sci-libs/ceres-solver
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ChangeLog,v 1.6 2013/10/23 18:36:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ChangeLog,v 1.7 2013/11/14 01:49:00 bicatali Exp $
+
+*ceres-solver-1.8.0 (14 Nov 2013)
+
+ 14 Nov 2013; SĂ©bastien Fabbro <bicatali@gentoo.org>
+ +ceres-solver-1.8.0.ebuild, -ceres-solver-1.4.0.ebuild,
+ -ceres-solver-1.6.0.ebuild, -files/ceres-solver-1.4.0-respect-libdir.patch,
+ -files/ceres-solver-1.4.0-test-no-suitesparse.patch, metadata.xml:
+ Version bump. Separate cxsparse (simpler library) from sparse flag, add lapack
+ flag, adapt changes upstream to be more cmake friendly
*ceres-solver-1.7.0 (23 Oct 2013)
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 6dfe6984b720..566044453065 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,20 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX ceres-solver-1.4.0-respect-libdir.patch 1428 SHA256 08af3dfe6578c61874a01062f98c20e705b5783c7ee869966a0d1480bf1e77a0 SHA512 a124cc7d2bc5d0ff3592e7d8bf9396df000723e9a5d57afc88ada2ecd9e6a0c9ad26f6d67e3fff2b8e89df71585771c808b0e1dd3739826804e49c0da5579403 WHIRLPOOL c9f76c754ef3133f4f244480c54fff6ccf6e70c99100ecbdcae30ef0ebaee481e7cef87d7ebee2b5295b275daebd72223f073466f6361838f2c04dc7f09a0c15
-AUX ceres-solver-1.4.0-test-no-suitesparse.patch 729 SHA256 6d85e8546a4972c226c51fb760bc1b049ff71fe4275afb3f1f8b98c2a6bcca68 SHA512 dbd39b3e23c56817ec64ae65f3de953b0951c409a89e1df07622243c7729421bbf601c407090280955333e04d70147f6a5d9b150edbc6c4ceb6ca6517720cf2a WHIRLPOOL 3f58635e4a9ea07bd900cf7d1a1e132d180d12afb7254929ff0f43dea557016db453e6abd4ee3b9610bed26e9f172c948dd89a098c17cf394db2e37d51fb1889
-DIST ceres-solver-1.4.0.tar.gz 3659154 SHA256 0a88bbfa20a98c780e4a3371b4f4059d77f7daa0515ef6bb31c25f335bf2a2be SHA512 6489d4840072729652ef95badd7eecf48755dc2d7fce54b7926eab5e3411d6dde20142576683ff45bf649950b445bbb1bead1bad2f10ed63ae319f0f3069cd66 WHIRLPOOL 6f76c0329fda0a31620627b2c6ab777739bea7f11068841f545e2cfc2511e8950a0399a7c4c3cda5152e15676a0a760ce9e7219fd5ed5408a317b9ecb6e96e0f
-DIST ceres-solver-1.6.0.tar.gz 3947640 SHA256 4d0887ec5081505ab73e65a8a70c14b20e0c08ef7075ec3bba801cf5f014775b SHA512 a32556edaf1295051cb8aba29c348dc3a6be3b6be545b219df45a50e222effc7ebe384d9c9fcad33c23b85a75429ad73a5926a7af4a520706bed47c5b52840cc WHIRLPOOL b42610289a5be1d2b1fc381a113c6bd6256813c9364e85152268fce83e9ed7a005580e23324ea3d9cd97d47086c499deb5619ff122f4ea86d763d2b48f241824
DIST ceres-solver-1.7.0.tar.gz 3455041 SHA256 5dd60e4dd076824574841ddc6fdeb5dbcdba3035c5a208ec0a58c970724b6f05 SHA512 617fda19de55105ad349cc111e0f393b40daffb2d9bd91a676beae209795628f1c21e2dfdb8a6247f212c2636349ebf5d592cf4e050f05741db080af5fd7f2e9 WHIRLPOOL 8314590bc9f29ca082d707b8f450069c79c7f2427b4ed32048ec5e58331f8c318643e7113a61f505f9475886307e6c60aaae400d1fa78ef1474a63eed35d2131
-EBUILD ceres-solver-1.4.0.ebuild 2458 SHA256 e0c48f292fe3d804769c303158034176d7a5ddba3734d0dae40aa980f9bf67de SHA512 b075674e3d01c44e7653a17447a320aff1ab2fca694ffa6e2a593bcb19cdc9993ab85de14016b525e99d6d999981f73bb9214393a6a480ce701d5d10edbbaab6 WHIRLPOOL 3162be2f54dbbcb8445eb9c4ccd030f73180289e4e99413468e90fffbc902f2c80e2b1ec96df09db0c0ac7df9e81cae8da061136064b7c6bb8ad49c6c4cbc429
-EBUILD ceres-solver-1.6.0.ebuild 2261 SHA256 8ae1f1730b4838ce677c2458bffb96894157397e62e9d81b4acfd66aa4069589 SHA512 459131364994e82ebab2701adc2b515b818596fb434c1ff1df7044cba8bb68abbab6c53ed54dce57b57168ca7234f5e4a29b5db406fa8c0f450b63519b04d38c WHIRLPOOL 5aad9128fb705515941bdf2e0d4bf20a38fe0b041b439b192469884e5c650a81ac39378d69954f2579c1400884ed62b81e446de8015a9680c2331e074e7e87e7
+DIST ceres-solver-1.8.0.tar.gz 3506384 SHA256 8ee53241930622b74946201123cd38231161878caacf6c30a3bf1c68b24d79af SHA512 114ab5e8e40cffb325c69b70b546697d90833a3f82239fc901fb0d87a9d98b376e2e042b768fd0252d8412f3d301adfb7d992202a0e149d037bea86a08f8c6db WHIRLPOOL cf966a02dced9b672d6aa8a2aecf0aab71bb718bbc5f13acdab2641aed4622c08909eaae6fde1ea91d3e2d0046131692e2ce65969dcbd431ff372482540e4d31
EBUILD ceres-solver-1.7.0.ebuild 2277 SHA256 b8599af28ce9768b3a9bf5e2c033b74c9207d4139cd4a77eab5d8665488c1c7e SHA512 b66a931e778d70f1a40fbb5f9d81c16f3510fa64f9249e6c9d190f064ad15bd46b502c581c8f2c623a7a8f8fe8e6ddb887a4d2355ccaf43caa02322b0d40aab4 WHIRLPOOL 781f6ad434b0486dbb644f43e1c11d00163a623615c7130f68dafe13babc000b65d1f8e90f77f550a385a8c4a793e7a0074af2ca09dfc7c6f0e8018b5587c8f3
-MISC ChangeLog 1165 SHA256 8ae8172e3b57a198b7b1c05384a23ca9b769cf6ca820afc5af8a234cefee4cd0 SHA512 f4112e3bf7afc9c0f505937065932e1da82e6ad7701ce89bee67387903f2b746cf6cd4e7f203dde3767dba13f711235f7eba72ff91c7eb17552377379194612e WHIRLPOOL 409ab5c2c92373e2e44728d5e52d62418f08cef30fba4e083bbda5b95d59bf1340196199eaa8a1c2de8a111250abea4f2400d92be49797646f676ac2439219c5
-MISC metadata.xml 1375 SHA256 167df44ea3a8a7af388ce00ebbff10b02e2c50418b4137d1446581729e93fb5e SHA512 d1229e9e235f154a7dc29970e1d9f70f6b05400f296f6a99e26d52dd0f6bf517e0e64820f60a3e3baed7c7fb7653bc980539176338b248a55a768de5f6a32974 WHIRLPOOL b78eee2044a9f22ed74dc2cb616c31babf272ffc5bde2be0eddacb434b3efb055abd2166d482083d73d8801ad2cabd4a1e61fc19831addbe66ef98a4cb1326cf
+EBUILD ceres-solver-1.8.0.ebuild 1958 SHA256 701a0af26f027cb4ddb2fd1325a31df9ca14743c59ff86c55c1cfd74c9cc5cb0 SHA512 045d30f9e1c72c21a1393488fa300d075e4a95372f617a81bce83d1d3b825cd087d0bf9321211867eccd98c5771271314b89a838be6aa2fd057c1cdc6b34b0fc WHIRLPOOL a02542e02c2809577fee05bfe790382c3a1037f69029424bf854019cce0511b820b24fd775ff1a03795c729dd87b19dc06bf7be0fbe89a9b083ca37ab9ade08f
+MISC ChangeLog 1599 SHA256 14709f0904acc24b5f277344961f0f7b24b539fcaa67c22f31ba5fd92dc155ce SHA512 1af0b25ec6d0d21afde3777ed1ff7ca64f5558da7d8dbeb153cf0a451d758f2cdc3c951112b3d7a3f7c6b6fe1ba9f0dfcbfaf9275161048b21b2fefa6003cd9b WHIRLPOOL 8254db333300179631ca57afab50144f9bb8ebe7e6159e074837f20c28e37834c502bc4b275dd39599d37f371acda5e2be2715d127824698a76f2d1f0a674ede
+MISC metadata.xml 1518 SHA256 8092b5f1ed9a02338434d7e77f8210b3cb918e422d7bac9c98d9949268659d5d SHA512 847f71743d9fe7b0035e122d28ee32d3c5d1ab0c52fbd96cc539b1cd008a66cac145974736c96e28714d59715766d1b73ab8e8cb48e4a7b6d16bdd6b03640b7c WHIRLPOOL 4e4f7237b906c1c3ff928dc50db6a1a1f8d81d6cd3cece4fc34b35d28e1c7ae95663f69659ef2b7c58a8c7f962dd5e6acc6edef1dbca6dc380f66d94b411d590
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlJoF3gACgkQ1ycZbhPLE2BalACfQ38QhHJgTBy7Yk0dTAy5ayYV
-ONkAoKWfoAfPAOTi+mMZePKIMOZfz0ez
-=+IVH
+iEYEAREIAAYFAlKELBEACgkQ1ycZbhPLE2B98QCgkCUOVLP5xhFtUdJAhCaK/AjA
+z7gAn1qur7x4VUQBC1JPfozz/X01BWYD
+=0wOr
-----END PGP SIGNATURE-----
diff --git a/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild
deleted file mode 100644
index a7702c0e4f0b..000000000000
--- a/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild,v 1.4 2013/03/04 18:28:26 bicatali Exp $
-
-EAPI=4
-
-inherit cmake-utils eutils multilib toolchain-funcs
-
-DESCRIPTION="Nonlinear least-squares minimizer"
-HOMEPAGE="https://code.google.com/p/ceres-solver/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gflags metis openmp protobuf +schur +sparse static-libs test"
-REQUIRED_USE="test? ( gflags )"
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-cpp/glog[gflags?]
- protobuf? ( dev-libs/protobuf )
- sparse? (
- sci-libs/amd
- sci-libs/camd
- sci-libs/ccolamd
- sci-libs/cholmod[metis?]
- sci-libs/colamd
- sci-libs/cxsparse
- virtual/blas
- virtual/lapack )"
-DEPEND="${RDEPEND}
- sparse? ( virtual/pkgconfig )
- doc? (
- dev-python/pygments
- dev-tex/minted
- dev-texlive/texlive-science
- virtual/latex-base )"
-
-src_prepare() {
- # prefix love
- # disable blas/lapack forced library names
- sed -i \
- -e "s:/usr:${EPREFIX}/usr:g" \
- -e '/FIND_LIBRARY(BLAS_LIB NAMES blas)/d' \
- -e '/FIND_LIBRARY(LAPACK_LIB NAMES lapack)/d' \
- -e 's/EXISTS ${BLAS_LIB}/BLAS_LIB/g' \
- -e 's/EXISTS ${LAPACK_LIB}/LAPACK_LIB/g' \
- CMakeLists.txt || die
-
- # remove downloading minted.sty
- sed -i \
- -e '/minted/d' \
- -e '/SHOW_PROGRES/d' \
- -e "s:share/ceres/docs:share/doc/${PF}:" \
- docs/CMakeLists.txt || die
-
- epatch \
- "${FILESDIR}"/${P}-test-no-suitesparse.patch \
- "${FILESDIR}"/${P}-respect-libdir.patch
-}
-
-src_configure() {
- local blibs llibs
- if use sparse; then
- blibs=$($(tc-getPKG_CONFIG) --libs blas)
- llibs=$($(tc-getPKG_CONFIG) --libs lapack)
- fi
- local mycmakeargs=(
- -DBLAS_LIB="${blibs}"
- -DLAPACK_LIB="${llibs}"
- $(cmake-utils_use_enable test TESTING)
- $(cmake-utils_use doc BUILD_DOCUMENTATION)
- $(cmake-utils_use gflags GFLAGS)
- $(cmake-utils_use openmp OPENMP)
- $(cmake-utils_use protobuf PROTOBUF)
- $(cmake-utils_use schur SCHUR_SPECIALIZATIONS)
- $(cmake-utils_use sparse CXSPARSE)
- $(cmake-utils_use sparse SUITESPARSE)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc README VERSION
-
- use static-libs || rm "${ED}"/usr/$(get_libdir)/libceres.a
- dosym libceres_shared.so /usr/$(get_libdir)/libceres.so
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.8.0.ebuild
index 91ed71c5669c..b1ca9fc67f4c 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.8.0.ebuild
@@ -1,47 +1,47 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild,v 1.1 2013/05/22 21:10:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ceres-solver-1.8.0.ebuild,v 1.1 2013/11/14 01:49:00 bicatali Exp $
EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs
+inherit cmake-utils eutils multilib
DESCRIPTION="Nonlinear least-squares minimizer"
HOMEPAGE="https://code.google.com/p/ceres-solver/"
SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/1"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gflags metis openmp protobuf +schur +sparse static-libs test"
-REQUIRED_USE="test? ( gflags )"
+IUSE="cxsparse doc examples gflags lapack openmp protobuf +schur sparse static-libs test"
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack )"
RDEPEND="
- dev-cpp/eigen:3
dev-cpp/glog[gflags?]
+ cxsparse? ( sci-libs/cxsparse )
+ lapack? ( virtual/lapack )
protobuf? ( dev-libs/protobuf )
sparse? (
sci-libs/amd
sci-libs/camd
sci-libs/ccolamd
- sci-libs/cholmod[metis?]
+ sci-libs/cholmod
sci-libs/colamd
- sci-libs/cxsparse
- virtual/blas
- virtual/lapack )"
+ sci-libs/spqr )"
+
DEPEND="${RDEPEND}
- sparse? ( virtual/pkgconfig )
+ dev-cpp/eigen:3
+ lapack? ( virtual/pkgconfig )
doc? ( dev-python/sphinx )"
src_prepare() {
# prefix love
- # disable blas/lapack forced library names
sed -i \
-e "s:/usr:${EPREFIX}/usr:g" \
- -e '/FIND_LIBRARY(BLAS_LIB NAMES blas)/d' \
- -e '/FIND_LIBRARY(LAPACK_LIB NAMES lapack)/d' \
- -e 's/EXISTS ${BLAS_LIB}/BLAS_LIB/g' \
- -e 's/EXISTS ${LAPACK_LIB}/LAPACK_LIB/g' \
+ cmake/*.cmake || die
+
+ # remove Werror and
+ sed -i \
-e 's/-Werror//g' \
CMakeLists.txt || die
@@ -52,21 +52,17 @@ src_prepare() {
}
src_configure() {
- local blibs llibs
- if use sparse; then
- blibs=$($(tc-getPKG_CONFIG) --libs blas)
- llibs=$($(tc-getPKG_CONFIG) --libs lapack)
- fi
local mycmakeargs=(
- -DBLAS_LIB="${blibs}"
- -DLAPACK_LIB="${llibs}"
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_EXAMPLES=OFF
$(cmake-utils_use_enable test TESTING)
$(cmake-utils_use doc BUILD_DOCUMENTATION)
$(cmake-utils_use gflags GFLAGS)
+ $(cmake-utils_use lapack LAPACK)
$(cmake-utils_use openmp OPENMP)
$(cmake-utils_use protobuf PROTOBUF)
$(cmake-utils_use schur SCHUR_SPECIALIZATIONS)
- $(cmake-utils_use sparse CXSPARSE)
+ $(cmake-utils_use cxsparse CXSPARSE)
$(cmake-utils_use sparse SUITESPARSE)
)
cmake-utils_src_configure
@@ -76,11 +72,9 @@ src_install() {
cmake-utils_src_install
dodoc README VERSION
- use static-libs || rm "${ED}"/usr/$(get_libdir)/libceres.a
- dosym libceres_shared.so /usr/$(get_libdir)/libceres.so
-
if use examples; then
insinto /usr/share/doc/${PF}
- doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ doins -r examples data
fi
}
diff --git a/sci-libs/ceres-solver/files/ceres-solver-1.4.0-respect-libdir.patch b/sci-libs/ceres-solver/files/ceres-solver-1.4.0-respect-libdir.patch
deleted file mode 100644
index 940b20e5598d..000000000000
--- a/sci-libs/ceres-solver/files/ceres-solver-1.4.0-respect-libdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-patch from ceres-solver issue ticket
-http://code.google.com/p/ceres-solver/issues/detail?id=75
-
-
-Index: ceres-solver-1.4.0/internal/ceres/CMakeLists.txt
-===================================================================
---- ceres-solver-1.4.0.orig/internal/ceres/CMakeLists.txt
-+++ ceres-solver-1.4.0/internal/ceres/CMakeLists.txt
-@@ -118,8 +118,8 @@ IF (${BUILD_ANDROID})
-
- INSTALL(TARGETS miniglog
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
- ENDIF (${BUILD_ANDROID})
-
- SET(CERES_LIBRARY_DEPENDENCIES ${GLOG_LIB})
-@@ -175,8 +175,8 @@ TARGET_LINK_LIBRARIES(ceres ${CERES_LIBR
-
- INSTALL(TARGETS ceres
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
-
- # Don't build a DLL on MSVC. Supporting Ceres as a DLL on Windows involves
- # nontrivial changes that we haven't made yet.
-@@ -189,8 +189,8 @@ IF (NOT MSVC AND NOT ${BUILD_ANDROID})
-
- INSTALL(TARGETS ceres_shared
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
-
- ENDIF (NOT MSVC AND NOT ${BUILD_ANDROID})
-
diff --git a/sci-libs/ceres-solver/files/ceres-solver-1.4.0-test-no-suitesparse.patch b/sci-libs/ceres-solver/files/ceres-solver-1.4.0-test-no-suitesparse.patch
deleted file mode 100644
index 7c5712c0af50..000000000000
--- a/sci-libs/ceres-solver/files/ceres-solver-1.4.0-test-no-suitesparse.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-define the linear ordering when SuiteSparse is not used
-(otherwise chokes on a unit test)
-bicatali@gentoo.org
-
---- ceres-solver-1.4.0.orig/internal/ceres/solver_impl_test.cc 2012-11-19 13:34:36.194795640 -0800
-+++ ceres-solver-1.4.0/internal/ceres/solver_impl_test.cc 2012-11-19 13:59:42.395429059 -0800
-@@ -498,6 +498,8 @@
- #if defined(CERES_NO_SUITESPARSE) && defined(CERES_NO_CXSPARSE)
- TEST(SolverImpl, CreateLinearSolverNoSuiteSparse) {
- Solver::Options options;
-+ // CreateLinearSolver assumes a non-empty ordering.
-+ options.linear_solver_ordering = new ParameterBlockOrdering;
- options.linear_solver_type = SPARSE_NORMAL_CHOLESKY;
- string error;
- EXPECT_FALSE(SolverImpl::CreateLinearSolver(&options, &error));
diff --git a/sci-libs/ceres-solver/metadata.xml b/sci-libs/ceres-solver/metadata.xml
index 58151b34fb81..f537455df71a 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/metadata.xml
@@ -19,6 +19,8 @@
adjustment problems
</longdescription>
<use>
+ <flag name="cxsparse">Enable simple support for sparse matrix algebra from
+ <pkg>sci-libs/cxsparse</pkg> with no LAPACK dependencies</flag>
<flag name="schur">Enable fixed-size schur specializations (disable if
binary size is an issue)</flag>
<flag name="metis">Use METIS via <pkg>sci-libs/cholmod</pkg> for matrix partitioning</flag>