ros-noetic-rviz.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f212ca6d..501ff318 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(rviz)
 
+## Restrict Windows header namespace usage
+if(WIN32)
+  add_definitions(-DNOGDI)
+endif()
+
 if (POLICY CMP0042)
   cmake_policy(SET CMP0042 NEW)
 endif()
@@ -98,10 +103,10 @@ if(APPLE)
 endif()
 
 # Prefer newer vendor-specific OpenGL library
-if (POLICY CMP0072)
-  cmake_policy(SET CMP0072 NEW)
-endif()
-find_package(OpenGL REQUIRED)
+# if (POLICY CMP0072)
+#   cmake_policy(SET CMP0072 NEW)
+# endif()
+# find_package(OpenGL REQUIRED)
 
 set(CMAKE_AUTOMOC ON)
 
@@ -226,7 +231,7 @@ catkin_package(
 
 #catkin_lint: ignore_once external_directory
 include_directories(src ${EXPORT_HEADER_DIR})
-include_directories(SYSTEM
+include_directories(
   ${EIGEN3_INCLUDE_DIRS}
   ${OGRE_INCLUDE_DIRS}
   ${OPENGL_INCLUDE_DIR}
diff --git a/ogre_media/fonts/ogre1.10.fontdef b/ogre_media/fonts/ogre1.10.fontdef
index 4b3c5b82..e714db0f 100644
--- a/ogre_media/fonts/ogre1.10.fontdef
+++ b/ogre_media/fonts/ogre1.10.fontdef
@@ -1,3 +1,12 @@
+Liberation Sans
+{
+  type truetype
+  source liberation-sans/LiberationSans-Regular.ttf
+  size 18
+  resolution 96
+}
+
+# Ogre >= 1.10 has changed the format
 font "Liberation Sans"
 {
   type truetype
diff --git a/src/python_bindings/sip/CMakeLists.txt b/src/python_bindings/sip/CMakeLists.txt
index efbb497b..0def9a65 100644
--- a/src/python_bindings/sip/CMakeLists.txt
+++ b/src/python_bindings/sip/CMakeLists.txt
@@ -48,14 +48,21 @@ set(rviz_sip_INCLUDE_DIRS
   ${OGRE_INCLUDE_DIRS}
   ${catkin_INCLUDE_DIRS}
 )
+
+find_package(OpenGL REQUIRED)
+find_package(Threads REQUIRED)
+
 set(rviz_sip_LIBRARIES ${rviz_LIBRARIES} ${PROJECT_NAME})
-set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION})
+set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION} /usr/lib/x86_64-linux-gnu/)
 if (MSVC)
   set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} /LIBPATH:\"${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}\")
 else()
   set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}\\")
 endif()
 
+message(WARNING "rviz_sip_LIBRARIES: ${rviz_sip_LIBRARIES}")
+message(WARNING "rviz_sip_LIBRARY_DIRS: ${rviz_sip_LIBRARY_DIRS}")
+
 if(sip_helper_FOUND)
   list(APPEND rviz_BINDINGS "sip")
   set(rviz_BINDINGS "${rviz_BINDINGS}" PARENT_SCOPE)
@@ -69,11 +76,11 @@ if(sip_helper_FOUND)
   if(DEFINED PYTHON_EXTENSION_MODULE_SUFFIX)
     set(rviz_sip_LIBRARY_FILE librviz_sip${PYTHON_EXTENSION_MODULE_SUFFIX})
   elseif(APPLE)
-    set(rviz_sip_LIBRARY_FILE librviz_sip.so)
+    set(rviz_sip_LIBRARY_FILE "librviz_sip.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-darwin.so")
   elseif(WIN32)
     set(rviz_sip_LIBRARY_FILE librviz_sip.pyd)
   else()
-    set(rviz_sip_LIBRARY_FILE librviz_sip${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(rviz_sip_LIBRARY_FILE "librviz_sip.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu${CMAKE_SHARED_LIBRARY_SUFFIX}")
   endif()
   #catkin_lint: ignore_once external_file
   install(FILES ${CATKIN_DEVEL_PREFIX}/${PYTHON_INSTALL_DIR}/rviz/${rviz_sip_LIBRARY_FILE}
diff --git a/src/rviz/ogre_helpers/render_system.cpp b/src/rviz/ogre_helpers/render_system.cpp
index 4005f982..c0441de8 100644
--- a/src/rviz/ogre_helpers/render_system.cpp
+++ b/src/rviz/ogre_helpers/render_system.cpp
@@ -159,9 +159,10 @@ void RenderSystem::setupDummyWindowId()
 
 void RenderSystem::loadOgrePlugins()
 {
-  std::string plugin_prefix = get_ogre_plugin_path() + "/";
-#ifdef Q_OS_MAC
-  plugin_prefix += "lib";
+#ifdef _WIN32
+ std::string plugin_prefix = std::string(std::getenv("CONDA_PREFIX")) + "\\Library\\bin\\";
+#else
+ std::string plugin_prefix = std::string(std::getenv("CONDA_PREFIX")) + "/lib/OGRE/";
 #endif
   ogre_root_->loadPlugin(plugin_prefix + "RenderSystem_GL");
   ogre_root_->loadPlugin(plugin_prefix + "Plugin_OctreeSceneManager");
diff --git a/src/rviz/mesh_loader.cpp b/src/rviz/mesh_loader.cpp
index 80f1120a..950ffaf2 100644
--- a/src/rviz/mesh_loader.cpp
+++ b/src/rviz/mesh_loader.cpp
@@ -408,7 +408,7 @@ void loadTexture(const std::string& resource_path)
     {
       Ogre::DataStreamPtr stream(new Ogre::MemoryDataStream(res.data.get(), res.size));
       Ogre::Image image;
-      std::string extension = fs::extension(fs::path(resource_path));
+      std::string extension = fs::path(resource_path).extension().string();
 
       if (extension[0] == '.')
       {
diff --git a/src/rviz/robot/robot_link.cpp b/src/rviz/robot/robot_link.cpp
index 7ffe26e1..c122ba98 100644
--- a/src/rviz/robot/robot_link.cpp
+++ b/src/rviz/robot/robot_link.cpp
@@ -518,7 +518,7 @@ Ogre::MaterialPtr RobotLink::getMaterialForLink(const urdf::LinkConstSharedPtr&
       {
         Ogre::DataStreamPtr stream(new Ogre::MemoryDataStream(res.data.get(), res.size));
         Ogre::Image image;
-        std::string extension = fs::extension(fs::path(filename));
+        std::string extension = fs::path(filename).extension().string();
 
         if (extension[0] == '.')
         {
diff --git a/src/rviz/properties/enum_property.h b/src/rviz/properties/enum_property.h
index c3e5e873..5e29c425 100644
--- a/src/rviz/properties/enum_property.h
+++ b/src/rviz/properties/enum_property.h
@@ -43,7 +43,7 @@ namespace rviz
  * option.  The integer returned will be that passed to addOption()
  * for with the string that is currently selected.
  */
-class EnumProperty : public StringProperty
+class RVIZ_EXPORT EnumProperty : public StringProperty
 {
   Q_OBJECT
 public: