From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- sci-electronics/gazebo/Manifest | 8 +-- sci-electronics/gazebo/files/gv.patch | 13 ++++ sci-electronics/gazebo/files/qwt.patch | 17 ------ sci-electronics/gazebo/gazebo-11.10.1.ebuild | 85 -------------------------- sci-electronics/gazebo/gazebo-11.11.0.ebuild | 84 +++++++++++++++++++++++++ sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild | 83 ------------------------- 6 files changed, 100 insertions(+), 190 deletions(-) create mode 100644 sci-electronics/gazebo/files/gv.patch delete mode 100644 sci-electronics/gazebo/files/qwt.patch delete mode 100644 sci-electronics/gazebo/gazebo-11.10.1.ebuild create mode 100644 sci-electronics/gazebo/gazebo-11.11.0.ebuild delete mode 100644 sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild (limited to 'sci-electronics/gazebo') diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index d60e5fbcab11..f54717ce7ba0 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,12 +1,10 @@ AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f AUX ffmpeg4.patch 619 BLAKE2B 365911baabf0c5a0788e1a964aea75d04749bc6874a696104ed47f7d9c017cb31d0c11294481768ceb3f0c8c139256b0876d5266594cf780954533395ead7034 SHA512 3055895af8a651dc7cac24c4a7258adbd29586a1411178ca7eb7420b8a0897cb6fc9d89dd42a41221b12a79e34757d82071c2841d77ecfeeeb42d60b9a4e8210 AUX ffmpeg5.patch 5512 BLAKE2B 8bdd4e447fb825cd0a5cd1b2d56503803fc6cda2c8cab568caa604d6f9acaaae3b998b61cacfb275ff8ddb9c484b4ac3d40409b0f56f878437a1332477b6be75 SHA512 bf927c2eec9a6cbc373355c5535bce63618fa29def46c1357172fd45e8229eb122e680e3f7ca01012cc4b9eb49d9c254e302ea42350d3c79a4d44b4ac802235c -AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8 +AUX gv.patch 511 BLAKE2B 85011a38aa5f749a152ab725469d96a4cf3560fa655f69af55de0ac9b4a2125efaa3cdaacf7ec5c99351e345c90686dee0ee7dcfa8ea8d4ba8c39c8a764bb33d SHA512 7b3a8fea65ec47ba0d159435c73eb69b12835394c614bf37f95e183a450b446cf93a834dd3cecb28b6571d974ebfb8ac2dcff29b33ce5c454325ecacca030a26 AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792 -DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3 DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2 -DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694 -EBUILD gazebo-11.10.1.ebuild 1970 BLAKE2B 36e71e0bf16f643a997d56d8a83235e33d336b70cd1951fe4b14c3a8ec80109f2ea61b25ddb3c1f2c368e1cda088c161d7bd5d968fc962523e935dd2f33ac57c SHA512 d889a779064d00ba0ad9e8070ee7946a4086be50689e95218ed2ed6037084218d011f3d49ea0e2ed6d7815c10fa48204b9e46b8afb8014107c70cafdf4337625 +DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882 EBUILD gazebo-11.10.2.ebuild 1958 BLAKE2B 98a891f8f0b9e1cbee1591f4077fa363b09bd85551eafac5d10ea7f6d191efb823bcb7dfbde5ae8a64752ffb4da9eb3b134296f7b96861bc69fb7fa3883128e3 SHA512 d3996a65b59ce87b1aa970219a76b7c70602ceb76ff9caf45b4d276de812bd6b2e1056354036e51cce2bcd8927b0906bd68516f0951baee25a06967b359a31ec -EBUILD gazebo-11.9.1-r1.ebuild 1912 BLAKE2B ab1806c0767335f5d3d51f9bf1832cb7e75c44c9ad47560153867167451019d1b296fce5a7c66cb4d1db7379b59970f3612f2b180ecb2a3a963b64e2389b152f SHA512 77e581310235fcba1f4e140d44b0525ba2fd5a29aa0810c9013937defe94cf75cb9a1560544f86a8c35db8de1bb01c29ed75931d6e2a46a387a7b756fdd58b56 +EBUILD gazebo-11.11.0.ebuild 1928 BLAKE2B 48f11a9bea7cf6cfcbbab65ab77119c1654a8b344e6519046b471bbd0c98428a85ecd205f6b72fa77800c4ba12ec4b6f7ceb492eb89975076f1068a9b19b7ab8 SHA512 3898a68d523092af1d174ae2c889b669a7d028940df35c0dfd767537c439a261b503c5436657225e623ff48da67688a361d65be2073984b3c8b80f3868ef90f9 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af diff --git a/sci-electronics/gazebo/files/gv.patch b/sci-electronics/gazebo/files/gv.patch new file mode 100644 index 000000000000..7afa786f4774 --- /dev/null +++ b/sci-electronics/gazebo/files/gv.patch @@ -0,0 +1,13 @@ +Index: gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h +=================================================================== +--- gazebo-11.11.0.orig/gazebo/gui/qgv/private/QGVCore.h ++++ gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h +@@ -96,7 +96,7 @@ class QGVCore + Agiodisc_t memIoDisc; + + memIoDisc.afread = memiofread; +- memIoDisc.putstr = AgIoDisc.putstr; ++ memIoDisc.printf = AgIoDisc.printf; + memIoDisc.flush = AgIoDisc.flush; + rdr.data = cp; + rdr.len = strlen(cp); diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch deleted file mode 100644 index d4f1538900bc..000000000000 --- a/sci-electronics/gazebo/files/qwt.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: gazebo-8.0.0/cmake/SearchForStuff.cmake -=================================================================== ---- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake -+++ gazebo-8.0.0/cmake/SearchForStuff.cmake -@@ -758,10 +758,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA - /usr/local/lib/qwt.framework/Headers - ${QWT_WIN_INCLUDE_DIR} - -- PATH_SUFFIXES qwt qwt5 -+ PATH_SUFFIXES qwt6 - ) - --find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS -+find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS - /usr/lib - /usr/local/lib - /usr/local/lib/qwt.framework diff --git a/sci-electronics/gazebo/gazebo-11.10.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild deleted file mode 100644 index 3291c74fa777..000000000000 --- a/sci-electronics/gazebo/gazebo-11.10.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" - -LICENSE="Apache-2.0" -# Subslot = major version = soname of libs -SLOT="0/11" -KEYWORDS="~amd64" -IUSE="cpu_flags_x86_sse2 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/protobuf-2:= - virtual/opengl - media-libs/openal - net-misc/curl - dev-libs/tinyxml - >=dev-libs/tinyxml2-6:= - dev-libs/libtar - =dev-games/ogre-1.7.4:=[freeimage] - =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= -