From 6ebc31d804d2d70d8f78d25714c853f6ac6d232d Mon Sep 17 00:00:00 2001 From: Simon Haegler Date: Thu, 13 Oct 2011 14:15:55 +0200 Subject: updated opencollada live ebuild. thanks to ideasman42 for improving the cmake scripts for better out-of-source builds. --- media-libs/opencollada/Manifest | 3 +-- media-libs/opencollada/opencollada-9999.ebuild | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index b7e93d5..6fc1e11 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -1,3 +1,2 @@ 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 1649 RMD160 95b4c75a62f82daca8b1bc7b241ab27cd77cf882 SHA1 db9c39ac5751c706c6d087ace3cac1cd269decee SHA256 4bd6a57df22218708e294ab5b09e3acd2ce00b61343cf273a982854a1878ee5a +EBUILD opencollada-9999.ebuild 1660 RMD160 4adbf3cfeab49b95bd0520233176d0057d47d6f6 SHA1 66ff160b5ef91e931a995091284f54099806c96d SHA256 02dc190a9bb7f66c99191d3cf0f46eb647b783a27a00aae51ec7c6a217b8daef diff --git a/media-libs/opencollada/opencollada-9999.ebuild b/media-libs/opencollada/opencollada-9999.ebuild index 71629d4..832db0b 100644 --- a/media-libs/opencollada/opencollada-9999.ebuild +++ b/media-libs/opencollada/opencollada-9999.ebuild @@ -12,7 +12,7 @@ LICENSE="MIT" ESVN_REPO_URI="http://opencollada.googlecode.com/svn/trunk" ESVN_PROJECT="opencollada-trunk" -ESVN_PATCHES="${FILESDIR}/opencollada-9999-gcc-fixes.patch" +#ESVN_PATCHES="${FILESDIR}/opencollada-9999-gcc-fixes.patch" SLOT="0" KEYWORDS="~amd64" @@ -21,11 +21,11 @@ DEPEND=">=dev-libs/libxml2-2.7.8-r1" RDEPEND="${DEPEND}" 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 + 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/ -- cgit v1.2.3-65-gdbad