From 435403c0696f0b7170e5f4bfc76c135844a25445 Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Jan 09 2016 02:34:17 +0000
Subject: Add missing patch


---

diff --git a/gazebo-6.5.1-fedora.patch b/gazebo-6.5.1-fedora.patch
new file mode 100644
index 0000000..d718deb
--- /dev/null
+++ b/gazebo-6.5.1-fedora.patch
@@ -0,0 +1,108 @@
+diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt
+--- ./CMakeLists.txt.fedora	2016-01-04 23:49:04.948409534 -0500
++++ ./CMakeLists.txt	2016-01-04 23:50:20.517301199 -0500
+@@ -383,6 +383,9 @@ else (build_errors)
+   if (INCLUDE_PLAYER)
+     set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_player)
+   endif()
++  if (NOT SKYX_FOUND)
++    set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_skyx)
++  endif()
+ 
+   set(PKG_LIBRARIES ${PKG_LIBRARIES}
+     gazebo_physics_ode
+@@ -403,7 +406,6 @@ else (build_errors)
+ 
+   # No other internal dependencies:
+   set(PKG_LIBRARIES ${PKG_LIBRARIES}
+-    gazebo_skyx
+     gazebo_gimpact
+     gazebo_opcode
+     gazebo_opende_ou
+diff -up ./cmake/SearchForStuff.cmake.fedora ./cmake/SearchForStuff.cmake
+--- ./cmake/SearchForStuff.cmake.fedora	2015-10-29 17:38:08.000000000 -0400
++++ ./cmake/SearchForStuff.cmake	2016-01-04 23:49:04.949409572 -0500
+@@ -394,6 +394,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	2015-10-29 17:38:09.000000000 -0400
++++ ./gazebo/common/CMakeLists.txt	2016-01-04 23:49:04.950409610 -0500
+@@ -172,6 +172,7 @@ endif()
+ 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	2015-10-29 17:38:10.000000000 -0400
++++ ./gazebo/rendering/Camera.cc	2016-01-04 23:49:04.950409610 -0500
+@@ -38,7 +38,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/CMakeLists.txt.fedora ./gazebo/rendering/CMakeLists.txt
+--- ./gazebo/rendering/CMakeLists.txt.fedora	2015-10-29 17:38:10.000000000 -0400
++++ ./gazebo/rendering/CMakeLists.txt	2016-01-04 23:51:02.114892942 -0500
+@@ -11,7 +11,12 @@ if (${OGRE_VERSION} VERSION_GREATER 1.7.
+   add_subdirectory(deferred_shading)
+ endif()
+ 
+-add_subdirectory(skyx)
++if (${SKYX_FOUND})
++  include_directories(SYSTEM ${SKYX_INCLUDE_DIRS})
++else()
++  add_subdirectory(skyx)
++endif()
++
+ add_subdirectory(selection_buffer)
+ 
+ if (WIN32)
+@@ -183,7 +188,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}
+@@ -203,5 +207,9 @@ if (${OGRE_VERSION} VERSION_GREATER 1.7.
+   target_link_libraries(gazebo_rendering gazebo_rendering_deferred)
+ endif()
+ 
++if (${SKYX_FOUND})
++  target_link_libraries(gazebo_rendering ${SKYX_LIBRARIES})
++endif()
++
+ gz_install_library(gazebo_rendering)
+ gz_install_includes("rendering" ${headers} ${CMAKE_CURRENT_BINARY_DIR}/rendering.hh)
+diff -up ./gazebo/rendering/Scene.cc.fedora ./gazebo/rendering/Scene.cc
+--- ./gazebo/rendering/Scene.cc.fedora	2016-01-04 23:49:04.952409687 -0500
++++ ./gazebo/rendering/Scene.cc	2016-01-04 23:51:31.721025830 -0500
+@@ -17,7 +17,7 @@
+ #include <boost/bind.hpp>
+ #include <boost/lexical_cast.hpp>
+ 
+-#include "gazebo/rendering/skyx/include/SkyX.h"
++#include "SkyX.h"
+ #include "gazebo/rendering/ogre_gazebo.h"
+ 
+ #include "gazebo/msgs/msgs.hh"