summaryrefslogtreecommitdiff
path: root/devel/collada-dom
diff options
context:
space:
mode:
Diffstat (limited to 'devel/collada-dom')
-rw-r--r--devel/collada-dom/Makefile17
-rw-r--r--devel/collada-dom/distinfo6
-rw-r--r--devel/collada-dom/files/patch-CMakeLists.txt13
-rw-r--r--devel/collada-dom/files/patch-dom_include_dae.h11
-rw-r--r--devel/collada-dom/files/patch-dom_src_dae_daeDom.cpp29
-rw-r--r--devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp19
-rw-r--r--devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp11
-rw-r--r--devel/collada-dom/files/patch-dom_src_modules_LIBXMLPlugin_daeLIBXMLPlugin.cpp11
-rw-r--r--devel/collada-dom/pkg-plist2
9 files changed, 17 insertions, 102 deletions
diff --git a/devel/collada-dom/Makefile b/devel/collada-dom/Makefile
index 3c22c1d1387a..75fe6acfe1a6 100644
--- a/devel/collada-dom/Makefile
+++ b/devel/collada-dom/Makefile
@@ -1,27 +1,22 @@
PORTNAME= collada-dom
DISTVERSIONPREFIX= v
-DISTVERSION= 2.5.0
-PORTREVISION= 16
+DISTVERSION= 2.5.2
CATEGORIES= devel
MAINTAINER= trueos@norwegianrockcat.com
COMMENT= COLLADA Document Object Model (DOM) C++ Library
-WWW= https://github.com/rdiankov/collada-dom
+WWW= https://github.com/Gepetto/collada-dom
LICENSE= MIT
-LIB_DEPENDS= libpcre.so:devel/pcre \
- libboost_filesystem.so:devel/boost-libs \
- libboost_thread.so:devel/boost-libs
+LIB_DEPENDS= liburiparser.so:net/uriparser \
+ libboost_filesystem.so:devel/boost-libs
USES= cmake gnome minizip pkgconfig
-USE_CXXSTD= c++14
-USE_GITHUB= yes
-GH_ACCOUNT= rdiankov
USE_GNOME= libxml2
USE_LDCONFIG= yes
-# LLVM15+ workaround
-CFLAGS= -Wno-int-conversion
+USE_GITHUB= yes
+GH_ACCOUNT= Gepetto
.include <bsd.port.mk>
diff --git a/devel/collada-dom/distinfo b/devel/collada-dom/distinfo
index 9c5388542fac..a5dcd6c7861d 100644
--- a/devel/collada-dom/distinfo
+++ b/devel/collada-dom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569926613
-SHA256 (rdiankov-collada-dom-v2.5.0_GH0.tar.gz) = 3be672407a7aef60b64ce4b39704b32816b0b28f61ebffd4fbd02c8012901e0d
-SIZE (rdiankov-collada-dom-v2.5.0_GH0.tar.gz) = 4509266
+TIMESTAMP = 1761710883
+SHA256 (Gepetto-collada-dom-v2.5.2_GH0.tar.gz) = 23a621becb0202af4b476022a95a91bb2998b3604b12459ccfda267202e741f6
+SIZE (Gepetto-collada-dom-v2.5.2_GH0.tar.gz) = 4511348
diff --git a/devel/collada-dom/files/patch-CMakeLists.txt b/devel/collada-dom/files/patch-CMakeLists.txt
index ae5c50e87ed6..520212d4ce2f 100644
--- a/devel/collada-dom/files/patch-CMakeLists.txt
+++ b/devel/collada-dom/files/patch-CMakeLists.txt
@@ -1,15 +1,6 @@
---- CMakeLists.txt.orig 2019-05-09 19:44:01 UTC
+--- CMakeLists.txt.orig 2025-10-29 04:19:43 UTC
+++ CMakeLists.txt
-@@ -2,6 +2,8 @@ cmake_minimum_required (VERSION 2.6.0)
- project (collada-dom)
- set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
-
-+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+
- # Define here the needed parameters
- set (COLLADA_DOM_VERSION_MAJOR 2)
- set (COLLADA_DOM_VERSION_MINOR 5)
-@@ -138,7 +140,7 @@ if( APPLE OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -138,7 +138,7 @@ endif()
add_definitions("-Dftello64=ftello")
endif()
diff --git a/devel/collada-dom/files/patch-dom_include_dae.h b/devel/collada-dom/files/patch-dom_include_dae.h
deleted file mode 100644
index 74e13ec081c7..000000000000
--- a/devel/collada-dom/files/patch-dom_include_dae.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dom/include/dae.h.orig 2017-10-21 05:05:24 UTC
-+++ dom/include/dae.h
-@@ -25,7 +25,7 @@
- #pragma warning(disable: 4180 4245)
- #endif
- #ifndef NO_BOOST
--#include <boost/filesystem/convenience.hpp>
-+#include <boost/filesystem.hpp>
- #endif
- #ifdef _MSC_VER
- #pragma warning(pop)
diff --git a/devel/collada-dom/files/patch-dom_src_dae_daeDom.cpp b/devel/collada-dom/files/patch-dom_src_dae_daeDom.cpp
deleted file mode 100644
index 60ecbc0d91fa..000000000000
--- a/devel/collada-dom/files/patch-dom_src_dae_daeDom.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- dom/src/dae/daeDom.cpp.orig 2019-05-09 19:35:00 UTC
-+++ dom/src/dae/daeDom.cpp
-@@ -111,7 +111,7 @@ daeInt getDomAnyID(DAE& dae)
- return ColladaDOM141::domAny::ID();
- }
- #endif
-- return NULL;
-+ return 0;
- }
-
- daeInt getDomSourceID(DAE& dae)
-@@ -126,7 +126,7 @@ daeInt getDomSourceID(DAE& dae)
- return ColladaDOM141::domSource::ID();
- }
- #endif
-- return NULL;
-+ return 0;
- }
-
- daeInt getDomCOLLADAID(const char* specversion)
-@@ -141,7 +141,7 @@ daeInt getDomCOLLADAID(const char* specversion)
- return ColladaDOM141::domCOLLADA::ID();
- }
- #endif
-- return NULL;
-+ return 0;
- }
-
- void copyElementAny(daeElementRef dstAny, daeElement* srcAny)
diff --git a/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp b/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp
index 61894cc204f6..8e326f428d4c 100644
--- a/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp
+++ b/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp
@@ -1,20 +1,11 @@
---- dom/src/dae/daeUtils.cpp.orig 2017-10-21 05:05:24 UTC
+--- dom/src/dae/daeUtils.cpp.orig 2025-10-29 04:16:09 UTC
+++ dom/src/dae/daeUtils.cpp
-@@ -18,7 +18,7 @@
- #endif
-
- #ifndef NO_BOOST
--#include <boost/filesystem/convenience.hpp> // THIS WAS NOT COMMENTED.
-+#include <boost/filesystem.hpp> // THIS WAS NOT COMMENTED.
- #endif
-
- #include <cstdio> // for tmpnam
@@ -152,7 +152,7 @@ const string& cdom::getSystemTmpDir() {
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__)
+-#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__)
++#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__) || defined(__FreeBSD__)
static string tmpDir = "/tmp/";
#elif defined __APPLE_CC__
static string tmpDir = string(getenv("TMPDIR"));
@@ -22,8 +13,8 @@
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__)
+-#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__)
++#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__) || defined(__FreeBSD__)
randomSegment = tmp.substr(tmp.find_last_of('/')+1);
#elif defined __APPLE_CC__
randomSegment = tmp.substr(tmp.find_last_of('/')+1);
diff --git a/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp b/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp
deleted file mode 100644
index 1402c1bbeca7..000000000000
--- a/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dom/src/dae/daeZAEUncompressHandler.cpp.orig 2017-10-21 05:05:24 UTC
-+++ dom/src/dae/daeZAEUncompressHandler.cpp
-@@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalA
- bool error = false;
-
- boost::filesystem::path archivePath(filePath);
-- std::string dir = archivePath.branch_path().string();
-+ std::string dir = archivePath.parent_path().string();
-
- const std::string& randomSegment = cdom::getRandomFileName();
- std::string tmpDir = dir + cdom::getFileSeparator() + randomSegment + cdom::getFileSeparator();
diff --git a/devel/collada-dom/files/patch-dom_src_modules_LIBXMLPlugin_daeLIBXMLPlugin.cpp b/devel/collada-dom/files/patch-dom_src_modules_LIBXMLPlugin_daeLIBXMLPlugin.cpp
deleted file mode 100644
index 685c9b103114..000000000000
--- a/devel/collada-dom/files/patch-dom_src_modules_LIBXMLPlugin_daeLIBXMLPlugin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp.orig 2019-05-09 19:36:39 UTC
-+++ dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-@@ -32,7 +32,7 @@
- #include <iomanip>
- using namespace std;
-
--#include <zip.h> // for saving compressed files
-+#include <minizip/zip.h> // for saving compressed files
- #ifdef _WIN32
- #include <iowin32.h>
- #else
diff --git a/devel/collada-dom/pkg-plist b/devel/collada-dom/pkg-plist
index f85babef2fed..66596bdc17dd 100644
--- a/devel/collada-dom/pkg-plist
+++ b/devel/collada-dom/pkg-plist
@@ -456,7 +456,7 @@ lib/cmake/collada_dom-2.5/collada_dom-config-version.cmake
lib/cmake/collada_dom-2.5/collada_dom-config.cmake
lib/libcollada-dom2.5-dp.so
lib/libcollada-dom2.5-dp.so.0
-lib/libcollada-dom2.5-dp.so.2.5.0
+lib/libcollada-dom2.5-dp.so.2.5.2
libdata/pkgconfig/collada-dom-141.pc
libdata/pkgconfig/collada-dom-150.pc
libdata/pkgconfig/collada-dom.pc
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-11 15:19:05 +0000