From 603f43566983c5821a2590022f8bca2140eb7ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 12 Nov 2017 17:54:39 +0100 Subject: [PATCH] collada2gltf: remove unused This was intended to be used in libreoffice but was always either too new or too old. Use libreoffice's internal collada2gltf instead. --- .../patches/musl-return_default.patch | 10 ----- .../collada2gltf/patches/musl-stdint_h.patch | 20 ---------- srcpkgs/collada2gltf/template | 39 ------------------- 3 files changed, 69 deletions(-) delete mode 100644 srcpkgs/collada2gltf/patches/musl-return_default.patch delete mode 100644 srcpkgs/collada2gltf/patches/musl-stdint_h.patch delete mode 100644 srcpkgs/collada2gltf/template diff --git a/srcpkgs/collada2gltf/patches/musl-return_default.patch b/srcpkgs/collada2gltf/patches/musl-return_default.patch deleted file mode 100644 index 156ebb7a74..0000000000 --- a/srcpkgs/collada2gltf/patches/musl-return_default.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- COLLADA2GLTF/dependencies/OpenCOLLADA/common/libBuffer/src/CommonFWriteBufferFlusher.cpp -+++ COLLADA2GLTF/dependencies/OpenCOLLADA/common/libBuffer/src/CommonFWriteBufferFlusher.cpp -@@ -146,6 +146,7 @@ - return success; - } - } -+ return false; - } - - } // namespace Common diff --git a/srcpkgs/collada2gltf/patches/musl-stdint_h.patch b/srcpkgs/collada2gltf/patches/musl-stdint_h.patch deleted file mode 100644 index d668767485..0000000000 --- a/srcpkgs/collada2gltf/patches/musl-stdint_h.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- COLLADA2GLTF/dependencies/OpenCOLLADA/common/libBuffer/include/CommonFWriteBufferFlusher.h -+++ COLLADA2GLTF/dependencies/OpenCOLLADA/common/libBuffer/include/CommonFWriteBufferFlusher.h -@@ -35,15 +35,14 @@ - #ifdef __GNUC__ - # include /* size_t */ - # include /* FILE */ --#ifdef __FreeBSD__ --#include /* int64_t */ --#endif - #endif - -+#include -+ - #if __cplusplus > 199711L - typedef int64_t __int64; - #else - #if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(__MINGW32__)) || (__STDC_VERSION__ >= 199901L) - typedef int64_t __int64; - #endif - #endif diff --git a/srcpkgs/collada2gltf/template b/srcpkgs/collada2gltf/template deleted file mode 100644 index c45d0b5cfc..0000000000 --- a/srcpkgs/collada2gltf/template +++ /dev/null @@ -1,39 +0,0 @@ -# Template file for 'collada2gltf' -pkgname=collada2gltf -version=1.0.20160229 -revision=2 -_gitrev=bc1fe2adaf3e0bec42750ade3bc1d763d0f298aa -wrksrc="glTF" -build_wrksrc="COLLADA2GLTF" -build_style=cmake -nopies=yes -hostmakedepends="git git-perl pkg-config" -makedepends="libpng-devel libxml2-devel pcre-devel" -short_desc="Converter for COLLADA to glTF" -maintainer="Jürgen Buchmüller " -license="MIT, BSD" -homepage="https://github.com/KhronosGroup/glTF/wiki/converter" - -do_fetch() { - git clone --recurse-submodules https://github.com/KhronosGroup/glTF.git - cd glTF - git checkout ${_gitrev} - if [ -n "$CROSS_BUILD" ]; then - # Linking test_o3gdc fails in cross build with message: - # "relocation R_ARM_MOVW_ABS_NC against `__pthread_key_create' can not - # be used when making a shared object; recompile with -fPIC" - # Simply disable it because we don't need it for libreoffice - sed -i COLLADA2GLTF/dependencies/o3dgc/src/CMakeLists.txt \ - -e 's;add_subdirectory ("${${PROJECT_NAME}_SOURCE_DIR}/test");;' - fi -} - -do_install() { - vbin build/bin/OpenCOLLADAValidator - vbin build/bin/collada2gltf - if [ -z "$CROSS_BUILD" ]; then - vbin build/bin/test_o3dgc - fi - cat ${wrksrc}/LICENSE.md | tr -d \013 > LICENSE - vlicense LICENSE -}