From ddf490f355f4829a01ff9d57ed2465813d4de0b3 Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Sun, 2 Oct 2011 22:47:01 +0200 Subject: fixed opencollada --- media-libs/opencollada/Manifest | 3 +- .../files/opencollada-9999-gcc-fixes.patch | 119 +++++++++++++++++++++ media-libs/opencollada/opencollada-9999.ebuild | 34 +++--- 3 files changed, 141 insertions(+), 15 deletions(-) create mode 100644 media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch (limited to 'media-libs') diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index 4e69392..b7e93d5 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,2 +1,3 @@ +AUX opencollada-9999-gcc-fixes.patch 6978 RMD160 5acaa7807a7640b3c87a1a9b06844c6c4fb6ddaf SHA1 79c84b97f32e4216a2310486fcfafd2eae6c2ab1 SHA256 3cbaffc7da784073f720a2eed699ba036cc618584562b828d7fb22e5a2a9468d AUX opencollada-r736-expat-and-include-fixes.patch 1622 RMD160 121524c0cc9c376bef119a871fdd1b9ce3b2889d SHA1 51f1bf309f296960f95ad81bf897e82180535244 SHA256 49e5897338ebdb15757eadd7f7448b662a115204ee99327a1d2b5b969eeb409e -EBUILD opencollada-9999.ebuild 817 RMD160 5498e42844d50f7b33ddd3cf3986018364f30bba SHA1 9fff10dbae1c002cbd308f1b247c07ce56262a3b SHA256 a91dd588b2770ad37280dfff7ab9c40f401e25bcc5d9b6e4c92f870af281237a +EBUILD opencollada-9999.ebuild 1649 RMD160 95b4c75a62f82daca8b1bc7b241ab27cd77cf882 SHA1 db9c39ac5751c706c6d087ace3cac1cd269decee SHA256 4bd6a57df22218708e294ab5b09e3acd2ce00b61343cf273a982854a1878ee5a diff --git a/media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch b/media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch new file mode 100644 index 0000000..a661c26 --- /dev/null +++ b/media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch @@ -0,0 +1,119 @@ +diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//CMakeLists.txt opencollada-9999//CMakeLists.txt +--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//CMakeLists.txt 2011-10-02 21:52:37.516882396 +0200 ++++ opencollada-9999//CMakeLists.txt 2011-10-02 21:42:47.785882579 +0200 +@@ -14,6 +14,7 @@ + + IF (NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") ++ add_definitions("-D_wfopen=fopen" "-D_ftelli64=ftell" "-D_fseeki64=fseek" "-D__int64=int64_t") + ENDIF (NOT WIN32) + + OPTION(USE_STATIC "Build static libraries" ON) +@@ -66,10 +67,10 @@ + ENDIF (PCRE_FOUND) + + #building required libs +-ADD_SUBDIRECTORY(common/libftoa) +-ADD_SUBDIRECTORY(common/libBuffer) + ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/UTF) + ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/MathMLSolver) ++ADD_SUBDIRECTORY(common/libftoa) ++ADD_SUBDIRECTORY(common/libBuffer) + + #building OpenCOLLADA libs + ADD_SUBDIRECTORY(COLLADABaseUtils) +diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h +--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h 2011-10-02 21:52:37.519882396 +0200 ++++ opencollada-9999//COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h 2011-10-02 21:47:39.706882488 +0200 +@@ -13,7 +13,6 @@ + + #include "COLLADABUMathVector3.h" + #include "COLLADABUMathMatrix3.h" +-#include "COLLADABUMathUtils.h" + + namespace COLLADABU + { +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//bin/OpenCOLLADAValidator and opencollada-9999//bin/OpenCOLLADAValidator differ +diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/CMakeLists.txt opencollada-9999//common/libBuffer/CMakeLists.txt +--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/CMakeLists.txt 2011-10-02 21:52:38.039882396 +0200 ++++ opencollada-9999//common/libBuffer/CMakeLists.txt 2011-10-02 21:42:17.274882588 +0200 +@@ -20,7 +20,7 @@ + + SET(libBuffer_libs ftoa) + +-INCLUDE_DIRECTORIES(${libBuffer_include_dirs} ${libftoa_include_dirs}) ++INCLUDE_DIRECTORIES(${libBuffer_include_dirs} ${libUTF_include_dirs} ${libftoa_include_dirs}) + LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}) + + IF (USE_STATIC) +diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonBuffer.h opencollada-9999//common/libBuffer/include/CommonBuffer.h +--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonBuffer.h 2011-10-02 21:52:38.039882396 +0200 ++++ opencollada-9999//common/libBuffer/include/CommonBuffer.h 2011-10-02 21:39:59.802882631 +0200 +@@ -11,6 +11,8 @@ + #ifndef __COMMON_BUFFER_H__ + #define __COMMON_BUFFER_H__ + ++#include ++ + #include "CommonIBufferFlusher.h" + + namespace Common +diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h +--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h 2011-10-02 21:52:38.040882396 +0200 ++++ opencollada-9999//common/libBuffer/include/CommonFWriteBufferFlusher.h 2011-10-02 21:44:54.924882539 +0200 +@@ -11,12 +11,16 @@ + #ifndef __COMMON_FWRITEBUFFERFLUSHER_H__ + #define __COMMON_FWRITEBUFFERFLUSHER_H__ + ++#include ++#include ++#include ++ + #include "CommonIBufferFlusher.h" + + #if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) || (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)) +-# include ++# include + #else +-# include ++# include + #endif + + +diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h +--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h 2011-10-02 21:52:38.040882396 +0200 ++++ opencollada-9999//common/libBuffer/include/CommonIBufferFlusher.h 2011-10-02 21:43:28.628882566 +0200 +@@ -11,6 +11,8 @@ + #ifndef __COMMON_IBUFFERFLUSHER_H__ + #define __COMMON_IBUFFERFLUSHER_H__ + ++#include ++ + namespace Common + { + /** Derived classes of this interface are used by Buffer.*/ +diff -urN /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp +--- /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2011-10-02 21:52:38.041882396 +0200 ++++ opencollada-9999//common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2011-10-02 21:47:05.885882499 +0200 +@@ -35,12 +35,6 @@ + FWriteBufferFlusher::FWriteBufferFlusher( const wchar_t* fileName, size_t bufferSize, const wchar_t* mode/*=L"wb"*/ ) + : mBufferSize(bufferSize) + , mBuffer( new char[bufferSize] ) +-#ifdef _WIN32 +- , mError( (int)_wfopen_s( &mStream, fileName, mode ) ) +-#else +- , mStream(_wfopen( fileName, mode )) +- , mError( mStream ? 0 : errno ) +-#endif + , mLastMarkId(END_OF_STREAM) + , mMarkIds() + { +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libGeneratedSaxParser.a and opencollada-9999//lib/libGeneratedSaxParser.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libMathMLSolver.a and opencollada-9999//lib/libMathMLSolver.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADABaseUtils.a and opencollada-9999//lib/libOpenCOLLADABaseUtils.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADAFramework.a and opencollada-9999//lib/libOpenCOLLADAFramework.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADASaxFrameworkLoader.a and opencollada-9999//lib/libOpenCOLLADASaxFrameworkLoader.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libOpenCOLLADAStreamWriter.a and opencollada-9999//lib/libOpenCOLLADAStreamWriter.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libUTF.a and opencollada-9999//lib/libUTF.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libbuffer.a and opencollada-9999//lib/libbuffer.a differ +Binary files /var/tmp/portage/media-libs/opencollada-9999/work/opencollada-9999//lib/libftoa.a and opencollada-9999//lib/libftoa.a differ diff --git a/media-libs/opencollada/opencollada-9999.ebuild b/media-libs/opencollada/opencollada-9999.ebuild index 0573425..71629d4 100644 --- a/media-libs/opencollada/opencollada-9999.ebuild +++ b/media-libs/opencollada/opencollada-9999.ebuild @@ -3,6 +3,7 @@ # $Header: $ inherit eutils +inherit cmake-utils inherit subversion DESCRIPTION="OpenCOLLADA is a stream based reader and writer library for COLLADA files" @@ -11,24 +12,29 @@ LICENSE="MIT" ESVN_REPO_URI="http://opencollada.googlecode.com/svn/trunk" ESVN_PROJECT="opencollada-trunk" -ESVN_PATCHES="${FILESDIR}/opencollada-r736-expat-and-include-fixes.patch" +ESVN_PATCHES="${FILESDIR}/opencollada-9999-gcc-fixes.patch" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64" IUSE="" -DEPEND="" +DEPEND=">=dev-libs/libxml2-2.7.8-r1" RDEPEND="${DEPEND}" -src_compile() { - # call configure for bundled expat to generate a missing header file - cd $S/Externals/expat - sh configure +src_install() { + dobin ${CMAKE_USE_DIR}/bin/OpenCOLLADAValidator + dolib ${CMAKE_USE_DIR}/lib/libOpenCOLLADABaseUtils.a + dolib ${CMAKE_USE_DIR}/lib/libOpenCOLLADAFramework.a + dolib ${CMAKE_USE_DIR}/lib/libOpenCOLLADASaxFrameworkLoader.a + dolib ${CMAKE_USE_DIR}/lib/libOpenCOLLADAStreamWriter.a - cd $S - scons RELEASE=1 XMLPARSER=expat PCRENATIVE=0 || die "emake failed" + insinto /usr/include/OpenCOLLADA/COLLADABaseUtils + cp -r ${CMAKE_USE_DIR}/COLLADABaseUtils/include/* ${D}/usr/include/OpenCOLLADA/COLLADABaseUtils/ + insinto /usr/include/OpenCOLLADA/COLLADAFramework + cp -r ${CMAKE_USE_DIR}/COLLADAFramework/include/* ${D}/usr/include/OpenCOLLADA/COLLADAFramework/ + insinto /usr/include/OpenCOLLADA/COLLADAStreamWriter + cp -r ${CMAKE_USE_DIR}/COLLADAStreamWriter/include/* ${D}/usr/include/OpenCOLLADA/COLLADAStreamWriter/ + insinto /usr/include/OpenCOLLADA/GeneratedSaxParser + cp -r ${CMAKE_USE_DIR}/GeneratedSaxParser/include/* ${D}/usr/include/OpenCOLLADA/GeneratedSaxParser/ + insinto /usr/include/OpenCOLLADA/COLLADASaxFrameworkLoader + cp -r ${CMAKE_USE_DIR}/COLLADASaxFrameworkLoader/include/* ${D}/usr/include/OpenCOLLADA/COLLADASaxFrameworkLoader/ } - -#src_install() { - #dodir /usr/include/opencollada/ - #dodir /usr/lib/opencollada/ -#} -- cgit v1.2.3-65-gdbad