* [gentoo-commits] proj/betagarden:master commit in: media-libs/opencollada/files/, media-libs/opencollada/
@ 2012-01-15 22:34 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2012-01-15 22:34 UTC (permalink / raw
To: gentoo-commits
commit: bd3a6121e14a610591b62f1465c9c8fde6856509
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sun Jan 15 22:32:13 2012 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 22:33:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=bd3a6121
media-libs/opencollada: 0_p864
---
.../files/opencollada-0_p864-expat.patch | 12 ++++
media-libs/opencollada/metadata.xml | 8 +++
media-libs/opencollada/opencollada-0_p864.ebuild | 59 ++++++++++++++++++++
3 files changed, 79 insertions(+), 0 deletions(-)
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/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.ebuild b/media-libs/opencollada/opencollada-0_p864.ebuild
new file mode 100644
index 0000000..6041ff3
--- /dev/null
+++ b/media-libs/opencollada/opencollada-0_p864.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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
+ 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_install() {
+ cmake-utils_src_install
+ mv "${D}"/usr/{lib,$(get_libdir)} || die
+
+ dobin build/bin/OpenCOLLADAValidator || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: media-libs/opencollada/files/, media-libs/opencollada/
@ 2012-01-16 18:15 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2012-01-16 18:15 UTC (permalink / raw
To: gentoo-commits
commit: e916b21c0902c04d9643b29980c7c2774faa7da3
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jan 16 18:14:13 2012 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 18:14:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=e916b21c
media-libs/opencollada: Moved to main tree
---
.../files/opencollada-0_p864-expat.patch | 12 ----
media-libs/opencollada/metadata.xml | 8 ---
media-libs/opencollada/opencollada-0_p864.ebuild | 59 --------------------
3 files changed, 0 insertions(+), 79 deletions(-)
diff --git a/media-libs/opencollada/files/opencollada-0_p864-expat.patch b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
deleted file mode 100644
index 9086acf..0000000
--- a/media-libs/opencollada/files/opencollada-0_p864-expat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/metadata.xml b/media-libs/opencollada/metadata.xml
deleted file mode 100644
index 16bcc9f..0000000
--- a/media-libs/opencollada/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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.ebuild b/media-libs/opencollada/opencollada-0_p864.ebuild
deleted file mode 100644
index 6041ff3..0000000
--- a/media-libs/opencollada/opencollada-0_p864.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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
- 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_install() {
- cmake-utils_src_install
- mv "${D}"/usr/{lib,$(get_libdir)} || die
-
- dobin build/bin/OpenCOLLADAValidator || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-16 18:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-15 22:34 [gentoo-commits] proj/betagarden:master commit in: media-libs/opencollada/files/, media-libs/opencollada/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2012-01-16 18:15 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox