diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2012-09-10 12:55:10 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2012-09-10 12:55:10 +0000 |
| commit | e2de930e26f1879efdb4b7b4b85e4c03f367bc7a (patch) | |
| tree | 21092e20cc3a72a76e890cb95a006359388bcf26 /media-libs/opencollada | |
| parent | version bump, drop old (diff) | |
| download | gentoo-2-e2de930e26f1879efdb4b7b4b85e4c03f367bc7a.tar.gz gentoo-2-e2de930e26f1879efdb4b7b4b85e4c03f367bc7a.tar.bz2 gentoo-2-e2de930e26f1879efdb4b7b4b85e4c03f367bc7a.zip | |
media-libs/opencollada: Fix compilation (bug #428016)
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/opencollada')
4 files changed, 55 insertions, 3 deletions
diff --git a/media-libs/opencollada/ChangeLog b/media-libs/opencollada/ChangeLog index 132ecaaa3b38..fda9e2f0f70f 100644 --- a/media-libs/opencollada/ChangeLog +++ b/media-libs/opencollada/ChangeLog @@ -1,6 +1,11 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.4 2012/09/10 12:55:10 sping Exp $ + + 10 Sep 2012; Sebastian Pipping <sping@gentoo.org> + opencollada-0_p864-r1.ebuild, +files/opencollada-0_p864-gcc-4.7.patch, + +files/opencollada-0_p864-parallel.patch: + Fix compilation, many thanks for the patches to Jimmy Jazz (bug #428016) *opencollada-0_p864-r1 (11 Feb 2012) diff --git a/media-libs/opencollada/files/opencollada-0_p864-gcc-4.7.patch b/media-libs/opencollada/files/opencollada-0_p864-gcc-4.7.patch new file mode 100644 index 000000000000..fd908e55943a --- /dev/null +++ b/media-libs/opencollada/files/opencollada-0_p864-gcc-4.7.patch @@ -0,0 +1,26 @@ +--- common//libBuffer/include/CommonBuffer.h.ori 2012-04-28 15:45:37.621142222 +0200 ++++ common//libBuffer/include/CommonBuffer.h 2012-04-28 15:45:28.740797826 +0200 +@@ -11,6 +11,12 @@ + #ifndef __COMMON_BUFFER_H__
+ #define __COMMON_BUFFER_H__
+
++/* size_t for gcc, may want to move this include some place else - campbell */
++#ifdef __GNUC__
++# include <cstdlib> /* size_t */
++# include <cstring> /* memcpy */
++#endif
++
+ #include "CommonIBufferFlusher.h"
+
+ namespace Common
+--- COLLADAStreamWriter/include/COLLADASWAnnotation.h 2012-01-15 04:37:13.000000000 +0100 ++++ COLLADAStreamWriter/include/COLLADASWAnnotation.h 2012-03-14 22:17:51.000000000 +0100 +@@ -219,7 +219,7 @@ + void add (
+ const String &name,
+ const ValueType::ColladaType &type,
+- const T val ) const
++ const T val )
+ {
+ openAnnotation ( name );
+ openValuesElement ( type );
diff --git a/media-libs/opencollada/files/opencollada-0_p864-parallel.patch b/media-libs/opencollada/files/opencollada-0_p864-parallel.patch new file mode 100644 index 000000000000..cac6ee285e40 --- /dev/null +++ b/media-libs/opencollada/files/opencollada-0_p864-parallel.patch @@ -0,0 +1,18 @@ +diff -Naur openCOLLADA-svn864.orig/COLLADASaxFrameworkLoader/CMakeLists.txt openCOLLADA-svn864/COLLADASaxFrameworkLoader/CMakeLists.txt +--- openCOLLADA-svn864.orig/COLLADASaxFrameworkLoader/CMakeLists.txt 2011-10-13 18:54:06.000000000 -0500 ++++ openCOLLADA-svn864/COLLADASaxFrameworkLoader/CMakeLists.txt 2012-01-17 16:11:35.825610565 -0600 +@@ -260,6 +260,14 @@ + ${PCRE_LIBRARIES}
+ )
+
++# For parallel building.
++if(USE_SHARED)
++ add_dependencies(GeneratedSaxParser_shared OpenCOLLADABaseUtils_shared)
++endif()
++if(USE_STATIC)
++ add_dependencies(GeneratedSaxParser_static OpenCOLLADABaseUtils_static)
++endif()
++
+ if (USE_LIBXML)
+ list(APPEND libGeneratedSaxParser_include_dirs ${LIBXML2_INCLUDE_DIR})
+ list(APPEND TARGET_LIBS ${LIBXML2_LIBRARIES})
diff --git a/media-libs/opencollada/opencollada-0_p864-r1.ebuild b/media-libs/opencollada/opencollada-0_p864-r1.ebuild index f50de8bc3daa..a464f4d91606 100644 --- a/media-libs/opencollada/opencollada-0_p864-r1.ebuild +++ b/media-libs/opencollada/opencollada-0_p864-r1.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-0_p864-r1.ebuild,v 1.2 2012/09/10 12:55:10 sping Exp $ EAPI="3" @@ -38,6 +38,9 @@ src_prepare() { # Remove unused build systems rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die find "${S}" -name SConscript -delete || die + + epatch "${FILESDIR}"/${P}-gcc-4.7.patch + epatch "${FILESDIR}"/${P}-parallel.patch # still not fully done } src_configure() { @@ -52,7 +55,7 @@ src_configure() { } src_compile() { - MAKEOPTS="${MAKEOPTS} -j1" default # TODO + MAKEOPTS="${MAKEOPTS} -j1" cmake-utils_src_compile # TODO } src_install() { |