From ea9ff01bbc249751f7366607d796353784daaf69 Mon Sep 17 00:00:00 2001 From: Hiroo Ono Date: Sun, 1 Sep 2024 21:17:05 +0900 Subject: Build and link collada-dom v2.3-r7 taken from Linden Lab's 3rd party software repository. --- patches/collada-dom-v2.3-r7.patch | 122 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 patches/collada-dom-v2.3-r7.patch (limited to 'patches') diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch new file mode 100644 index 0000000000..485693ec7a --- /dev/null +++ b/patches/collada-dom-v2.3-r7.patch @@ -0,0 +1,122 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b1c1993..9df2dee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,14 +1,35 @@ +-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +-set(COLLADA14_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4) +-set(COLLADA15_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.5) ++project(colladadom) ++cmake_minimum_required(VERSION 3.17) ++ ++include(FindPkgConfig) ++ ++pkg_check_modules(LIBXML2 libxml-2.0) ++pkg_check_modules(MINIZIP minizip-ng) ++pkg_check_modules(ZLIB zlib) ++ ++set(COLLADA_DOM_SOVERSION "2") ++set(COLLADA_DOM_VERSION "2.3") ++set(COLLADA_DOM_INCLUDE_INSTALL_DIR ++ ${CMAKE_BINARY_DIR}/packages/include/collada ++) ++set(COLLADA_DOM_LIBS_INSTALL_DIR ++ ${CMAKE_BINARY_DIR}/packages/lib ++) ++file(MAKE_DIRECTORY ++ ${COLLADA_DOM_INCLUDE_INSTALL_DIR}/1.4 ++ ${COLLADA_DOM_INCLUDE_INSTALL_DIR}/1.5 ++ ${COLLADA_DOM_LIBS_INSTALL_DIR} ++) ++ + file(GLOB dae_files ${CMAKE_CURRENT_SOURCE_DIR}/src/dae/*.cpp) + file(GLOB libxmlplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/LIBXMLPlugin/*.cpp) + file(GLOB stddatabase_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/STLDatabase/*.cpp) + file(GLOB stderrplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/stdErrPlugin/*.cpp) + + set(COLLADA_BASE_SOURCES ${dae_files} ${libxmlplugin_files} ${stddatabase_files} ${stderrplugin_files}) +-set(COLLADA_LIBS minizip ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) +-set(COLLADA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS} -DDOM_INCLUDE_LIBXML") ++set(COLLADA_LIBS ${LIBXML2_LIBRARIES} ${MINIZIP_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) ++list(JOIN MINIZIP_CFLAGS " " VAR_MINIZIP_CFLAGS) ++set(COLLADA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${VAR_MINIZIP_CFLAGS} ${Boost_CFLAGS} -DDOM_INCLUDE_LIBXML") + + if( OPT_COLLADA15 ) + add_subdirectory(src/1.5) +diff --git a/src/1.4/CMakeLists.txt b/src/1.4/CMakeLists.txt +index 17fbaea..a5f0b51 100644 +--- a/src/1.4/CMakeLists.txt ++++ b/src/1.4/CMakeLists.txt +@@ -1,10 +1,21 @@ + file(GLOB dom_files ${CMAKE_CURRENT_SOURCE_DIR}/dom/*.cpp) +-include_directories(${COLLADA14_INCLUDE_DIR}) +-add_library(collada14dom SHARED ${COLLADA_BASE_SOURCES} ${dom_files}) ++add_library(collada14dom STATIC ${COLLADA_BASE_SOURCES} ${dom_files}) ++target_include_directories(collada14dom PRIVATE ++ ${colladadom_SOURCE_DIR}/include ++ ${colladadom_SOURCE_DIR}/include/1.4 ++ ${LIBXML2_INCLUDE_DIRS} ++ ${MINIZIP_INCLUDE_DIRS} ++ ${ZLIB_INCLUDE_DIRS} ++) ++target_link_directories(collada14dom INTERFACE ++ ${LIBXML2_LIBRARY_DIRS} ++ ${MINIZIP_LIBRARY_DIRS} ++ ${ZLIB_LIBRARY_DIRS} ++) + target_link_libraries(collada14dom ${COLLADA_LIBS}) + set_target_properties(collada14dom PROPERTIES + COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS}" + CLEAN_DIRECT_OUTPUT 1 + SOVERSION ${COLLADA_DOM_SOVERSION} + VERSION ${COLLADA_DOM_VERSION}) +-install(TARGETS collada14dom DESTINATION lib${LIB_SUFFIX}) ++install(TARGETS collada14dom DESTINATION ${COLLADA_DOM_LIBS_INSTALL_DIR}) +diff --git a/src/1.5/CMakeLists.txt b/src/1.5/CMakeLists.txt +index e061a01..fb73a70 100644 +--- a/src/1.5/CMakeLists.txt ++++ b/src/1.5/CMakeLists.txt +@@ -1,10 +1,10 @@ + file(GLOB dom_files ${CMAKE_CURRENT_SOURCE_DIR}/dom/*.cpp) + include_directories(${COLLADA15_INCLUDE_DIR}) +-add_library(collada15dom SHARED ${COLLADA_BASE_SOURCES} ${dom_files}) ++add_library(collada15dom STATIC ${COLLADA_BASE_SOURCES} ${dom_files}) + target_link_libraries(collada15dom ${COLLADA_LIBS}) + set_target_properties(collada15dom PROPERTIES + COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS}" + CLEAN_DIRECT_OUTPUT 1 + SOVERSION ${COLLADA_DOM_SOVERSION} + VERSION ${COLLADA_DOM_VERSION}) +-install(TARGETS collada15dom DESTINATION lib${LIB_SUFFIX}) ++install(TARGETS collada15dom DESTINATION ${COLLADA_DOM_LIBS_INSTALL_DIR}) +diff --git a/src/dae/daeUtils.cpp b/src/dae/daeUtils.cpp +index 682692c..0e61ef1 100644 +--- a/src/dae/daeUtils.cpp ++++ b/src/dae/daeUtils.cpp +@@ -118,7 +118,7 @@ list cdom::makeStringList(const char* s, ...) { + va_end(args); + return result; + } +-#endif 0 ++#endif // 0 + + string cdom::getCurrentDir() { + #ifdef __CELLOS_LV2__ +@@ -154,7 +154,7 @@ char cdom::getFileSeparator() { + const string& cdom::getSystemTmpDir() { + #ifdef WIN32 + static string tmpDir = string(getenv("TMP")) + getFileSeparator(); +-#elif defined(__linux__) || defined(__linux) ++#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__) + static string tmpDir = "/tmp/"; + #elif defined __APPLE_CC__ + static string tmpDir = string(getenv("TMPDIR")); +@@ -173,7 +173,7 @@ string cdom::getRandomFileName() { + std::string tmp(tmpnam(&tmpbuffer[0])); + #ifdef WIN32 + randomSegment = tmp.substr(tmp.find_last_of('\\')+1); +-#elif defined(__linux__) || defined(__linux) ++#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__) + randomSegment = tmp.substr(tmp.find_last_of('/')+1); + #elif defined __APPLE_CC__ + randomSegment = tmp.substr(tmp.find_last_of('/')+1); -- cgit v1.2.3 From 68a3c60cfec78ae8b6d2477cc4220ad3892b08a4 Mon Sep 17 00:00:00 2001 From: Hiroo Ono Date: Mon, 2 Sep 2024 22:50:37 +0900 Subject: Fix build. * check for minizip (not minizip-ng) on Linux (Debian) * added find_package(Boost REQUIRED CONFIG) in collada-dom build for Linux and FreeBSD --- patches/collada-dom-v2.3-r7.patch | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'patches') diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch index 485693ec7a..b98965d986 100644 --- a/patches/collada-dom-v2.3-r7.patch +++ b/patches/collada-dom-v2.3-r7.patch @@ -1,21 +1,27 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1c1993..9df2dee 100644 +index b1c1993..3cbf2fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,14 +1,35 @@ +@@ -1,14 +1,41 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -set(COLLADA14_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4) -set(COLLADA15_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.5) +project(colladadom) +cmake_minimum_required(VERSION 3.17) ++cmake_policy(SET CMP0167 NEW) + +include(FindPkgConfig) + ++find_package(Boost REQUIRED CONFIG) +pkg_check_modules(LIBXML2 libxml-2.0) -+pkg_check_modules(MINIZIP minizip-ng) ++if(LINUX) ++ pkg_check_modules(MINIZIP minizip) ++else(LINUX) ++ pkg_check_modules(MINIZIP minizip-ng) ++endif(LINUX) +pkg_check_modules(ZLIB zlib) + -+set(COLLADA_DOM_SOVERSION "2") ++set(COLLADA_DOM_SOVERSION "0") +set(COLLADA_DOM_VERSION "2.3") +set(COLLADA_DOM_INCLUDE_INSTALL_DIR + ${CMAKE_BINARY_DIR}/packages/include/collada -- cgit v1.2.3 From 6c24e7833f10a20dfbd83610104dae0188b732c0 Mon Sep 17 00:00:00 2001 From: Hiroo Ono Date: Tue, 3 Sep 2024 14:12:04 +0900 Subject: added Boost include directory to the target collada14dom. added -Wno-error=unused-result to the target collada14dom. --- patches/collada-dom-v2.3-r7.patch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'patches') diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch index b98965d986..fce2b934d1 100644 --- a/patches/collada-dom-v2.3-r7.patch +++ b/patches/collada-dom-v2.3-r7.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1c1993..3cbf2fb 100644 +index b1c1993..7bd70d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,41 @@ @@ -43,29 +43,34 @@ index b1c1993..3cbf2fb 100644 set(COLLADA_BASE_SOURCES ${dae_files} ${libxmlplugin_files} ${stddatabase_files} ${stderrplugin_files}) -set(COLLADA_LIBS minizip ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) -set(COLLADA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS} -DDOM_INCLUDE_LIBXML") -+set(COLLADA_LIBS ${LIBXML2_LIBRARIES} ${MINIZIP_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) ++set(COLLADA_LIBS ${LIBXML2_LIBRARIES} ${MINIZIP_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY}) +list(JOIN MINIZIP_CFLAGS " " VAR_MINIZIP_CFLAGS) +set(COLLADA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${VAR_MINIZIP_CFLAGS} ${Boost_CFLAGS} -DDOM_INCLUDE_LIBXML") if( OPT_COLLADA15 ) add_subdirectory(src/1.5) diff --git a/src/1.4/CMakeLists.txt b/src/1.4/CMakeLists.txt -index 17fbaea..a5f0b51 100644 +index 17fbaea..8df5462 100644 --- a/src/1.4/CMakeLists.txt +++ b/src/1.4/CMakeLists.txt -@@ -1,10 +1,21 @@ +@@ -1,10 +1,26 @@ file(GLOB dom_files ${CMAKE_CURRENT_SOURCE_DIR}/dom/*.cpp) -include_directories(${COLLADA14_INCLUDE_DIR}) -add_library(collada14dom SHARED ${COLLADA_BASE_SOURCES} ${dom_files}) +add_library(collada14dom STATIC ${COLLADA_BASE_SOURCES} ${dom_files}) ++target_compile_options(collada14dom PRIVATE ++ "-Wno-error=unused-result" ++) +target_include_directories(collada14dom PRIVATE + ${colladadom_SOURCE_DIR}/include + ${colladadom_SOURCE_DIR}/include/1.4 ++ ${Boost_INCLUDE_DIRS} + ${LIBXML2_INCLUDE_DIRS} + ${MINIZIP_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} +) +target_link_directories(collada14dom INTERFACE ++ ${Boost_LIBRARY_DIRS} + ${LIBXML2_LIBRARY_DIRS} + ${MINIZIP_LIBRARY_DIRS} + ${ZLIB_LIBRARY_DIRS} -- cgit v1.2.3 From cd4e9098c148dd35002c167fde7febc02849c86a Mon Sep 17 00:00:00 2001 From: Hiroo Ono Date: Tue, 3 Sep 2024 19:52:49 +0900 Subject: So, it was minizip, not minizip-ng. Sorry. --- patches/collada-dom-v2.3-r7.patch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'patches') diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch index fce2b934d1..4c36e83891 100644 --- a/patches/collada-dom-v2.3-r7.patch +++ b/patches/collada-dom-v2.3-r7.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1c1993..7bd70d4 100644 +index b1c1993..d9787be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,14 +1,41 @@ +@@ -1,14 +1,37 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) -set(COLLADA14_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4) -set(COLLADA15_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.5) @@ -14,11 +14,7 @@ index b1c1993..7bd70d4 100644 + +find_package(Boost REQUIRED CONFIG) +pkg_check_modules(LIBXML2 libxml-2.0) -+if(LINUX) -+ pkg_check_modules(MINIZIP minizip) -+else(LINUX) -+ pkg_check_modules(MINIZIP minizip-ng) -+endif(LINUX) ++pkg_check_modules(MINIZIP minizip) +pkg_check_modules(ZLIB zlib) + +set(COLLADA_DOM_SOVERSION "0") -- cgit v1.2.3