public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2015-09-19 11:59 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2015-09-19 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7c528924b36e66dac17a4b528cbeb467e36f086c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 11:59:28 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 11:59:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c528924

sci-electronics/gazebo: remove old.

Package-Manager: portage-2.2.20.1

 sci-electronics/gazebo/Manifest               |  1 -
 sci-electronics/gazebo/files/bullet_283.patch | 41 ----------------
 sci-electronics/gazebo/gazebo-5.1.0.ebuild    | 69 ---------------------------
 3 files changed, 111 deletions(-)

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 7bfa15f..be018d6 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,2 +1 @@
 DIST gazebo-6.1.0.tar.bz2 50795925 SHA256 0460f1c706f609b6ff0e61a71bdd3cac2d55d714147edc01609b5226e7fb2904 SHA512 ae41b53b0f33e81fe5b3baaaca8649e98c5b99c4701650414b0686f9a327d89e00c674e806cb9537aabfd933c9819d668e45b18e964d383d99325c5ddcdcf7ef WHIRLPOOL bfab23edc9c68ca02aefa4a20206bfdf2973cc5ee7750f4c017543979dca10434d9e38dad8836510b292dc67b97aa0514229c8b5fd9f73897075525e45a5bd74
-DIST gazebo5_5.1.0.tar.bz2 49544340 SHA256 eac72ca2633deb7ea0f5e775c1208f0743d98c8b53083607df77bae6e38ab0b1 SHA512 d3222d9d98cc9d1c52bc1bb24e12ece7ff8d8506782f9cd2d574a1aca8556e33d93781f4d2c91eacfe317a35c7cddfa2c4a4fdb58da1f348142f6a887de3c981 WHIRLPOOL 5e9e01195b02581d684ee0c5e30f9ace0210a7b61a59a63b7a3c01c8c672230ad026f998ed93583eafb9b640c73c9df350e578a774d9579fdb8574570fa0bd94

diff --git a/sci-electronics/gazebo/files/bullet_283.patch b/sci-electronics/gazebo/files/bullet_283.patch
deleted file mode 100644
index cc1649b..0000000
--- a/sci-electronics/gazebo/files/bullet_283.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User Steve Peters <scpeters@osrfoundation.org>
-# Date 1430782295 25200
-# Branch issue_1074
-# Node ID 05b7ee5db6f524e19b6cca54d66208cb48a0854c
-# Parent  2cbd32c6246166f6f50af3503553180e7c1cd4a4
-Fix build when compiled against bullet 2.83
-
-diff --git a/gazebo/physics/bullet/BulletHinge2Joint.cc b/gazebo/physics/bullet/BulletHinge2Joint.cc
---- a/gazebo/physics/bullet/BulletHinge2Joint.cc
-+++ b/gazebo/physics/bullet/BulletHinge2Joint.cc
-@@ -211,8 +211,12 @@
-     return math::Angle();
-   }
- 
--  btRotationalLimitMotor *motor =
--    this->bulletHinge2->getRotationalLimitMotor(_index);
-+#ifndef LIBBULLET_VERSION_GT_282
-+  btRotationalLimitMotor
-+#else
-+  btRotationalLimitMotor2
-+#endif
-+    *motor = this->bulletHinge2->getRotationalLimitMotor(_index);
-   if (motor)
-     return motor->m_hiLimit;
- 
-@@ -229,8 +233,12 @@
-     return math::Angle(0.0);
-   }
- 
--  btRotationalLimitMotor *motor =
--    this->bulletHinge2->getRotationalLimitMotor(_index);
-+#ifndef LIBBULLET_VERSION_GT_282
-+  btRotationalLimitMotor
-+#else
-+  btRotationalLimitMotor2
-+#endif
-+  *motor = this->bulletHinge2->getRotationalLimitMotor(_index);
-   if (motor)
-     return motor->m_loLimit;
- 

diff --git a/sci-electronics/gazebo/gazebo-5.1.0.ebuild b/sci-electronics/gazebo/gazebo-5.1.0.ebuild
deleted file mode 100644
index d32b6ba..0000000
--- a/sci-electronics/gazebo/gazebo-5.1.0.ebuild
+++ /dev/null
@@ -1,69 +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="https://bitbucket.org/osrf/gazebo/get/${PN}$(get_major_version)_${PV}.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-2.3.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
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:4
-	app-text/ronn
-	virtual/pkgconfig
-"
-S="${WORKDIR}/${PN}$(get_major_version)_${PV}"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
-	"${FILESDIR}/bullet_283.patch"
-	"${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"
-
-	has_version '>=sci-physics/bullet-2.83' && append-cppflags "-DLIBBULLET_VERSION_GT_282=1"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2016-10-06 12:52 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2016-10-06 12:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3bae47de2cc5ffeab8c2e9da928f4b66442e1814
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 11:55:47 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 12:51:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bae47de

sci-electronics/gazebo: fix build with boost 1.62

Package-Manager: portage-2.3.1

 sci-electronics/gazebo/files/boost162.patch | 12 ++++++++++++
 sci-electronics/gazebo/gazebo-7.3.1.ebuild  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/sci-electronics/gazebo/files/boost162.patch b/sci-electronics/gazebo/files/boost162.patch
new file mode 100644
index 00000000..e91643f
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost162.patch
@@ -0,0 +1,12 @@
+Index: gazebo-7.3.1/gazebo/rendering/Camera.cc
+===================================================================
+--- gazebo-7.3.1.orig/gazebo/rendering/Camera.cc
++++ gazebo-7.3.1/gazebo/rendering/Camera.cc
+@@ -25,6 +25,7 @@
+ 
+ #include <boost/algorithm/string.hpp>
+ #include <boost/filesystem.hpp>
++#include <boost/format.hpp>
+ #include <sdf/sdf.hh>
+ 
+ #ifndef _WIN32

diff --git a/sci-electronics/gazebo/gazebo-7.3.1.ebuild b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
index cdc015c..01d18e8 100644
--- a/sci-electronics/gazebo/gazebo-7.3.1.ebuild
+++ b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
@@ -54,7 +54,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/tinyxml2.patch" )
+PATCHES=( "${FILESDIR}/tinyxml2.patch" "${FILESDIR}/boost162.patch" )
 
 src_configure() {
 	# doesnt build without it


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2016-11-29 12:18 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2016-11-29 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     6665d96340a282a5757bc092d0d2a5df46e4e87e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 09:58:13 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 12:18:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6665d963

sci-electronics/gazebo: remove old

Package-Manager: portage-2.3.2

 sci-electronics/gazebo/Manifest             |  2 -
 sci-electronics/gazebo/files/boost162.patch | 12 -----
 sci-electronics/gazebo/files/tinyxml2.patch | 22 ---------
 sci-electronics/gazebo/gazebo-7.2.0.ebuild  | 73 ----------------------------
 sci-electronics/gazebo/gazebo-7.3.1.ebuild  | 74 -----------------------------
 5 files changed, 183 deletions(-)

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index e704c17..736cc65 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1 @@
-DIST gazebo-7.2.0.tar.bz2 51084680 SHA256 3e10501379236146f5393fcf02be419ce343bfa76b0f6670d43cc5bc13cd6fb1 SHA512 b484ef589fbcbe3262b257a6741f253ba23837c3585f42a857e7b03acf6dcbf7209a65f1fce9e4ee6df3b8a45a5124015c99e8708644f259e6d1275bbadab503 WHIRLPOOL 595146621ed9f6bbeecb325fddcacf048fadaff69338c2c8cefccb6e82669494d92000ae194e0a1941094491be3ec759165e8f8220fb7649cdb209ee66e5b60a
-DIST gazebo-7.3.1.tar.bz2 50992794 SHA256 aeff031d9b1b72c94b06b2a87790e6b561f4cba0e1dce155269108b3237e5c62 SHA512 2ecf89efd5312efe2d7c2b27c898467b49f94e2dbe75c69c2e403262e11361bea0a701a61134bbbfe01f1723621e5ccfc44c6d40698c7c2e8608292e275b5ea5 WHIRLPOOL 50886561eb6d8fffaabeb90466ddee1ed57aefc9b9d8ef4d65cc9a311355a8abea62034289dcd15bbf185c697bda1575d2365f80b52f8922af734dbd5586f37f
 DIST gazebo-7.4.0.tar.bz2 50061936 SHA256 a033b2273383f16e5dd5b5bfe597551dc3618b98e64abecfa8a41bdddd6542f7 SHA512 924c0f20484af552190fd09a92f3148af2371ca4948db6783711083157324d97f49de58df97df3a67ffa5d8c61b1503096556b17b4451efcefa4f5253ac4d2ae WHIRLPOOL 090fa669ae514b0fd705368b04493eee18dad70be9205de52c6c06e07e24bb42b55ef4f5dc75b47718f991339fdb7149f8ecb1354f6ef5f73eb2ecb9ecf91b88

diff --git a/sci-electronics/gazebo/files/boost162.patch b/sci-electronics/gazebo/files/boost162.patch
deleted file mode 100644
index e91643f..00000000
--- a/sci-electronics/gazebo/files/boost162.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gazebo-7.3.1/gazebo/rendering/Camera.cc
-===================================================================
---- gazebo-7.3.1.orig/gazebo/rendering/Camera.cc
-+++ gazebo-7.3.1/gazebo/rendering/Camera.cc
-@@ -25,6 +25,7 @@
- 
- #include <boost/algorithm/string.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/format.hpp>
- #include <sdf/sdf.hh>
- 
- #ifndef _WIN32

diff --git a/sci-electronics/gazebo/files/tinyxml2.patch b/sci-electronics/gazebo/files/tinyxml2.patch
deleted file mode 100644
index b829201..00000000
--- a/sci-electronics/gazebo/files/tinyxml2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.2.0.ebuild b/sci-electronics/gazebo/gazebo-7.2.0.ebuild
deleted file mode 100644
index c3b8b54..00000000
--- a/sci-electronics/gazebo/gazebo-7.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 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*:=
-	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.1:=
-	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
-
-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
-}

diff --git a/sci-electronics/gazebo/gazebo-7.3.1.ebuild b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
deleted file mode 100644
index 01d18e8..00000000
--- a/sci-electronics/gazebo/gazebo-7.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 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*:=
-	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.1:=
-	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}/tinyxml2.patch" "${FILESDIR}/boost162.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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2018-06-08 12:26 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2018-06-08 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     25cf3201c31249fcb4b2641e6df087aae1632bcd
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  8 11:16:53 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 12:26:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25cf3201

sci-electronics/gazebo: Remove old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-electronics/gazebo/Manifest               |  1 -
 sci-electronics/gazebo/files/tinyxml6.patch   | 20 -------
 sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild | 77 ---------------------------
 3 files changed, 98 deletions(-)

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 2599468bfd5..5a61ca67a97 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,2 +1 @@
-DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843
 DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50

diff --git a/sci-electronics/gazebo/files/tinyxml6.patch b/sci-electronics/gazebo/files/tinyxml6.patch
deleted file mode 100644
index 16a3862fc78..00000000000
--- a/sci-electronics/gazebo/files/tinyxml6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gazebo-8.2.0/gazebo/util/LogPlay.cc
-===================================================================
---- gazebo-8.2.0.orig/gazebo/util/LogPlay.cc
-+++ gazebo-8.2.0/gazebo/util/LogPlay.cc
-@@ -125,12 +125,9 @@ void LogPlay::Open(const std::string &_l
-   {
-     gzerr << "Unable to load file[" << _logFile << "]. "
-       << "Check the Gazebo server log file for more information.\n";
--    const char *errorStr1 = this->dataPtr->xmlDoc.GetErrorStr1();
--    const char *errorStr2 = this->dataPtr->xmlDoc.GetErrorStr2();
--    if (errorStr1)
--      gzlog << "Log Error 1:\n" << errorStr1 << std::endl;
--    if (errorStr2)
--      gzlog << "Log Error 2:\n" << errorStr2 << std::endl;
-+    const char *errorStr = this->dataPtr->xmlDoc.ErrorStr();
-+    if (errorStr)
-+      gzlog << "Log Error:\n" << errorStr << std::endl;
-     gzthrow("Error parsing log file");
-   }
- 

diff --git a/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild b/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild
deleted file mode 100644
index 2c1546415b0..00000000000
--- a/sci-electronics/gazebo/gazebo-8.2.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/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-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-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:0=
-	>=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}/tinyxml6.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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2020-01-21 18:28 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2020-01-21 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     15d62364ce7eed77f358a03c5724083ea2894eda
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 16:17:44 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 18:27:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d62364

sci-electronics/gazebo: fix build with qt 5.14.

Patch from upstream provided by Nikita Shubin.
Closes: https://bugs.gentoo.org/704988
Package-Manager: Portage-2.3.84, Repoman-2.3.20

Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-electronics/gazebo/files/qtmoc.patch    | 44 +++++++++++++++++++++++++++++
 sci-electronics/gazebo/gazebo-10.1.0.ebuild |  4 +--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/sci-electronics/gazebo/files/qtmoc.patch b/sci-electronics/gazebo/files/qtmoc.patch
new file mode 100644
index 00000000000..47841eb26e0
--- /dev/null
+++ b/sci-electronics/gazebo/files/qtmoc.patch
@@ -0,0 +1,44 @@
+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
index 80c4d00fc21..7b7aa2a408f 100644
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/oal.patch" "${FILESDIR}/qtmoc.patch" )
 
 src_configure() {
 	# doesnt build without it


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2020-05-15 16:34 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2020-05-15 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b9262d3d7017a92783514e2f642edc5a2d94cf55
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 11:44:58 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri May 15 16:33:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9262d3d

sci-electronics/gazebo: bump to 11.0.0

Fix build with boost 1.73 and cmake 3.17

Closes: https://bugs.gentoo.org/723106
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-electronics/gazebo/Manifest             |   1 +
 sci-electronics/gazebo/files/boost173.patch | 135 ++++++++++++++++++++++++++++
 sci-electronics/gazebo/files/cmake.patch    |  24 +++++
 sci-electronics/gazebo/gazebo-11.0.0.ebuild |  80 +++++++++++++++++
 4 files changed, 240 insertions(+)

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index d6b1a9766d7..bd4b17f4b6d 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1,2 @@
 DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
+DIST gazebo-11.0.0.tar.bz2 53806265 BLAKE2B 0658bdfd7d1f130767bd38cc2b33379f66f8cd92a9e6496581cd660638fb0307f87af19bcd5bd9ec2edb2be980e964297241ab4c1cec855751fdd7b394c717e9 SHA512 7c6cbb17c52829bb553f57a4bc2d515211aefa105d97cd5e71ff239244e49312562af1c901dac6c88b982986dd1318c0bb780c0a68f10ce78f25e12f031ba934

diff --git a/sci-electronics/gazebo/files/boost173.patch b/sci-electronics/gazebo/files/boost173.patch
new file mode 100644
index 00000000000..618f6f1b534
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost173.patch
@@ -0,0 +1,135 @@
+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/cmake.patch b/sci-electronics/gazebo/files/cmake.patch
new file mode 100644
index 00000000000..192a4c9c571
--- /dev/null
+++ b/sci-electronics/gazebo/files/cmake.patch
@@ -0,0 +1,24 @@
+From 9fe44347eac29da2afe6e49646310a51641d3182 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <silvio.traversaro@iit.it>
+Date: Sun, 15 Mar 2020 16:24:17 +0000
+Subject: [PATCH] Fix  problem with  automoc in CMake 3.17
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e93d65cc52..51f072bc8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,10 @@ if(COMMAND CMAKE_POLICY)
+   CMAKE_POLICY(SET CMP0004 NEW)
+ endif(COMMAND CMAKE_POLICY)
+ 
++if(POLICY CMP0100)
++  cmake_policy(SET CMP0100 NEW)
++endif()
++
+ project (Gazebo)
+ string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+ string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)

diff --git a/sci-electronics/gazebo/gazebo-11.0.0.ebuild b/sci-electronics/gazebo/gazebo-11.0.0.ebuild
new file mode 100644
index 00000000000..d0014afc557
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.0.0.ebuild
@@ -0,0 +1,80 @@
+# 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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2020-08-17 15:53 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2020-08-17 15:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4cf95c412621d88b6b72b431cc8d634de25f8fa4
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 15:29:42 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 15:53:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf95c41

sci-electronics/gazebo: bump to 11.1.0

Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-electronics/gazebo/Manifest             |  1 +
 sci-electronics/gazebo/files/boost174.patch | 20 +++++++
 sci-electronics/gazebo/gazebo-11.1.0.ebuild | 85 +++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+)

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index bd4b17f4b6d..48c83055e43 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,2 +1,3 @@
 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/boost174.patch b/sci-electronics/gazebo/files/boost174.patch
new file mode 100644
index 00000000000..82bbdf40f7a
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost174.patch
@@ -0,0 +1,20 @@
+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/gazebo-11.1.0.ebuild b/sci-electronics/gazebo/gazebo-11.1.0.ebuild
new file mode 100644
index 00000000000..ee7b5f268a7
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.1.0.ebuild
@@ -0,0 +1,85 @@
+# 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"
+	"${FILESDIR}/boost174.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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2022-02-21 17:04 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2022-02-21 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     230459bb8b717563636a891c28f05d759bd2d282
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 13:30:45 2022 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 17:04:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=230459bb

sci-electronics/gazebo: bump to 11.10.1

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/ffmpeg5.patch   | 137 +++++++++++++++++++++++++++
 sci-electronics/gazebo/gazebo-11.10.1.ebuild |  84 ++++++++++++++++
 3 files changed, 222 insertions(+)

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 8c6078be5b34..bfbca468808c 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1,2 @@
+DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3
 DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694

diff --git a/sci-electronics/gazebo/files/ffmpeg5.patch b/sci-electronics/gazebo/files/ffmpeg5.patch
new file mode 100644
index 000000000000..e55bab3c311f
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg5.patch
@@ -0,0 +1,137 @@
+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.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
new file mode 100644
index 000000000000..4641556896a7
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.10.1.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-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"
+)
+
+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] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2023-08-25 12:54 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2023-08-25 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     65ff89889a937748b45a22bdb806b00793a0ae76
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 12:52:55 2023 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 12:54:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ff8988

sci-electronics/gazebo: bump to 11.13.0

Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-electronics/gazebo/Manifest                    |   2 +-
 sci-electronics/gazebo/files/ffmpeg6.patch         |  40 ----
 sci-electronics/gazebo/files/protobuf.patch        | 226 +++++++++++++++++++++
 ...ebo-11.12.0-r1.ebuild => gazebo-11.13.0.ebuild} |   2 +-
 4 files changed, 228 insertions(+), 42 deletions(-)

diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index b778335ec365..bec10d111a87 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1 @@
-DIST gazebo-11.12.0.tar.bz2 56542859 BLAKE2B f2da8371fa4655cc831401fcf6ceec8c82d507a93515762c078ac20a78cb4b739c9f373ef53bebc71b5d7e1c1cf4b98928b3e855fca6943a09da554ee19df1cb SHA512 8f60d432ab07084951bbe31c632f04f2fa11500441fb81fe27078a5cb5b67ba681889e1079844d44a5a30df562797d51683fd674942db9fd8c4d853e3e2c5d3e
+DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390

diff --git a/sci-electronics/gazebo/files/ffmpeg6.patch b/sci-electronics/gazebo/files/ffmpeg6.patch
deleted file mode 100644
index 932d1e31c9d1..000000000000
--- a/sci-electronics/gazebo/files/ffmpeg6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/files/protobuf.patch b/sci-electronics/gazebo/files/protobuf.patch
new file mode 100644
index 000000000000..c815d7a9aab3
--- /dev/null
+++ b/sci-electronics/gazebo/files/protobuf.patch
@@ -0,0 +1,226 @@
+From 92a44c60e4b38d147fd92ed480e33e61cc68c928 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <silvio@traversaro.it>
+Date: Tue, 6 Jun 2023 13:50:07 +0200
+Subject: [PATCH 1/6] Support for protobuf >= 22 by using find_package(Protobuf
+ CONFIG)
+
+---
+ cmake/SearchForStuff.cmake   | 49 +++++++++++++++++++++++++-----------
+ cmake/gazebo-config.cmake.in | 15 ++++++++---
+ 2 files changed, 46 insertions(+), 18 deletions(-)
+
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index b1cb3f37b3..e0fbd68274 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -25,29 +25,48 @@ if (CMAKE_BUILD_TYPE)
+ endif()
+ 
+ ########################################
+-if (PROTOBUF_VERSION LESS 2.3.0)
++if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0)
+   BUILD_ERROR("Incorrect version: Gazebo requires protobuf version 2.3.0 or greater")
+ endif()
+ 
+ ########################################
+ # The Google Protobuf library for message generation + serialization
+-find_package(Protobuf REQUIRED)
+-if (NOT PROTOBUF_FOUND)
+-  BUILD_ERROR ("Missing: Google Protobuf (libprotobuf-dev)")
+-endif()
+-if (NOT PROTOBUF_PROTOC_EXECUTABLE)
+-  BUILD_ERROR ("Missing: Google Protobuf Compiler (protobuf-compiler)")
+-endif()
+-if (NOT PROTOBUF_PROTOC_LIBRARY)
+-  BUILD_ERROR ("Missing: Google Protobuf Compiler Library (libprotoc-dev)")
++
++# Protobuf >= 22 requires to link abseil, so we are constrained to use 
++# find_package(Protobuf) and link to protobuf::libprotobuf,
++# see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075#issuecomment-1569242816
++if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0)
++  set(GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT ON)
++else()
++  set(GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT OFF)
+ endif()
++option(GZ_PROTOBUF_USE_CMAKE_CONFIG "If true use protobuf-config.cmake to find protobuf" ${GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT})
++mark_as_advanced(GZ_PROTOBUF_USE_CMAKE_CONFIG)
+ 
+-if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-  set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY_DEBUG})
+-  set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_DEBUG})
++if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG)
++  find_package(Protobuf REQUIRED)
++  if (NOT PROTOBUF_FOUND)
++    BUILD_ERROR ("Missing: Google Protobuf (libprotobuf-dev)")
++  endif()
++  if (NOT PROTOBUF_PROTOC_EXECUTABLE)
++    BUILD_ERROR ("Missing: Google Protobuf Compiler (protobuf-compiler)")
++  endif()
++  if (NOT PROTOBUF_PROTOC_LIBRARY)
++    BUILD_ERROR ("Missing: Google Protobuf Compiler Library (libprotoc-dev)")
++  endif()
++  if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
++    set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY_DEBUG})
++    set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_DEBUG})
++  else()
++    set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY})
++    set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY})
++  endif()
+ else()
+-  set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY})
+-  set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY})
++  set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf)
++  set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc)
++  if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY)
++    get_target_property(PROTOBUF_PROTOC_LIBRARY protobuf::protoc LOCATION)
++  endif()
+ endif()
+ 
+ ########################################
+diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in
+index 96993f93fa..ac1de2c061 100644
+--- a/cmake/gazebo-config.cmake.in
++++ b/cmake/gazebo-config.cmake.in
+@@ -166,9 +166,18 @@ list(APPEND @PKG_NAME@_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
+ list(APPEND @PKG_NAME@_LIBRARIES ${Boost_LIBRARIES})
+ 
+ # Find protobuf
+-find_package(Protobuf REQUIRED)
+-list(APPEND @PKG_NAME@_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
+-list(APPEND @PKG_NAME@_LIBRARIES ${PROTOBUF_LIBRARIES})
++set(GZ_PROTOBUF_USE_CMAKE_CONFIG @GZ_PROTOBUF_USE_CMAKE_CONFIG@)
++
++if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG)
++  find_package(Protobuf REQUIRED)
++  list(APPEND @PKG_NAME@_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
++  list(APPEND @PKG_NAME@_LIBRARIES ${PROTOBUF_LIBRARIES})
++else()
++  find_package(Protobuf CONFIG REQUIRED)
++  list(APPEND @PKG_NAME@_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
++  list(APPEND @PKG_NAME@_LIBRARIES protobuf::libprotoc)
++  list(APPEND @PKG_NAME@_LIBRARIES protobuf::libprotobuf)
++endif()
+ 
+ # Find SDFormat
+ find_package(sdformat9 REQUIRED VERSION 9.8)
+
+From 83f05b7778ff2933d8bd3b9149207dd17a20b9b4 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <silvio@traversaro.it>
+Date: Tue, 6 Jun 2023 14:18:48 +0200
+Subject: [PATCH 2/6] Update SearchForStuff.cmake
+
+---
+ cmake/SearchForStuff.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index e0fbd68274..d25b7a4a63 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -25,7 +25,7 @@ if (CMAKE_BUILD_TYPE)
+ endif()
+ 
+ ########################################
+-if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0)
++if (PROTOBUF_VERSION LESS 2.3.0)
+   BUILD_ERROR("Incorrect version: Gazebo requires protobuf version 2.3.0 or greater")
+ endif()
+ 
+
+From 398e832301429b2f406a5a0e35187ca8fabd50ad Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <silvio@traversaro.it>
+Date: Tue, 6 Jun 2023 23:25:06 +0200
+Subject: [PATCH 3/6] Update SearchForStuff.cmake
+
+---
+ cmake/SearchForStuff.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index d25b7a4a63..2f0b53358f 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -62,6 +62,7 @@ if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG)
+     set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY})
+   endif()
+ else()
++  find_package(Protobuf CONFIG REQUIRED)
+   set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf)
+   set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc)
+   if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY)
+
+From d46bf2353a25b38b9613b67f2567f729e133d2b7 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <silvio@traversaro.it>
+Date: Tue, 6 Jun 2023 23:55:22 +0200
+Subject: [PATCH 4/6] Update SearchForStuff.cmake
+
+---
+ cmake/SearchForStuff.cmake | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 2f0b53358f..1bbadd3c29 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -66,7 +66,9 @@ else()
+   set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf)
+   set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc)
+   if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY)
+-    get_target_property(PROTOBUF_PROTOC_LIBRARY protobuf::protoc LOCATION)
++    get_target_property(PROTOBUF_PROTOC_LIBRARY_VAR protobuf::protoc LOCATION)
++    set(PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_VAR} CACHE STRING "")
++    mark_as_advanced(PROTOBUF_PROTOC_LIBRARY)
+   endif()
+ endif()
+ 
+
+From f372ef83b99bf2dc2f4a456ab74c7831c347ec89 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <silvio@traversaro.it>
+Date: Wed, 7 Jun 2023 00:39:40 +0200
+Subject: [PATCH 5/6] Update SearchForStuff.cmake
+
+---
+ cmake/SearchForStuff.cmake | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 1bbadd3c29..c400bee0e3 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -65,10 +65,8 @@ else()
+   find_package(Protobuf CONFIG REQUIRED)
+   set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf)
+   set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc)
+-  if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY)
+-    get_target_property(PROTOBUF_PROTOC_LIBRARY_VAR protobuf::protoc LOCATION)
+-    set(PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_VAR} CACHE STRING "")
+-    mark_as_advanced(PROTOBUF_PROTOC_LIBRARY)
++  if(NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE)
++    get_target_property(PROTOBUF_PROTOC_EXECUTABLE protobuf::protoc LOCATION)
+   endif()
+ endif()
+ 
+
+From c4674eee1ad234d4a74bafc1d3ec401b595d3d63 Mon Sep 17 00:00:00 2001
+From: Steve Peters <computersthatmove@gmail.com>
+Date: Wed, 14 Jun 2023 09:27:16 -0700
+Subject: [PATCH 6/6] Fix whitespace
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ cmake/SearchForStuff.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index c400bee0e3..948cf0a8a1 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -32,7 +32,7 @@ endif()
+ ########################################
+ # The Google Protobuf library for message generation + serialization
+ 
+-# Protobuf >= 22 requires to link abseil, so we are constrained to use 
++# Protobuf >= 22 requires to link abseil, so we are constrained to use
+ # find_package(Protobuf) and link to protobuf::libprotobuf,
+ # see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075#issuecomment-1569242816
+ if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0)

diff --git a/sci-electronics/gazebo/gazebo-11.12.0-r1.ebuild b/sci-electronics/gazebo/gazebo-11.13.0.ebuild
similarity index 98%
rename from sci-electronics/gazebo/gazebo-11.12.0-r1.ebuild
rename to sci-electronics/gazebo/gazebo-11.13.0.ebuild
index 1ba53c80d837..801fdd8a98a1 100644
--- a/sci-electronics/gazebo/gazebo-11.12.0-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.13.0.ebuild
@@ -65,7 +65,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	"${FILESDIR}/qwt2.patch"
 	"${FILESDIR}/cmake.patch"
-	"${FILESDIR}/ffmpeg6.patch"
+	"${FILESDIR}/protobuf.patch"
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2024-04-16 15:36 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2024-04-16 15:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4e4cb3179c40d12bd9adda012c5c6a60cc217a4f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 15:36:23 2024 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 15:36:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4cb317

sci-electronics/gazebo: add upstream patch to build with graphviz 10

Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-electronics/gazebo/files/gv10.patch      | 45 ++++++++++++++++++++++++++++
 sci-electronics/gazebo/gazebo-11.14.0.ebuild |  3 +-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/sci-electronics/gazebo/files/gv10.patch b/sci-electronics/gazebo/files/gv10.patch
new file mode 100644
index 000000000000..f3ab5eb1e686
--- /dev/null
+++ b/sci-electronics/gazebo/files/gv10.patch
@@ -0,0 +1,45 @@
+From 660ae15f4af1f5ea8d9d50d4a24e4d91a94f9c2d Mon Sep 17 00:00:00 2001
+From: Steve Peters <scpeters@openrobotics.org>
+Date: Tue, 20 Feb 2024 17:25:23 -0800
+Subject: [PATCH] Fix build with graphviz 10.0
+
+Replace TRUE with 1, since the TRUE macro has been removed.
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ gazebo/gui/qgv/QGVSubGraph.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gazebo/gui/qgv/QGVSubGraph.cpp b/gazebo/gui/qgv/QGVSubGraph.cpp
+index 51925aba30..c16b69d065 100644
+--- a/gazebo/gui/qgv/QGVSubGraph.cpp
++++ b/gazebo/gui/qgv/QGVSubGraph.cpp
+@@ -44,13 +44,13 @@ QString QGVSubGraph::name() const
+ 
+ QGVNode *QGVSubGraph::addNode(const QString &label)
+ {
+-    Agnode_t *node = agnode(_sgraph->graph(), NULL, TRUE);
++    Agnode_t *node = agnode(_sgraph->graph(), NULL, 1);
+     if (node == NULL)
+     {
+         qWarning()<<"Invalid sub node :"<<label;
+         return 0;
+     }
+-    agsubnode(_sgraph->graph(), node, TRUE);
++    agsubnode(_sgraph->graph(), node, 1);
+ 
+     QGVNode *item = new QGVNode(new QGVNodePrivate(node), _scene);
+     item->setLabel(label);
+@@ -66,10 +66,10 @@ QGVSubGraph *QGVSubGraph::addSubGraph(const QString &_name, bool cluster)
+     if (cluster)
+     {
+         sgraph = agsubg(_sgraph->graph(),
+-            ("cluster_" + _name).toLocal8Bit().data(), TRUE);
++            ("cluster_" + _name).toLocal8Bit().data(), 1);
+     }
+     else
+-        sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), TRUE);
++        sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), 1);
+ 
+     if (sgraph == NULL)
+     {

diff --git a/sci-electronics/gazebo/gazebo-11.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
index 0a321f61f496..1746085d2235 100644
--- a/sci-electronics/gazebo/gazebo-11.14.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,6 +65,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	"${FILESDIR}/qwt2.patch"
 	"${FILESDIR}/cmake.patch"
+	"${FILESDIR}/gv10.patch"
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/
@ 2024-05-23 13:14 Alexis Ballier
  0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2024-05-23 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     8d529d424ed21b03320ca72913afc7877f31700c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 13:14:21 2024 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu May 23 13:14:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d529d42

sci-electronics/gazebo: upstream patch to build with latest boost

Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-electronics/gazebo/files/boost.patch     | 49 ++++++++++++++++++++++++++++
 sci-electronics/gazebo/gazebo-11.14.0.ebuild |  1 +
 2 files changed, 50 insertions(+)

diff --git a/sci-electronics/gazebo/files/boost.patch b/sci-electronics/gazebo/files/boost.patch
new file mode 100644
index 000000000000..56f26387c58c
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost.patch
@@ -0,0 +1,49 @@
+From 6b4d0f0b94cb2d98e6a48970c1c128e9b4f13e47 Mon Sep 17 00:00:00 2001
+From: Steve Peters <scpeters@openrobotics.org>
+Date: Fri, 10 May 2024 15:39:02 +0200
+Subject: [PATCH 1/2] Fix build with boost 1.85.0
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ gazebo/common/Console.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gazebo/common/Console.cc b/gazebo/common/Console.cc
+index 6b86bc2d02..bb4dbe3180 100644
+--- a/gazebo/common/Console.cc
++++ b/gazebo/common/Console.cc
+@@ -221,7 +221,7 @@ void FileLogger::Init(const std::string &_prefix, const std::string &_filename)
+   if (boost::filesystem::is_directory(logPath))
+     this->logDirectory = logPath.string();
+   else
+-    this->logDirectory = logPath.branch_path().string();
++    this->logDirectory = logPath.parent_path().string();
+ }
+ 
+ /////////////////////////////////////////////////
+
+From 27c2277a2376f9d82755e975ae8b564d9d6ca6ed Mon Sep 17 00:00:00 2001
+From: Steve Peters <scpeters@openrobotics.org>
+Date: Fri, 10 May 2024 17:43:32 +0200
+Subject: [PATCH 2/2] Fix build error in LogPlay.cc as well
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ gazebo/util/LogPlay.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc
+index 70cfcc3346..be00820edb 100644
+--- a/gazebo/util/LogPlay.cc
++++ b/gazebo/util/LogPlay.cc
+@@ -414,8 +414,8 @@ common::Time LogPlay::LogEndTime() const
+ /////////////////////////////////////////////////
+ std::string LogPlay::Filename() const
+ {
+-  return boost::filesystem::basename(this->dataPtr->filename) +
+-    boost::filesystem::extension(this->dataPtr->filename);
++  boost::filesystem::path path(this->dataPtr->filename);
++  return path.stem().string() + path.extension().string();
+ }
+ 
+ /////////////////////////////////////////////////

diff --git a/sci-electronics/gazebo/gazebo-11.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
index 1746085d2235..04caee69b302 100644
--- a/sci-electronics/gazebo/gazebo-11.14.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}/qwt2.patch"
 	"${FILESDIR}/cmake.patch"
 	"${FILESDIR}/gv10.patch"
+	"${FILESDIR}/boost.patch"
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-05-23 13:14 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-17 15:53 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/files/, sci-electronics/gazebo/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2024-05-23 13:14 Alexis Ballier
2024-04-16 15:36 Alexis Ballier
2023-08-25 12:54 Alexis Ballier
2022-02-21 17:04 Alexis Ballier
2020-05-15 16:34 Alexis Ballier
2020-01-21 18:28 Alexis Ballier
2018-06-08 12:26 Alexis Ballier
2016-11-29 12:18 Alexis Ballier
2016-10-06 12:52 Alexis Ballier
2015-09-19 11:59 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox