OpenCOLLADA OpenColorIO1

This commit is contained in:
Rmys
2021-05-11 20:53:25 +03:00
parent 74f16c07c7
commit 0a3c9e741d
15 changed files with 542 additions and 3 deletions
+27
View File
@@ -0,0 +1,27 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import cmaketools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.configure("-DUSE_SHARED=ON \
-DUSE_STATIC=OFF", sourceDir="..")
def build():
shelltools.cd("build")
cmaketools.make()
def install():
shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
shelltools.cd("..")
pisitools.dodoc("README*")
@@ -0,0 +1,62 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ macro(opencollada_add_lib
message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
endif ()
add_library(${name}_shared SHARED ${sources})
- set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
+ set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion})
foreach(target_lib ${target_libs})
if(TARGET ${target_lib}_shared)
target_link_libraries(${name}_shared ${target_lib}_shared)
@@ -190,8 +190,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
#-----------------------------------------------------------------------------
# Install vars
-set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
-set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
+set(OPENCOLLADA_INST_INCLUDE ${INCLUDE_INSTALL_DIR})
+set(OPENCOLLADA_INST_LIBRARY ${LIB_INSTALL_DIR})
set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
@@ -274,7 +274,10 @@ add_subdirectory(common/libftoa)
add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
add_subdirectory(common/libBuffer)
add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
-add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
+#add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
+pkg_check_modules(ZLIB REQUIRED zlib)
+message(STATUS "zlib libraries: ${ZLIB_LIBRARIES}")
+set(zlib_shared ${ZLIB_LIBRARIES})
# building OpenCOLLADA libs
add_subdirectory(COLLADABaseUtils)
--- a/DAEValidator/CMakeLists.txt
+++ b/DAEValidator/CMakeLists.txt
@@ -83,7 +83,7 @@ endif ()
if (USE_STATIC)
list(APPEND Libraries zlib_static)
else ()
- list(APPEND Libraries zlib_shared)
+ list(APPEND Libraries ${zlib_shared})
endif ()
if (WIN32)
list(APPEND Libraries ws2_32.lib)
@@ -158,7 +158,7 @@ if (WIN32 AND ${CMAKE_MAJOR_VERSION}.${C
if (USE_STATIC)
list(APPEND Libraries xml_static zlib_static)
else ()
- list(APPEND Libraries xml_shared zlib_shared)
+ list(APPEND Libraries xml_shared ${zlib_shared})
endif ()
if (WIN32)
list(APPEND Libraries ws2_32.lib)
@@ -211,7 +211,4 @@ endif ()
# zlib
if (USE_STATIC)
add_dependencies(DAEValidatorExecutable zlib_static)
-else ()
- add_dependencies(DAEValidatorExecutable zlib_shared)
endif ()
-include_directories("../Externals/zlib/include")
@@ -0,0 +1,13 @@
--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
@@ -12,9 +12,7 @@
#define __COLLADABU_PCRECOMPILEDPATTERN_H__
#include "COLLADABUPrerequisites.h"
-
-struct real_pcre;
-typedef struct real_pcre pcre;
+#include "pcre.h"
namespace COLLADABU
@@ -0,0 +1,11 @@
--- a/DAEValidator/CMakeLists.txt
+++ b/DAEValidator/CMakeLists.txt
@@ -59,7 +59,7 @@ set(DAEValidatorLibrarySources
library/include/XmlSchema.h
library/include/win/dirent.h
)
-add_library(DAEValidatorLibrary ${DAEValidatorLibrarySources})
+add_library(DAEValidatorLibrary STATIC ${DAEValidatorLibrarySources})
include_directories("library/include")
@@ -0,0 +1 @@
/usr/lib/opencollada
+65
View File
@@ -0,0 +1,65 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>OpenCOLLADA</Name>
<Homepage>https://collada.org/mediawiki/index.php/OpenCOLLADA</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>app</IsA>
<Summary>Collada 3D import and export libraries</Summary>
<Description>Collada 3B kütüphaneleri içe ve dışa aktarma</Description>
<Archive sha1sum="228625c1ddb8dc1bdb620d0a6532215effbff018" type="targz">https://github.com/KhronosGroup/OpenCOLLADA/archive/refs/tags/v1.6.68.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
</BuildDependencies>
-->
<Patches>
<Patch level="1">fedora/OpenCOLLADA-pcre.patch</Patch>
</Patches>
</Source>
<Package>
<Name>OpenCOLLADA</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>libpcre</Dependency>
<Dependency>libxml2</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/ld.so.conf.d/opencollada.conf">opencollada.conf</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>OpenCOLLADA-devel</Name>
<Summary>Development files for OpenCOLLADA</Summary>
<RuntimeDependencies>
<Dependency release="current">OpenCOLLADA</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2021-05-11</Date>
<Version>1.6.68</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admin@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>OpenCOLLADA</Name>
<Summary xml:lang="tr">Collada 3D import and export libraries</Summary>
<Description xml:lang="tr">Collada 3B kütüphaneleri içe ve dışa aktarma</Description>
</Source>
</PISI>