media-libs/opencollada : Added a patch to make this build with gcc-4.7

6 files changed, 139 insertions, 0 deletions

diff --git a/media-libs/opencollada/ChangeLog b/media-libs/opencollada/ChangeLog
new file mode 100644
index 0000000..132ecaa
--- /dev/null
+++ b/media-libs/opencollada/ChangeLog
@@ -0,0 +1,21 @@
+# 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.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)
+
+*opencollada-0_p864 (16 Jan 2012)
+
+  16 Jan 2012; Sebastian Pipping <sping@gentoo.org> +opencollada-0_p864.ebuild,
+  +files/opencollada-0_p864-expat.patch, +metadata.xml:
+  New package required by media-gfx/blender (bug #390431)
+
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
new file mode 100644
index 0000000..589bd81
--- /dev/null
+++ b/media-libs/opencollada/Manifest
@@ -0,0 +1,6 @@
+AUX opencollada-0_p864-expat.patch 353 RMD160 73fc958e3af8cd4f5892bf78b48230aaf0584fd0 SHA1 a86bb3079c08699ad5b0dff14e9d8c2e76792a3d SHA256 e7d7f303921b09db1b92a0299ad464d6185ac1f470e028829443785ed98bf1a2
+AUX opencollada-0_p864-fix-const.patch 818 RMD160 ffcedda98123d7adb6929283262fba0c44bf8d94 SHA1 7edbe3e77faa3a0b45fe85624def5561c6b39b68 SHA256 b510c4f2893ddae805830f9e989eafa28ed0b196c637230e89be15821fb12de5
+DIST opencollada-0_p864.tar.xz 5255868 RMD160 8054b3513dcc1f5d6b40db38f8a581319d01b633 SHA1 bc1406e144273faaded4759f48234d5f45cb267b SHA256 e939fba12d7118378a6166c3799cb51b29e22dbdeda5204407a261fc06c10d05
+EBUILD opencollada-0_p864-r2.ebuild 1925 RMD160 52135b011d8b4e6638bae54682ed00af87a24aba SHA1 44215627cf6c59f13d5bb5a8703f5f131dd58b3a SHA256 2e11dc749ddae64f6ff9ed4bf84f3b418e598c54b5df209d7f21a395725be22b
+MISC ChangeLog 886 RMD160 eaed83468f21982621476ae168ed40746c61b8ae SHA1 d4d7f09021f1e883346d3a0f840e53bbb1588298 SHA256 5e694393f07b7958f2402d5d9a554be926e9a5b4a51635a69283a40955b6c3e4
+MISC metadata.xml 235 RMD160 e964157be48c204555d79827e1bf79c9d9fb23a5 SHA1 767b5eb408113ae55d84adcb94d44a692285d175 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe
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 @@

+ 

+ if (USE_EXPAT)

+ 	add_definitions(-DGENERATEDSAXPARSER_XMLPARSER_EXPAT)

+-	message("FATAL: EXPAT support not implemented")

+-	# TODO:: use externals

++	set(LIBEXPAT_LIBRARIES expat)

+ endif ()

+ 

+ #adding PCRE

diff --git a/media-libs/opencollada/files/opencollada-0_p864-fix-const.patch b/media-libs/opencollada/files/opencollada-0_p864-fix-const.patch
new file mode 100644
index 0000000..2126be5
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-0_p864-fix-const.patch
@@ -0,0 +1,22 @@
+--- COLLADAStreamWriter/COLLADASWAnnotation.h  (revision 44412)
++++ COLLADAStreamWriter/COLLADASWAnnotation.h  (working copy)
+@@ -219,7 +219,7 @@
+         void add ( 
+             const String &name, 
+             const ValueType::ColladaType &type, 
+-            const T val ) const
++            const T val )
+         {
+             openAnnotation ( name );
+             openValuesElement ( type );
+--- COLLADAStreamWriter/COLLADASWParamTemplate.h       (revision 44412)
++++ COLLADAStreamWriter/COLLADASWParamTemplate.h       (working copy)
+@@ -93,7 +93,7 @@
+     private:
+ 
+         /** Returns the modifier as string. */
+-        String& getModifierString ( const Modifier& modifier )
++        const String& getModifierString ( const Modifier& modifier )
+         {
+             switch ( modifier )
+             {
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/opencollada/opencollada-0_p864-r2.ebuild b/media-libs/opencollada/opencollada-0_p864-r2.ebuild
new file mode 100644
index 0000000..ba31868
--- /dev/null
+++ b/media-libs/opencollada/opencollada-0_p864-r2.ebuild
@@ -0,0 +1,70 @@
+# 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
+	epatch "${FILESDIR}"/${P}-fix-const.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
+}