summaryrefslogtreecommitdiff
path: root/sci-electronics
diff options
context:
space:
mode:
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/Manifest.gzbin8704 -> 8708 bytes
-rw-r--r--sci-electronics/gazebo/Manifest8
-rw-r--r--sci-electronics/gazebo/files/boost.patch49
-rw-r--r--sci-electronics/gazebo/files/boost186.patch23
-rw-r--r--sci-electronics/gazebo/files/gv10.patch45
-rw-r--r--sci-electronics/gazebo/files/protobuf.patch226
-rw-r--r--sci-electronics/gazebo/gazebo-11.13.0.ebuild84
-rw-r--r--sci-electronics/gazebo/gazebo-11.14.0.ebuild86
8 files changed, 0 insertions, 521 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index e09cd2d031a1..45ed6abb6772 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
Binary files differ
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index c3afb598e4ec..625d2aa6fa7e 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,14 +1,6 @@
-AUX boost.patch 1851 BLAKE2B b05a0397ec6cd16d910c3edfa636d31959daea0992c56cfe67030ffe49a8462ddf20ce4a0d205c711ec0eedfe591381e342d3aacf5ddedb81ed49058a8436f93 SHA512 d1c4a4359e0f1719f8793bd65388cf2ac77494685e12dca6872c145dbea9abc1866375b171720937f9290d3c435c47254c37d6b26210a388069c55ef59007f8d
-AUX boost186.patch 794 BLAKE2B 341d0636232511ae5d437a9806823a09bc107f2c89c04ac159871584c7eb773d638b43dd681b597712786935e9f95d5f8658dd58b2917e4fdd6dfbad8fdb53f0 SHA512 821ba11dfafed69d3f964e393cc829230594ab5be04d756ff834ac43b02734cc2105fbdb4ae8bc3e7207c72ee3d63a699a6d7d9af9c5f0e897e506de5d4b8206
AUX boost187.patch 7727 BLAKE2B 861d4efb46f766d4f3fd3f844bfd65a86518187aaa8375900775e6296b5179774cc619f817b18d5e257cceb2703b97ba7e294dcca96b34e5c078df59c077692b SHA512 58b1aa3e1414f077798f1ec9d7dcc76c9fb3b21cc345bee393a0b7b755c7120190cdca9708c23e7d1d18fec0c8023e2f85348c416e725be83de9e98ffb00ebfb
AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
-AUX gv10.patch 1617 BLAKE2B 2fee9681e2f2f67e6a52bef75fc7c56217a4c57c8136e4b27ace7ba49c520161c2f15a1a73035822244b321b0f6b15c0af9c67254076e6168b4cc8624334e81d SHA512 3c3b8a08d212c5f93e85577ea043107e6008ebd85631951cd7ed6767a22be2b807b87b1cfce3f13f66d936ea53cf1eb14a4c067d1f444d2cd7e35462bb1f27bc
-AUX protobuf.patch 8899 BLAKE2B c8d181250926a7b22aa67e17b1e38b9713c50578458452d02b9af89400d4194f31808563709cbfc81fdb4709ee57032fbb77d26ff413bc069a5dc0407a57146b SHA512 eb36f0000204788ad9fa40d8fcdc0fcb6fc8d27489c5bae3cc12e910a7046936ed1d6adc23b3498060ee6da380df5f238bde17b699b3c3b0eec9f1c75a6c07e9
AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792
-DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390
-DIST gazebo-11.14.0.tar.bz2 56640328 BLAKE2B 9712118339593edd6c3cc1321ffa3d60f9f986abecc858d0709a0ddd1600a00620b26141300083dcfbc8ff699ae01a21340190cda04b276d146e93ccd1bfc6dc SHA512 365bda1be67745b6b40834a059f220351559e962df5f7254c80d363a04cc4beb092d20eaa357469d87f64c00fd3c6b2480693d7b1d734b0b42a75eb0ba687e34
DIST gazebo-11.15.1.tar.bz2 111639491 BLAKE2B 1a97fd04980310ed8e775c5ba8aa36af6d60ea0235c467ade763a4d7cb2ca72008bae2299c73018f89b0d5b12c23f3663948fd0a5c91b58a3cf235b49ffaa975 SHA512 085bd71f2495d86752274c02578d4e30d49f4e35dc91226ad11242f0cc5129f98686dfbae83120d228036d2034beb21b9cd1be91505a48d4ccc757d19cecb111
-EBUILD gazebo-11.13.0.ebuild 1893 BLAKE2B 01d3b523ca6342fea4be572679cbee959da6dbe89084680786ef5e0edb655f6fa3051e69aedfbfd0f929f41211447029b59021d31c22fe3ead1a07e803d57467 SHA512 e2f5973099b478942089d2863d2751ee7b47bf46db4ae0730cd3a765af3e484ef63c5c5df5d41c99eb32b47acf7775f6818cb70befad0e7a65c54bd27e6b75de
-EBUILD gazebo-11.14.0.ebuild 1946 BLAKE2B 4835978994e711666ca4fd40d9046ec8458cee3a07ea9967224c91807658cd9fdc4d0f0ff9635c01739a34d9d951863cfef0a05859b02098ab257ec06a1a7821 SHA512 41d1fd8291bc7eaee1961b3608ad6dbe52eafb40ed9b7237885b5e3b15d9cdc170f3eee446a3447ba8aa01322cd6bbb2ca71b6dc45320197764ea5a1fcf9ffdf
EBUILD gazebo-11.15.1.ebuild 1893 BLAKE2B 7e1e238bac3fd139cce1615e746fa26d2f7d3b7076f9f2165362f6c5badf92cbe59b75fb9e99182b0fe3ec2718c5ce8456072bf49b46c140140bfbb1e79645b0 SHA512 a6918b5c12f842c6e43a32e15d661edfb6443e9352a11c9d2230b6a24d8b5c41277b063771f48f807eb29fb5168700023169c97c1f309363883d18bcc0443012
MISC metadata.xml 339 BLAKE2B 2e86aa36f341e7c650a7af81354fdbd8fffc63558877ea4a226e8d4bf6a9b4eceb14339ed2e2131fde619fef2f655c75a847bc2a671c71430b6aa19051dec34a SHA512 d19331593693ad389d6956bdbc5e3129f67d9bd417e0fc98cbb00130d6e2d1f0674d77387151830ecf2168bb1c09da56e5ffad05fadba3b6b16769ce3c96ddad
diff --git a/sci-electronics/gazebo/files/boost.patch b/sci-electronics/gazebo/files/boost.patch
deleted file mode 100644
index 56f26387c58c..000000000000
--- a/sci-electronics/gazebo/files/boost.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/files/boost186.patch b/sci-electronics/gazebo/files/boost186.patch
deleted file mode 100644
index c34632d9b819..000000000000
--- a/sci-electronics/gazebo/files/boost186.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/files/gv10.patch b/sci-electronics/gazebo/files/gv10.patch
deleted file mode 100644
index f3ab5eb1e686..000000000000
--- a/sci-electronics/gazebo/files/gv10.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/files/protobuf.patch b/sci-electronics/gazebo/files/protobuf.patch
deleted file mode 100644
index c815d7a9aab3..000000000000
--- a/sci-electronics/gazebo/files/protobuf.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-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.13.0.ebuild b/sci-electronics/gazebo/gazebo-11.13.0.ebuild
deleted file mode 100644
index 801fdd8a98a1..000000000000
--- a/sci-electronics/gazebo/gazebo-11.13.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="https://gazebosim.org/home"
-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-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}/qwt2.patch"
- "${FILESDIR}/cmake.patch"
- "${FILESDIR}/protobuf.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.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild
deleted file mode 100644
index 3fda8329c57b..000000000000
--- a/sci-electronics/gazebo/gazebo-11.14.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="https://gazebosim.org/home"
-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-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}/qwt2.patch"
- "${FILESDIR}/cmake.patch"
- "${FILESDIR}/gv10.patch"
- "${FILESDIR}/boost.patch"
- "${FILESDIR}/boost186.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
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-01 08:17:38 +0000