From 2929788def9a92c1eb237eed93fbdb0c02838bbf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:11:03 +0100 Subject: Revert "gentoo resync : 13.10.2019" This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030. --- media-libs/opencollada/Manifest | 2 +- .../opencollada/opencollada-1.6.63-r1.ebuild | 72 --------------------- media-libs/opencollada/opencollada-1.6.63.ebuild | 73 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 73 deletions(-) delete mode 100644 media-libs/opencollada/opencollada-1.6.63-r1.ebuild create mode 100644 media-libs/opencollada/opencollada-1.6.63.ebuild (limited to 'media-libs/opencollada') diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index ed13b25156aa..44e699b2cc5e 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -3,5 +3,5 @@ AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6f DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01 EBUILD opencollada-1.6.62.ebuild 1628 BLAKE2B a29e1f0236cc8f4abc7a486b03b6e67e04e07022ea14e93e39b8835fe40da5d8b75c683264beb8b96158b114bcf33ee7ec9ee216f74e1cbed38e4e5325c4639c SHA512 0cb788227b1eb0581239463b7ce3af50c5bb4928a8377ae2bdeb37065535da5096fa35df67a3fda9f06e48d14ef232920dcdd22a758ed2cd4a7938372f036fae -EBUILD opencollada-1.6.63-r1.ebuild 1635 BLAKE2B ff873765d294e722e5cce7752433f4f4dea1cb9eb637d9e43d7ca743bfa35ffb8aa46305fc085c5e560674b5f28cd277961a5739af416bb1a6aa70fa32e27268 SHA512 b6ce66e702225926b49c02bf287629235bd28cab42107cee59a8d767f545e0e5ff391c55951521f627b3eb700ef05ba7caf83dbb39f2fe25039238648026a033 +EBUILD opencollada-1.6.63.ebuild 1657 BLAKE2B a35b086ac9651e4360df3913b31aa8ff41ba7cdbabe325c1d712c561e93002b03989c6cd5c84d7f2bf0c9b227ede1313daa8da04485f44e97f6c92abed7cc040 SHA512 6719a2a2fcedd078474304a0aa357c6d09aa090a6ca50764e5b954c1b4afdae6262fc913d544020d7836d1cc03f2fac0690a5e108d6c21166070c2438cc28a1c MISC metadata.xml 256 BLAKE2B 9e83a301f9fadaeea1559fbf7774e1d353df51a19661d95134705312a6f1465807f815f733b0ba72a6e891a551891fefc05de9a37f9c8cb2c2236e6e475962c5 SHA512 4ffbc8e0ad4a1456f33e5b568166f3e6285ffd42218fbc0d9f8f04c319a341c367aec0b92a1074029cd11ededf0c110a22f3358a47e2cdce5946a6d42c82fc30 diff --git a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild b/media-libs/opencollada/opencollada-1.6.63-r1.ebuild deleted file mode 100644 index f83d0770c2fd..000000000000 --- a/media-libs/opencollada/opencollada-1.6.63-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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 - 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" -} 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 000000000000..ad9d4681dfa8 --- /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" +} -- cgit v1.2.3