commit: ca36b0b3434b490ad02a932eefcc62c750339495 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Mon May 2 12:39:00 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon May 2 16:31:59 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca36b0b3
sci-electronics/gazebo: remove old Package-Manager: portage-2.2.28 sci-electronics/gazebo/Manifest | 3 -- sci-electronics/gazebo/files/ffmpeg29.patch | 22 --------- sci-electronics/gazebo/gazebo-6.1.0.ebuild | 70 -------------------------- sci-electronics/gazebo/gazebo-6.5.1.ebuild | 70 -------------------------- sci-electronics/gazebo/gazebo-7.0.0.ebuild | 76 ----------------------------- 5 files changed, 241 deletions(-) diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 61a5724..85db8fa 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,4 +1 @@ -DIST gazebo-6.1.0.tar.bz2 50795925 SHA256 0460f1c706f609b6ff0e61a71bdd3cac2d55d714147edc01609b5226e7fb2904 SHA512 ae41b53b0f33e81fe5b3baaaca8649e98c5b99c4701650414b0686f9a327d89e00c674e806cb9537aabfd933c9819d668e45b18e964d383d99325c5ddcdcf7ef WHIRLPOOL bfab23edc9c68ca02aefa4a20206bfdf2973cc5ee7750f4c017543979dca10434d9e38dad8836510b292dc67b97aa0514229c8b5fd9f73897075525e45a5bd74 -DIST gazebo-6.5.1.tar.bz2 50828358 SHA256 96260aa23f1a1f24bc116f8e359d31f3bc65011033977cb7fb2c64d574321908 SHA512 3d72da5c6b577e4a44b9cef32df64cb2329f04b498f7a21d3e733b52a93db35dd2f2f67c5d114624de15d5f054fd7c92ab11617f27beb1a39d8505deab70e5d6 WHIRLPOOL cc6c913919bf8aa0df363bb53fb265a22e69052536044b55b2ffbac9d7a419dae5c796415abd1d0dc7a92363f8005e171b6e303eafbe756241c27b1531b0879b -DIST gazebo-7.0.0.tar.bz2 51076734 SHA256 74413e18d812abb3398af3124dc24e009af27e1f81c26d9698aaee39d213f888 SHA512 578869659b5a148915ce83196890bf2f1093ee097ef61b2f7b7a3e0ccc0737ae89db794f7355387c495aea821f5d6186170c73b937dfdc52e4b981fffa9a0d51 WHIRLPOOL 6b61d43c3f1f237d48625253c04fa6f8d88b3641dd23532ab55ccdb8d50f873d719fd6591d72f59e9d1b1fc269728753fecbaebd3423ffb042f7ba6b61321f5b DIST gazebo-7.1.0.tar.bz2 51097678 SHA256 93f75ec601bdafd2d4715d7200d81f52123979b00d547635ae38738e6405d863 SHA512 573392d984a2770c2394234da9532d7e46517e8312091fab5a4b3df8ad6997ab2594c7648694cea858f8210938f1c1787c51df80910f554a2bfc005f8894c6fc WHIRLPOOL c5a0ed5ac645ad215f5bc8b1b96d8d2e20ab78b3d5546eb9a1cce5ae0a5941f809760b12f71b12f38b84cab755f95c3b152f0c9633a9815d8ca001f026281a21 diff --git a/sci-electronics/gazebo/files/ffmpeg29.patch b/sci-electronics/gazebo/files/ffmpeg29.patch deleted file mode 100644 index df53cc7..0000000 --- a/sci-electronics/gazebo/files/ffmpeg29.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: gazebo5_5.1.0/gazebo/common/Video.cc -=================================================================== ---- gazebo5_5.1.0.orig/gazebo/common/Video.cc -+++ gazebo5_5.1.0/gazebo/common/Video.cc -@@ -147,7 +147,7 @@ bool Video::Load(const std::string &_fil - return false; - } - -- avpicture_alloc(this->pic, PIX_FMT_RGB24, this->codecCtx->width, -+ avpicture_alloc(this->pic, AV_PIX_FMT_RGB24, this->codecCtx->width, - this->codecCtx->height); - - this->swsCtx = sws_getContext( -@@ -156,7 +156,7 @@ bool Video::Load(const std::string &_fil - this->codecCtx->pix_fmt, - this->codecCtx->width, - this->codecCtx->height, -- PIX_FMT_RGB24, -+ AV_PIX_FMT_RGB24, - SWS_BICUBIC, NULL, NULL, NULL); - - if (this->swsCtx == NULL) diff --git a/sci-electronics/gazebo/gazebo-6.1.0.ebuild b/sci-electronics/gazebo/gazebo-6.1.0.ebuild deleted file mode 100644 index 4df9d14..0000000 --- a/sci-electronics/gazebo/gazebo-6.1.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils versionator vcs-snapshot flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/"; -SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 libav test" - -RDEPEND=" - >=dev-libs/protobuf-2.3.0 - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - dev-libs/libtar - dev-cpp/tbb - >=dev-games/ogre-1.7.4 - sci-libs/libccd - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - sci-libs/gts - >=sci-physics/bullet-2.82 - >=dev-libs/sdformat-3.1.0 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-libs/boost:=[threads] - sci-libs/gdal - virtual/libusb:1 - dev-libs/libspnav - media-libs/freeimage - sci-libs/hdf5:= - sys-apps/util-linux - media-gfx/graphviz - sci-libs/ignition-math:2= -" -DEPEND="${RDEPEND} - dev-qt/qttest:4 - app-text/ronn - virtual/pkgconfig - test? ( dev-libs/libxslt ) -" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/ffmpeg29.patch" -) - -src_configure() { - # doesnt build without it - append-cxxflags "-std=c++11" - # doesnt build with as-needed either - append-ldflags "-Wl,--no-as-needed" - - local mycmakeargs=( - "-DUSE_UPSTREAM_CFLAGS=OFF" - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" - "-DUSE_HOST_CFLAGS=FALSE" - "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" - "-DENABLE_SCREEN_TESTS=FALSE" - ) - cmake-utils_src_configure -} diff --git a/sci-electronics/gazebo/gazebo-6.5.1.ebuild b/sci-electronics/gazebo/gazebo-6.5.1.ebuild deleted file mode 100644 index aa5a3fa..0000000 --- a/sci-electronics/gazebo/gazebo-6.5.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils versionator vcs-snapshot flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/"; -SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 libav test" - -RDEPEND=" - >=dev-libs/protobuf-2.3.0 - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - dev-libs/libtar - dev-cpp/tbb - >=dev-games/ogre-1.7.4 - sci-libs/libccd - libav? ( >=media-video/libav-9:0= ) - !libav? ( >=media-video/ffmpeg-2.6:0= ) - sci-libs/gts - >=sci-physics/bullet-2.82 - >=dev-libs/sdformat-3.1.1 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-libs/boost:=[threads] - sci-libs/gdal - virtual/libusb:1 - dev-libs/libspnav - media-libs/freeimage - sci-libs/hdf5:= - sys-apps/util-linux - media-gfx/graphviz - sci-libs/ignition-math:2= -" -DEPEND="${RDEPEND} - dev-qt/qttest:4 - app-text/ronn - virtual/pkgconfig - test? ( dev-libs/libxslt ) -" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/ffmpeg29.patch" -) - -src_configure() { - # doesnt build without it - append-cxxflags "-std=c++11" - # doesnt build with as-needed either - append-ldflags "-Wl,--no-as-needed" - - local mycmakeargs=( - "-DUSE_UPSTREAM_CFLAGS=OFF" - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" - "-DUSE_HOST_CFLAGS=FALSE" - "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" - "-DENABLE_SCREEN_TESTS=FALSE" - ) - cmake-utils_src_configure -} diff --git a/sci-electronics/gazebo/gazebo-7.0.0.ebuild b/sci-electronics/gazebo/gazebo-7.0.0.ebuild deleted file mode 100644 index 078f693..0000000 --- a/sci-electronics/gazebo/gazebo-7.0.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils versionator vcs-snapshot flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/"; -SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 libav test" - -RDEPEND=" - >=dev-libs/protobuf-2.3.0 - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - dev-libs/tinyxml2 - dev-libs/libtar - dev-cpp/tbb - >=dev-games/ogre-1.7.4 - sci-libs/libccd - libav? ( >=media-video/libav-9:0= ) - !libav? ( >=media-video/ffmpeg-2.6:0= ) - sci-libs/gts - >=sci-physics/bullet-2.82 - >=dev-libs/sdformat-4:= - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtwebkit:4 - dev-qt/qtxmlpatterns:4 - dev-libs/boost:=[threads] - sci-libs/gdal - virtual/libusb:1 - dev-libs/libspnav - media-libs/freeimage - sci-libs/hdf5:= - sys-apps/util-linux - media-gfx/graphviz - >=sci-libs/ignition-math-2.3:2= - net-libs/ignition-transport:= -" -DEPEND="${RDEPEND} - dev-qt/qttest:4 - app-text/ronn - virtual/pkgconfig - x11-apps/mesa-progs - test? ( dev-libs/libxslt ) -" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/ffmpeg29.patch" -) - -src_configure() { - # doesnt build without it - append-cxxflags "-std=c++11" - # doesnt build with as-needed either - append-ldflags "-Wl,--no-as-needed" - - local mycmakeargs=( - "-DUSE_UPSTREAM_CFLAGS=OFF" - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" - "-DUSE_HOST_CFLAGS=FALSE" - "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" - "-DENABLE_SCREEN_TESTS=FALSE" - "-DUSE_EXTERNAL_TINYXML2=TRUE" - ) - cmake-utils_src_configure -}
