commit: e8961458ced3f2550e8272124f8a521ed6070a68 Author: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org> AuthorDate: Tue Aug 7 12:19:06 2018 +0000 Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org> CommitDate: Tue Aug 7 12:19:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8961458
media-libs/opencollada: version bump to 1.6.63 Added patch for future libpcre versions. Package-Manager: Portage-2.3.44, Repoman-2.3.10 media-libs/opencollada/Manifest | 1 + .../files/opencollada-1.6.63-pcre-fix.patch | 14 +++++ media-libs/opencollada/opencollada-1.6.63.ebuild | 73 ++++++++++++++++++++++ 3 files changed, 88 insertions(+) diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index 9bf5a7379e3..9fa5fa9dfa6 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,2 +1,3 @@ DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9 DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574 +DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01 diff --git a/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch b/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch new file mode 100644 index 00000000000..2d4077446de --- /dev/null +++ b/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch @@ -0,0 +1,14 @@ +diff -purN a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-07-19 01:10:56.000000000 +0100 ++++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-08-07 12:12:59.209871432 +0100 +@@ -12,9 +12,7 @@ + #define __COLLADABU_PCRECOMPILEDPATTERN_H__ + + #include "COLLADABUPrerequisites.h" +- +-struct real_pcre; +-typedef struct real_pcre pcre; ++#include <pcre.h> + + + namespace COLLADABU diff --git a/media-libs/opencollada/opencollada-1.6.63.ebuild b/media-libs/opencollada/opencollada-1.6.63.ebuild new file mode 100644 index 00000000000..ad9d4681dfa --- /dev/null +++ b/media-libs/opencollada/opencollada-1.6.63.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils flag-o-matic + +DESCRIPTION="Stream based read/write library for COLLADA files" +HOMEPAGE="http://www.opencollada.org/"; +SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="static-libs" + +RDEPEND="dev-libs/libpcre + dev-libs/libxml2 + dev-libs/zziplib + media-libs/lib3ds + sys-libs/zlib +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S="${WORKDIR}/OpenCOLLADA-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-1.6.62-cmake-fixes.patch" + "${FILESDIR}/${P}-pcre-fix.patch" +) + +src_prepare() { + edos2unix CMakeLists.txt + + cmake-utils_src_prepare + + # Remove bundled depends that have portage equivalents + rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die + + # Remove unused build systems + rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die + find "${S}" -name SConscript -delete || die +} + +src_configure() { + # bug 619670 + append-cxxflags -std=c++14 + + local mycmakeargs=( + -DUSE_SHARED=ON + -DUSE_STATIC=$(usex static-libs) + -DUSE_LIBXML=ON + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed" + doenvd "${T}"/99${PN} + + dobin "${BUILD_DIR}/bin/DAEValidator" + dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator" + # Need to be in same directory as above binaries + docinto "/usr/bin" + dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd" + dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd" + dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd" +}
