diff --git a/.gitignore b/.gitignore index 5ec6ccc..de44690 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gazebo-3.0.0.tar.bz2 /gazebo-3.1.0.tar.bz2 +/gazebo-4.0.2.tar.bz2 diff --git a/gazebo-3.0.0-latex.patch b/gazebo-3.0.0-latex.patch deleted file mode 100644 index 5190d83..0000000 --- a/gazebo-3.0.0-latex.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up ./doc/CMakeLists.txt.latex ./doc/CMakeLists.txt ---- ./doc/CMakeLists.txt.latex 2014-04-12 07:21:03.000000000 -0400 -+++ ./doc/CMakeLists.txt 2014-07-17 18:41:17.652653181 -0400 -@@ -10,21 +10,23 @@ if (DOXYGEN_FOUND) - add_custom_target(doc - - # Generate the API documentation -- ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/gazebo.dox -+ ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/gazebo.dox || /bin/true - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - COMMAND cp ${CMAKE_SOURCE_DIR}/doc/gazebo_logo.png - ${CMAKE_BINARY_DIR}/doxygen/html - COMMAND cp ${CMAKE_SOURCE_DIR}/doc/search.js - ${CMAKE_BINARY_DIR}/doxygen/html/search -- COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen/latex -- COMMAND mv ${CMAKE_BINARY_DIR}/doxygen/latex/refman.pdf -- ${CMAKE_BINARY_DIR}/doxygen/latex/gazebo-${GAZEBO_VERSION_FULL}.pdf -+# COMMAND sed -i "s|latex_count=5|latex_count=25|" ${CMAKE_BINARY_DIR}/doxygen/latex/Makefile -+# COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen/latex -+# COMMAND mv ${CMAKE_BINARY_DIR}/doxygen/latex/refman.pdf -+# ${CMAKE_BINARY_DIR}/doxygen/latex/gazebo-${GAZEBO_VERSION_FULL}.pdf - - # Generate the messages documentation -- COMMAND doxygen ${CMAKE_BINARY_DIR}/gazebo_messages.dox -- COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen_msgs/latex -- COMMAND mv ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/refman.pdf -- ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/gazebo-msgs-${GAZEBO_VERSION_FULL}.pdf -+ COMMAND doxygen ${CMAKE_BINARY_DIR}/gazebo_messages.dox || /bin/true -+# COMMAND sed -i "s|latex_count=5|latex_count=25|" ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/Makefile -+# COMMAND make -C ${CMAKE_BINARY_DIR}/doxygen_msgs/latex -+# COMMAND mv ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/refman.pdf -+# ${CMAKE_BINARY_DIR}/doxygen_msgs/latex/gazebo-msgs-${GAZEBO_VERSION_FULL}.pdf - - COMMENT "Generating API documentation with Doxygen" VERBATIM) - endif() -diff -up ./doc/gazebo.in.latex ./doc/gazebo.in ---- ./doc/gazebo.in.latex 2014-07-17 18:41:41.416767906 -0400 -+++ ./doc/gazebo.in 2014-07-17 18:41:53.664244134 -0400 -@@ -1241,7 +1241,7 @@ SERVER_BASED_SEARCH = NO - # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will - # generate Latex output. - --GENERATE_LATEX = YES -+GENERATE_LATEX = NO - - # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. - # If a relative path is entered the value of OUTPUT_DIRECTORY will be diff --git a/gazebo-3.0.0-rpath.patch b/gazebo-3.0.0-rpath.patch deleted file mode 100644 index 96f68aa..0000000 --- a/gazebo-3.0.0-rpath.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up ./cmake/gazebo-config.cmake.in.rpath ./cmake/gazebo-config.cmake.in ---- ./cmake/gazebo-config.cmake.in.rpath 2014-06-23 21:57:13.965133513 -0400 -+++ ./cmake/gazebo-config.cmake.in 2014-06-23 21:57:28.221250531 -0400 -@@ -40,6 +40,4 @@ foreach(dep @PKG_DEPENDS@) - list(APPEND @PKG_NAME@_LIBRARIES ${${dep_lib}_LIBRARIES}) - endforeach() - --list(APPEND @PKG_NAME@_LDFLAGS -Wl,-rpath,@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/gazebo-@GAZEBO_VERSION@/plugins) - list(APPEND @PKG_NAME@_LDFLAGS -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@) --list(APPEND @PKG_NAME@_LDFLAGS -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/gazebo-@GAZEBO_VERSION@/plugins) -diff -up ./cmake/pkgconfig/gazebo.in.rpath ./cmake/pkgconfig/gazebo.in ---- ./cmake/pkgconfig/gazebo.in.rpath 2014-04-12 07:21:02.000000000 -0400 -+++ ./cmake/pkgconfig/gazebo.in 2014-06-23 21:55:40.884898491 -0400 -@@ -6,5 +6,5 @@ Name: gazebo - Description: Gazebo Libraries - Version: @GAZEBO_VERSION_FULL@ - Requires: --Libs: -Wl,-rpath,${prefix}/@CMAKE_INSTALL_LIBDIR@/gazebo-@GAZEBO_VERSION@/plugins -L${libdir} -L${prefix}/@CMAKE_INSTALL_LIBDIR@/gazebo-@GAZEBO_VERSION@/plugins -L@SDF_LIBRARY_DIRS@ -lgazebo_transport -lgazebo_physics -lgazebo_sensors -lgazebo_rendering -lgazebo_gui -l@SDF_LIBRARIES@ -lgazebo_msgs -lgazebo_math -lgazebo_common -lgazebo -+Libs: -L${libdir} -L${libdir}/gazebo-@GAZEBO_VERSION@/plugins -lgazebo_transport -lgazebo_physics -lgazebo_sensors -lgazebo_rendering -lgazebo_gui -l@SDF_LIBRARIES@ -lgazebo_msgs -lgazebo_math -lgazebo_common -lgazebo - CFlags: -I${includedir}/gazebo-@GAZEBO_VERSION@ -I@SDF_INCLUDE_DIRS@ -diff -up ./cmake/pkgconfig/gazebo_ode.in.rpath ./cmake/pkgconfig/gazebo_ode.in ---- ./cmake/pkgconfig/gazebo_ode.in.rpath 2014-04-12 07:21:02.000000000 -0400 -+++ ./cmake/pkgconfig/gazebo_ode.in 2014-06-23 21:55:40.884898491 -0400 -@@ -6,5 +6,5 @@ Name: gazebo - Description: Gazebo Exported ODE Libraries - Version: @GAZEBO_VERSION_FULL@ - Requires: --Libs: -Wl,-rpath,${prefix}/@CMAKE_INSTALL_LIBDIR@ -L${prefix}/@CMAKE_INSTALL_LIBDIR@ -lgazebo_ode -+Libs: -L${prefix}/@CMAKE_INSTALL_LIBDIR@ -lgazebo_ode - CFlags: -I${includedir}/gazebo-@GAZEBO_VERSION@ diff --git a/gazebo-4.0.2-fedora.patch b/gazebo-4.0.2-fedora.patch new file mode 100644 index 0000000..13f3ff2 --- /dev/null +++ b/gazebo-4.0.2-fedora.patch @@ -0,0 +1,181 @@ +diff -up ./cmake/FindFreeimage.cmake.fedora ./cmake/FindFreeimage.cmake +--- ./cmake/FindFreeimage.cmake.fedora 2014-09-23 20:53:26.000000000 -0400 ++++ ./cmake/FindFreeimage.cmake 2014-11-02 09:48:01.260483209 -0500 +@@ -4,7 +4,7 @@ include (${gazebo_cmake_dir}/GazeboUtils + ######################################## + # Find packages + if (PKG_CONFIG_FOUND) +- pkg_check_modules(freeimage freeimage>=${FREEIMAGE_VERSION}) ++ pkg_check_modules(freeimage freeimage>=${MIN_FREEIMAGE_VERSION}) + if (NOT freeimage_FOUND) + message (STATUS " freeimage.pc not found, trying freeimage_include_dir and freeimage_library_dir flags.") + endif (NOT freeimage_FOUND) +diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt +--- ./CMakeLists.txt.fedora 2014-11-02 09:48:01.261483245 -0500 ++++ ./CMakeLists.txt 2014-11-02 09:49:47.925430534 -0500 +@@ -349,7 +349,6 @@ else (build_errors) + gazebo_rendering + gazebo_selection_buffer + gazebo_sensors +- gazebo_skyx + gazebo_transport + gazebo_util) + +@@ -357,8 +356,8 @@ else (build_errors) + set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_ccd) + endif() + +- if (INCLUDE_PLAYER) +- set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_player) ++ if (NOT SKYX_FOUND) ++ set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_skyx) + endif() + + if (HAVE_BULLET) +diff -up ./cmake/SearchForStuff.cmake.fedora ./cmake/SearchForStuff.cmake +--- ./cmake/SearchForStuff.cmake.fedora 2014-09-23 20:53:26.000000000 -0400 ++++ ./cmake/SearchForStuff.cmake 2014-11-02 09:48:01.261483245 -0500 +@@ -100,8 +100,8 @@ if (PKG_CONFIG_FOUND) + endif() + endif () + +- pkg_check_modules(CEGUI CEGUI) +- pkg_check_modules(CEGUI_OGRE CEGUI-OGRE) ++ pkg_search_module(CEGUI CEGUI ) ++ pkg_search_module(CEGUI_OGRE CEGUI-OGRE ) + if (NOT CEGUI_FOUND) + BUILD_WARNING ("CEGUI not found, opengl GUI will be disabled.") + set (HAVE_CEGUI OFF CACHE BOOL "HAVE CEGUI" FORCE) +@@ -335,6 +335,13 @@ if (PKG_CONFIG_FOUND) + endif () + + ######################################## ++ # Find SkyX ++ pkg_check_modules(SKYX SKYX) ++ if (NOT SKYX_FOUND) ++ BUILD_WARNING("SkyX not found, using private copy of SkyX") ++ endif() ++ ++ ######################################## + # Find Player + pkg_check_modules(PLAYER playercore>=3.0 playerc++ playerwkb) + if (NOT PLAYER_FOUND) +diff -up ./gazebo/common/CMakeLists.txt.fedora ./gazebo/common/CMakeLists.txt +--- ./gazebo/common/CMakeLists.txt.fedora 2014-09-23 20:53:27.000000000 -0400 ++++ ./gazebo/common/CMakeLists.txt 2014-11-02 09:48:01.262483283 -0500 +@@ -129,6 +129,7 @@ set (gtest_sources + if (HAVE_FFMPEG) + set (gtest_sources ${gtest_sources} + AudioDecoder_TEST.cc) ++ include_directories(${LIBAVFORMAT_PATH} ${LIBAVCODEC_PATH}) + endif() + + gz_build_tests(${gtest_sources}) +diff -up ./gazebo/rendering/Camera.cc.fedora ./gazebo/rendering/Camera.cc +--- ./gazebo/rendering/Camera.cc.fedora 2014-09-23 20:53:27.000000000 -0400 ++++ ./gazebo/rendering/Camera.cc 2014-11-02 09:48:01.262483283 -0500 +@@ -23,7 +23,7 @@ + // Moved to top to avoid osx compilation errors + #include "gazebo/math/Rand.hh" + +-#include "gazebo/rendering/skyx/include/SkyX.h" ++#include "SkyX.h" + + #include "gazebo/common/Assert.hh" + #include "gazebo/common/Events.hh" +diff -up ./gazebo/rendering/cegui.h.fedora ./gazebo/rendering/cegui.h +--- ./gazebo/rendering/cegui.h.fedora 2014-09-23 20:53:27.000000000 -0400 ++++ ./gazebo/rendering/cegui.h 2014-11-02 09:48:01.263483320 -0500 +@@ -24,8 +24,15 @@ + + #ifdef HAVE_CEGUI + #include ++ ++#if CEGUI_VERSION_MAJOR == 0 && CEGUI_VERSION_MINOR > 7 ++#include ++#include ++#else + #include + #include + #endif + + #endif ++ ++#endif +diff -up ./gazebo/rendering/CMakeLists.txt.fedora ./gazebo/rendering/CMakeLists.txt +--- ./gazebo/rendering/CMakeLists.txt.fedora 2014-09-23 20:53:27.000000000 -0400 ++++ ./gazebo/rendering/CMakeLists.txt 2014-11-02 09:51:20.469860689 -0500 +@@ -3,14 +3,21 @@ include (${gazebo_cmake_dir}/GazeboUtils + include_directories(SYSTEM + ${OGRE_INCLUDE_DIRS} + ${CEGUI_INCLUDE_DIRS} +- skyx +- skyx/include + ) + ++if (${SKYX_FOUND}) ++ include_directories(SYSTEM ${SKYX_INCLUDE_DIRS}) ++else () ++ include_directories(SYSTEM skyx skyx/include) ++endif () ++ + if (${OGRE_VERSION} GREATER 1.7.4) + add_subdirectory(deferred_shading) + endif() +-add_subdirectory(skyx) ++if (NOT SKYX_FOUND) ++ add_subdirectory(skyx) ++endif() ++ + add_subdirectory(selection_buffer) + + set (sources +@@ -140,7 +147,6 @@ gz_add_library(gazebo_rendering ${source + target_link_libraries(gazebo_rendering + gazebo_common + gazebo_msgs +- gazebo_skyx + gazebo_selection_buffer + gazebo_transport + ${ogre_libraries} +@@ -148,6 +154,16 @@ target_link_libraries(gazebo_rendering + ${CEGUI_LIBRARIES} + ) + ++if (SKYX_FOUND) ++ target_link_libraries(gazebo_rendering ++ ${SKYX_LIBRARIES} ++ ) ++else (SKYX_FOUND) ++ target_link_libraries (gazebo_rendering ++ gazebo_skyx) ++endif() ++ ++ + if (HAVE_OCULUS) + target_link_libraries(gazebo_rendering + OculusVR +diff -up ./gazebo/rendering/GUIOverlay.hh.fedora ./gazebo/rendering/GUIOverlay.hh +--- ./gazebo/rendering/GUIOverlay.hh.fedora 2014-09-23 20:53:27.000000000 -0400 ++++ ./gazebo/rendering/GUIOverlay.hh 2014-11-02 09:48:01.263483320 -0500 +@@ -169,7 +169,7 @@ namespace gazebo + void ButtonCallback(const std::string &_buttonName, + void (T::*_fp)(), T *_obj) + { +-#ifdef HAVE_CEGUI ++#if 0 + CEGUI::Window *buttonWindow; + buttonWindow = + CEGUI::WindowManager::getSingletonPtr()->getWindow( +diff -up ./gazebo/rendering/Scene.cc.fedora ./gazebo/rendering/Scene.cc +--- ./gazebo/rendering/Scene.cc.fedora 2014-09-23 20:53:27.000000000 -0400 ++++ ./gazebo/rendering/Scene.cc 2014-11-02 09:48:01.264483357 -0500 +@@ -16,7 +16,7 @@ + */ + #include + +-#include "gazebo/rendering/skyx/include/SkyX.h" ++#include "SkyX.h" + #include "gazebo/rendering/ogre_gazebo.h" + + #include "gazebo/msgs/msgs.hh" diff --git a/gazebo-4.0.2-rpath.patch b/gazebo-4.0.2-rpath.patch new file mode 100644 index 0000000..e51901a --- /dev/null +++ b/gazebo-4.0.2-rpath.patch @@ -0,0 +1,10 @@ +diff -up ./cmake/pkgconfig/gazebo_ode.in.rpath ./cmake/pkgconfig/gazebo_ode.in +--- ./cmake/pkgconfig/gazebo_ode.in.rpath 2014-04-12 07:21:02.000000000 -0400 ++++ ./cmake/pkgconfig/gazebo_ode.in 2014-06-23 21:55:40.884898491 -0400 +@@ -6,5 +6,5 @@ Name: gazebo + Description: Gazebo Exported ODE Libraries + Version: @GAZEBO_VERSION_FULL@ + Requires: +-Libs: -Wl,-rpath,${prefix}/@CMAKE_INSTALL_LIBDIR@ -L${prefix}/@CMAKE_INSTALL_LIBDIR@ -lgazebo_ode ++Libs: -L${prefix}/@CMAKE_INSTALL_LIBDIR@ -lgazebo_ode + CFlags: -I${includedir}/gazebo-@GAZEBO_VERSION@ diff --git a/gazebo.spec b/gazebo.spec index 44f540c..8229e46 100644 --- a/gazebo.spec +++ b/gazebo.spec @@ -1,8 +1,8 @@ -%global abiversion 3.1 +%global abiversion 4.0 Name: gazebo -Version: 3.1.0 -Release: 2%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: 3D multi-robot simulator with dynamics License: ASL 2.0 and BSD @@ -13,12 +13,10 @@ Source1: gazebo.desktop # path to find ogre. It also fixes a problem with avformat and avcodec # not being found when ffmpeg is, and fixes the freeimage pkg-config # version being used -Patch0: %{name}-3.1.0-fedora.patch -# Patch to disable latex doxygen generation. Consistent with upstream issue 1141 -Patch1: %{name}-3.0.0-latex.patch +Patch0: %{name}-4.0.2-fedora.patch # Remove rpath in pkgconfig files # Not submitted upstream -Patch2: %{name}-3.0.0-rpath.patch +Patch2: %{name}-4.0.2-rpath.patch # Fix an exception that differs in behaviour because of boost differences # Not submitted upstream Patch3: %{name}-2.2.2-connection.patch @@ -146,7 +144,6 @@ Development documentation for %{name} %prep %setup -q %patch0 -p0 -b .fedora -%patch1 -p0 -b .latex %patch2 -p0 -b .rpath %patch3 -p0 -b .connection @@ -156,12 +153,6 @@ rm -rf deps/fcl rm -rf deps/parallel_quickstep rm -rf deps/libccd -# cmake variable mismatch -sed -i 's/HAVE_CCD/CCD_FOUND/' CMakeLists.txt deps/CMakeLists.txt - -# This will have to be removed eventually. -#rm -rf deps/opende - %build mkdir build pushd build @@ -180,7 +171,7 @@ pushd build -Dogre_library_dirs=%{_libdir} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_UPSTREAM_CFLAGS=OFF \ - -DUSE_HOST_CFLAGS=OFF \ + -DUSE_HOST_CFLAGS=ON \ -DCMAKE_INSTALL_DATAROOTDIR=share \ .. @@ -239,15 +230,15 @@ SET(CTEST_CUSTOM_TESTS_IGNORE # OpenAL tests will fail if the builder doesn't have an audio device. UNIT_OpenAL_TEST check_UNIT_OpenAL_TEST - # Since the pkg-config and cmake config have absolute paths, - # these tests will fail as long as Gazebo is not actually - # installed on the system. - EXAMPLE_example_plugins - check_EXAMPLE_example_plugins - REGRESSION_config-cmake - check_REGRESSION_config-cmake - REGRESSION_config-pkgconfig - check_REGRESSION_config-pkgconfig +# # Since the pkg-config and cmake config have absolute paths, +# # these tests will fail as long as Gazebo is not actually +# # installed on the system. +# EXAMPLE_example_plugins +# check_EXAMPLE_example_plugins +# REGRESSION_config-cmake +# check_REGRESSION_config-cmake +# REGRESSION_config-pkgconfig +# check_REGRESSION_config-pkgconfig ) EOF export GAZEBO_RESOURCE_PATH=%{buildroot}%{_datadir}/gazebo-%{abiversion} @@ -299,7 +290,7 @@ fi %files media %{_datadir}/%{name}-%{abiversion}/media - +%{_datadir}/%{name}-%{abiversion}/models %files ode %doc deps/opende/LICENSE-BSD.TXT %{_libdir}/libgazebo_ode.so.* @@ -326,6 +317,9 @@ fi %{_libdir}/cmake %changelog +* Sun Nov 02 2014 Rich Mattes - 4.0.2-1 +- Update to release 4.0.2 + * Mon Oct 20 2014 Rich Mattes - 3.1.0-2 - Devel package requires ogre-devel (rhbz#1154450) diff --git a/sources b/sources index b59e249..52902ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -abf387db70882611171e724c41b0ace1 gazebo-3.1.0.tar.bz2 +ed457015f1570ded3621d481bb732570 gazebo-4.0.2.tar.bz2