* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2015-09-16 11:33 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2015-09-16 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 9bb8ed37fb04ab2797ac42261bb93ef6297cbd4e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 11:32:37 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 11:33:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bb8ed37
sci-electronics/gazebo: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
sci-electronics/gazebo/files/ffmpeg29.patch | 22 ++++++++++++++++++++++
sci-electronics/gazebo/gazebo-5.1.0.ebuild | 5 ++++-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/sci-electronics/gazebo/files/ffmpeg29.patch b/sci-electronics/gazebo/files/ffmpeg29.patch
new file mode 100644
index 0000000..df53cc7
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg29.patch
@@ -0,0 +1,22 @@
+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-5.1.0.ebuild b/sci-electronics/gazebo/gazebo-5.1.0.ebuild
index d1a55a1..81d360d 100644
--- a/sci-electronics/gazebo/gazebo-5.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-5.1.0.ebuild
@@ -45,7 +45,10 @@ DEPEND="${RDEPEND}
"
S="${WORKDIR}/${PN}$(get_major_version)_${PV}"
CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/bullet_283.patch" )
+PATCHES=(
+ "${FILESDIR}/bullet_283.patch"
+ "${FILESDIR}/ffmpeg29.patch"
+)
src_configure() {
# doesnt build without it
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2016-05-02 16:35 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2016-05-02 16:35 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2016-08-04 12:49 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2016-08-04 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 3b77a1b7737e4cad76736127140215a203a253c4
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 4 12:48:56 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Aug 4 12:49:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b77a1b7
sci-electronics/gazebo: fix build with tinyxml2 4.0
Package-Manager: portage-2.3.0
sci-electronics/gazebo/files/tinyxml2.patch | 22 ++++++++++++++++++++++
sci-electronics/gazebo/gazebo-7.3.1.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/sci-electronics/gazebo/files/tinyxml2.patch b/sci-electronics/gazebo/files/tinyxml2.patch
new file mode 100644
index 0000000..b829201
--- /dev/null
+++ b/sci-electronics/gazebo/files/tinyxml2.patch
@@ -0,0 +1,22 @@
+Index: gazebo-7.3.1/gazebo/util/LogPlay.cc
+===================================================================
+--- gazebo-7.3.1.orig/gazebo/util/LogPlay.cc
++++ gazebo-7.3.1/gazebo/util/LogPlay.cc
+@@ -72,7 +72,7 @@ void LogPlay::Open(const std::string &_l
+
+ // Flag use to indicate if a parser failure has occurred
+ bool xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+- tinyxml2::XML_NO_ERROR;
++ tinyxml2::XML_SUCCESS;
+
+ // Parse the log file
+ if (xmlParserFail)
+@@ -105,7 +105,7 @@ void LogPlay::Open(const std::string &_l
+
+ // Retry loading the log file.
+ xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) !=
+- tinyxml2::XML_NO_ERROR;
++ tinyxml2::XML_SUCCESS;
+ }
+ }
+ }
diff --git a/sci-electronics/gazebo/gazebo-7.3.1.ebuild b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
index c3b8b54..cdc015c 100644
--- a/sci-electronics/gazebo/gazebo-7.3.1.ebuild
+++ b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=( "${FILESDIR}/tinyxml2.patch" )
src_configure() {
# doesnt build without it
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2017-01-28 20:13 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2017-01-28 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 9c0dddf487d1ee72312fc8c1f7d2a5034ad79d50
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 20:03:09 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 20:13:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0dddf4
sci-electronics/gazebo: Bump to 8.0.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-electronics/gazebo/Manifest | 1 +
sci-electronics/gazebo/files/qwt.patch | 64 ++++++++++++++++++++++++
sci-electronics/gazebo/files/tests.patch | 46 ++++++++++++++++++
sci-electronics/gazebo/gazebo-8.0.0.ebuild | 78 ++++++++++++++++++++++++++++++
4 files changed, 189 insertions(+)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 51ba775..d00ed3b 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1,2 @@
DIST gazebo-7.5.0.tar.bz2 50140753 SHA256 15d87d0d329ef37ff82e676e7b8b0c8535c40ba635cdebd5b8ee3b5832fa8e56 SHA512 dd65a937a4fe7273b8cefa4d9491e3fca981c86b54769805b2164e53c2c25e18a544412657f942b7d6ec5de612e77f89777150ef25cc62de1726a519161d1d85 WHIRLPOOL d81b9cd4f338c2ef327d7946b2a5f61c916fe35d26c6150825f1d7b26b3f0582890b0a56080ad523d19c024b2b24b482143df80eefade4e973a04157408b2ae8
+DIST gazebo-8.0.0.tar.bz2 52472089 SHA256 ea733be6946ac5c538bf207ba01f3a6d6afa456d0b70455f7066b19d722f0d12 SHA512 51890faebe50112fcdc4f53cb8e7be583f62e9690ffdfab1bc2346a79157a7e796830f58f64573c3fbe1caa7653b2fb0be514f43dfd36545bf9c8ab8d580ffee WHIRLPOOL ff351dad7bede38d1b1749cfb74b18c853c11e9e3db89d112586ce4cdfa51efebb7ab9c06f32e2ff2b5ed6a1b687a44da238de91c6254e12b82f722ba9dc1ade
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
new file mode 100644
index 00000000..d7bbce2
--- /dev/null
+++ b/sci-electronics/gazebo/files/qwt.patch
@@ -0,0 +1,64 @@
+Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
+===================================================================
+--- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake
++++ gazebo-8.0.0/cmake/SearchForStuff.cmake
+@@ -758,10 +758,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
+ /usr/local/lib/qwt.framework/Headers
+ ${QWT_WIN_INCLUDE_DIR}
+
+- PATH_SUFFIXES qwt qwt5
++ PATH_SUFFIXES qwt6
+ )
+
+-find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
++find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS
+ /usr/lib
+ /usr/local/lib
+ /usr/local/lib/qwt.framework
+Index: gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
+===================================================================
+--- gazebo-8.0.0.orig/gazebo/gui/plot/qwt_gazebo.h
++++ gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
+@@ -23,24 +23,24 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wfloat-equal"
+
+-#include <qwt/qwt_curve_fitter.h>
+-#include <qwt/qwt_legend.h>
+-#include <qwt/qwt_painter.h>
+-#include <qwt/qwt_picker_machine.h>
+-#include <qwt/qwt_plot.h>
+-#include <qwt/qwt_plot_canvas.h>
+-#include <qwt/qwt_plot_curve.h>
+-#include <qwt/qwt_plot_directpainter.h>
+-#include <qwt/qwt_plot_grid.h>
+-#include <qwt/qwt_plot_layout.h>
+-#include <qwt/qwt_plot_magnifier.h>
+-#include <qwt/qwt_plot_marker.h>
+-#include <qwt/qwt_plot_panner.h>
+-#include <qwt/qwt_plot_zoomer.h>
+-#include <qwt/qwt_scale_engine.h>
+-#include <qwt/qwt_scale_widget.h>
+-#include <qwt/qwt_symbol.h>
+-#include <qwt/qwt_plot_renderer.h>
++#include <qwt6/qwt_curve_fitter.h>
++#include <qwt6/qwt_legend.h>
++#include <qwt6/qwt_painter.h>
++#include <qwt6/qwt_picker_machine.h>
++#include <qwt6/qwt_plot.h>
++#include <qwt6/qwt_plot_canvas.h>
++#include <qwt6/qwt_plot_curve.h>
++#include <qwt6/qwt_plot_directpainter.h>
++#include <qwt6/qwt_plot_grid.h>
++#include <qwt6/qwt_plot_layout.h>
++#include <qwt6/qwt_plot_magnifier.h>
++#include <qwt6/qwt_plot_marker.h>
++#include <qwt6/qwt_plot_panner.h>
++#include <qwt6/qwt_plot_zoomer.h>
++#include <qwt6/qwt_scale_engine.h>
++#include <qwt6/qwt_scale_widget.h>
++#include <qwt6/qwt_symbol.h>
++#include <qwt6/qwt_plot_renderer.h>
+
+ #pragma clang diagnostic pop
+
diff --git a/sci-electronics/gazebo/files/tests.patch b/sci-electronics/gazebo/files/tests.patch
new file mode 100644
index 00000000..4f06acb
--- /dev/null
+++ b/sci-electronics/gazebo/files/tests.patch
@@ -0,0 +1,46 @@
+Index: gazebo-8.0.0/test/integration/physics_link.cc
+===================================================================
+--- gazebo-8.0.0.orig/test/integration/physics_link.cc
++++ gazebo-8.0.0/test/integration/physics_link.cc
+@@ -199,7 +199,7 @@ void PhysicsLinkTest::AddForce(const std
+ gzdbg << "World != link == inertial frames, no offset" << std::endl;
+ model->SetLinkWorldPose(ignition::math::Pose3d(
+ ignition::math::Vector3d(2, 3, 4),
+- ignition::math::Vector3d(0, IGN_PI/2.0, 1)), link);
++ ignition::math::Quaterniond(0, IGN_PI/2.0, 1)), link);
+ EXPECT_NE(ignition::math::Pose3d::Zero, link->WorldPose());
+ EXPECT_EQ(link->WorldPose(), link->WorldInertialPose());
+ this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(-1, 10, 5));
+@@ -215,7 +215,7 @@ void PhysicsLinkTest::AddForce(const std
+ model->SetLinkWorldPose(ignition::math::Pose3d::Zero, link);
+ ignition::math::Pose3d inertialPose = ignition::math::Pose3d(
+ ignition::math::Vector3d(1, 5, 8),
+- ignition::math::Vector3d(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4));
++ ignition::math::Quaterniond(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4));
+ link->GetInertial()->SetCoG(inertialPose);
+ EXPECT_EQ(ignition::math::Pose3d::Zero, link->WorldPose());
+ EXPECT_EQ(inertialPose, link->WorldInertialPose());
+@@ -224,9 +224,9 @@ void PhysicsLinkTest::AddForce(const std
+ gzdbg << "World != link != inertial frames, with offset" << std::endl;
+ model->SetLinkWorldPose(ignition::math::Pose3d(
+ ignition::math::Vector3d(5, 10, -4),
+- ignition::math::Vector3d(0, IGN_PI/2.0, IGN_PI/6)), link);
++ ignition::math::Quaterniond(0, IGN_PI/2.0, IGN_PI/6)), link);
+ inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(0, -5, 10),
+- ignition::math::Vector3d(0, 2.0*IGN_PI, IGN_PI/3));
++ ignition::math::Quaterniond(0, 2.0*IGN_PI, IGN_PI/3));
+ link->GetInertial()->SetCoG(inertialPose);
+ this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(1, 2, 1),
+ ignition::math::Vector3d(-2, 0.5, 1));
+@@ -235,9 +235,9 @@ void PhysicsLinkTest::AddForce(const std
+ << std::endl;
+ model->SetLinkWorldPose(ignition::math::Pose3d(
+ ignition::math::Vector3d(-1.5, 0.8, 3),
+- ignition::math::Vector3d(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link);
++ ignition::math::Quaterniond(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link);
+ inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(1, 0, -5.6),
+- ignition::math::Vector3d(IGN_PI/9, 0, IGN_PI*3));
++ ignition::math::Quaterniond(IGN_PI/9, 0, IGN_PI*3));
+ link->GetInertial()->SetCoG(inertialPose);
+ link->SetLinearVel(ignition::math::Vector3d(2, -0.1, 5));
+ link->SetAngularVel(ignition::math::Vector3d(-IGN_PI/10, 0, 0.0001));
diff --git a/sci-electronics/gazebo/gazebo-8.0.0.ebuild b/sci-electronics/gazebo/gazebo-8.0.0.ebuild
new file mode 100644
index 00000000..eaba13c
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-8.0.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 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="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/8"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 libav test"
+
+RDEPEND="
+ >=dev-libs/protobuf-2:=
+ 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[freeimage]
+ >=media-libs/freeimage-3.15.4[png]
+ 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-5.0:=
+ dev-qt/qtwidgets:5
+ dev-qt/qtcore:5
+ dev-qt/qtopengl:5
+ 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
+ net-libs/ignition-msgs:=
+ >=sci-libs/ignition-math-2.3:3=
+ net-libs/ignition-transport:3=
+ x11-libs/qwt:6=[qt5]
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+ app-text/ronn
+ app-arch/gzip
+ virtual/pkgconfig
+ x11-apps/mesa-progs
+ test? ( dev-libs/libxslt )
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/tests.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"
+ "-DBUILD_TESTING=$(usex test TRUE FALSE)"
+ "-DENABLE_SCREEN_TESTS=FALSE"
+ "-DUSE_EXTERNAL_TINYXML2=TRUE"
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2017-06-29 20:28 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2017-06-29 20:28 UTC (permalink / raw
To: gentoo-commits
commit: a5da9dec25cc7e8b323cfc6c4e3cdff66750c925
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 29 09:51:41 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 29 20:28:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5da9dec
sci-electronics/gazebo: Remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sci-electronics/gazebo/Manifest | 2 -
sci-electronics/gazebo/files/tests.patch | 46 ------------------
sci-electronics/gazebo/gazebo-8.0.0.ebuild | 77 ------------------------------
sci-electronics/gazebo/gazebo-8.1.0.ebuild | 77 ------------------------------
4 files changed, 202 deletions(-)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index f1118838fb7..4a2024f0bed 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1 @@
-DIST gazebo-8.0.0.tar.bz2 52472089 SHA256 ea733be6946ac5c538bf207ba01f3a6d6afa456d0b70455f7066b19d722f0d12 SHA512 51890faebe50112fcdc4f53cb8e7be583f62e9690ffdfab1bc2346a79157a7e796830f58f64573c3fbe1caa7653b2fb0be514f43dfd36545bf9c8ab8d580ffee WHIRLPOOL ff351dad7bede38d1b1749cfb74b18c853c11e9e3db89d112586ce4cdfa51efebb7ab9c06f32e2ff2b5ed6a1b687a44da238de91c6254e12b82f722ba9dc1ade
-DIST gazebo-8.1.0.tar.bz2 52442394 SHA256 d24cda8919c49cd0b15a51975d551eed1c7c0bfba7b9aa2b1ca9711bf9441e5e SHA512 d451d068a44c487e7b0a6cef17bbffaa39ec4bb08593c4c05d8c758dd56c1bcdb52e6284254c0d27a984761c0eb944012b8a1061bebf47662f6f3c91d3be955c WHIRLPOOL 82f85c1b115e585f352f2fce9b3fac0fc4fa1a35c4c24ffc00b45fe4dc33bd13df655c6f64acd652b1707af3a2756279c572650da5c52eec27d52414c8a45e7d
DIST gazebo-8.1.1.tar.bz2 52448136 SHA256 bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949 SHA512 bf5585e63cfb5a86b89a0e802c33ff07c5753e94b9282610d2ea1a4248af705a1c80ea52389b4a7c49f51ec1990e2c9a5e3a6a74fefebe1b20e70960ceb755e8 WHIRLPOOL dfd2fe727dacaf58d6a9b1344ef5c00170ce6d109fa159f2379bbebaa6899ce9011cb2f7863faffaa3a34905c04485957a4a574bc9b10307cf22d0a283ef51a3
diff --git a/sci-electronics/gazebo/files/tests.patch b/sci-electronics/gazebo/files/tests.patch
deleted file mode 100644
index 4f06acbc0ee..00000000000
--- a/sci-electronics/gazebo/files/tests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: gazebo-8.0.0/test/integration/physics_link.cc
-===================================================================
---- gazebo-8.0.0.orig/test/integration/physics_link.cc
-+++ gazebo-8.0.0/test/integration/physics_link.cc
-@@ -199,7 +199,7 @@ void PhysicsLinkTest::AddForce(const std
- gzdbg << "World != link == inertial frames, no offset" << std::endl;
- model->SetLinkWorldPose(ignition::math::Pose3d(
- ignition::math::Vector3d(2, 3, 4),
-- ignition::math::Vector3d(0, IGN_PI/2.0, 1)), link);
-+ ignition::math::Quaterniond(0, IGN_PI/2.0, 1)), link);
- EXPECT_NE(ignition::math::Pose3d::Zero, link->WorldPose());
- EXPECT_EQ(link->WorldPose(), link->WorldInertialPose());
- this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(-1, 10, 5));
-@@ -215,7 +215,7 @@ void PhysicsLinkTest::AddForce(const std
- model->SetLinkWorldPose(ignition::math::Pose3d::Zero, link);
- ignition::math::Pose3d inertialPose = ignition::math::Pose3d(
- ignition::math::Vector3d(1, 5, 8),
-- ignition::math::Vector3d(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4));
-+ ignition::math::Quaterniond(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4));
- link->GetInertial()->SetCoG(inertialPose);
- EXPECT_EQ(ignition::math::Pose3d::Zero, link->WorldPose());
- EXPECT_EQ(inertialPose, link->WorldInertialPose());
-@@ -224,9 +224,9 @@ void PhysicsLinkTest::AddForce(const std
- gzdbg << "World != link != inertial frames, with offset" << std::endl;
- model->SetLinkWorldPose(ignition::math::Pose3d(
- ignition::math::Vector3d(5, 10, -4),
-- ignition::math::Vector3d(0, IGN_PI/2.0, IGN_PI/6)), link);
-+ ignition::math::Quaterniond(0, IGN_PI/2.0, IGN_PI/6)), link);
- inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(0, -5, 10),
-- ignition::math::Vector3d(0, 2.0*IGN_PI, IGN_PI/3));
-+ ignition::math::Quaterniond(0, 2.0*IGN_PI, IGN_PI/3));
- link->GetInertial()->SetCoG(inertialPose);
- this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(1, 2, 1),
- ignition::math::Vector3d(-2, 0.5, 1));
-@@ -235,9 +235,9 @@ void PhysicsLinkTest::AddForce(const std
- << std::endl;
- model->SetLinkWorldPose(ignition::math::Pose3d(
- ignition::math::Vector3d(-1.5, 0.8, 3),
-- ignition::math::Vector3d(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link);
-+ ignition::math::Quaterniond(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link);
- inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(1, 0, -5.6),
-- ignition::math::Vector3d(IGN_PI/9, 0, IGN_PI*3));
-+ ignition::math::Quaterniond(IGN_PI/9, 0, IGN_PI*3));
- link->GetInertial()->SetCoG(inertialPose);
- link->SetLinearVel(ignition::math::Vector3d(2, -0.1, 5));
- link->SetAngularVel(ignition::math::Vector3d(-IGN_PI/10, 0, 0.0001));
diff --git a/sci-electronics/gazebo/gazebo-8.0.0.ebuild b/sci-electronics/gazebo/gazebo-8.0.0.ebuild
deleted file mode 100644
index b63f695c4c9..00000000000
--- a/sci-electronics/gazebo/gazebo-8.0.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/8"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav test"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- 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[freeimage]
- >=media-libs/freeimage-3.15.4[png]
- 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-5.0:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- 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
- net-libs/ignition-msgs:=
- >=sci-libs/ignition-math-2.3:3=
- net-libs/ignition-transport:3=
- x11-libs/qwt:6=[qt5]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- app-text/ronn
- app-arch/gzip
- virtual/pkgconfig
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/tests.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"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake-utils_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-8.1.0.ebuild b/sci-electronics/gazebo/gazebo-8.1.0.ebuild
deleted file mode 100644
index 92b92dfc69c..00000000000
--- a/sci-electronics/gazebo/gazebo-8.1.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/8"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav test"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- 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[freeimage]
- >=media-libs/freeimage-3.15.4[png]
- 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-5.0:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads]
- sci-libs/gdal
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:=
- >=sci-libs/ignition-math-2.3:3=
- net-libs/ignition-transport:3=
- x11-libs/qwt:6=[qt5]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- app-text/ronn
- app-arch/gzip
- virtual/pkgconfig
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.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"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2018-04-20 7:48 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2018-04-20 7:48 UTC (permalink / raw
To: gentoo-commits
commit: d237d82ef8ecdc197e3211900c726619a2278189
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 15:50:02 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 07:47:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d237d82e
sci-electronics/gazebo: fix build with ffmpeg 4
Package-Manager: Portage-2.3.30, Repoman-2.3.9
sci-electronics/gazebo/files/ffmpeg4.patch | 30 ++++++++++++++++++++++++++++++
sci-electronics/gazebo/gazebo-9.0.0.ebuild | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
new file mode 100644
index 00000000000..7bd8777dea3
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg4.patch
@@ -0,0 +1,30 @@
+Index: gazebo-9.0.0/gazebo/common/AudioDecoder.cc
+===================================================================
+--- gazebo-9.0.0.orig/gazebo/common/AudioDecoder.cc
++++ gazebo-9.0.0/gazebo/common/AudioDecoder.cc
+@@ -255,8 +255,8 @@ bool AudioDecoder::SetFile(const std::st
+ return false;
+ }
+
+- if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
+- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++ if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ // Open codec
+ if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0)
+Index: gazebo-9.0.0/gazebo/common/Video.cc
+===================================================================
+--- gazebo-9.0.0.orig/gazebo/common/Video.cc
++++ gazebo-9.0.0/gazebo/common/Video.cc
+@@ -143,8 +143,8 @@ bool Video::Load(const std::string &_fil
+
+ // Inform the codec that we can handle truncated bitstreams -- i.e.,
+ // bitstreams where frame boundaries can fall in the middle of packets
+- if (codec->capabilities & CODEC_CAP_TRUNCATED)
+- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
++ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ // Open codec
+ if (avcodec_open2(this->codecCtx, codec, nullptr) < 0)
diff --git a/sci-electronics/gazebo/gazebo-9.0.0.ebuild b/sci-electronics/gazebo/gazebo-9.0.0.ebuild
index 76ad65771aa..77f42540c99 100644
--- a/sci-electronics/gazebo/gazebo-9.0.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-9.0.0.ebuild
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/ffmpeg4.patch" )
src_configure() {
# doesnt build without it
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2018-08-23 11:41 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2018-08-23 11:41 UTC (permalink / raw
To: gentoo-commits
commit: a9278d349bd375e00bf565fbe2382eeb270c2216
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 23 11:41:33 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Aug 23 11:41:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9278d34
sci-electronics/gazebo: Remove old
Package-Manager: Portage-2.3.48, Repoman-2.3.10
sci-electronics/gazebo/Manifest | 3 --
sci-electronics/gazebo/files/ffmpeg4.patch | 30 -----------
sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild | 77 --------------------------
sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild | 78 ---------------------------
sci-electronics/gazebo/gazebo-9.2.0.ebuild | 78 ---------------------------
5 files changed, 266 deletions(-)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index f414b5b75a8..5e7b82c4c6d 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,5 +1,2 @@
-DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50
-DIST gazebo-9.1.1.tar.bz2 52978923 BLAKE2B 46ddcc0928b3f591356379e20fa5478e385046f8ef2295730b5cb69e07636928226e423db654697a32bcab14846cd13dfe6248017fe1f410d4060f372154ae69 SHA512 1892a3f09d98b75cfdd30b020eb335b4e267db161850eba58153c5be4beb1c2053843f336d63fe638e3ba6466a9d746210a8e7cf3e2d577cc380ce4904576b3c
-DIST gazebo-9.2.0.tar.bz2 52929158 BLAKE2B 208b911551d4a16f5ab2e37b033e0f132bfbf4cdf01129fa4849d67ea9d2e092e00c3382e925a437d67916ddbaaf8ac499b21231ebdc5bd2302865476b9773df SHA512 4c91c66ce4b5d63cb97d948de5f9d5ae9dcb88de8f5e650a6f6dee085cd7539454a25871691a1bdb38a3c65fa52c5ea1b94fbd3a618a77cb234579f2f268a017
DIST gazebo-9.3.0.tar.bz2 52924750 BLAKE2B c908827fca7786b0dac10401549265d6d0ca0ce5c952816b5d3d5f2feec096f0465778b4165a4054abd285ec1fedc80e3d2ed3c81be234574d7419d2635f61f4 SHA512 5874582e015cfc2b690b26cd810e4c79cc5dba1ecea7eaa72d3c12e0a5f3dd6f42185666f0cf36a1d00564b642c2c63662b06657da82cfd2ce3ebd9219012cb4
DIST gazebo-9.3.1.tar.bz2 52961705 BLAKE2B d1860a13f1c23d3ffaeb8087c94a5b72682c99eec03927105a4e2fc9e951a41c2723f394fe613be4a2603aacd153817e5445b21518ecdb0f0d4d8e6eb4ee28eb SHA512 d3d41a32cab440358fb1dd2524d9a1601fbff8b272c86120d82ddc3337f2a8dcda46c3ba24f95dba99e061ef69c15ac919b5c8e4d16ea71a9da572bb9a5cee12
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
deleted file mode 100644
index 7bd8777dea3..00000000000
--- a/sci-electronics/gazebo/files/ffmpeg4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gazebo-9.0.0/gazebo/common/AudioDecoder.cc
-===================================================================
---- gazebo-9.0.0.orig/gazebo/common/AudioDecoder.cc
-+++ gazebo-9.0.0/gazebo/common/AudioDecoder.cc
-@@ -255,8 +255,8 @@ bool AudioDecoder::SetFile(const std::st
- return false;
- }
-
-- if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
-- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
-+ if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
-
- // Open codec
- if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0)
-Index: gazebo-9.0.0/gazebo/common/Video.cc
-===================================================================
---- gazebo-9.0.0.orig/gazebo/common/Video.cc
-+++ gazebo-9.0.0/gazebo/common/Video.cc
-@@ -143,8 +143,8 @@ bool Video::Load(const std::string &_fil
-
- // Inform the codec that we can handle truncated bitstreams -- i.e.,
- // bitstreams where frame boundaries can fall in the middle of packets
-- if (codec->capabilities & CODEC_CAP_TRUNCATED)
-- this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
-+ if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
-
- // Open codec
- if (avcodec_open2(this->codecCtx, codec, nullptr) < 0)
diff --git a/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild b/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild
deleted file mode 100644
index 082cdd6c8e6..00000000000
--- a/sci-electronics/gazebo/gazebo-9.0.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/9"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav test"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- dev-cpp/tbb
- >=dev-games/ogre-1.7.4[freeimage]
- >=media-libs/freeimage-3.15.4[png]
- 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-6.0:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:1=
- sci-libs/ignition-math:4=
- net-libs/ignition-transport:4=
- x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- app-text/ronn
- app-arch/gzip
- virtual/pkgconfig
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/ffmpeg4.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"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake-utils_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild b/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild
deleted file mode 100644
index a1bfd2b1d31..00000000000
--- a/sci-electronics/gazebo/gazebo-9.1.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/9"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav test"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- dev-cpp/tbb
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- 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-6.0:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:1=
- sci-libs/ignition-math:4=
- net-libs/ignition-transport:4=
- x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- app-text/ronn
- app-arch/gzip
- virtual/pkgconfig
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.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"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake-utils_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-9.2.0.ebuild b/sci-electronics/gazebo/gazebo-9.2.0.ebuild
deleted file mode 100644
index a1bfd2b1d31..00000000000
--- a/sci-electronics/gazebo/gazebo-9.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/9"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav test"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- dev-cpp/tbb
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- 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-6.0:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:1=
- sci-libs/ignition-math:4=
- net-libs/ignition-transport:4=
- x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- app-text/ronn
- app-arch/gzip
- virtual/pkgconfig
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.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"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2019-12-10 17:35 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2019-12-10 17:35 UTC (permalink / raw
To: gentoo-commits
commit: e6da5cbebb60ceb1982fdc12c511f8b92a1133ee
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 14:48:22 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 17:34:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6da5cbe
sci-electronics/gazebo: fix build with openal 1.20
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/files/oal.patch | 19 +++++++++++++++++++
sci-electronics/gazebo/gazebo-10.1.0.ebuild | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/sci-electronics/gazebo/files/oal.patch b/sci-electronics/gazebo/files/oal.patch
new file mode 100644
index 00000000000..4a09793aed0
--- /dev/null
+++ b/sci-electronics/gazebo/files/oal.patch
@@ -0,0 +1,19 @@
+Fixes build with openal 1.20
+
+Index: gazebo-10.1.0/gazebo/util/OpenALPrivate.hh
+===================================================================
+--- gazebo-10.1.0.orig/gazebo/util/OpenALPrivate.hh
++++ gazebo-10.1.0/gazebo/util/OpenALPrivate.hh
+@@ -37,10 +37,10 @@ namespace gazebo
+ class OpenALPrivate
+ {
+ /// \brief OpenAL audio context pointer.
+- public: ALCcontext_struct *context;
++ public: ALCcontext *context;
+
+ /// \brief OpenAL audio device pointer.
+- public: ALCdevice_struct *audioDevice;
++ public: ALCdevice *audioDevice;
+
+ /// \brief OpenAL sink pointer.
+ public: OpenALSinkPtr sink;
diff --git a/sci-electronics/gazebo/gazebo-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
index 2ba6f5bb35d..dbc0c2f89e3 100644
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
@@ -58,7 +58,7 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" )
src_configure() {
# doesnt build without it
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2020-09-21 13:47 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2020-09-21 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 44e8c7e2605d77d478241ea6050b24c0028f4a09
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 13:20:52 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 13:47:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44e8c7e2
sci-electronics/gazebo: Remove old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/Manifest | 2 -
sci-electronics/gazebo/files/oal.patch | 19 -------
sci-electronics/gazebo/files/qtmoc.patch | 44 ----------------
sci-electronics/gazebo/gazebo-10.1.0.ebuild | 78 ----------------------------
sci-electronics/gazebo/gazebo-11.0.0.ebuild | 80 -----------------------------
5 files changed, 223 deletions(-)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 48c83055e43..5e66a9b6169 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1 @@
-DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
-DIST gazebo-11.0.0.tar.bz2 53806265 BLAKE2B 0658bdfd7d1f130767bd38cc2b33379f66f8cd92a9e6496581cd660638fb0307f87af19bcd5bd9ec2edb2be980e964297241ab4c1cec855751fdd7b394c717e9 SHA512 7c6cbb17c52829bb553f57a4bc2d515211aefa105d97cd5e71ff239244e49312562af1c901dac6c88b982986dd1318c0bb780c0a68f10ce78f25e12f031ba934
DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76
diff --git a/sci-electronics/gazebo/files/oal.patch b/sci-electronics/gazebo/files/oal.patch
deleted file mode 100644
index 4a09793aed0..00000000000
--- a/sci-electronics/gazebo/files/oal.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes build with openal 1.20
-
-Index: gazebo-10.1.0/gazebo/util/OpenALPrivate.hh
-===================================================================
---- gazebo-10.1.0.orig/gazebo/util/OpenALPrivate.hh
-+++ gazebo-10.1.0/gazebo/util/OpenALPrivate.hh
-@@ -37,10 +37,10 @@ namespace gazebo
- class OpenALPrivate
- {
- /// \brief OpenAL audio context pointer.
-- public: ALCcontext_struct *context;
-+ public: ALCcontext *context;
-
- /// \brief OpenAL audio device pointer.
-- public: ALCdevice_struct *audioDevice;
-+ public: ALCdevice *audioDevice;
-
- /// \brief OpenAL sink pointer.
- public: OpenALSinkPtr sink;
diff --git a/sci-electronics/gazebo/files/qtmoc.patch b/sci-electronics/gazebo/files/qtmoc.patch
deleted file mode 100644
index 47841eb26e0..00000000000
--- a/sci-electronics/gazebo/files/qtmoc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 66dcba0375357d294d4769a6eb542de29b78a519 Mon Sep 17 00:00:00 2001
-From: Steve Peters <scpeters@openrobotics.org>
-Date: Thu, 26 Dec 2019 05:12:08 -0800
-Subject: [PATCH] use ifndef Q_MOC_RUN to fix compilation of plugins with tbb
- and qt 5.14 (issue #2681)
-
----
- plugins/CessnaGUIPlugin.hh | 3 +++
- plugins/LookAtDemoPlugin.hh | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/plugins/CessnaGUIPlugin.hh b/plugins/CessnaGUIPlugin.hh
-index 7556d89982..091b8ffd00 100644
---- a/plugins/CessnaGUIPlugin.hh
-+++ b/plugins/CessnaGUIPlugin.hh
-@@ -23,7 +23,10 @@
-
- #include <gazebo/common/Plugin.hh>
- #include <gazebo/gui/GuiPlugin.hh>
-+// moc parsing error of tbb headers
-+#ifndef Q_MOC_RUN
- #include <gazebo/transport/transport.hh>
-+#endif
-
- namespace gazebo
- {
-diff --git a/plugins/LookAtDemoPlugin.hh b/plugins/LookAtDemoPlugin.hh
-index 5659394892..2a22b222f5 100644
---- a/plugins/LookAtDemoPlugin.hh
-+++ b/plugins/LookAtDemoPlugin.hh
-@@ -21,7 +21,10 @@
-
- #include <gazebo/common/Plugin.hh>
- #include <gazebo/gui/GuiPlugin.hh>
-+// moc parsing error of tbb headers
-+#ifndef Q_MOC_RUN
- #include <gazebo/transport/transport.hh>
-+#endif
-
- namespace gazebo
- {
---
-2.24.1
-
diff --git a/sci-electronics/gazebo/gazebo-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
deleted file mode 100644
index d9ee4733544..00000000000
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/10"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- dev-cpp/tbb
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- sci-libs/libccd
- >=media-video/ffmpeg-2.6:0=
- sci-libs/gts
- >=sci-physics/bullet-2.82
- >=dev-libs/sdformat-6.0:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:1=
- sci-libs/ignition-math:4=
- net-libs/ignition-transport:4=
- x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- app-text/ronn
- app-arch/gzip
- virtual/pkgconfig
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" "${FILESDIR}/qtmoc.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"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake-utils_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-11.0.0.ebuild b/sci-electronics/gazebo/gazebo-11.0.0.ebuild
deleted file mode 100644
index d0014afc557..00000000000
--- a/sci-electronics/gazebo/gazebo-11.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- dev-cpp/tbb
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- sci-libs/libccd
- >=media-video/ffmpeg-2.6:0=
- sci-libs/gts
- >=sci-physics/bullet-2.82
- >=dev-libs/sdformat-9.1:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:5=
- sci-libs/ignition-math:6=
- net-libs/ignition-transport:8=
- sci-libs/ignition-common:3=
- sci-libs/ignition-fuel-tools:4=
- x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-BDEPEND="
- app-text/ronn
- app-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/boost173.patch" "${FILESDIR}/cmake.patch" )
-
-src_configure() {
- # doesnt build with as-needed
- #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"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2021-01-20 15:33 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2021-01-20 15:33 UTC (permalink / raw
To: gentoo-commits
commit: e172420d6da7928006f9c54a5b016e62735de7f9
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 15:08:09 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 15:33:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e172420d
sci-electronics/gazebo: bump to 11.3.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/Manifest | 2 +-
sci-electronics/gazebo/files/boost173.patch | 135 ---------------------
sci-electronics/gazebo/files/boost174.patch | 20 ---
sci-electronics/gazebo/files/qwt.patch | 47 -------
...azebo-11.1.0-r1.ebuild => gazebo-11.3.0.ebuild} | 8 +-
5 files changed, 4 insertions(+), 208 deletions(-)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 5e66a9b6169..ce307cd34ad 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1 @@
-DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76
+DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
diff --git a/sci-electronics/gazebo/files/boost173.patch b/sci-electronics/gazebo/files/boost173.patch
deleted file mode 100644
index 618f6f1b534..00000000000
--- a/sci-electronics/gazebo/files/boost173.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc
-===================================================================
---- gazebo-11.0.0.orig/gazebo/gui/model/ModelTreeWidget.cc
-+++ gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc
-@@ -162,7 +162,7 @@ ModelTreeWidget::ModelTreeWidget(QWidget
- // Connections
- this->connections.push_back(
- gui::model::Events::ConnectSaveModel(
-- boost::bind(&ModelTreeWidget::OnSaveModel, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnSaveModel, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectNewModel(
-@@ -170,11 +170,11 @@ ModelTreeWidget::ModelTreeWidget(QWidget
-
- this->connections.push_back(
- gui::model::Events::ConnectModelPropertiesChanged(
-- boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2)));
-+ boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->connections.push_back(
- gui::model::Events::ConnectModelNameChanged(
-- boost::bind(&ModelTreeWidget::OnModelNameChanged, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnModelNameChanged, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectNestedModelInserted(
-@@ -183,51 +183,51 @@ ModelTreeWidget::ModelTreeWidget(QWidget
-
- this->connections.push_back(
- gui::model::Events::ConnectLinkInserted(
-- boost::bind(&ModelTreeWidget::OnLinkInserted, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnLinkInserted, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectJointInserted(
-- boost::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4)));
-+ boost::bind(&ModelTreeWidget::OnJointInserted, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4)));
-
- this->connections.push_back(
- gui::model::Events::ConnectModelPluginInserted(
-- boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectNestedModelRemoved(
-- boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectLinkRemoved(
-- boost::bind(&ModelTreeWidget::OnLinkRemoved, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnLinkRemoved, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectJointRemoved(
-- boost::bind(&ModelTreeWidget::OnJointRemoved, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnJointRemoved, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectModelPluginRemoved(
-- boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1)));
-+ boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, boost::placeholders::_1)));
-
- this->connections.push_back(
- gui::model::Events::ConnectJointNameChanged(
-- boost::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2)));
-+ boost::bind(&ModelTreeWidget::OnJointNameChanged, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->connections.push_back(
- event::Events::ConnectSetSelectedEntity(
-- boost::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2)));
-+ boost::bind(&ModelTreeWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->connections.push_back(
- gui::model::Events::ConnectSetSelectedEntity(
-- boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2)));
-+ boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->connections.push_back(
- gui::model::Events::ConnectSetSelectedJoint(
-- boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2)));
-+ boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->connections.push_back(
- gui::model::Events::ConnectSetSelectedModelPlugin(
-- boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2)));
-+ boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->ClearModelTree();
- }
-Index: gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc
-===================================================================
---- gazebo-11.0.0.orig/gazebo/gui/model/SchematicViewWidget.cc
-+++ gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc
-@@ -83,31 +83,31 @@ void SchematicViewWidget::Reset()
- void SchematicViewWidget::Init()
- {
- this->connections.push_back(gui::model::Events::ConnectLinkInserted(
-- boost::bind(&SchematicViewWidget::AddNode, this, _1)));
-+ boost::bind(&SchematicViewWidget::AddNode, this, boost::placeholders::_1)));
-
- this->connections.push_back(gui::model::Events::ConnectLinkRemoved(
-- boost::bind(&SchematicViewWidget::RemoveNode, this, _1)));
-+ boost::bind(&SchematicViewWidget::RemoveNode, this, boost::placeholders::_1)));
-
- this->connections.push_back(gui::model::Events::ConnectJointInserted(
-- boost::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5)));
-+ boost::bind(&SchematicViewWidget::AddEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5)));
-
- this->connections.push_back(gui::model::Events::ConnectJointRemoved(
-- boost::bind(&SchematicViewWidget::RemoveEdge, this, _1)));
-+ boost::bind(&SchematicViewWidget::RemoveEdge, this, boost::placeholders::_1)));
-
- this->connections.push_back(gui::model::Events::ConnectJointChanged(
-- boost::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5)));
-+ boost::bind(&SchematicViewWidget::UpdateEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5)));
-
- this->connections.push_back(
- event::Events::ConnectSetSelectedEntity(
-- boost::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2)));
-+ boost::bind(&SchematicViewWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->connections.push_back(
- gui::model::Events::ConnectSetSelectedEntity(
-- boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2)));
-+ boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2)));
-
- this->connections.push_back(
- gui::model::Events::ConnectSetSelectedJoint(
-- boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2)));
-+ boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2)));
- }
-
- /////////////////////////////////////////////////
diff --git a/sci-electronics/gazebo/files/boost174.patch b/sci-electronics/gazebo/files/boost174.patch
deleted file mode 100644
index 82bbdf40f7a..00000000000
--- a/sci-electronics/gazebo/files/boost174.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
-===================================================================
---- gazebo-11.1.0.orig/plugins/SimpleTrackedVehiclePlugin.cc
-+++ gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
-@@ -30,6 +30,7 @@
-
- #include "plugins/SimpleTrackedVehiclePlugin.hh"
-
-+#if BOOST_VERSION < 107400 || defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
- namespace std {
- template<class T>
- class hash<boost::shared_ptr<T>> {
-@@ -38,6 +39,7 @@ class hash<boost::shared_ptr<T>> {
- }
- };
- }
-+#endif
-
- namespace gazebo
- {
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
index d7bbce2f8cb..d4f1538900b 100644
--- a/sci-electronics/gazebo/files/qwt.patch
+++ b/sci-electronics/gazebo/files/qwt.patch
@@ -15,50 +15,3 @@ Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
/usr/lib
/usr/local/lib
/usr/local/lib/qwt.framework
-Index: gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
-===================================================================
---- gazebo-8.0.0.orig/gazebo/gui/plot/qwt_gazebo.h
-+++ gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
-@@ -23,24 +23,24 @@
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wfloat-equal"
-
--#include <qwt/qwt_curve_fitter.h>
--#include <qwt/qwt_legend.h>
--#include <qwt/qwt_painter.h>
--#include <qwt/qwt_picker_machine.h>
--#include <qwt/qwt_plot.h>
--#include <qwt/qwt_plot_canvas.h>
--#include <qwt/qwt_plot_curve.h>
--#include <qwt/qwt_plot_directpainter.h>
--#include <qwt/qwt_plot_grid.h>
--#include <qwt/qwt_plot_layout.h>
--#include <qwt/qwt_plot_magnifier.h>
--#include <qwt/qwt_plot_marker.h>
--#include <qwt/qwt_plot_panner.h>
--#include <qwt/qwt_plot_zoomer.h>
--#include <qwt/qwt_scale_engine.h>
--#include <qwt/qwt_scale_widget.h>
--#include <qwt/qwt_symbol.h>
--#include <qwt/qwt_plot_renderer.h>
-+#include <qwt6/qwt_curve_fitter.h>
-+#include <qwt6/qwt_legend.h>
-+#include <qwt6/qwt_painter.h>
-+#include <qwt6/qwt_picker_machine.h>
-+#include <qwt6/qwt_plot.h>
-+#include <qwt6/qwt_plot_canvas.h>
-+#include <qwt6/qwt_plot_curve.h>
-+#include <qwt6/qwt_plot_directpainter.h>
-+#include <qwt6/qwt_plot_grid.h>
-+#include <qwt6/qwt_plot_layout.h>
-+#include <qwt6/qwt_plot_magnifier.h>
-+#include <qwt6/qwt_plot_marker.h>
-+#include <qwt6/qwt_plot_panner.h>
-+#include <qwt6/qwt_plot_zoomer.h>
-+#include <qwt6/qwt_scale_engine.h>
-+#include <qwt6/qwt_scale_widget.h>
-+#include <qwt6/qwt_symbol.h>
-+#include <qwt6/qwt_plot_renderer.h>
-
- #pragma clang diagnostic pop
-
diff --git a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild b/sci-electronics/gazebo/gazebo-11.3.0.ebuild
similarity index 91%
rename from sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild
rename to sci-electronics/gazebo/gazebo-11.3.0.ebuild
index 2bb213d040a..e1a11ffee74 100644
--- a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -64,14 +64,12 @@ BDEPEND="
CMAKE_BUILD_TYPE=RelWithDebInfo
PATCHES=(
"${FILESDIR}/qwt.patch"
- "${FILESDIR}/boost173.patch"
"${FILESDIR}/cmake.patch"
- "${FILESDIR}/boost174.patch"
)
src_configure() {
- # doesnt build with as-needed
- #append-ldflags "-Wl,--no-as-needed"
+ # find OGRE properly
+ sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
local mycmakeargs=(
"-DUSE_UPSTREAM_CFLAGS=OFF"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2022-03-02 17:45 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2022-03-02 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 218f0e9d77cc20c2c6f37cbe2d25e608ba80ea09
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 17:27:32 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 17:45:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218f0e9d
sci-electronics/gazebo: fix build with ffmpeg4
Closes: https://bugs.gentoo.org/833868
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/files/ffmpeg4.patch | 16 ++++++++++++++++
sci-electronics/gazebo/gazebo-11.10.1.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
new file mode 100644
index 000000000000..7b7c8d7270fd
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg4.patch
@@ -0,0 +1,16 @@
+Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc
+===================================================================
+--- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc
++++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc
+@@ -224,7 +224,10 @@ bool VideoEncoder::Start(const std::stri
+
+ // The remainder of this function handles FFMPEG initialization of a video
+ // stream
+- const AVOutputFormat *outputFormat = nullptr;
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++ const
++#endif
++ AVOutputFormat *outputFormat = nullptr;
+
+ // This 'if' and 'free' are just for safety. We chech the value of formatCtx
+ // below.
diff --git a/sci-electronics/gazebo/gazebo-11.10.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
index 4641556896a7..3291c74fa777 100644
--- a/sci-electronics/gazebo/gazebo-11.10.1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}/qwt.patch"
"${FILESDIR}/cmake.patch"
"${FILESDIR}/ffmpeg5.patch"
+ "${FILESDIR}/ffmpeg4.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2022-04-21 10:19 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2022-04-21 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 333f5e1520569d2ff485bd02229056afb93c8caf
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 10:19:41 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 10:19:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333f5e15
sci-electronics/gazebo: bump to 11.10.2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/Manifest | 1 +
sci-electronics/gazebo/files/qwt2.patch | 17 ++++++
sci-electronics/gazebo/gazebo-11.10.2.ebuild | 85 ++++++++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index bfbca468808c..f643396f6d4b 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,2 +1,3 @@
DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3
+DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
diff --git a/sci-electronics/gazebo/files/qwt2.patch b/sci-electronics/gazebo/files/qwt2.patch
new file mode 100644
index 000000000000..08e406055970
--- /dev/null
+++ b/sci-electronics/gazebo/files/qwt2.patch
@@ -0,0 +1,17 @@
+Index: gazebo-11.10.2/cmake/SearchForStuff.cmake
+===================================================================
+--- gazebo-11.10.2.orig/cmake/SearchForStuff.cmake
++++ gazebo-11.10.2/cmake/SearchForStuff.cmake
+@@ -847,10 +847,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
+ /usr/local/lib/qwt.framework/Headers
+ ${QWT_WIN_INCLUDE_DIR}
+
+- PATH_SUFFIXES qwt qwt5
++ PATH_SUFFIXES qwt qwt5 qwt6
+ )
+
+-find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
++find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt-qt5 qwt PATHS
+ /usr/local/lib
+ /usr/local/lib/qwt.framework
+ ${QWT_WIN_LIBRARY_DIR}
diff --git a/sci-electronics/gazebo/gazebo-11.10.2.ebuild b/sci-electronics/gazebo/gazebo-11.10.2.ebuild
new file mode 100644
index 000000000000..c870b58b8472
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.10.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/11"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/protobuf-2:=
+ virtual/opengl
+ media-libs/openal
+ net-misc/curl
+ dev-libs/tinyxml
+ >=dev-libs/tinyxml2-6:=
+ dev-libs/libtar
+ dev-cpp/tbb:=
+ >=dev-games/ogre-1.7.4:=[freeimage]
+ <dev-games/ogre-1.10
+ >=media-libs/freeimage-3.15.4[png]
+ sci-libs/libccd
+ >=media-video/ffmpeg-2.6:0=
+ sci-libs/gts
+ >=sci-physics/bullet-2.82:=
+ >=dev-libs/sdformat-9.1:=
+ dev-qt/qtwidgets:5
+ dev-qt/qtcore:5
+ dev-qt/qtopengl:5
+ dev-libs/boost:=[threads(+)]
+ sci-libs/gdal:=
+ virtual/libusb:1
+ dev-libs/libspnav
+ media-libs/freeimage
+ sci-libs/hdf5:=[cxx]
+ sys-apps/util-linux
+ media-gfx/graphviz
+ net-libs/ignition-msgs:5=
+ sci-libs/ignition-math:6=
+ net-libs/ignition-transport:8=
+ sci-libs/ignition-common:3=
+ sci-libs/ignition-fuel-tools:4=
+ <x11-libs/qwt-6.2.0:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+ x11-apps/mesa-progs
+ test? ( dev-libs/libxslt )
+"
+BDEPEND="
+ || ( app-text/ronn-ng app-text/ronn )
+ app-arch/gzip
+ virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+ "${FILESDIR}/qwt2.patch"
+ "${FILESDIR}/cmake.patch"
+ "${FILESDIR}/ffmpeg5.patch"
+ "${FILESDIR}/ffmpeg4.patch"
+)
+
+src_configure() {
+ # find OGRE properly
+ sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
+
+ local mycmakeargs=(
+ "-DUSE_UPSTREAM_CFLAGS=OFF"
+ "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+ "-DUSE_HOST_CFLAGS=FALSE"
+ "-DBUILD_TESTING=$(usex test TRUE FALSE)"
+ "-DENABLE_SCREEN_TESTS=FALSE"
+ "-DUSE_EXTERNAL_TINYXML2=TRUE"
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2022-06-23 11:10 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2022-06-23 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 943dc3ebe4f79074fe8d86235572cb42e80aa801
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 11:09:53 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 11:10:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943dc3eb
sci-electronics/gazebo: bump to 11.11.0
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/Manifest | 1 +
sci-electronics/gazebo/files/gv.patch | 13 +++++
sci-electronics/gazebo/gazebo-11.11.0.ebuild | 84 ++++++++++++++++++++++++++++
3 files changed, 98 insertions(+)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 20ee674fb53d..c0eac4fab473 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1,2 @@
DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
+DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882
diff --git a/sci-electronics/gazebo/files/gv.patch b/sci-electronics/gazebo/files/gv.patch
new file mode 100644
index 000000000000..7afa786f4774
--- /dev/null
+++ b/sci-electronics/gazebo/files/gv.patch
@@ -0,0 +1,13 @@
+Index: gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
+===================================================================
+--- gazebo-11.11.0.orig/gazebo/gui/qgv/private/QGVCore.h
++++ gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
+@@ -96,7 +96,7 @@ class QGVCore
+ Agiodisc_t memIoDisc;
+
+ memIoDisc.afread = memiofread;
+- memIoDisc.putstr = AgIoDisc.putstr;
++ memIoDisc.printf = AgIoDisc.printf;
+ memIoDisc.flush = AgIoDisc.flush;
+ rdr.data = cp;
+ rdr.len = strlen(cp);
diff --git a/sci-electronics/gazebo/gazebo-11.11.0.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
new file mode 100644
index 000000000000..27daf4976fd8
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/11"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/protobuf-2:=
+ virtual/opengl
+ media-libs/openal
+ net-misc/curl
+ dev-libs/tinyxml
+ >=dev-libs/tinyxml2-6:=
+ dev-libs/libtar
+ dev-cpp/tbb:=
+ >=dev-games/ogre-1.7.4:=[freeimage]
+ <dev-games/ogre-1.10
+ >=media-libs/freeimage-3.15.4[png]
+ sci-libs/libccd
+ >=media-video/ffmpeg-2.6:0=
+ sci-libs/gts
+ >=sci-physics/bullet-2.82:=
+ >=dev-libs/sdformat-9.8:=
+ dev-qt/qtwidgets:5
+ dev-qt/qtcore:5
+ dev-qt/qtopengl:5
+ dev-libs/boost:=[threads(+)]
+ sci-libs/gdal:=
+ virtual/libusb:1
+ dev-libs/libspnav
+ media-libs/freeimage
+ sci-libs/hdf5:=[cxx]
+ sys-apps/util-linux
+ >=media-gfx/graphviz-4
+ net-libs/ignition-msgs:5=
+ sci-libs/ignition-math:6=
+ net-libs/ignition-transport:8=
+ sci-libs/ignition-common:3=
+ sci-libs/ignition-fuel-tools:4=
+ x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+ x11-apps/mesa-progs
+ test? ( dev-libs/libxslt )
+"
+BDEPEND="
+ || ( app-text/ronn-ng app-text/ronn )
+ app-arch/gzip
+ virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+ "${FILESDIR}/qwt2.patch"
+ "${FILESDIR}/cmake.patch"
+ "${FILESDIR}/gv.patch"
+)
+
+src_configure() {
+ # find OGRE properly
+ sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
+
+ local mycmakeargs=(
+ "-DUSE_UPSTREAM_CFLAGS=OFF"
+ "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+ "-DUSE_HOST_CFLAGS=FALSE"
+ "-DBUILD_TESTING=$(usex test TRUE FALSE)"
+ "-DENABLE_SCREEN_TESTS=FALSE"
+ "-DUSE_EXTERNAL_TINYXML2=TRUE"
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2022-06-23 11:10 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2022-06-23 11:10 UTC (permalink / raw
To: gentoo-commits
commit: a99d564dfb07a5484c1ecdf04c76e95f6e26d9de
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 10:03:37 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 11:10:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99d564d
sci-electronics/gazebo: Remove old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/Manifest | 2 -
sci-electronics/gazebo/files/qwt.patch | 17 ------
sci-electronics/gazebo/gazebo-11.10.1.ebuild | 85 --------------------------
sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild | 83 -------------------------
4 files changed, 187 deletions(-)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index f643396f6d4b..20ee674fb53d 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1 @@
-DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3
DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
-DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
deleted file mode 100644
index d4f1538900bc..000000000000
--- a/sci-electronics/gazebo/files/qwt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
-===================================================================
---- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake
-+++ gazebo-8.0.0/cmake/SearchForStuff.cmake
-@@ -758,10 +758,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
- /usr/local/lib/qwt.framework/Headers
- ${QWT_WIN_INCLUDE_DIR}
-
-- PATH_SUFFIXES qwt qwt5
-+ PATH_SUFFIXES qwt6
- )
-
--find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
-+find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS
- /usr/lib
- /usr/local/lib
- /usr/local/lib/qwt.framework
diff --git a/sci-electronics/gazebo/gazebo-11.10.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
deleted file mode 100644
index 3291c74fa777..000000000000
--- a/sci-electronics/gazebo/gazebo-11.10.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- <dev-cpp/tbb-2021:=
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- sci-libs/libccd
- >=media-video/ffmpeg-2.6:0=
- sci-libs/gts
- >=sci-physics/bullet-2.82:=
- >=dev-libs/sdformat-9.1:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads(+)]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:5=
- sci-libs/ignition-math:6=
- net-libs/ignition-transport:8=
- sci-libs/ignition-common:3=
- sci-libs/ignition-fuel-tools:4=
- <x11-libs/qwt-6.2.0:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-BDEPEND="
- || ( app-text/ronn-ng app-text/ronn )
- app-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}/qwt.patch"
- "${FILESDIR}/cmake.patch"
- "${FILESDIR}/ffmpeg5.patch"
- "${FILESDIR}/ffmpeg4.patch"
-)
-
-src_configure() {
- # find OGRE properly
- sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
-
- local mycmakeargs=(
- "-DUSE_UPSTREAM_CFLAGS=OFF"
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
- "-DUSE_HOST_CFLAGS=FALSE"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild b/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
deleted file mode 100644
index f34484f385e7..000000000000
--- a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- <dev-cpp/tbb-2021:=
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- sci-libs/libccd
- >=media-video/ffmpeg-2.6:0=
- sci-libs/gts
- >=sci-physics/bullet-2.82:=
- >=dev-libs/sdformat-9.1:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads(+)]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:5=
- sci-libs/ignition-math:6=
- net-libs/ignition-transport:8=
- sci-libs/ignition-common:3=
- sci-libs/ignition-fuel-tools:4=
- <x11-libs/qwt-6.2.0:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-BDEPEND="
- || ( app-text/ronn-ng app-text/ronn )
- app-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}/qwt.patch"
- "${FILESDIR}/cmake.patch"
-)
-
-src_configure() {
- # find OGRE properly
- sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
-
- local mycmakeargs=(
- "-DUSE_UPSTREAM_CFLAGS=OFF"
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
- "-DUSE_HOST_CFLAGS=FALSE"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2022-08-31 11:35 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2022-08-31 11:35 UTC (permalink / raw
To: gentoo-commits
commit: fd2cb1329861ca51ac178c8a1b1029081c05b2e1
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 11:35:16 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 11:35:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2cb132
sci-electronics/gazebo: rm graphviz patch causing build failures
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/files/gv.patch | 13 -------------
sci-electronics/gazebo/gazebo-11.11.0.ebuild | 1 -
2 files changed, 14 deletions(-)
diff --git a/sci-electronics/gazebo/files/gv.patch b/sci-electronics/gazebo/files/gv.patch
deleted file mode 100644
index 7afa786f4774..000000000000
--- a/sci-electronics/gazebo/files/gv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
-===================================================================
---- gazebo-11.11.0.orig/gazebo/gui/qgv/private/QGVCore.h
-+++ gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
-@@ -96,7 +96,7 @@ class QGVCore
- Agiodisc_t memIoDisc;
-
- memIoDisc.afread = memiofread;
-- memIoDisc.putstr = AgIoDisc.putstr;
-+ memIoDisc.printf = AgIoDisc.printf;
- memIoDisc.flush = AgIoDisc.flush;
- rdr.data = cp;
- rdr.len = strlen(cp);
diff --git a/sci-electronics/gazebo/gazebo-11.11.0.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
index 27daf4976fd8..fcddab396e65 100644
--- a/sci-electronics/gazebo/gazebo-11.11.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
@@ -65,7 +65,6 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
PATCHES=(
"${FILESDIR}/qwt2.patch"
"${FILESDIR}/cmake.patch"
- "${FILESDIR}/gv.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2023-02-01 19:27 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 8905bcd7f8606448a288c413513c56011471b72b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 20:59:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 19:26:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8905bcd7
sci-electronics/gazebo: drop 11.10.2, 11.11.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-electronics/gazebo/Manifest | 2 -
sci-electronics/gazebo/files/ffmpeg4.patch | 16 ----
sci-electronics/gazebo/files/ffmpeg5.patch | 137 ---------------------------
sci-electronics/gazebo/gazebo-11.10.2.ebuild | 85 -----------------
sci-electronics/gazebo/gazebo-11.11.0.ebuild | 83 ----------------
5 files changed, 323 deletions(-)
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 51f9bccaff8e..b778335ec365 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1 @@
-DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
-DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882
DIST gazebo-11.12.0.tar.bz2 56542859 BLAKE2B f2da8371fa4655cc831401fcf6ceec8c82d507a93515762c078ac20a78cb4b739c9f373ef53bebc71b5d7e1c1cf4b98928b3e855fca6943a09da554ee19df1cb SHA512 8f60d432ab07084951bbe31c632f04f2fa11500441fb81fe27078a5cb5b67ba681889e1079844d44a5a30df562797d51683fd674942db9fd8c4d853e3e2c5d3e
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
deleted file mode 100644
index 7b7c8d7270fd..000000000000
--- a/sci-electronics/gazebo/files/ffmpeg4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc
-===================================================================
---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc
-+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc
-@@ -224,7 +224,10 @@ bool VideoEncoder::Start(const std::stri
-
- // The remainder of this function handles FFMPEG initialization of a video
- // stream
-- const AVOutputFormat *outputFormat = nullptr;
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+ const
-+#endif
-+ AVOutputFormat *outputFormat = nullptr;
-
- // This 'if' and 'free' are just for safety. We chech the value of formatCtx
- // below.
diff --git a/sci-electronics/gazebo/files/ffmpeg5.patch b/sci-electronics/gazebo/files/ffmpeg5.patch
deleted file mode 100644
index e55bab3c311f..000000000000
--- a/sci-electronics/gazebo/files/ffmpeg5.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: gazebo-11.10.1/gazebo/common/AudioDecoder.cc
-===================================================================
---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.cc
-+++ gazebo-11.10.1/gazebo/common/AudioDecoder.cc
-@@ -113,8 +113,13 @@ bool AudioDecoder::Decode(uint8_t **_out
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-- bytesDecoded = avcodec_decode_audio4(this->codecCtx, decodedFrame,
-- &gotFrame, &packet1);
-+ bytesDecoded = avcodec_send_packet(this->codecCtx, &packet1);
-+ if (bytesDecoded >= 0 || bytesDecoded == AVERROR_EOF) {
-+ bytesDecoded = avcodec_receive_frame(this->codecCtx, decodedFrame);
-+ gotFrame = bytesDecoded >= 0;
-+ if (bytesDecoded == AVERROR(EAGAIN) || bytesDecoded == AVERROR_EOF) bytesDecoded = 0;
-+ }
-+
- #ifndef _WIN32
- # pragma GCC diagnostic pop
- #endif
-@@ -214,7 +219,7 @@ bool AudioDecoder::SetFile(const std::st
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
- #ifndef _WIN32
- # pragma GCC diagnostic pop
- #endif
-@@ -238,7 +243,9 @@ bool AudioDecoder::SetFile(const std::st
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-- this->codecCtx = this->formatCtx->streams[audioStream]->codec;
-+ this->codecCtx = avcodec_alloc_context3(nullptr);
-+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[audioStream]->codecpar);
-+
- #ifndef _WIN32
- # pragma GCC diagnostic pop
- #endif
-Index: gazebo-11.10.1/gazebo/common/AudioDecoder.hh
-===================================================================
---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.hh
-+++ gazebo-11.10.1/gazebo/common/AudioDecoder.hh
-@@ -75,7 +75,7 @@ namespace gazebo
- private: AVCodecContext *codecCtx;
-
- /// \brief libavcodec audio codec.
-- private: AVCodec *codec;
-+ private: const AVCodec *codec;
-
- /// \brief Index of the audio stream.
- private: int audioStream;
-Index: gazebo-11.10.1/gazebo/common/Video.cc
-===================================================================
---- gazebo-11.10.1.orig/gazebo/common/Video.cc
-+++ gazebo-11.10.1/gazebo/common/Video.cc
-@@ -77,7 +77,7 @@ void Video::Cleanup()
- #ifdef HAVE_FFMPEG
- bool Video::Load(const std::string &_filename)
- {
-- AVCodec *codec = nullptr;
-+ const AVCodec *codec = nullptr;
- this->videoStream = -1;
-
- if (this->formatCtx || this->avFrame || this->codecCtx)
-@@ -107,7 +107,7 @@ bool Video::Load(const std::string &_fil
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
- #ifndef _WIN32
- # pragma GCC diagnostic pop
- #endif
-@@ -128,13 +128,14 @@ bool Video::Load(const std::string &_fil
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-- this->codecCtx = this->formatCtx->streams[this->videoStream]->codec;
-+ this->codecCtx = avcodec_alloc_context3(nullptr);
-+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[this->videoStream]->codecpar);
- #ifndef _WIN32
- # pragma GCC diagnostic pop
- #endif
-
- // Find the decoder for the video stream
-- codec = avcodec_find_decoder(this->codecCtx->codec_id);
-+ codec = avcodec_find_decoder(this->formatCtx->streams[this->videoStream]->codecpar->codec_id);
- if (codec == nullptr)
- {
- gzerr << "Codec not found\n";
-@@ -231,15 +232,19 @@ bool Video::GetNextFrame(unsigned char *
- # pragma GCC diagnostic push
- # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-- int processedLength = avcodec_decode_video2(this->codecCtx, this->avFrame,
-- &frameAvailable, &tmpPacket);
-+ int processedLength = avcodec_send_packet(this->codecCtx, !tmpPacket.data && !tmpPacket.size ? nullptr : &tmpPacket);
- #ifndef _WIN32
- # pragma GCC diagnostic pop
- #endif
-+ if (processedLength >= 0 || processedLength == AVERROR_EOF) {
-+ processedLength = avcodec_receive_frame(this->codecCtx, this->avFrame);
-+ frameAvailable = processedLength >= 0;
-+ if (processedLength == AVERROR(EAGAIN) || processedLength == AVERROR_EOF) processedLength = 0;
-+ }
- if (processedLength < 0)
- {
- gzerr << "Error while processing the data\n";
-- break;
-+ break;
- }
-
- tmpPacket.data = tmpPacket.data + processedLength;
-Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc
-===================================================================
---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc
-+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc
-@@ -224,7 +224,7 @@ bool VideoEncoder::Start(const std::stri
-
- // The remainder of this function handles FFMPEG initialization of a video
- // stream
-- AVOutputFormat *outputFormat = nullptr;
-+ const AVOutputFormat *outputFormat = nullptr;
-
- // This 'if' and 'free' are just for safety. We chech the value of formatCtx
- // below.
-@@ -294,7 +294,7 @@ bool VideoEncoder::Start(const std::stri
- }
-
- // find the video encoder
-- AVCodec *encoder = avcodec_find_encoder(
-+ const AVCodec *encoder = avcodec_find_encoder(
- this->dataPtr->formatCtx->oformat->video_codec);
- if (!encoder)
- {
diff --git a/sci-electronics/gazebo/gazebo-11.10.2.ebuild b/sci-electronics/gazebo/gazebo-11.10.2.ebuild
deleted file mode 100644
index d813f60aea22..000000000000
--- a/sci-electronics/gazebo/gazebo-11.10.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- dev-cpp/tbb:=
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- sci-libs/libccd
- >=media-video/ffmpeg-2.6:0=
- sci-libs/gts
- >=sci-physics/bullet-2.82:=
- >=dev-libs/sdformat-9.1:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:5=
- sci-libs/ignition-math:6=
- net-libs/ignition-transport:8=
- sci-libs/ignition-common:3=
- sci-libs/ignition-fuel-tools:4=
- x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-BDEPEND="
- || ( app-text/ronn-ng app-text/ronn )
- app-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}/qwt2.patch"
- "${FILESDIR}/cmake.patch"
- "${FILESDIR}/ffmpeg5.patch"
- "${FILESDIR}/ffmpeg4.patch"
-)
-
-src_configure() {
- # find OGRE properly
- sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
-
- local mycmakeargs=(
- "-DUSE_UPSTREAM_CFLAGS=OFF"
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
- "-DUSE_HOST_CFLAGS=FALSE"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-11.11.0.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
deleted file mode 100644
index 4eac05330fc9..000000000000
--- a/sci-electronics/gazebo/gazebo-11.11.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- dev-cpp/tbb:=
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- sci-libs/libccd
- >=media-video/ffmpeg-2.6:0=
- sci-libs/gts
- >=sci-physics/bullet-2.82:=
- >=dev-libs/sdformat-9.8:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- >=media-gfx/graphviz-4
- net-libs/ignition-msgs:5=
- sci-libs/ignition-math:6=
- net-libs/ignition-transport:8=
- sci-libs/ignition-common:3=
- sci-libs/ignition-fuel-tools:4=
- x11-libs/qwt:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-BDEPEND="
- || ( app-text/ronn-ng app-text/ronn )
- app-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}/qwt2.patch"
- "${FILESDIR}/cmake.patch"
-)
-
-src_configure() {
- # find OGRE properly
- sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
-
- local mycmakeargs=(
- "-DUSE_UPSTREAM_CFLAGS=OFF"
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
- "-DUSE_HOST_CFLAGS=FALSE"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2023-03-29 16:38 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2023-03-29 16:38 UTC (permalink / raw
To: gentoo-commits
commit: f5229d7d812b1b9e66eb5556eae4803edd1a4943
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 16:38:42 2023 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 16:38:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5229d7d
sci-electronics/gazebo: fix build with ffmpeg6
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/files/ffmpeg6.patch | 40 ++++++++++++++++++++++++++++
sci-electronics/gazebo/gazebo-11.12.0.ebuild | 1 +
2 files changed, 41 insertions(+)
diff --git a/sci-electronics/gazebo/files/ffmpeg6.patch b/sci-electronics/gazebo/files/ffmpeg6.patch
new file mode 100644
index 000000000000..932d1e31c9d1
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg6.patch
@@ -0,0 +1,40 @@
+Index: gazebo-11.12.0/gazebo/common/AudioDecoder.cc
+===================================================================
+--- gazebo-11.12.0.orig/gazebo/common/AudioDecoder.cc
++++ gazebo-11.12.0/gazebo/common/AudioDecoder.cc
+@@ -364,6 +364,7 @@ bool AudioDecoder::SetFile(const std::st
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 60
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
+ if (this->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
+ this->codecCtx->flags |= AV_CODEC_FLAG_TRUNCATED;
+@@ -371,6 +372,7 @@ bool AudioDecoder::SetFile(const std::st
+ if (this->codec->capabilities & CODEC_CAP_TRUNCATED)
+ this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
+ #endif
++#endif
+
+ // Open codec
+ if (avcodec_open2(this->codecCtx, this->codec, nullptr) < 0)
+Index: gazebo-11.12.0/gazebo/common/Video.cc
+===================================================================
+--- gazebo-11.12.0.orig/gazebo/common/Video.cc
++++ gazebo-11.12.0/gazebo/common/Video.cc
+@@ -214,6 +214,7 @@ bool Video::Load(const std::string &_fil
+ return false;
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 60
+ // Inform the codec that we can handle truncated bitstreams -- i.e.,
+ // bitstreams where frame boundaries can fall in the middle of packets
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 60, 100)
+@@ -223,6 +224,7 @@ bool Video::Load(const std::string &_fil
+ if (codec->capabilities & CODEC_CAP_TRUNCATED)
+ this->codecCtx->flags |= CODEC_FLAG_TRUNCATED;
+ #endif
++#endif
+
+ // Open codec
+ if (avcodec_open2(this->codecCtx, codec, nullptr) < 0)
diff --git a/sci-electronics/gazebo/gazebo-11.12.0.ebuild b/sci-electronics/gazebo/gazebo-11.12.0.ebuild
index 79c54a12daca..3eaa4232a79e 100644
--- a/sci-electronics/gazebo/gazebo-11.12.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.12.0.ebuild
@@ -65,6 +65,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
PATCHES=(
"${FILESDIR}/qwt2.patch"
"${FILESDIR}/cmake.patch"
+ "${FILESDIR}/ffmpeg6.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
@ 2024-11-18 8:37 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2024-11-18 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 6dc7a6f57c7681f7dd669295adeb5dcbc15117f2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 08:31:02 2024 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 08:31:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc7a6f5
sci-electronics/gazebo: upstream patch for boost 1.86 compat
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
sci-electronics/gazebo/files/boost186.patch | 23 +++++++++++++++++++++++
sci-electronics/gazebo/gazebo-11.14.0.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/sci-electronics/gazebo/files/boost186.patch b/sci-electronics/gazebo/files/boost186.patch
new file mode 100644
index 000000000000..c34632d9b819
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost186.patch
@@ -0,0 +1,23 @@
+From 0cc96de9cd128c8f2255f022f6e2b1bccc8512c4 Mon Sep 17 00:00:00 2001
+From: Tobias Fischer <info@tobiasfischer.info>
+Date: Sun, 25 Aug 2024 08:09:21 +1000
+Subject: [PATCH] Boost 1.86 compatibility
+
+Signed-off-by: Tobias Fischer <info@tobiasfischer.info>
+---
+ gazebo/common/CommonIface.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gazebo/common/CommonIface.hh b/gazebo/common/CommonIface.hh
+index 82606a8528..a38935250f 100644
+--- a/gazebo/common/CommonIface.hh
++++ b/gazebo/common/CommonIface.hh
+@@ -229,7 +229,7 @@ namespace gazebo
+ std::string common::get_sha1(const T &_buffer)
+ {
+ boost::uuids::detail::sha1 sha1;
+- unsigned int hash[5];
++ boost::uuids::detail::sha1::digest_type hash;
+ std::stringstream stream;
+
+ if (_buffer.size() == 0)
diff --git a/sci-electronics/gazebo/gazebo-11.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
index 04caee69b302..3fda8329c57b 100644
--- a/sci-electronics/gazebo/gazebo-11.14.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${FILESDIR}/cmake.patch"
"${FILESDIR}/gv10.patch"
"${FILESDIR}/boost.patch"
+ "${FILESDIR}/boost186.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-11-18 8:37 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-20 7:48 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2024-11-18 8:37 Alexis Ballier
2023-03-29 16:38 Alexis Ballier
2023-02-01 19:27 Andreas Sturmlechner
2022-08-31 11:35 Alexis Ballier
2022-06-23 11:10 Alexis Ballier
2022-06-23 11:10 Alexis Ballier
2022-04-21 10:19 Alexis Ballier
2022-03-02 17:45 Alexis Ballier
2021-01-20 15:33 Alexis Ballier
2020-09-21 13:47 Alexis Ballier
2019-12-10 17:35 Alexis Ballier
2018-08-23 11:41 Alexis Ballier
2017-06-29 20:28 Alexis Ballier
2017-01-28 20:13 Alexis Ballier
2016-08-04 12:49 Alexis Ballier
2016-05-02 16:35 Alexis Ballier
2015-09-16 11:33 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox