From 8763943933bfff52b9c9a6918aa7da74936ca158 Mon Sep 17 00:00:00 2001 From: Jonathan Scruggs Date: Fri, 15 Jul 2016 14:20:14 +0100 Subject: media-libs/opencollada: version bump to 1.6.25. Closes: https://github.com/gentoo/gentoo/pull/1890 Signed-off-by: Patrice Clement --- media-libs/opencollada/Manifest | 2 +- media-libs/opencollada/opencollada-1.6.23.ebuild | 79 ------------------------ media-libs/opencollada/opencollada-1.6.25.ebuild | 75 ++++++++++++++++++++++ 3 files changed, 76 insertions(+), 80 deletions(-) delete mode 100644 media-libs/opencollada/opencollada-1.6.23.ebuild create mode 100644 media-libs/opencollada/opencollada-1.6.25.ebuild (limited to 'media-libs') diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index e4a9b10dbf81..23cfa80e7a6c 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,3 +1,3 @@ DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98 DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead -DIST opencollada-1.6.23.tar.gz 11816731 SHA256 ca242cbf4f25931df95c5a5d7f0af17452d72c73783e74c5735118e37bb093ce SHA512 6296f44a33bf80f23789276977119b37fbdc32e8fad583d1d80902311ad6f37982e5e04a527ac84ac61650bf300354bd61195bbf26f8e05b6981d47ef82e3b10 WHIRLPOOL 1f133a5513b3a1c78e78ef29ba997094867481507c1409e38190ea541375979eaabc8ffc2091880fd359695f0b11869257064db26ce5b90b284134d7325ca47b +DIST opencollada-1.6.25.tar.gz 11817949 SHA256 9cea5c85164758b01ac0d5c37ea10373a0d1fc7eba1e5d9dea9ba4af8aa6dca9 SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e WHIRLPOOL e074a66424e66b98476d40f7c525a4e05e0e5537efc7c695f0e1b9099a51bd8d4645ce7a2ceae646607c7399446f22098a93dbc0bcf8c49013a49940f5737d87 diff --git a/media-libs/opencollada/opencollada-1.6.23.ebuild b/media-libs/opencollada/opencollada-1.6.23.ebuild deleted file mode 100644 index 028f63147757..000000000000 --- a/media-libs/opencollada/opencollada-1.6.23.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit eutils cmake-utils - -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="expat static-libs" - -# This is still needed to have so version numbers -MY_SOVERSION="1.6" - -RDEPEND="dev-libs/libpcre - dev-libs/zziplib - media-libs/lib3ds - sys-libs/zlib - expat? ( dev-libs/expat ) - !expat? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}"/OpenCOLLADA-${PV} -# This is needed or you get an error on install -BUILD_DIR="${S}"/build - -PATCHES=( - "${FILESDIR}"/${PN}-0_p864-expat.patch - "${FILESDIR}"/${PN}-1.2.2-soversion.patch - "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch - "${FILESDIR}"/${PN}-1.2.2-libdir.patch -) - -src_prepare() { - edos2unix CMakeLists.txt - - default - - # Remove bundled depends that have portage equivalents - rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die - - # Remove unused build systems - rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die - find "${S}" -name SConscript -delete || die - - # Fix insecure RUNPATHS vulnerability - sed '/link_directories/i SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)' \ - -i COLLADAValidator/CMakeLists.txt || die "sed failed" -} - -src_configure() { - local mycmakeargs=( - -DUSE_SHARED=ON - -DUSE_STATIC=$(usex static-libs ON OFF) - -DUSE_EXPAT=$(usex expat ON OFF) - -DUSE_LIBXML=$(usex !expat ON OFF) - -Dsoversion=${MY_SOVERSION} - ) - - 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/bin/OpenCOLLADAValidator -} diff --git a/media-libs/opencollada/opencollada-1.6.25.ebuild b/media-libs/opencollada/opencollada-1.6.25.ebuild new file mode 100644 index 000000000000..2978d51245b0 --- /dev/null +++ b/media-libs/opencollada/opencollada-1.6.25.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils cmake-utils + +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="expat static-libs" + +# This is still needed to have so version numbers +MY_SOVERSION="1.6" + +RDEPEND="dev-libs/libpcre + dev-libs/zziplib + media-libs/lib3ds + sys-libs/zlib + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}"/OpenCOLLADA-${PV} +# This is needed or you get an error on install +BUILD_DIR="${S}"/build + +PATCHES=( + "${FILESDIR}"/${PN}-0_p864-expat.patch + "${FILESDIR}"/${PN}-1.2.2-soversion.patch + "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch + "${FILESDIR}"/${PN}-1.2.2-libdir.patch +) + +src_prepare() { + edos2unix CMakeLists.txt + + default + + # Remove bundled depends that have portage equivalents + rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die + + # Remove unused build systems + rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die + find "${S}" -name SConscript -delete || die +} + +src_configure() { + local mycmakeargs=( + -DUSE_SHARED=ON + -DUSE_STATIC=$(usex static-libs ON OFF) + -DUSE_EXPAT=$(usex expat ON OFF) + -DUSE_LIBXML=$(usex !expat ON OFF) + -Dsoversion=${MY_SOVERSION} + ) + + 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/bin/OpenCOLLADAValidator +} -- cgit v1.2.3