!2 update ignition math 6.9.2

From: @davidhan008 
Reviewed-by: @anchuanxu 
Signed-off-by: @anchuanxu
This commit is contained in:
openeuler-ci-bot 2024-03-19 06:35:32 +00:00 committed by Gitee
commit 670f4ee090
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 216 additions and 296 deletions

Binary file not shown.

View File

@ -1,295 +0,0 @@
Name: ros-foxy-ros-gz-math
Version: 4.5.0
Release: 0
Summary: This is ROS2 foxy gazebo Package
License: Public Domain and Apache-2.0 and BSD and MIT and BSL-1.0 and LGPL-2.1-only and MPL-2.0 and GPL-3.0-only and GPL-2.0-or-later and MPL-1.1 and IJG and Zlib and OFL-1.1
URL: https://github.com/gazebosim/gz-math
Source0: https://github.com/gazebosim/gz-math/refs/tags/6.11.0.tar.gz
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pytest
BuildRequires: asio-devel
BuildRequires: tinyxml2-devel
BuildRequires: git
BuildRequires: qt5-devel
BuildRequires: bullet-devel
BuildRequires: gmock-devel
BuildRequires: suitesparse-devel
BuildRequires: lua-devel
BuildRequires: protobuf-devel
BuildRequires: cairo-devel
BuildRequires: gflags-devel
BuildRequires: freeglut-devel
BuildRequires: libXt-devel
BuildRequires: libX11-devel
BuildRequires: libXrandr-devel
BuildRequires: libXaw-devel
BuildRequires: assimp-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: yaml-cpp-devel
BuildRequires: libatomic
BuildRequires: lz4-devel
BuildRequires: sphinx
BuildRequires: bullet-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: fltk-devel
BuildRequires: libtiff-devel
BuildRequires: libwebp-devel
BuildRequires: gtest-devel
BuildRequires: yaml-cpp-devel
BuildRequires: libjpeg-devel
BuildRequires: swig
BuildRequires: python3-psutil
#BuildRequires: freeimage-devel
BuildRequires: libXaw-devel
BuildRequires: libcurl-devel
BuildRequires: libtar-devel
BuildRequires: tbb-devel
#BuildRequires: cppzmq-devel
BuildRequires: rubygem-sqlite3
BuildRequires: hdf5-devel
BuildRequires: graphviz-devel
BuildRequires: libusb
BuildRequires: libzip-devel
BuildRequires: sqlite-devel
BuildRequires: jsoncpp-devel
BuildRequires: openal-soft-devel
BuildRequires: openblas-devel
BuildRequires: lapack-devel
BuildRequires: freeglut-devel
BuildRequires: libatomic
BuildRequires: zlib
BuildRequires: zeromq-devel
BuildRequires: openeuler-lsb
BuildRequires: ruby-devel
BuildRequires: rubygem-rexml
#BuildRequires: freeimage-devel
%description
This is ROS2 foxy gazebo Package.
%prep
%setup
%install
cd 3rdparty/
cd empy-3.3.4/
python3 setup.py install --user
cd ..
cd six-1.15.0/
python3 setup.py install --user
cd ..
cd setuptools_scm-4.1.2/
python3 setup.py install --user
cd ..
cd python-dateutil-2.8.1/
python3 setup.py install --user
cd ..
cd pyparsing-2.4.7/
python3 setup.py install --user
cd ..
cd docutils-0.16/
python3 setup.py install --user
cd ..
cd catkin_pkg-0.4.22/
python3 setup.py install --user
cd ..
#ros2
cd distlib-0.3.3/
python3 setup.py install --user
cd ..
cd attrs-21.2.0
python3 setup.py install --user
cd ..
cd more-itertools-5.0.0
python3 setup.py install --user
cd ..
cd zipp-1.0.0
python3 setup.py install --user
cd ..
cd wheel-0.33.0
python3 setup.py install --user
cd ..
cd toml-0.10.2
python3 setup.py install --user
cd ..
cd importlib_metadata-3.8.0
python3 setup.py install --user
cd ..
cd py-1.11.0
python3 setup.py install --user
cd ..
cd packaging-21.3
python3 setup.py install --user
cd ..
cd iniconfig-1.1.1
python3 setup.py install --user
cd ..
cd pluggy-1.0.0
python3 setup.py install --user
cd ..
cd typing_extensions-3.7.4
python3 setup.py install --user
cd ..
cd pytest-6.2.5
python3 setup.py install --user
cd ..
cd coverage-5.4
python3 setup.py install --user
cd ..
cd pytest-cov-3.0.0
python3 setup.py install --user
cd ..
cd pytest-repeat-0.9.1
python3 setup.py install --user
cd ..
cd pytest-rerunfailures-10.2
python3 setup.py install --user
cd ..
cd pytest-runner-5.3.1
python3 setup.py install --user
cd ..
cd PyYAML-5.4
python3 setup.py install --user
cd ..
#cd setuptools-50.0.0
#python3 setup.py install --user
#cd ..
cd argcomplete-1.11.1
python3 setup.py install --user
cd ..
cd notify2-0.3.1
python3 setup.py install --user
cd ..
cd lark-1.0.0
python3 setup.py install --user
cd ..
# for 21.03 python3.8
#cd setuptools-50.0.0
#python3 setup.py install --user
#cd ..
#cd Cython-0.29.24
#python3 setup.py install --user
#cd ..
#cd numpy-1.19.2
#python3 setup.py install --user
#cd ..
# for factory python3.10
#cd setuptools-50.0.0 need detel setuptools
#python3 setup.py install --user
#cd ..
cd Cython-0.29.24
python3 setup.py install --user
cd ..
cd numpy-1.21.2
python3 setup.py install --user
cd ..
####cpp 相关依赖库
#export BUILD_PLATFORM=`uname -m`
#if (($BUILD_PLATFORM=="aarch64"))
#then
# BUILD_PLATFORM="arm"
#fi
#cd gts-0.7.6
# ./configure --prefix=$PWD/../../workspace/install/ --build=$BUILD_PLATFORM --enable-shared
#make -j8
#make install
#cd ..
#cd ffmpeg
#./configure --prefix=$PWD/../../workspace/install/ --enable-shared --disable-x86asm
#make -j8
#make install
#cd ..
#cd qwt-6.1.3
#/usr/bin/qmake-qt5 qwt.pro
#make -j8
#make install
#cd ..
cd ..
# for colcon build tools
cd build_tools
export BUILD_WORSPCE=$PWD
./colcon/colcon-core/bin/colcon build --paths colcon/* --merge-install
source install/local_setup.sh
cd ..
# for workspace
cd workspace
colcon build --merge-install
cp ../install_dependence.sh install/
cp -r ../build_tools/install/bin install/
cp -r ../build_tools/install/lib install/
cp -r ../build_tools/install/share install/
####
# 对install内部的变量名称进行替换
#
####
SRC_PATH=$PWD/install
DST_PATH=/opt/ros/foxy
sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*`
SRC_PATH=$BUILD_WORSPCE/install
DST_PATH=/opt/ros/foxy
sed -i "s:${SRC_PATH}:${DST_PATH}:g" `grep -rIln "${SRC_PATH}" install/*`
####
# install
#
####
mkdir -p %{buildroot}/opt/ros/foxy/
cp -r install/* %{buildroot}/opt/ros/foxy/
#cp install/share/gazebo-11/setup.sh %{buildroot}/opt/ros/foxy/share/gazebo/local_setup.bash
%files
%defattr(-,root,root)
/opt/ros/foxy/*
%changelog
* Sat Nov 19 2022 openEuler Buildteam <hanhaomin008@126.com> - 4.5.0
- Fix Package name

View File

@ -1,5 +1,5 @@
---
version_control: git
src_repo: https://github.com/gazebosim/gz-math
tag_prefix: 4.5.0
tag_prefix: 6.9.2
separator: "."

View File

@ -0,0 +1,42 @@
diff -up ./src/MaterialType.hh.gcc12 ./src/MaterialType.hh
--- ./src/MaterialType.hh.gcc12 2022-01-24 21:27:24.132627129 -0500
+++ ./src/MaterialType.hh 2022-01-24 21:28:18.264899715 -0500
@@ -37,20 +37,22 @@ struct MaterialData
// The mapping of material type to name and density values.
// If you modify this map, make sure to also modify the MaterialType enum in
// include/ignition/math/MaterialTypes.hh
-static std::map<MaterialType, MaterialData> kMaterialData =
-{{
- {MaterialType::STYROFOAM, {"styrofoam", 75.0}},
- {MaterialType::PINE, {"pine", 373.0}},
- {MaterialType::WOOD, {"wood", 700.0}},
- {MaterialType::OAK, {"oak", 710.0}},
- {MaterialType::PLASTIC, {"plastic", 1175.0}},
- {MaterialType::CONCRETE, {"concrete", 2000.0}},
- {MaterialType::ALUMINUM, {"aluminum", 2700.0}},
- {MaterialType::STEEL_ALLOY, {"steel_alloy", 7600.0}},
- {MaterialType::STEEL_STAINLESS, {"steel_stainless", 7800.0}},
- {MaterialType::IRON, {"iron", 7870.0}},
- {MaterialType::BRASS, {"brass", 8600.0}},
- {MaterialType::COPPER, {"copper", 8940.0}},
- {MaterialType::TUNGSTEN, {"tungsten", 19300.0}}
-}};
+static std::map<MaterialType, MaterialData> kMaterialData = []()
+{
+ std::map<MaterialType, MaterialData> ret;
+ ret[MaterialType::STYROFOAM] = {"styrofoam", 75.0};
+ ret[MaterialType::PINE] = {"pine", 373.0};
+ ret[MaterialType::WOOD] = {"wood", 700.0};
+ ret[MaterialType::OAK] = {"oak", 710.0};
+ ret[MaterialType::PLASTIC] = {"plastic", 1175.0};
+ ret[MaterialType::CONCRETE] = {"concrete", 2000.0};
+ ret[MaterialType::ALUMINUM] = {"aluminum", 2700.0};
+ ret[MaterialType::STEEL_ALLOY] = {"steel_alloy", 7600.0};
+ ret[MaterialType::STEEL_STAINLESS] = {"steel_stainless", 7800.0};
+ ret[MaterialType::IRON] = {"iron", 7870.0};
+ ret[MaterialType::BRASS] = {"brass", 8600.0};
+ ret[MaterialType::COPPER] = {"copper", 8940.0};
+ ret[MaterialType::TUNGSTEN] = {"tungsten", 19300.0};
+ return ret;
+}();
#endif

173
ignition-math.spec Normal file
View File

@ -0,0 +1,173 @@
%global _docdir_fmt %{name}
%global abiver 6
Name: ignition-math
Version: 6.9.2
Release: 2%{?dist}
Summary: Small, Fast, High Performance Math Library
License: ASL 2.0
URL: http://ignitionrobotics.org/libraries/math
Source0: https://osrf-distributions.s3.us-east-1.amazonaws.com/ign-math/releases/ignition-math%{abiver}-%{version}.tar.bz2
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: eigen3-devel
BuildRequires: ignition-cmake-devel >= 2.0.0
BuildRequires: graphviz
BuildRequires: make
BuildRequires: rubygem-ronn
# Change a static map intiailization to work around error where density values were not intialized correctly.
# Not yet submitted upstream
Patch0: %{name}-6.9.2-gcc12.patch
%description
Ignition Math is a component in the Ignition framework, a set of libraries
designed to rapidly develop robot applications. The library defines math
classes and functions used in other Ignition libraries and programs.
%package devel
Summary: Development files and libraries for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package contains the header files and libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.
%package doc
Summary: Development documentation for %{name}
BuildArch: noarch
%description doc
Generated API and development documentation for %{name}
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .gcc12
# Required to sneak in custom CFLAGS via CMAKE_C_FLAGS_ALL
sed -i 's/unset/#unset/g' CMakeLists.txt
sed -i 's/NOT RUBY_FOUND/TRUE/g' CMakeLists.txt
sed -i 's/RUBY_FOUND/FALSE/g' src/CMakeLists.txt
%build
%cmake -DBUILD_TESTING=OFF \
%ifnarch x86_64
-DSSE2_FOUND=FALSE \
%endif
-DSSE3_FOUND=FALSE \
-DSSSE3_FOUND=FALSE \
-DSSE4_1_FOUND=FALSE \
-DSSE4_2_FOUND=FALSE \
-DCMAKE_C_FLAGS_ALL="%{optflags}" \
-DCMAKE_CXX_FLAGS_ALL="%{optflags}" \
-DCMAKE_BUILD_TYPE=Release
%make_build
%make_build doc
%install
%make_install
%check
# The INTEGRATION_versioned_symbols test fails due to unversioned symbols inserted by annobin.
# The UNIT_Pose_TEST fails on aarch64 due to cout printing 0 with a negative sign.
make test
%files
%license COPYING
%doc README.md Changelog.md
%{_libdir}/*.so.%{version}
%{_libdir}/*.so.%{abiver}
%{_datadir}/ignition/
%files devel
%{_libdir}/pkgconfig
%{_libdir}/*.so
%{_libdir}/cmake/*
%{_includedir}/ignition
%files doc
%license COPYING
%changelog
* Mon Jan 24 2022 Rich Mattes <rmattes@fedoraproject.org> - 6.9.2-2
- Add patch to work around rawhide test errors with gcc12
* Sun Jan 23 2022 Rich Mattes <rmattes@fedoraproject.org> - 6.9.2-1
- Update to release 6.9.2
* Sun Mar 07 2021 Rich Mattes <rmattes@fedoraproject.org> - 6.7.0-1
- Update to release 6.7.0
* Wed Aug 19 2020 Rich Mattes <rmattes@fedoraproject.org> - 6.4.0-1
- Update to release 6.4.0
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-6
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Nov 23 2018 Rich Mattes <richmattes@gmail.com> - 4.0.0-1
- Update to release 4.0 (rhbz#1652991)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sun Aug 20 2017 Rich Mattes <richmattes@gmail.com> - 3.2.0-1
- Update to release 3.2.0
* Mon Aug 07 2017 Björn Esser <besser82@fedoraproject.org> - 3.0.0-5
- Rebuilt for AutoReq cmake-filesystem
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
* Sun Feb 19 2017 Rich Mattes <richmattes@gmail.com> - 3.0.0-1
- Update to release 3.0.0
- Fix FTBFS (rhbz#1423733)
- Remove upstreamed patch
- Added a new fix for i686 non-SSE math
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Jul 17 2016 Rich Mattes <richmattes@gmail.com> - 2.4.1-1
- Update to release 2.4.1
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jan 15 2016 Rich Mattes <richmattes@gmail.com> - 2.3.0-1
- Update to release 2.3.0
* Tue Oct 20 2015 Rich Mattes <richmattes@gmail.com> - 2.2.3-1
- Update to release 2.2.3
* Thu Aug 20 2015 Rich Mattes <richmattes@gmail.com> - 2.2.2-1
- Update to release 2.2.2
* Fri May 22 2015 Rich Mattes <richmattes@gmail.com> - 1.0.0-1
- Initial release (rhbz#1224390)

Binary file not shown.