dilfridge 15/02/08 00:19:58
Modified: ChangeLog metadata.xml
Added: opencollada-9999.ebuild
opencollada-1.2.2_p20150207.ebuild
Log:
Version bump and live ebuild, based on work by Andreas Sturmlechner, bug
486018
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
EBE6A336BE19039C!)
Revision Changes Path
1.7 media-libs/opencollada/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 1 Dec 2012 18:32:28 -0000 1.6
+++ ChangeLog 8 Feb 2015 00:19:57 -0000 1.7
@@ -1,6 +1,17 @@
# 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.6
2012/12/01 18:32:28 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.7
2015/02/08 00:19:57 dilfridge Exp $
+
+*opencollada-9999 (08 Feb 2015)
+*opencollada-1.2.2_p20150207 (08 Feb 2015)
+
+ 08 Feb 2015; Andreas K. Huettel <[email protected]>
+ +opencollada-1.2.2_p20150207.ebuild, +opencollada-9999.ebuild,
+ +files/opencollada-1.2.2-libdir.patch,
+ +files/opencollada-1.2.2-no-undefined.patch,
+ +files/opencollada-1.2.2-soversion.patch, metadata.xml:
+ Version bump and live ebuild, based on work by Andreas Sturmlechner, bug
+ 486018
01 Dec 2012; Anthony G. Basile <[email protected]>
opencollada-0_p864-r1.ebuild:
1.2 media-libs/opencollada/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/metadata.xml?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/metadata.xml?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/metadata.xml?r1=1.1&r2=1.2
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencollada/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml 16 Jan 2012 18:11:33 -0000 1.1
+++ metadata.xml 8 Feb 2015 00:19:57 -0000 1.2
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
+ <herd>openoffice</herd>
<maintainer>
<email>[email protected]</email>
<name>Sebastian Pipping</name>
1.1 media-libs/opencollada/opencollada-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-9999.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-9999.ebuild?rev=1.1&content-type=text/plain
Index: opencollada-9999.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-9999.ebuild,v 1.1
2015/02/08 00:19:57 dilfridge Exp $
EAPI=5
if [[ ${PV} == *9999* ]] ; then
SCM_ECLASS="git-r3"
else
SCM_ECLASS="vcs-snapshot"
fi
inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
DESCRIPTION="Stream based read/write library for COLLADA files"
HOMEPAGE="http://www.opencollada.org/";
LICENSE="MIT"
IUSE="expat"
# seems like the Khronos Group hasnt invented the SOVERSION yet
MY_SOVERSION="1.2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
#
# UPDATE THE COMMIT WHEN BUMPING!
COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
#
SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT}
-> ${P}.tar.gz"
KEYWORDS="~amd64 ~ppc64 ~x86"
else
EGIT_REPO_URI="http://github.com/KhronosGroup/OpenCOLLADA.git";
fi
RDEPEND="dev-libs/libpcre
dev-libs/zziplib
media-libs/lib3ds
sys-libs/zlib
>=sys-devel/gcc-4.7
expat? ( dev-libs/expat )
!expat? ( dev-libs/libxml2 )"
DEPEND="${RDEPEND}
sys-apps/findutils
sys-apps/sed"
BUILD_DIR="${S}"/build
src_prepare() {
# Remove some bundled dependencies
edos2unix CMakeLists.txt || die
epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
epatch "${FILESDIR}"/${PN}-1.2.2-libdir.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'
# Seems like the Khronos Group hasnt invented the SOVERSION yet.
mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
dodir /etc/env.d || die
echo "LDPATH=/usr/$(get_libdir)/opencollada" \
> "${D}"/etc/env.d/99opencollada || die
dobin build/bin/OpenCOLLADAValidator || die
}
1.1 media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild?rev=1.1&content-type=text/plain
Index: opencollada-1.2.2_p20150207.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild,v
1.1 2015/02/08 00:19:57 dilfridge Exp $
EAPI=5
if [[ ${PV} == *9999* ]] ; then
SCM_ECLASS="git-r3"
else
SCM_ECLASS="vcs-snapshot"
fi
inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
DESCRIPTION="Stream based read/write library for COLLADA files"
HOMEPAGE="http://www.opencollada.org/";
LICENSE="MIT"
IUSE="expat"
# seems like the Khronos Group hasnt invented the SOVERSION yet
MY_SOVERSION="1.2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
#
# UPDATE THE COMMIT WHEN BUMPING!
COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
#
SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT}
-> ${P}.tar.gz"
KEYWORDS="~amd64 ~ppc64 ~x86"
else
EGIT_REPO_URI="http://github.com/KhronosGroup/OpenCOLLADA.git";
fi
RDEPEND="dev-libs/libpcre
dev-libs/zziplib
media-libs/lib3ds
sys-libs/zlib
>=sys-devel/gcc-4.7
expat? ( dev-libs/expat )
!expat? ( dev-libs/libxml2 )"
DEPEND="${RDEPEND}
sys-apps/findutils
sys-apps/sed"
BUILD_DIR="${S}"/build
src_prepare() {
# Remove some bundled dependencies
edos2unix CMakeLists.txt || die
epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
epatch "${FILESDIR}"/${PN}-1.2.2-libdir.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'
# Seems like the Khronos Group hasnt invented the SOVERSION yet.
mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
dodir /etc/env.d || die
echo "LDPATH=/usr/$(get_libdir)/opencollada" \
> "${D}"/etc/env.d/99opencollada || die
dobin build/bin/OpenCOLLADAValidator || die
}
