diff --git a/osg-dae/Makefile b/osg-dae/Makefile index ed3a983848136d7379816d25ee9a1fd876dd51b1..5ea21b82678568f252797e761da41a3c955e2f6c 100644 --- a/osg-dae/Makefile +++ b/osg-dae/Makefile @@ -5,7 +5,7 @@ ORG= gepetto NAME= osg-dae VERSION= 3.2.1 -PKGREVISION= 3 +PKGREVISION= 4 DISTNAME= ${NAME}-${VERSION} @@ -22,9 +22,11 @@ DYNAMIC_PLIST_DIRS+= share/doc/${NAME} PLIST_SRC+= ${PKGDIR}/PLIST PLIST_SRC+= ${PKGDIR}/PLIST.${OS_VERSION} -CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF +CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF +CMAKE_ARGS+= -DCOLLADA14DOM_PREFIX=${PREFIX.collada-dom} USE_BOOST_LIBS= system filesystem +#export COLLADA_DIR= ${PREFIX.collada-dom}/include/collada-dom2.4/1.4 include ../../devel/boost-headers/depend.mk include ../../devel/boost-libs/depend.mk diff --git a/osg-dae/distinfo b/osg-dae/distinfo index fe09bb44c70c03ec68f0926e3e7de3227d7d76d3..c0300c51de18e27bad7e7bda24502cb077d9fb82 100644 --- a/osg-dae/distinfo +++ b/osg-dae/distinfo @@ -2,4 +2,4 @@ SHA1 (osg-dae-3.2.1.tar.gz) = 4c1d2ba98eed2aad80c089552e79f42216dafd27 RMD160 (osg-dae-3.2.1.tar.gz) = 56032d266e2b47ff2ca1a7887bed9dde0b7e923d Size (osg-dae-3.2.1.tar.gz) = 818587 bytes SHA1 (patch-aa) = 4fcd38b47a54675e52d8b8381ea24ac93c5c6c61 -SHA1 (patch-ab) = a1568eface0bd6aa594d165b9fbb9b24df205087 +SHA1 (patch-ab) = c42165586c0c85715976392d46dbd8deff32e2b1 diff --git a/osg-dae/patches/patch-ab b/osg-dae/patches/patch-ab new file mode 100644 index 0000000000000000000000000000000000000000..4ef3a7ff97c396686649fe212eac1193124a3221 --- /dev/null +++ b/osg-dae/patches/patch-ab @@ -0,0 +1,25 @@ +--- CMakeLists.txt.orig 2017-11-16 15:17:45.000000000 +0100 ++++ CMakeLists.txt 2020-05-30 11:38:49.850337869 +0200 +@@ -58,7 +58,6 @@ + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}") + + ADD_REQUIRED_DEPENDENCY("openscenegraph >= 3.2.0") +-ADD_REQUIRED_DEPENDENCY("collada14dom = 2.3.1") + FIND_PACKAGE(COLLADA REQUIRED) + + FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY +--- CMakeModules/FindCOLLADA.cmake.orig 2017-11-16 15:17:45.000000000 +0100 ++++ CMakeModules/FindCOLLADA.cmake 2020-05-30 11:49:23.944824786 +0200 +@@ -43,10 +43,10 @@ + ENDIF(APPLE) + + +-FIND_PATH(COLLADA_INCLUDE_DIR dae.h ${COLLADA14DOM_PREFIX}/include/collada-dom) ++FIND_PATH(COLLADA_INCLUDE_DIR dae.h ${COLLADA14DOM_PREFIX}/include/collada-dom2.4) + + FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY +- NAMES libcollada14dom.so ++ NAMES libcollada-dom2.4-dp.so + PATHS ${COLLADA14DOM_PREFIX}/lib + ) +