From b20bdcfc5a848d2d3d222ee83314df170875097f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 8 Jan 2025 02:47:48 +0100 Subject: [PATCH 1/2] osg: enable collada-dom --- srcpkgs/osg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index 2a89cf2164e133..15b1b98f11fd36 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -1,7 +1,7 @@ # Template file for 'osg' pkgname=osg version=3.6.5 -revision=4 +revision=5 build_style=cmake build_helper="qemu" # don't use /usr/lib64 on 64bit platforms @@ -9,7 +9,7 @@ configure_args="-DLIB_POSTFIX=" hostmakedepends="pkg-config xrandr" makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-devel jasper-devel tiff-devel libgdal-devel libgta-devel ffmpeg6-devel xine-lib-devel - SDL2-devel gst-plugins-base1-devel + SDL2-devel gst-plugins-base1-devel collada-dom-devel $(vopt_if openexr libopenexr-devel) $(vopt_if poppler poppler-glib-devel) $(vopt_if vnc libvncserver-devel)" From e648e81cbd63cf05e1fb435f74b56711b2b25d47 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 8 Jan 2025 16:13:59 +0100 Subject: [PATCH 2/2] New package: collada-dom-2.5.0 --- common/shlibs | 2 ++ srcpkgs/collada-dom-devel | 1 + srcpkgs/collada-dom/patches/null.patch | 29 ++++++++++++++++++++++++++ srcpkgs/collada-dom/template | 27 ++++++++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 120000 srcpkgs/collada-dom-devel create mode 100644 srcpkgs/collada-dom/patches/null.patch create mode 100644 srcpkgs/collada-dom/template diff --git a/common/shlibs b/common/shlibs index cc76cbdd35cd7c..e0b62b8fc29765 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3146,6 +3146,8 @@ libwithsctp.so.1 lksctp-tools-1.0.17_1 libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4 libunshield.so.0 libunshield-0.6_1 libMyGUIEngine.so.3.4.2 libmygui-3.4.2_1 +libMyGUIEngine.so.3.4.3 libmygui-3.4.3_1 +libcollada-dom2.5-dp.so.0 collada-dom-2.5.0_1 libproj.so.25 proj-9.1.1_1 libnlopt.so.0 nlopt-2.4.2_1 libeb.so.16 libeb-4.3.3_1 diff --git a/srcpkgs/collada-dom-devel b/srcpkgs/collada-dom-devel new file mode 120000 index 00000000000000..0372e419b86c56 --- /dev/null +++ b/srcpkgs/collada-dom-devel @@ -0,0 +1 @@ +collada-dom \ No newline at end of file diff --git a/srcpkgs/collada-dom/patches/null.patch b/srcpkgs/collada-dom/patches/null.patch new file mode 100644 index 00000000000000..c03eae3bf937c4 --- /dev/null +++ b/srcpkgs/collada-dom/patches/null.patch @@ -0,0 +1,29 @@ +--- a/dom/src/dae/daeDom.cpp 2017-10-21 07:05:24.000000000 +0200 ++++ - 2025-01-08 16:10:01.914351183 +0100 +@@ -111,7 +111,7 @@ + return ColladaDOM141::domAny::ID(); + } + #endif +- return NULL; ++ return 0; + } + + daeInt getDomSourceID(DAE& dae) +@@ -126,7 +126,7 @@ + return ColladaDOM141::domSource::ID(); + } + #endif +- return NULL; ++ return 0; + } + + daeInt getDomCOLLADAID(const char* specversion) +@@ -141,7 +141,7 @@ + return ColladaDOM141::domCOLLADA::ID(); + } + #endif +- return NULL; ++ return 0; + } + + void copyElementAny(daeElementRef dstAny, daeElement* srcAny) diff --git a/srcpkgs/collada-dom/template b/srcpkgs/collada-dom/template new file mode 100644 index 00000000000000..eac6015c71e4fa --- /dev/null +++ b/srcpkgs/collada-dom/template @@ -0,0 +1,27 @@ +# Template file for 'collada-dom' +pkgname=collada-dom +version=2.5.0 +revision=1 +build_style=cmake +makedepends="boost-devel libxml2-devel" +short_desc="COLLADA Document Object Model (DOM) C++ Library" +maintainer="John " +license="MIT" +homepage="https://github.com/rdiankov/collada-dom" +distfiles="https://github.com/rdiankov/collada-dom/archive/refs/tags/v${version}.tar.gz" +checksum=3be672407a7aef60b64ce4b39704b32816b0b28f61ebffd4fbd02c8012901e0d + +post_install() { + vlicense licenses/dom_license_e.txt +} + +collada-dom-devel_package() { + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/cmake + vmove "usr/lib/*.so" + } +}