From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RmYfA-0007vT-6G for garchives@archives.gentoo.org; Sun, 15 Jan 2012 22:34:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B05FE0686; Sun, 15 Jan 2012 22:34:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D0405E0686 for ; Sun, 15 Jan 2012 22:34:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C85A1B4009 for ; Sun, 15 Jan 2012 22:34:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0D17C80042 for ; Sun, 15 Jan 2012 22:34:46 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: Subject: [gentoo-commits] proj/betagarden:master commit in: media-libs/opencollada/files/, media-libs/opencollada/ X-VCS-Repository: proj/betagarden X-VCS-Files: media-libs/opencollada/files/opencollada-0_p864-expat.patch media-libs/opencollada/metadata.xml media-libs/opencollada/opencollada-0_p864.ebuild X-VCS-Directories: media-libs/opencollada/files/ media-libs/opencollada/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: bd3a6121e14a610591b62f1465c9c8fde6856509 Date: Sun, 15 Jan 2012 22:34:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1519c6a9-731c-4ac0-8bb0-34b784bbc61c X-Archives-Hash: b02ef3a1004850fae32d9183539fae14 commit: bd3a6121e14a610591b62f1465c9c8fde6856509 Author: Sebastian Pipping pipping org> AuthorDate: Sun Jan 15 22:32:13 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Jan 15 22:33:15 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi= t;a=3Dcommit;h=3Dbd3a6121 media-libs/opencollada: 0_p864 --- .../files/opencollada-0_p864-expat.patch | 12 ++++ media-libs/opencollada/metadata.xml | 8 +++ media-libs/opencollada/opencollada-0_p864.ebuild | 59 ++++++++++++++= ++++++ 3 files changed, 79 insertions(+), 0 deletions(-) diff --git a/media-libs/opencollada/files/opencollada-0_p864-expat.patch = b/media-libs/opencollada/files/opencollada-0_p864-expat.patch new file mode 100644 index 0000000..9086acf --- /dev/null +++ b/media-libs/opencollada/files/opencollada-0_p864-expat.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt 2012-01-15 23:14:49.478520648 +0100 ++++ b/CMakeLists.txt 2012-01-15 23:15:06.947302261 +0100 +@@ -208,8 +208,7 @@ +=20 + if (USE_EXPAT) + add_definitions(-DGENERATEDSAXPARSER_XMLPARSER_EXPAT) +- message("FATAL: EXPAT support not implemented") +- # TODO:: use externals ++ set(LIBEXPAT_LIBRARIES expat) + endif () +=20 + #adding PCRE diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada= /metadata.xml new file mode 100644 index 0000000..16bcc9f --- /dev/null +++ b/media-libs/opencollada/metadata.xml @@ -0,0 +1,8 @@ + + + + + sping@gentoo.org + Sebastian Pipping + + diff --git a/media-libs/opencollada/opencollada-0_p864.ebuild b/media-lib= s/opencollada/opencollada-0_p864.ebuild new file mode 100644 index 0000000..6041ff3 --- /dev/null +++ b/media-libs/opencollada/opencollada-0_p864.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D"3" + +inherit eutils multilib cmake-utils + +DESCRIPTION=3D"Stream based read/write library for COLLADA files" +HOMEPAGE=3D"http://www.opencollada.org/" +SRC_URI=3D"http://www.hartwork.org/public/${P}.tar.xz" + +LICENSE=3D"MIT" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"expat" + +RDEPEND=3D"dev-libs/libpcre + expat? ( dev-libs/expat ) + !expat? ( dev-libs/libxml2 ) + media-libs/lib3ds + sys-libs/zlib + dev-libs/zziplib" +DEPEND=3D"${RDEPEND} + sys-apps/findutils + sys-apps/sed" + +CMAKE_BUILD_DIR=3D"${S}"/build + +src_prepare() { + # Remove some bundled dependencies + edos2unix CMakeLists.txt || die + epatch "${FILESDIR}"/${P}-expat.patch + rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die + ewarn "$(echo "Remaining bundled dependencies:"; + find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')" + + # Remove unused build systems + rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die + find "${S}" -name SConscript -delete || die +} + +src_configure() { + local mycmakeargs=3D" -DUSE_SHARED=3DON -DUSE_STATIC=3DOFF" + + # Master CMakeLists.txt says "EXPAT support not implemented" + # Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it = build + use expat \ + && mycmakeargs+=3D' -DUSE_EXPAT=3DON -DUSE_LIBXML=3DOFF' \ + || mycmakeargs+=3D' -DUSE_EXPAT=3DOFF -DUSE_LIBXML=3DON' + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + mv "${D}"/usr/{lib,$(get_libdir)} || die + + dobin build/bin/OpenCOLLADAValidator || die +}