diff options
| -rw-r--r-- | media-libs/opencollada/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch | 119 | ||||
| -rw-r--r-- | media-libs/opencollada/opencollada-9999.ebuild | 21 |
3 files changed, 3 insertions, 140 deletions
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index 6fc1e11..b8a5aeb 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,2 +1 @@ -AUX opencollada-9999-gcc-fixes.patch 6978 RMD160 5acaa7807a7640b3c87a1a9b06844c6c4fb6ddaf SHA1 79c84b97f32e4216a2310486fcfafd2eae6c2ab1 SHA256 3cbaffc7da784073f720a2eed699ba036cc618584562b828d7fb22e5a2a9468d -EBUILD opencollada-9999.ebuild 1660 RMD160 4adbf3cfeab49b95bd0520233176d0057d47d6f6 SHA1 66ff160b5ef91e931a995091284f54099806c96d SHA256 02dc190a9bb7f66c99191d3cf0f46eb647b783a27a00aae51ec7c6a217b8daef +EBUILD opencollada-9999.ebuild 583 RMD160 fb356c38e2ab31f53fb93e4fc3128007e4f4afa9 SHA1 e6aefd54134bcfcb1eb32a6e00e4a0978d14ae48 SHA256 b43152cfb051dd86e906a8a30e355e42a0059b9461de920044cc507c29cc8206 diff --git a/media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch b/media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch deleted file mode 100644 index a661c26..0000000 --- a/media-libs/opencollada/files/opencollada-9999-gcc-fixes.patch +++ /dev/null @@ -1,119 +0,0 @@ -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 <cstdlib>
-+
- #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 <cstdlib>
-+#include <cstdio>
-+#include <cerrno>
-+
- #include "CommonIBufferFlusher.h"
-
- #if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) || (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__))
--# include <unordered_map> -+# include <unordered_map>
- #else
--# include <tr1/unordered_map> -+# include <tr1/unordered_map>
- #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 <cstdlib>
-+
- 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 832db0b..cbfcc9b 100644 --- a/media-libs/opencollada/opencollada-9999.ebuild +++ b/media-libs/opencollada/opencollada-9999.ebuild @@ -2,9 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils -inherit cmake-utils -inherit subversion +inherit eutils cmake-utils subversion DESCRIPTION="OpenCOLLADA is a stream based reader and writer library for COLLADA files" HOMEPAGE="http://www.opencollada.org/" @@ -12,7 +10,6 @@ LICENSE="MIT" ESVN_REPO_URI="http://opencollada.googlecode.com/svn/trunk" ESVN_PROJECT="opencollada-trunk" -#ESVN_PATCHES="${FILESDIR}/opencollada-9999-gcc-fixes.patch" SLOT="0" KEYWORDS="~amd64" @@ -21,20 +18,6 @@ DEPEND=">=dev-libs/libxml2-2.7.8-r1" RDEPEND="${DEPEND}" src_install() { + cmake-utils_src_install dobin ${CMAKE_BUILD_DIR}/bin/OpenCOLLADAValidator - dolib ${CMAKE_BUILD_DIR}/lib/libOpenCOLLADABaseUtils.a - dolib ${CMAKE_BUILD_DIR}/lib/libOpenCOLLADAFramework.a - dolib ${CMAKE_BUILD_DIR}/lib/libOpenCOLLADASaxFrameworkLoader.a - dolib ${CMAKE_BUILD_DIR}/lib/libOpenCOLLADAStreamWriter.a - - 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/ } |