[gentoo-commits] gentoo-x86 commit in media-libs/opencollada: ChangeLog opencollada-0_p864-r1.ebuild opencollada-0_p864.ebuild

[gentoo-commits] gentoo-x86 commit in media-libs/opencollada: ChangeLog opencollada-0_p864-r1.ebuild opencollada-0_p864.ebuild

[Sebastian Pipping (sping)]

sping       12/02/11 23:01:23

  Modified:             ChangeLog
  Added:                opencollada-0_p864-r1.ebuild
  Removed:              opencollada-0_p864.ebuild
  Log:
  media-libs/opencollada: Append LDPATH to env.d file
  
  (Portage version: 2.1.10.45/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  media-libs/opencollada/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	27 Jan 2012 16:47:42 -0000	1.2
+++ ChangeLog	11 Feb 2012 23:01:22 -0000	1.3
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/opencollada
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.2 2012/01/27 16:47:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.3 2012/02/11 23:01:22 sping Exp $
+
+*opencollada-0_p864-r1 (11 Feb 2012)
+
+  11 Feb 2012; Sebastian Pipping <sping@gentoo.org> -opencollada-0_p864.ebuild,
+  +opencollada-0_p864-r1.ebuild:
+  Make sure installed libs can be linked against despite their
+  /usr/lib*/opencollada location (thanks to Anthoine Bourgeois!), workaround
+  parallel make issues
 
   27 Jan 2012; Sebastian Pipping <sping@gentoo.org> opencollada-0_p864.ebuild:
   Fix installation on arch x86 (bug #400823)



1.1                  media-libs/opencollada/opencollada-0_p864-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-0_p864-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-0_p864-r1.ebuild?rev=1.1&content-type=text/plain

Index: opencollada-0_p864-r1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-0_p864-r1.ebuild,v 1.1 2012/02/11 23:01:22 sping Exp $

EAPI="3"

inherit eutils multilib cmake-utils

DESCRIPTION="Stream based read/write library for COLLADA files"
HOMEPAGE="http://www.opencollada.org/"
SRC_URI="http://www.hartwork.org/public/${P}.tar.xz"

LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="expat"

RDEPEND="dev-libs/libpcre
	expat? ( dev-libs/expat )
	!expat? ( dev-libs/libxml2 )
	media-libs/lib3ds
	sys-libs/zlib
	dev-libs/zziplib"
DEPEND="${RDEPEND}
	sys-apps/findutils
	sys-apps/sed"

CMAKE_BUILD_DIR="${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=" -DUSE_SHARED=ON -DUSE_STATIC=OFF"

	# Master CMakeLists.txt says "EXPAT support not implemented"
	# Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build
	use expat \
		&& mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \
		|| mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON'
	cmake-utils_src_configure
}

src_compile() {
	MAKEOPTS="${MAKEOPTS} -j1" default  # TODO
}

src_install() {
	cmake-utils_src_install
	if [[ $(get_libdir) != 'lib' ]]; then
		mv "${D}"/usr/{lib,$(get_libdir)} || die
	fi

	dodir /etc/env.d || die
	echo "LDPATH=/usr/$(get_libdir)/opencollada" \
			> "${D}"/etc/env.d/99opencollada || die

	dobin build/bin/OpenCOLLADAValidator || die
}