1 |
commit: ca36b0b3434b490ad02a932eefcc62c750339495 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 2 12:39:00 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 2 16:31:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca36b0b3 |
7 |
|
8 |
sci-electronics/gazebo: remove old |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
sci-electronics/gazebo/Manifest | 3 -- |
13 |
sci-electronics/gazebo/files/ffmpeg29.patch | 22 --------- |
14 |
sci-electronics/gazebo/gazebo-6.1.0.ebuild | 70 -------------------------- |
15 |
sci-electronics/gazebo/gazebo-6.5.1.ebuild | 70 -------------------------- |
16 |
sci-electronics/gazebo/gazebo-7.0.0.ebuild | 76 ----------------------------- |
17 |
5 files changed, 241 deletions(-) |
18 |
|
19 |
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest |
20 |
index 61a5724..85db8fa 100644 |
21 |
--- a/sci-electronics/gazebo/Manifest |
22 |
+++ b/sci-electronics/gazebo/Manifest |
23 |
@@ -1,4 +1 @@ |
24 |
-DIST gazebo-6.1.0.tar.bz2 50795925 SHA256 0460f1c706f609b6ff0e61a71bdd3cac2d55d714147edc01609b5226e7fb2904 SHA512 ae41b53b0f33e81fe5b3baaaca8649e98c5b99c4701650414b0686f9a327d89e00c674e806cb9537aabfd933c9819d668e45b18e964d383d99325c5ddcdcf7ef WHIRLPOOL bfab23edc9c68ca02aefa4a20206bfdf2973cc5ee7750f4c017543979dca10434d9e38dad8836510b292dc67b97aa0514229c8b5fd9f73897075525e45a5bd74 |
25 |
-DIST gazebo-6.5.1.tar.bz2 50828358 SHA256 96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908 SHA512 3d72da5c6b577e4a44b9cef32df64cb2329f04b498f7a21d3e733b52a93db35dd2f2f67c5d114624de15d5f054fd7c92ab11617f27beb1a39d8505deab70e5d6 WHIRLPOOL cc6c913919bf8aa0df363bb53fb265a22e69052536044b55b2ffbac9d7a419dae5c796415abd1d0dc7a92363f8005e171b6e303eafbe756241c27b1531b0879b |
26 |
-DIST gazebo-7.0.0.tar.bz2 51076734 SHA256 74413e18d812abb3398af3124dc24e009af27e1f81c26d9698aaee39d213f888 SHA512 578869659b5a148915ce83196890bf2f1093ee097ef61b2f7b7a3e0ccc0737ae89db794f7355387c495aea821f5d6186170c73b937dfdc52e4b981fffa9a0d51 WHIRLPOOL 6b61d43c3f1f237d48625253c04fa6f8d88b3641dd23532ab55ccdb8d50f873d719fd6591d72f59e9d1b1fc269728753fecbaebd3423ffb042f7ba6b61321f5b |
27 |
DIST gazebo-7.1.0.tar.bz2 51097678 SHA256 93f75ec601bdafd2d4715d7200d81f52123979b00d547635ae38738e6405d863 SHA512 573392d984a2770c2394234da9532d7e46517e8312091fab5a4b3df8ad6997ab2594c7648694cea858f8210938f1c1787c51df80910f554a2bfc005f8894c6fc WHIRLPOOL c5a0ed5ac645ad215f5bc8b1b96d8d2e20ab78b3d5546eb9a1cce5ae0a5941f809760b12f71b12f38b84cab755f95c3b152f0c9633a9815d8ca001f026281a21 |
28 |
|
29 |
diff --git a/sci-electronics/gazebo/files/ffmpeg29.patch b/sci-electronics/gazebo/files/ffmpeg29.patch |
30 |
deleted file mode 100644 |
31 |
index df53cc7..0000000 |
32 |
--- a/sci-electronics/gazebo/files/ffmpeg29.patch |
33 |
+++ /dev/null |
34 |
@@ -1,22 +0,0 @@ |
35 |
-Index: gazebo5_5.1.0/gazebo/common/Video.cc |
36 |
-=================================================================== |
37 |
---- gazebo5_5.1.0.orig/gazebo/common/Video.cc |
38 |
-+++ gazebo5_5.1.0/gazebo/common/Video.cc |
39 |
-@@ -147,7 +147,7 @@ bool Video::Load(const std::string &_fil |
40 |
- return false; |
41 |
- } |
42 |
- |
43 |
-- avpicture_alloc(this->pic, PIX_FMT_RGB24, this->codecCtx->width, |
44 |
-+ avpicture_alloc(this->pic, AV_PIX_FMT_RGB24, this->codecCtx->width, |
45 |
- this->codecCtx->height); |
46 |
- |
47 |
- this->swsCtx = sws_getContext( |
48 |
-@@ -156,7 +156,7 @@ bool Video::Load(const std::string &_fil |
49 |
- this->codecCtx->pix_fmt, |
50 |
- this->codecCtx->width, |
51 |
- this->codecCtx->height, |
52 |
-- PIX_FMT_RGB24, |
53 |
-+ AV_PIX_FMT_RGB24, |
54 |
- SWS_BICUBIC, NULL, NULL, NULL); |
55 |
- |
56 |
- if (this->swsCtx == NULL) |
57 |
|
58 |
diff --git a/sci-electronics/gazebo/gazebo-6.1.0.ebuild b/sci-electronics/gazebo/gazebo-6.1.0.ebuild |
59 |
deleted file mode 100644 |
60 |
index 4df9d14..0000000 |
61 |
--- a/sci-electronics/gazebo/gazebo-6.1.0.ebuild |
62 |
+++ /dev/null |
63 |
@@ -1,70 +0,0 @@ |
64 |
-# Copyright 1999-2015 Gentoo Foundation |
65 |
-# Distributed under the terms of the GNU General Public License v2 |
66 |
-# $Id$ |
67 |
- |
68 |
-EAPI=5 |
69 |
- |
70 |
-inherit cmake-utils versionator vcs-snapshot flag-o-matic |
71 |
- |
72 |
-DESCRIPTION="A 3D multiple robot simulator with dynamics" |
73 |
-HOMEPAGE="http://gazebosim.org/" |
74 |
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" |
75 |
- |
76 |
-LICENSE="Apache-2.0" |
77 |
-SLOT="0" |
78 |
-KEYWORDS="~amd64" |
79 |
-IUSE="cpu_flags_x86_sse2 libav test" |
80 |
- |
81 |
-RDEPEND=" |
82 |
- >=dev-libs/protobuf-2.3.0 |
83 |
- virtual/opengl |
84 |
- media-libs/openal |
85 |
- net-misc/curl |
86 |
- dev-libs/tinyxml |
87 |
- dev-libs/libtar |
88 |
- dev-cpp/tbb |
89 |
- >=dev-games/ogre-1.7.4 |
90 |
- sci-libs/libccd |
91 |
- libav? ( media-video/libav:= ) |
92 |
- !libav? ( media-video/ffmpeg:= ) |
93 |
- sci-libs/gts |
94 |
- >=sci-physics/bullet-2.82 |
95 |
- >=dev-libs/sdformat-3.1.0 |
96 |
- dev-qt/qtcore:4 |
97 |
- dev-qt/qtgui:4 |
98 |
- dev-libs/boost:=[threads] |
99 |
- sci-libs/gdal |
100 |
- virtual/libusb:1 |
101 |
- dev-libs/libspnav |
102 |
- media-libs/freeimage |
103 |
- sci-libs/hdf5:= |
104 |
- sys-apps/util-linux |
105 |
- media-gfx/graphviz |
106 |
- sci-libs/ignition-math:2= |
107 |
-" |
108 |
-DEPEND="${RDEPEND} |
109 |
- dev-qt/qttest:4 |
110 |
- app-text/ronn |
111 |
- virtual/pkgconfig |
112 |
- test? ( dev-libs/libxslt ) |
113 |
-" |
114 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
115 |
-PATCHES=( |
116 |
- "${FILESDIR}/ffmpeg29.patch" |
117 |
-) |
118 |
- |
119 |
-src_configure() { |
120 |
- # doesnt build without it |
121 |
- append-cxxflags "-std=c++11" |
122 |
- # doesnt build with as-needed either |
123 |
- append-ldflags "-Wl,--no-as-needed" |
124 |
- |
125 |
- local mycmakeargs=( |
126 |
- "-DUSE_UPSTREAM_CFLAGS=OFF" |
127 |
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |
128 |
- "-DUSE_HOST_CFLAGS=FALSE" |
129 |
- "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" |
130 |
- "-DENABLE_SCREEN_TESTS=FALSE" |
131 |
- ) |
132 |
- cmake-utils_src_configure |
133 |
-} |
134 |
|
135 |
diff --git a/sci-electronics/gazebo/gazebo-6.5.1.ebuild b/sci-electronics/gazebo/gazebo-6.5.1.ebuild |
136 |
deleted file mode 100644 |
137 |
index aa5a3fa..0000000 |
138 |
--- a/sci-electronics/gazebo/gazebo-6.5.1.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,70 +0,0 @@ |
141 |
-# Copyright 1999-2015 Gentoo Foundation |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
-# $Id$ |
144 |
- |
145 |
-EAPI=5 |
146 |
- |
147 |
-inherit cmake-utils versionator vcs-snapshot flag-o-matic |
148 |
- |
149 |
-DESCRIPTION="A 3D multiple robot simulator with dynamics" |
150 |
-HOMEPAGE="http://gazebosim.org/" |
151 |
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" |
152 |
- |
153 |
-LICENSE="Apache-2.0" |
154 |
-SLOT="0" |
155 |
-KEYWORDS="~amd64" |
156 |
-IUSE="cpu_flags_x86_sse2 libav test" |
157 |
- |
158 |
-RDEPEND=" |
159 |
- >=dev-libs/protobuf-2.3.0 |
160 |
- virtual/opengl |
161 |
- media-libs/openal |
162 |
- net-misc/curl |
163 |
- dev-libs/tinyxml |
164 |
- dev-libs/libtar |
165 |
- dev-cpp/tbb |
166 |
- >=dev-games/ogre-1.7.4 |
167 |
- sci-libs/libccd |
168 |
- libav? ( >=media-video/libav-9:0= ) |
169 |
- !libav? ( >=media-video/ffmpeg-2.6:0= ) |
170 |
- sci-libs/gts |
171 |
- >=sci-physics/bullet-2.82 |
172 |
- >=dev-libs/sdformat-3.1.1 |
173 |
- dev-qt/qtcore:4 |
174 |
- dev-qt/qtgui:4 |
175 |
- dev-libs/boost:=[threads] |
176 |
- sci-libs/gdal |
177 |
- virtual/libusb:1 |
178 |
- dev-libs/libspnav |
179 |
- media-libs/freeimage |
180 |
- sci-libs/hdf5:= |
181 |
- sys-apps/util-linux |
182 |
- media-gfx/graphviz |
183 |
- sci-libs/ignition-math:2= |
184 |
-" |
185 |
-DEPEND="${RDEPEND} |
186 |
- dev-qt/qttest:4 |
187 |
- app-text/ronn |
188 |
- virtual/pkgconfig |
189 |
- test? ( dev-libs/libxslt ) |
190 |
-" |
191 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
192 |
-PATCHES=( |
193 |
- "${FILESDIR}/ffmpeg29.patch" |
194 |
-) |
195 |
- |
196 |
-src_configure() { |
197 |
- # doesnt build without it |
198 |
- append-cxxflags "-std=c++11" |
199 |
- # doesnt build with as-needed either |
200 |
- append-ldflags "-Wl,--no-as-needed" |
201 |
- |
202 |
- local mycmakeargs=( |
203 |
- "-DUSE_UPSTREAM_CFLAGS=OFF" |
204 |
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |
205 |
- "-DUSE_HOST_CFLAGS=FALSE" |
206 |
- "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" |
207 |
- "-DENABLE_SCREEN_TESTS=FALSE" |
208 |
- ) |
209 |
- cmake-utils_src_configure |
210 |
-} |
211 |
|
212 |
diff --git a/sci-electronics/gazebo/gazebo-7.0.0.ebuild b/sci-electronics/gazebo/gazebo-7.0.0.ebuild |
213 |
deleted file mode 100644 |
214 |
index 078f693..0000000 |
215 |
--- a/sci-electronics/gazebo/gazebo-7.0.0.ebuild |
216 |
+++ /dev/null |
217 |
@@ -1,76 +0,0 @@ |
218 |
-# Copyright 1999-2015 Gentoo Foundation |
219 |
-# Distributed under the terms of the GNU General Public License v2 |
220 |
-# $Id$ |
221 |
- |
222 |
-EAPI=5 |
223 |
- |
224 |
-inherit cmake-utils versionator vcs-snapshot flag-o-matic |
225 |
- |
226 |
-DESCRIPTION="A 3D multiple robot simulator with dynamics" |
227 |
-HOMEPAGE="http://gazebosim.org/" |
228 |
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" |
229 |
- |
230 |
-LICENSE="Apache-2.0" |
231 |
-SLOT="0" |
232 |
-KEYWORDS="~amd64" |
233 |
-IUSE="cpu_flags_x86_sse2 libav test" |
234 |
- |
235 |
-RDEPEND=" |
236 |
- >=dev-libs/protobuf-2.3.0 |
237 |
- virtual/opengl |
238 |
- media-libs/openal |
239 |
- net-misc/curl |
240 |
- dev-libs/tinyxml |
241 |
- dev-libs/tinyxml2 |
242 |
- dev-libs/libtar |
243 |
- dev-cpp/tbb |
244 |
- >=dev-games/ogre-1.7.4 |
245 |
- sci-libs/libccd |
246 |
- libav? ( >=media-video/libav-9:0= ) |
247 |
- !libav? ( >=media-video/ffmpeg-2.6:0= ) |
248 |
- sci-libs/gts |
249 |
- >=sci-physics/bullet-2.82 |
250 |
- >=dev-libs/sdformat-4:= |
251 |
- dev-qt/qtcore:4 |
252 |
- dev-qt/qtgui:4 |
253 |
- dev-qt/qtwebkit:4 |
254 |
- dev-qt/qtxmlpatterns:4 |
255 |
- dev-libs/boost:=[threads] |
256 |
- sci-libs/gdal |
257 |
- virtual/libusb:1 |
258 |
- dev-libs/libspnav |
259 |
- media-libs/freeimage |
260 |
- sci-libs/hdf5:= |
261 |
- sys-apps/util-linux |
262 |
- media-gfx/graphviz |
263 |
- >=sci-libs/ignition-math-2.3:2= |
264 |
- net-libs/ignition-transport:= |
265 |
-" |
266 |
-DEPEND="${RDEPEND} |
267 |
- dev-qt/qttest:4 |
268 |
- app-text/ronn |
269 |
- virtual/pkgconfig |
270 |
- x11-apps/mesa-progs |
271 |
- test? ( dev-libs/libxslt ) |
272 |
-" |
273 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
274 |
-PATCHES=( |
275 |
- "${FILESDIR}/ffmpeg29.patch" |
276 |
-) |
277 |
- |
278 |
-src_configure() { |
279 |
- # doesnt build without it |
280 |
- append-cxxflags "-std=c++11" |
281 |
- # doesnt build with as-needed either |
282 |
- append-ldflags "-Wl,--no-as-needed" |
283 |
- |
284 |
- local mycmakeargs=( |
285 |
- "-DUSE_UPSTREAM_CFLAGS=OFF" |
286 |
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |
287 |
- "-DUSE_HOST_CFLAGS=FALSE" |
288 |
- "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" |
289 |
- "-DENABLE_SCREEN_TESTS=FALSE" |
290 |
- "-DUSE_EXTERNAL_TINYXML2=TRUE" |
291 |
- ) |
292 |
- cmake-utils_src_configure |
293 |
-} |