Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/opencollada: ChangeLog opencollada-9999.ebuild opencollada-1.2.2_p20150207.ebuild metadata.xml
Date: Sun, 08 Feb 2015 00:20:05
Message-Id: 20150208001958.070C91148E@oystercatcher.gentoo.org
1 dilfridge 15/02/08 00:19:58
2
3 Modified: ChangeLog metadata.xml
4 Added: opencollada-9999.ebuild
5 opencollada-1.2.2_p20150207.ebuild
6 Log:
7 Version bump and live ebuild, based on work by Andreas Sturmlechner, bug 486018
8
9 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
10
11 Revision Changes Path
12 1.7 media-libs/opencollada/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?rev=1.7&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?rev=1.7&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/ChangeLog?r1=1.6&r2=1.7
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v
21 retrieving revision 1.6
22 retrieving revision 1.7
23 diff -u -r1.6 -r1.7
24 --- ChangeLog 1 Dec 2012 18:32:28 -0000 1.6
25 +++ ChangeLog 8 Feb 2015 00:19:57 -0000 1.7
26 @@ -1,6 +1,17 @@
27 # ChangeLog for media-libs/opencollada
28 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.6 2012/12/01 18:32:28 blueness Exp $
30 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
31 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/ChangeLog,v 1.7 2015/02/08 00:19:57 dilfridge Exp $
32 +
33 +*opencollada-9999 (08 Feb 2015)
34 +*opencollada-1.2.2_p20150207 (08 Feb 2015)
35 +
36 + 08 Feb 2015; Andreas K. Huettel <dilfridge@g.o>
37 + +opencollada-1.2.2_p20150207.ebuild, +opencollada-9999.ebuild,
38 + +files/opencollada-1.2.2-libdir.patch,
39 + +files/opencollada-1.2.2-no-undefined.patch,
40 + +files/opencollada-1.2.2-soversion.patch, metadata.xml:
41 + Version bump and live ebuild, based on work by Andreas Sturmlechner, bug
42 + 486018
43
44 01 Dec 2012; Anthony G. Basile <blueness@g.o>
45 opencollada-0_p864-r1.ebuild:
46
47
48
49 1.2 media-libs/opencollada/metadata.xml
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/metadata.xml?rev=1.2&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/metadata.xml?rev=1.2&content-type=text/plain
53 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/metadata.xml?r1=1.1&r2=1.2
54
55 Index: metadata.xml
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/media-libs/opencollada/metadata.xml,v
58 retrieving revision 1.1
59 retrieving revision 1.2
60 diff -u -r1.1 -r1.2
61 --- metadata.xml 16 Jan 2012 18:11:33 -0000 1.1
62 +++ metadata.xml 8 Feb 2015 00:19:57 -0000 1.2
63 @@ -1,6 +1,7 @@
64 <?xml version="1.0" encoding="UTF-8"?>
65 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
66 <pkgmetadata>
67 + <herd>openoffice</herd>
68 <maintainer>
69 <email>sping@g.o</email>
70 <name>Sebastian Pipping</name>
71
72
73
74 1.1 media-libs/opencollada/opencollada-9999.ebuild
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-9999.ebuild?rev=1.1&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-9999.ebuild?rev=1.1&content-type=text/plain
78
79 Index: opencollada-9999.ebuild
80 ===================================================================
81 # Copyright 1999-2015 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencollada/opencollada-9999.ebuild,v 1.1 2015/02/08 00:19:57 dilfridge Exp $
84
85 EAPI=5
86
87 if [[ ${PV} == *9999* ]] ; then
88 SCM_ECLASS="git-r3"
89 else
90 SCM_ECLASS="vcs-snapshot"
91 fi
92
93 inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
94
95 DESCRIPTION="Stream based read/write library for COLLADA files"
96 HOMEPAGE="http://www.opencollada.org/"
97 LICENSE="MIT"
98 IUSE="expat"
99
100 # seems like the Khronos Group hasnt invented the SOVERSION yet
101 MY_SOVERSION="1.2"
102
103 SLOT="0"
104
105 if [[ ${PV} != *9999* ]]; then
106 #
107 # UPDATE THE COMMIT WHEN BUMPING!
108 COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
109 #
110 SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT} -> ${P}.tar.gz"
111 KEYWORDS="~amd64 ~ppc64 ~x86"
112 else
113 EGIT_REPO_URI="http://github.com/KhronosGroup/OpenCOLLADA.git"
114 fi
115
116 RDEPEND="dev-libs/libpcre
117 dev-libs/zziplib
118 media-libs/lib3ds
119 sys-libs/zlib
120 >=sys-devel/gcc-4.7
121 expat? ( dev-libs/expat )
122 !expat? ( dev-libs/libxml2 )"
123 DEPEND="${RDEPEND}
124 sys-apps/findutils
125 sys-apps/sed"
126
127 BUILD_DIR="${S}"/build
128
129 src_prepare() {
130
131 # Remove some bundled dependencies
132 edos2unix CMakeLists.txt || die
133
134 epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
135
136 epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
137 epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
138 epatch "${FILESDIR}"/${PN}-1.2.2-libdir.patch
139
140 rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
141 ewarn "$(echo "Remaining bundled dependencies:";
142 find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
143
144 # Remove unused build systems
145 rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
146 find "${S}" -name SConscript -delete || die
147 }
148
149 src_configure() {
150 local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF"
151
152 # Master CMakeLists.txt says "EXPAT support not implemented"
153 # Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build
154 use expat \
155 && mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \
156 || mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON'
157
158 # Seems like the Khronos Group hasnt invented the SOVERSION yet.
159 mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
160
161 cmake-utils_src_configure
162 }
163
164 src_install() {
165 cmake-utils_src_install
166
167 dodir /etc/env.d || die
168 echo "LDPATH=/usr/$(get_libdir)/opencollada" \
169 > "${D}"/etc/env.d/99opencollada || die
170
171 dobin build/bin/OpenCOLLADAValidator || die
172 }
173
174
175
176 1.1 media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild
177
178 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/opencollada-1.2.2_p20150207.ebuild?rev=1.1&view=markup
179 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
180
181 Index: opencollada-1.2.2_p20150207.ebuild
182 ===================================================================
183 # Copyright 1999-2015 Gentoo Foundation
184 # Distributed under the terms of the GNU General Public License v2
185 # $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 $
186
187 EAPI=5
188
189 if [[ ${PV} == *9999* ]] ; then
190 SCM_ECLASS="git-r3"
191 else
192 SCM_ECLASS="vcs-snapshot"
193 fi
194
195 inherit versionator eutils multilib cmake-utils ${SCM_ECLASS}
196
197 DESCRIPTION="Stream based read/write library for COLLADA files"
198 HOMEPAGE="http://www.opencollada.org/"
199 LICENSE="MIT"
200 IUSE="expat"
201
202 # seems like the Khronos Group hasnt invented the SOVERSION yet
203 MY_SOVERSION="1.2"
204
205 SLOT="0"
206
207 if [[ ${PV} != *9999* ]]; then
208 #
209 # UPDATE THE COMMIT WHEN BUMPING!
210 COMMIT="ceb409cabdccda3000aa2e5c065850b8fde60b0f"
211 #
212 SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/tarball/${COMMIT} -> ${P}.tar.gz"
213 KEYWORDS="~amd64 ~ppc64 ~x86"
214 else
215 EGIT_REPO_URI="http://github.com/KhronosGroup/OpenCOLLADA.git"
216 fi
217
218 RDEPEND="dev-libs/libpcre
219 dev-libs/zziplib
220 media-libs/lib3ds
221 sys-libs/zlib
222 >=sys-devel/gcc-4.7
223 expat? ( dev-libs/expat )
224 !expat? ( dev-libs/libxml2 )"
225 DEPEND="${RDEPEND}
226 sys-apps/findutils
227 sys-apps/sed"
228
229 BUILD_DIR="${S}"/build
230
231 src_prepare() {
232
233 # Remove some bundled dependencies
234 edos2unix CMakeLists.txt || die
235
236 epatch "${FILESDIR}"/${PN}-0_p864-expat.patch
237
238 epatch "${FILESDIR}"/${PN}-1.2.2-soversion.patch
239 epatch "${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
240 epatch "${FILESDIR}"/${PN}-1.2.2-libdir.patch
241
242 rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
243 ewarn "$(echo "Remaining bundled dependencies:";
244 find Externals -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
245
246 # Remove unused build systems
247 rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
248 find "${S}" -name SConscript -delete || die
249 }
250
251 src_configure() {
252 local mycmakeargs=" -DUSE_SHARED=ON -DUSE_STATIC=OFF"
253
254 # Master CMakeLists.txt says "EXPAT support not implemented"
255 # Something like "set(LIBEXPAT_LIBRARIES expat)" is missing to make it build
256 use expat \
257 && mycmakeargs+=' -DUSE_EXPAT=ON -DUSE_LIBXML=OFF' \
258 || mycmakeargs+=' -DUSE_EXPAT=OFF -DUSE_LIBXML=ON'
259
260 # Seems like the Khronos Group hasnt invented the SOVERSION yet.
261 mycmakeargs+=" -Dsoversion=${MY_SOVERSION}"
262
263 cmake-utils_src_configure
264 }
265
266 src_install() {
267 cmake-utils_src_install
268
269 dodir /etc/env.d || die
270 echo "LDPATH=/usr/$(get_libdir)/opencollada" \
271 > "${D}"/etc/env.d/99opencollada || die
272
273 dobin build/bin/OpenCOLLADAValidator || die
274 }
Report Message
Find on MARC Find on Google Groups