merge from gz-common6

Signed-off-by: Ian Chen <[email protected]>

Changelog.md

@@ -1,10 +1,25 @@
 ## Gazebo Common 6.x
 
-## Gazebo Common 6.0.0 (2024-09-XX)
+## Gazebo Common 6.0.0 (2024-09-25)
 
 1. **Baseline:** this includes all changes from 5.6.0 and earlier.
 
-1. Experimenting with spdlog
+1. Add a note about the conda-distributed ffmpeg on windows
+ * [Pull request #640](https://github.com/gazebosim/gz-common/pull/640)
+
+1. Fix table of content
+ * [Pull request #639](https://github.com/gazebosim/gz-common/pull/639)
+
+1. Fix severity level of gzlog
+ * [Pull request #635](https://github.com/gazebosim/gz-common/pull/635)
+
+1. Fix loading lightmaps from gltf / glb meshes
+ * [Pull request #630](https://github.com/gazebosim/gz-common/pull/630)
+
+1. Fix AssimpLoader collada texture coordinates
+ * [Pull request #634](https://github.com/gazebosim/gz-common/pull/634)
+
+1. Implement console logging using `spdlog`
  * [Pull request #615](https://github.com/gazebosim/gz-common/pull/615)
 
 1. Update Changelog, README and prepare for gz-common6.0.0~pre1 release

README.md

@@ -9,10 +9,10 @@
 
 Build | Status
 -- | --
-Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-common/tree/gz-common6/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-common/tree/gz-common6)
-Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-gz-common6-noble-amd64)](https://build.osrfoundation.org/job/gz_common-ci-gz-common6-noble-amd64)
-Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-gz-common6-homebrew-amd64)](https://build.osrfoundation.org/job/gz_common-ci-gz-common6-homebrew-amd64)
-Windows | [![Build Status](https://build.osrfoundation.org/job/gz_common-6-win/badge/icon)](https://build.osrfoundation.org/job/gz_common-6-win/)
+Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-common/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-common/tree/main)
+Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_common-ci-main-noble-amd64)
+Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_common-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_common-ci-main-homebrew-amd64)
+Windows | [![Build Status](https://build.osrfoundation.org/job/gz_common-main-win/badge/icon)](https://build.osrfoundation.org/job/gz_common-main-win/)
 
 Gazebo Common, a component of [Gazebo](https://gazebosim.org), provides a set of libraries that
 cover many different use cases. An audio-visual library supports
@@ -31,9 +31,9 @@ encoding/decoding to thread pools.
 
 [Folder Structure](#folder-structure)
 
-[Code of Conduct](#code-of-conduct)
+[Contributing](#contributing)
 
-[Contributing](#code-of-contributing)
+[Code of Conduct](#code-of-conduct)
 
 [Versioning](#versioning)
 
@@ -59,7 +59,7 @@ See the [installation tutorial](https://gazebosim.org/api/common/6/install.html)
 
 # Usage
 
-Please refer to the [examples directory](https://github.com/gazebosim/gz-common/tree/gz-common6/examples).
+Please refer to the [examples directory](https://github.com/gazebosim/gz-common/tree/main/examples).
 
 # Folder Structure
 

tutorials/hw-encoding.md

@@ -271,6 +271,14 @@ Just give them a try and dig deeper in the configuration if something is wrong.
 
 # Caveats
 
+## FFMpeg on Windows via Conda
+
+The current distribution of FFMpeg via Conda for Windows does not include the h264_qsv
+encoder. It only has h264_nvenc. This means that using Intel GPUs for HW acceleration is
+not possible out of the box. A possible solution would be to build a custom build of
+ffmpeg in the workspace with gz-common. Pull requests with the relevant tutorial are
+welcome.
+
 ## NVEnc per-machine limit
 
 If you have a multi-GPU station with desktop-class (not server-class) GPUs, you will

tutorials/install.md

@@ -71,7 +71,6 @@ Gazebo Common requires:
 The Graphics component requires:
 
  * [FreeImage](http://freeimage.sourceforge.net/)
- * [GTS](http://gts.sourceforge.net/).
 
 The AV component requires:
 
@@ -98,7 +97,7 @@ conda activate gz-ws
 
 Install prerequisites:
 ```
-conda install freeimage gdal gts glib dlfcn-win32 ffmpeg --channel conda-forge
+conda install freeimage gdal glib dlfcn-win32 ffmpeg --channel conda-forge
 ```
 
 Install Gazebo dependencies: