freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc/openmvg: Use external CEREAL library; Add CONFLICTS_BUILD

Browse Source
This commit is contained in:
Yuri Victorovich
2021-01-18 18:35:50 +00:00
parent 170732ade1
commit f90861327e
4 changed files with 31 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/openmvg/Makefile
+13 -5
View File
@@ -3,7 +3,7 @@
PORTNAME= openmvg
DISTVERSIONPREFIX= v
DISTVERSION= 1.6
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= misc science
MAINTAINER= yuri@FreeBSD.org
@@ -15,26 +15,31 @@ LICENSE_FILE= ${WRKSRC}/../LICENSE
ONLY_FOR_ARCHS= amd64 i386 powerpc64
ONLY_FOR_ARCHS_REASON= need to figure out which TARGET_ARCHITECTURE values correspond to other architectures, plus "generic" is broken
HPP_DEPENDS= cereal>0:devel/cereal
BUILD_DEPENDS= ${HPP_DEPENDS}
LIB_DEPENDS= libflann_cpp.so:math/flann \
libopenblas.so:math/openblas \
libpng.so:graphics/png \
libtiff.so:graphics/tiff
LIB_DEPENDS+= liblz4.so:archivers/liblz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
RUN_DEPENDS= ${HPP_DEPENDS}
USES= cmake compiler:c++11-lang eigen:3 jpeg qt:5
USE_GITHUB= yes
GH_ACCOUNT= openMVG
GH_PROJECT= openMVG
GH_TUPLE= openMVG-thirdparty:cereal:ac168fe78ac499be0a745bf4a3253a9660572f8d:cereal/dependencies/cereal \
openMVG-thirdparty:osi_clp:a25a980:osi/dependencies/osi_clp
GH_TUPLE= openMVG-thirdparty:osi_clp:a25a980:osi/dependencies/osi_clp
WRKSRC_SUBDIR= src
USE_QT= core gui opengl svg widgets buildtools_build qmake_build
USE_LDCONFIG= yes
CMAKE_ARGS= -DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
CONFLICTS_BUILD= Clp CoinMP # libopenMVG_lemon.so: undefined reference to ClpSimplex::setRowLower(int, double)
CMAKE_ARGS= -DCEREAL_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
-DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
-DFLANN_INCLUDE_DIR_HINTS=${LOCALBASE}/include
CMAKE_ON= OpenMVG_BUILD_SHARED
CMAKE_OFF= OpenMVG_BUILD_EXAMPLES
CMAKE_OFF= OpenMVG_BUILD_TESTS OpenMVG_BUILD_EXAMPLES
CXXFLAGS+= -fPIC \
-I${LOCALBASE}/include # because flann is looked for in a wrong directiory: https://github.com/openMVG/openMVG/issues/1284
@@ -58,4 +63,7 @@ CORE_CMAKE_ON= -DTARGET_ARCHITECTURE=core
MEROM_CMAKE_ON= -DTARGET_ARCHITECTURE=merom
NEHALEM_CMAKE_ON= -DTARGET_ARCHITECTURE=nehalem
post-install:
cd ${STAGEDIR}${PREFIX}/include/openMVG_dependencies && ${RMDIR} cereal
.include <bsd.port.mk>
misc/openmvg/distinfo
+1 -1
View File
@@ -1,4 +1,4 @@
TIMESTAMP = 1601062653
TIMESTAMP = 1610945557
SHA256 (openMVG-openMVG-v1.6_GH0.tar.gz) = 11b7f632a773f8c06fe7e30caeebc8ac124049cd5dd947eaadc8c7bf0a294d64
SIZE (openMVG-openMVG-v1.6_GH0.tar.gz) = 14752743
SHA256 (openMVG-thirdparty-cereal-ac168fe78ac499be0a745bf4a3253a9660572f8d_GH0.tar.gz) = 97e571da6be41eeba060ba257f74bdb329e043c078df7429f2f87ecdfeeb3db3
misc/openmvg/files/patch-CMakeLists.txt
+17 -3
View File
@@ -1,6 +1,20 @@
--- CMakeLists.txt.orig 2018-08-25 14:45:11 UTC
--- CMakeLists.txt.orig 2020-05-13 05:15:56 UTC
+++ CMakeLists.txt
@@ -104,8 +104,8 @@ AutodetectHostArchitecture()
@@ -88,11 +88,13 @@ endif()
# ==============================================================================
# Check that submodule have been initialized and updated
# ==============================================================================
+if (FALSE)
if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
message(FATAL_ERROR
"\n submodule(s) are missing, please update your repository:\n"
" > git submodule update -i\n")
endif()
+endif()
# ==============================================================================
# Additional cmake find modules
@@ -103,8 +105,8 @@ include(OptimizeForArchitecture)
OptimizeForArchitecture()
if (UNIX AND NOT OpenMVG_BUILD_COVERAGE)
@@ -11,7 +25,7 @@
endif ()
# ==============================================================================
@@ -257,7 +257,7 @@ endif()
@@ -260,7 +262,7 @@ endif()
# - external by default if CERES_DIR_HINTS or find_package found a valid Ceres
# - internal if ceres not found (ceres-solver+cxsparse+miniglog)
# ==============================================================================
misc/openmvg/pkg-plist
-131
View File
@@ -403,135 +403,6 @@ include/openMVG/tracks/tracks.hpp
include/openMVG/tracks/union_find.hpp
include/openMVG/types.hpp
include/openMVG/version.hpp
include/openMVG_dependencies/cereal/include/cereal/access.hpp
include/openMVG_dependencies/cereal/include/cereal/archives/adapters.hpp
include/openMVG_dependencies/cereal/include/cereal/archives/binary.hpp
include/openMVG_dependencies/cereal/include/cereal/archives/json.hpp
include/openMVG_dependencies/cereal/include/cereal/archives/portable_binary.hpp
include/openMVG_dependencies/cereal/include/cereal/archives/xml.hpp
include/openMVG_dependencies/cereal/include/cereal/cereal.hpp
include/openMVG_dependencies/cereal/include/cereal/details/helpers.hpp
include/openMVG_dependencies/cereal/include/cereal/details/polymorphic_impl.hpp
include/openMVG_dependencies/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
include/openMVG_dependencies/cereal/include/cereal/details/static_object.hpp
include/openMVG_dependencies/cereal/include/cereal/details/traits.hpp
include/openMVG_dependencies/cereal/include/cereal/details/util.hpp
include/openMVG_dependencies/cereal/include/cereal/external/base64.hpp
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/allocators.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/cursorstreamwrapper.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/document.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/encodedstream.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/encodings.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/error/en.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/error/error.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/filereadstream.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/filewritestream.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/fwd.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/biginteger.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/diyfp.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/dtoa.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/ieee754.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/itoa.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/meta.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/pow10.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/regex.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/stack.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/strfunc.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/strtod.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/internal/swap.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/istreamwrapper.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/memorybuffer.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/memorystream.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/pointer.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/prettywriter.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/rapidjson.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/reader.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/schema.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/stream.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/stringbuffer.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidjson/writer.h
include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml.hpp
include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
include/openMVG_dependencies/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
include/openMVG_dependencies/cereal/include/cereal/macros.hpp
include/openMVG_dependencies/cereal/include/cereal/specialize.hpp
include/openMVG_dependencies/cereal/include/cereal/types/array.hpp
include/openMVG_dependencies/cereal/include/cereal/types/atomic.hpp
include/openMVG_dependencies/cereal/include/cereal/types/base_class.hpp
include/openMVG_dependencies/cereal/include/cereal/types/bitset.hpp
include/openMVG_dependencies/cereal/include/cereal/types/boost_variant.hpp
include/openMVG_dependencies/cereal/include/cereal/types/chrono.hpp
include/openMVG_dependencies/cereal/include/cereal/types/common.hpp
include/openMVG_dependencies/cereal/include/cereal/types/complex.hpp
include/openMVG_dependencies/cereal/include/cereal/types/concepts/pair_associative_container.hpp
include/openMVG_dependencies/cereal/include/cereal/types/deque.hpp
include/openMVG_dependencies/cereal/include/cereal/types/forward_list.hpp
include/openMVG_dependencies/cereal/include/cereal/types/functional.hpp
include/openMVG_dependencies/cereal/include/cereal/types/list.hpp
include/openMVG_dependencies/cereal/include/cereal/types/map.hpp
include/openMVG_dependencies/cereal/include/cereal/types/memory.hpp
include/openMVG_dependencies/cereal/include/cereal/types/optional.hpp
include/openMVG_dependencies/cereal/include/cereal/types/polymorphic.hpp
include/openMVG_dependencies/cereal/include/cereal/types/queue.hpp
include/openMVG_dependencies/cereal/include/cereal/types/set.hpp
include/openMVG_dependencies/cereal/include/cereal/types/stack.hpp
include/openMVG_dependencies/cereal/include/cereal/types/string.hpp
include/openMVG_dependencies/cereal/include/cereal/types/tuple.hpp
include/openMVG_dependencies/cereal/include/cereal/types/unordered_map.hpp
include/openMVG_dependencies/cereal/include/cereal/types/unordered_set.hpp
include/openMVG_dependencies/cereal/include/cereal/types/utility.hpp
include/openMVG_dependencies/cereal/include/cereal/types/valarray.hpp
include/openMVG_dependencies/cereal/include/cereal/types/variant.hpp
include/openMVG_dependencies/cereal/include/cereal/types/vector.hpp
include/openMVG_dependencies/cereal/include/cereal/version.hpp
include/openMVG_dependencies/cereal/sandbox/sandbox_shared_lib/base.hpp
include/openMVG_dependencies/cereal/sandbox/sandbox_shared_lib/derived.hpp
include/openMVG_dependencies/cereal/unittests/array.hpp
include/openMVG_dependencies/cereal/unittests/atomic.hpp
include/openMVG_dependencies/cereal/unittests/basic_string.hpp
include/openMVG_dependencies/cereal/unittests/bitset.hpp
include/openMVG_dependencies/cereal/unittests/boost/boost_variant.hpp
include/openMVG_dependencies/cereal/unittests/chrono.hpp
include/openMVG_dependencies/cereal/unittests/common.hpp
include/openMVG_dependencies/cereal/unittests/complex.hpp
include/openMVG_dependencies/cereal/unittests/cpp17/optional.hpp
include/openMVG_dependencies/cereal/unittests/cpp17/variant.hpp
include/openMVG_dependencies/cereal/unittests/defer.hpp
include/openMVG_dependencies/cereal/unittests/deque.hpp
include/openMVG_dependencies/cereal/unittests/doctest.h
include/openMVG_dependencies/cereal/unittests/forward_list.hpp
include/openMVG_dependencies/cereal/unittests/list.hpp
include/openMVG_dependencies/cereal/unittests/load_construct.hpp
include/openMVG_dependencies/cereal/unittests/map.hpp
include/openMVG_dependencies/cereal/unittests/memory.hpp
include/openMVG_dependencies/cereal/unittests/memory_cycles.hpp
include/openMVG_dependencies/cereal/unittests/multimap.hpp
include/openMVG_dependencies/cereal/unittests/multiset.hpp
include/openMVG_dependencies/cereal/unittests/pair.hpp
include/openMVG_dependencies/cereal/unittests/pod.hpp
include/openMVG_dependencies/cereal/unittests/polymorphic.hpp
include/openMVG_dependencies/cereal/unittests/portable_binary_archive.hpp
include/openMVG_dependencies/cereal/unittests/priority_queue.hpp
include/openMVG_dependencies/cereal/unittests/queue.hpp
include/openMVG_dependencies/cereal/unittests/set.hpp
include/openMVG_dependencies/cereal/unittests/stack.hpp
include/openMVG_dependencies/cereal/unittests/structs.hpp
include/openMVG_dependencies/cereal/unittests/structs_minimal.hpp
include/openMVG_dependencies/cereal/unittests/structs_specialized.hpp
include/openMVG_dependencies/cereal/unittests/tuple.hpp
include/openMVG_dependencies/cereal/unittests/unordered_loads.hpp
include/openMVG_dependencies/cereal/unittests/unordered_map.hpp
include/openMVG_dependencies/cereal/unittests/unordered_multimap.hpp
include/openMVG_dependencies/cereal/unittests/unordered_multiset.hpp
include/openMVG_dependencies/cereal/unittests/unordered_set.hpp
include/openMVG_dependencies/cereal/unittests/user_data_adapters.hpp
include/openMVG_dependencies/cereal/unittests/valarray.hpp
include/openMVG_dependencies/cereal/unittests/vector.hpp
include/openMVG_dependencies/cereal/unittests/versioning.hpp
include/openMVG_dependencies/nonFree/sift/SIFT_describer.hpp
include/openMVG_dependencies/nonFree/sift/SIFT_describer_io.hpp
include/openMVG_dependencies/nonFree/sift/vl/generic.h
@@ -789,8 +660,6 @@ share/openMVG/webgl/common/trackball.js
share/openMVG/webgl/common/vector.js
@dir include/openMVG/exif/image_data
@dir include/openMVG/image/image_test
@dir include/openMVG_dependencies/cereal/doc
@dir include/openMVG_dependencies/cereal/scripts
@dir include/openMVG_dependencies/glfw
@dir include/openMVG_dependencies/osi_clp/Clp/doc/Howto
@dir include/openMVG_dependencies/osi_clp/Clp/doxydoc