OpenCollada: use system zlib.

Fixes #4685.
This commit is contained in:
Adrien Destugues
2020-05-24 18:03:01 +02:00
parent 76e9653a6d
commit 85e7c15243
2 changed files with 45 additions and 14 deletions

View File

@@ -5,9 +5,9 @@ otherwise store their assets in incompatible file formats. COLLADA documents \
that describe digital assets are XML files, usually identified with a .dae \
(digital asset exchange) filename extension."
HOMEPAGE="http://www.opencollada.org/"
COPYRIGHT="2013 The Khronos Group Inc."
COPYRIGHT="2013-2018 The Khronos Group Inc."
LICENSE="MIT"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="d9db0c0a518aa6ac0359626f222707c6ca1b63a83cbf229d97a5999c9cde347b"
SOURCE_FILENAME="opencollada-$portVersion.tar.gz"
@@ -28,7 +28,6 @@ PROVIDES="
lib:libOpenCOLLADASaxFrameworkLoader$secondaryArchSuffix = $portVersion
lib:libOpenCOLLADAStreamWriter$secondaryArchSuffix = $portVersion
lib:libUTF$secondaryArchSuffix = $portVersion
lib:libzlib$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -48,7 +47,6 @@ PROVIDES_devel="
devel:libOpenCOLLADASaxFrameworkLoader$secondaryArchSuffix = $portVersion
devel:libOpenCOLLADAStreamWriter$secondaryArchSuffix = $portVersion
devel:libUTF$secondaryArchSuffix = $portVersion
devel:libzlib$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
opencollada$secondaryArchSuffix == $portVersion base
@@ -59,6 +57,7 @@ BUILD_REQUIRES="
devel:libpcre$secondaryArchSuffix
devel:libpcreposix$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
@@ -76,8 +75,7 @@ defineDebugInfoPackage opencollada$secondaryArchSuffix \
$libDir/libOpenCOLLADAFramework.so \
$libDir/libOpenCOLLADASaxFrameworkLoader.so \
$libDir/libOpenCOLLADAStreamWriter.so \
$libDir/libUTF.so \
$libDir/libzlib.so
$libDir/libUTF.so
PATCH()
{
@@ -90,8 +88,7 @@ BUILD()
mkdir -p build
cd build
cmake .. \
-DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" \
-DUSE_SHARED=ON \
-DUSE_SHARED=ON -DUSE_STATIC=OFF\
$cmakeDirArgs
make $jobArgs
@@ -111,8 +108,7 @@ INSTALL()
libOpenCOLLADAFramework \
libOpenCOLLADASaxFrameworkLoader \
libOpenCOLLADAStreamWriter \
libUTF \
libzlib
libUTF
packageEntries devel \
$developDir \