From 85e7c15243041c2b0d9ea54be4bffb8393a140a1 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 24 May 2020 18:03:01 +0200
Subject: [PATCH] OpenCollada: use system zlib.

Fixes #4685.
---
 .../opencollada/opencollada-1.6.68.recipe     | 16 +++----
 .../patches/opencollada-1.6.68.patchset       | 43 +++++++++++++++++--
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/media-libs/opencollada/opencollada-1.6.68.recipe b/media-libs/opencollada/opencollada-1.6.68.recipe
index f12f006d8..61a0896c3 100644
--- a/media-libs/opencollada/opencollada-1.6.68.recipe
+++ b/media-libs/opencollada/opencollada-1.6.68.recipe
@@ -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 \
diff --git a/media-libs/opencollada/patches/opencollada-1.6.68.patchset b/media-libs/opencollada/patches/opencollada-1.6.68.patchset
index f7fb28f7a..27b286fef 100644
--- a/media-libs/opencollada/patches/opencollada-1.6.68.patchset
+++ b/media-libs/opencollada/patches/opencollada-1.6.68.patchset
@@ -1,4 +1,4 @@
-From 69a140c63022d89c0a0e04e35626635a3a802be4 Mon Sep 17 00:00:00 2001
+From e089c6a1f00069afd4558c7cd4770e2fe8851397 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Fri, 8 Dec 2017 18:14:31 +0100
 Subject: Build fix
@@ -84,10 +84,10 @@ index 97480a1..2c1d2cb 100644
  #else
  				bool success = (fseeko64(mStream, pos, SEEK_SET) == 0);
 -- 
-2.16.4
+2.26.0
 
 
-From e3ac6f3a6f7f85ba014a3a74bab074a316e65f52 Mon Sep 17 00:00:00 2001
+From 76c60950a01f5cd066393bd7b35d1f247e8661ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sat, 4 Aug 2018 23:24:44 +0200
 Subject: PCRE build fix
@@ -108,5 +108,40 @@ index 22f2598..f20e6cf 100644
  
  namespace COLLADABU
 -- 
-2.16.4
+2.26.0
+
+
+From f3ab6573b97c924e9205df3015a6d7b935497e64 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 24 May 2020 17:18:19 +0200
+Subject: Use system zlib.
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95abbe2..ab5c934 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -274,7 +274,6 @@ add_subdirectory(common/libftoa)
+ add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+ add_subdirectory(common/libBuffer)
+ add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
+ 
+ # building OpenCOLLADA libs
+ add_subdirectory(COLLADABaseUtils)
+diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt
+index 03ad540..b43a5d3 100644
+--- 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 z)
+     endif ()
+ if (WIN32)
+ 	list(APPEND Libraries ws2_32.lib)
+-- 
+2.26.0