rviz_ogre_vendor: don't build Ogre's EXR codec

distros/jazzy/patch/ros2-rviz-ogre-vendor.patch

@@ -1,7 +1,8 @@
-diff -ruN a/CMakeLists.txt b/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7f60ad5..6e36fdf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,6 +22,8 @@
+@@ -24,6 +24,8 @@ if(WIN32)
        -DFT_DISABLE_PNG:BOOL=ON
        -DFT_DISABLE_HARFBUZZ:BOOL=ON
        "-DCMAKE_C_FLAGS=${FREETYPE_C_FLAGS}"
@@ -10,12 +11,15 @@ diff -ruN a/CMakeLists.txt b/CMakeLists.txt
    )
 
    set(ZLIB_C_FLAGS "${ZLIB_C_FLAGS}")
-@@ -72,13 +74,19 @@
+@@ -72,13 +74,22 @@ else()
  endif()
 
  set(OGRE_CMAKE_ARGS)
 +# OGRE 1.12.10 declares cmake_minimum_required < 3.5, rejected by CMake >= 4
 +list(APPEND OGRE_CMAKE_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
++# RViz doesn't use the EXR codec, and Ogre's FindOpenEXR only knows OpenEXR 2's library names
++# (it never finds conda-forge's OpenEXR 3, but may mix in a system OpenEXR 2 from /usr)
++list(APPEND OGRE_CMAKE_ARGS -DOGRE_BUILD_PLUGIN_EXRCODEC:BOOL=OFF)
  if(NOT WIN32)
    list(APPEND OGRE_CMAKE_ARGS -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON)
  endif()
@@ -31,8 +35,10 @@ diff -ruN a/CMakeLists.txt b/CMakeLists.txt
  endif()
 
  ament_vendor(ogre_vendor
-diff -ruN a/patches/0005-fix-macos-arm64.patch b/patches/0005-fix-macos-arm64.patch
---- a/patches/0005-fix-macos-arm64.patch
+diff --git a/patches/0005-fix-macos-arm64.patch b/patches/0005-fix-macos-arm64.patch
+new file mode 100644
+index 0000000..9494cc9
+--- /dev/null
 +++ b/patches/0005-fix-macos-arm64.patch
 @@ -0,0 +1,19 @@
 +diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,8 +60,10 @@ diff -ruN a/patches/0005-fix-macos-arm64.patch b/patches/0005-fix-macos-arm64.pa
 +   # Make sure that the OpenGL render system is selected for non-iOS Apple builds
 +   set(OGRE_BUILD_RENDERSYSTEM_GLES2 FALSE)
 + endif ()
-diff -ruN a/patches/0006-fix-char16.patch b/patches/0006-fix-char16.patch
---- a/patches/0006-fix-char16.patch
+diff --git a/patches/0006-fix-char16.patch b/patches/0006-fix-char16.patch
+new file mode 100644
+index 0000000..dfc080b
+--- /dev/null
 +++ b/patches/0006-fix-char16.patch
 @@ -0,0 +1,17 @@
 +diff --git a/Components/Overlay/include/OgreUTFString.h b/Components/Overlay/include/OgreUTFString.h

distros/jazzy/pkg_additional_info.yaml

@@ -116,8 +116,6 @@ roboplan_toppra:
     max_pin: 'x.x'
 rtabmap:
   additional_cmake_args: -DBUILD_TESTING=OFF
-rviz_ogre_vendor:
-  additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
 urdfdom:
   generate_dummy_package_with_run_deps:
     dep_name: urdfdom
@@ -133,3 +131,6 @@ zenoh_cpp_vendor:
   additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
 gz_ogre_next_vendor:
   build_number: 28
+rviz_ogre_vendor:
+  additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
+  build_number: 28  # built without the EXR codec (ros2-rviz-ogre-vendor.patch)

distros/lyrical/patch/ros2-rviz-ogre-vendor.patch

@@ -1,8 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8d23a299a..f58c62831 100644
+index 2fa3254..81c6932 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -76,7 +76,11 @@ endif()
+@@ -34,13 +34,20 @@ else()
+ endif()
+
+ set(OGRE_CMAKE_ARGS)
++# RViz doesn't use the EXR codec, and Ogre's FindOpenEXR only knows OpenEXR 2's library names
++# (it never finds conda-forge's OpenEXR 3, but may mix in a system OpenEXR 2 from /usr)
++list(APPEND OGRE_CMAKE_ARGS -DOGRE_BUILD_PLUGIN_EXRCODEC:BOOL=OFF)
+ if(NOT WIN32)
+   list(APPEND OGRE_CMAKE_ARGS -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON)
+ endif()
 
  if(APPLE)
    list(APPEND OGRE_CMAKE_ARGS -DOGRE_ENABLE_PRECOMPILED_HEADERS:BOOL=OFF)
@@ -17,7 +26,7 @@ index 8d23a299a..f58c62831 100644
  ament_vendor(ogre_vendor
 diff --git a/patches/0005-fix-macos-arm64.patch b/patches/0005-fix-macos-arm64.patch
 new file mode 100644
-index 000000000..9494cc9ae
+index 0000000..9494cc9
 --- /dev/null
 +++ b/patches/0005-fix-macos-arm64.patch
 @@ -0,0 +1,19 @@
@@ -42,7 +51,7 @@ index 000000000..9494cc9ae
 + endif ()
 diff --git a/patches/0006-fix-char16.patch b/patches/0006-fix-char16.patch
 new file mode 100644
-index 000000000..dfc080bb9
+index 0000000..dfc080b
 --- /dev/null
 +++ b/patches/0006-fix-char16.patch
 @@ -0,0 +1,17 @@

distros/lyrical/pkg_additional_info.yaml

@@ -94,8 +94,6 @@ roboplan_toppra:
 rtabmap:
   # its tests (corelib/test) don't build with MSVC (as in jazzy, same 0.23.13)
   additional_cmake_args: -DBUILD_TESTING=OFF
-rviz_ogre_vendor:
-  additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
 toppra:
   generate_dummy_package_with_run_deps:
     dep_name: toppra-python
@@ -115,3 +113,6 @@ urdfdom_headers:
 zenoh_cpp_vendor:
   additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
 # Remove build_number fields below on new full rebuild
+rviz_ogre_vendor:
+  additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
+  build_number: 31  # built without the EXR codec (ros2-rviz-ogre-vendor.patch)

distros/rolling/patch/ros2-rviz-ogre-vendor.patch

@@ -2,7 +2,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 8d23a299a..f58c62831 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -76,7 +76,11 @@ endif()
+@@ -34,6 +34,9 @@ else()
+ endif()
+
+ set(OGRE_CMAKE_ARGS)
++# RViz doesn't use the EXR codec, and Ogre's FindOpenEXR only knows OpenEXR 2's library names
++# (it never finds conda-forge's OpenEXR 3, but may mix in a system OpenEXR 2 from /usr)
++list(APPEND OGRE_CMAKE_ARGS -DOGRE_BUILD_PLUGIN_EXRCODEC:BOOL=OFF)
+ if(NOT WIN32)
+   list(APPEND OGRE_CMAKE_ARGS -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON)
+ endif()
+@@ -76,7 +79,11 @@ endif()
 
  if(APPLE)
    list(APPEND OGRE_CMAKE_ARGS -DOGRE_ENABLE_PRECOMPILED_HEADERS:BOOL=OFF)

distros/rolling/pkg_additional_info.yaml

@@ -57,8 +57,6 @@ proxsuite:
     override_version: '0.7.3'
 rtabmap:
   additional_cmake_args: -DBUILD_TESTING=OFF
-rviz_ogre_vendor:
-  additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
 urdfdom:
   generate_dummy_package_with_run_deps:
     dep_name: urdfdom
@@ -73,3 +71,6 @@ urdfdom_headers:
     override_version: '3.0.0'
 zenoh_cpp_vendor:
   additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON"
+rviz_ogre_vendor:
+  additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
+  build_number: 33  # built without the EXR codec (ros2-rviz-ogre-vendor.patch)