Merge branch 'gz-common5' into collada_acceleration

.github/workflows/ci.yml

@@ -1,14 +1,20 @@
 name: Ubuntu CI
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ign-common[0-9]'
+      - 'gz-common[0-9]'
+      - 'main'
 
 jobs:
   focal-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Focal CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@focal

.github/workflows/macos.yml

@@ -1,29 +1,37 @@
 name: macOS latest
 
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ign-common[0-9]'
+      - 'gz-common[0-9]'
+      - 'main'
 
 jobs:
   build:
     env:
       PACKAGE: gz-common5
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Homebrew
       id: set-up-homebrew
       uses: Homebrew/actions/setup-homebrew@master
     - run: brew config
+    - run: brew list
 
     # Workaround for https://github.com/actions/setup-python/issues/577
     - name: Clean up python binaries
       run: |
-        rm -f /usr/local/bin/2to3*;
-        rm -f /usr/local/bin/idle3*;
-        rm -f /usr/local/bin/pydoc3*;
-        rm -f /usr/local/bin/python3*;
-        rm -f /usr/local/bin/python3*-config;
-
+        rm -f $(brew --prefix)/bin/2to3*;
+        rm -f $(brew --prefix)/bin/idle3*;
+        rm -f $(brew --prefix)/bin/pydoc3*;
+        rm -f $(brew --prefix)/bin/python3*;
+        rm -f $(brew --prefix)/bin/python3*-config;
     - name: Install base dependencies
+      env:
+        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
       run: |
         brew tap osrf/simulation;
         # check for ci_matching_branch
@@ -45,7 +53,7 @@ jobs:
     - run: mkdir build
     - name: cmake
       working-directory: build
-      run: cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/${PACKAGE}/HEAD
+      run: cmake .. -DCMAKE_INSTALL_PREFIX=$(brew --prefix)/Cellar/${PACKAGE}/HEAD
     - run: make
       working-directory: build
     # Run make install before make test so that the package will be available to

.github/workflows/package_xml.yml

@@ -0,0 +1,11 @@
+name: Validate package.xml
+
+on:
+  pull_request:
+
+jobs:
+  package-xml:
+    runs-on: ubuntu-latest
+    name: Validate package.xml
+    steps:
+      - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy

.github/workflows/triage.yml

@@ -14,4 +14,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/gazebosim/projects/7
           github-token: ${{ secrets.TRIAGE_TOKEN }}
-

BUILD.bazel

@@ -7,13 +7,24 @@ load(
     "gz_export_header",
     "gz_include_header",
 )
+load(
+    "@gz//bazel/lint:lint.bzl",
+    "add_lint_tests",
+)
+load("@rules_license//rules:license.bzl", "license")
 
 package(
+    default_applicable_licenses = [GZ_ROOT + "common:license"],
     default_visibility = GZ_VISIBILITY,
     features = GZ_FEATURES,
 )
 
-licenses(["notice"])  # Apache-2.0
+license(
+    name = "license",
+    package_name = "gz-common",
+)
+
+licenses(["notice"])
 
 exports_files(["LICENSE"])
 
@@ -67,6 +78,10 @@ cc_library(
     name = "common",
     srcs = sources + private_headers,
     hdrs = public_headers,
+    copts = [
+        "-fexceptions",
+        "-Wno-unused-value",
+    ],
     includes = ["include"],
     deps = [
         GZ_ROOT + "utils",
@@ -86,10 +101,13 @@ test_sources = glob(
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
+    copts = ["-fexceptions"],
     deps = [
         ":common",
         GZ_ROOT + "common/testing",
         "@gtest",
         "@gtest//:gtest_main",
     ],
 ) for src in test_sources]
+
+add_lint_tests()

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-common5 VERSION 5.4.2)
+project(gz-common5 VERSION 5.6.0)
 set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR})
 
 #============================================================================
@@ -99,6 +99,7 @@ gz_find_package(
 # Find GDAL
 gz_find_package(GDAL VERSION 3.0
   PKGCONFIG gdal
+  PKGCONFIG_VER_COMPARISON >=
   PRIVATE_FOR geospatial
   REQUIRED_BY geospatial)
 
@@ -137,7 +138,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cppcheck.suppress.in"
                ${PROJECT_BINARY_DIR}/cppcheck.suppress)
 
 gz_configure_build(QUIT_IF_BUILD_ERRORS
-  COMPONENTS av events geospatial graphics io profiler testing)
+  COMPONENTS av events graphics geospatial io profiler testing)
 
 #============================================================================
 # Create package information

Changelog.md

@@ -1,5 +1,85 @@
 ## Gazebo Common 5.x
 
+## Gazebo Common 5.6.0 (2024-04-23)
+
+1. Clarify units for the DEM classes
+    * [Pull request #595](https://github.com/gazebosim/gz-common/pull/595)
+
+1. Remove pessimizing move
+    * [Pull request #593](https://github.com/gazebosim/gz-common/pull/593)
+
+1. Fix bazel build
+    * [Pull request #592](https://github.com/gazebosim/gz-common/pull/592)
+
+1. Add new function in MeshManager to merge all submeshes of a mesh into one
+    * [Pull request #588](https://github.com/gazebosim/gz-common/pull/588)
+
+1. Adds new function in MeshManager for performing convex decomposition
+    * [Pull request #585](https://github.com/gazebosim/gz-common/pull/585)
+
+## Gazebo Common 5.5.1 (2024-03-14)
+
+1. Various Bazel adjustments for linting
+    * [Pull request #582](https://github.com/gazebosim/gz-common/pull/582)
+
+1. Extend AssimpLoader to parse material transmission factor
+    * [Pull request #577](https://github.com/gazebosim/gz-common/pull/577)
+
+1. Fix noise issue that appears in certain image textures
+    * [Pull request #578](https://github.com/gazebosim/gz-common/pull/578)
+
+## Gazebo Common 5.5.0 (2024-02-26)
+
+1. Be louder when graphics is missing for geospatial
+    * [Pull request #573](https://github.com/gazebosim/gz-common/pull/573)
+
+1. Multiple memory cleanup fixes
+    * [Pull request #571](https://github.com/gazebosim/gz-common/pull/571)
+
+1. Clarify GDAL version requirement
+    * [Pull request #574](https://github.com/gazebosim/gz-common/pull/574)
+
+1. 🎈  3.17.0
+    * [Pull request #567](https://github.com/gazebosim/gz-common/pull/567)
+
+1. Update CI badges in README
+    * [Pull request #566](https://github.com/gazebosim/gz-common/pull/566)
+
+1. Backwards compatible assimp texture name fix
+    * [Pull request #565](https://github.com/gazebosim/gz-common/pull/565)
+
+1. Fix error output when creating directories
+    * [Pull request #561](https://github.com/gazebosim/gz-common/pull/561)
+
+1. Update github action workflows
+    * [Pull request #558](https://github.com/gazebosim/gz-common/pull/558)
+
+1. Fix segfault in case of no write access to log dir
+    * [Pull request #546](https://github.com/gazebosim/gz-common/pull/546)
+
+1. ign -> gz
+    * [Pull request #547](https://github.com/gazebosim/gz-common/pull/547)
+
+1. Support loading glb with compressed jpeg textures
+    * [Pull request #545](https://github.com/gazebosim/gz-common/pull/545)
+
+1. Fix glTF / glb root node transform
+    * [Pull request #543](https://github.com/gazebosim/gz-common/pull/543)
+
+1. EnumIface: suppress deprecation warning
+    * [Pull request #540](https://github.com/gazebosim/gz-common/pull/540)
+
+1. Prevent loading lightmaps if mesh is a glb file that has an occlusion-metallic-roughness texture
+    * [Pull request #538](https://github.com/gazebosim/gz-common/pull/538)
+
+1. 🎈 3.16.0
+    * [Pull request #519](https://github.com/gazebosim/gz-common/pull/519)
+
+1. Fix cstdint with GCC 13
+    * [Pull request #528](https://github.com/gazebosim/gz-common/pull/528)
+    * [Pull request #517](https://github.com/gazebosim/gz-common/pull/517)
+    * [Pull request #513](https://github.com/gazebosim/gz-common/pull/513)
+
 ## Gazebo Common 5.4.2 (2023-09-26)
 
 1. Documentation fixes
@@ -669,6 +749,52 @@
 
 ## Gazebo Common 3.x
 
+## Gazebo Common 3.17.0 (2024-01-05)
+
+1. Fix error output when creating directories
+    * [Pull request #561](https://github.com/gazebosim/gz-common/pull/561)
+
+1. Update github action workflows
+    * [Pull request #558](https://github.com/gazebosim/gz-common/pull/558)
+
+1. Fix segfault in case of no write access to log dir
+    * [Pull request #546](https://github.com/gazebosim/gz-common/pull/546)
+
+## Gazebo Common 3.16.0 (2023-06-05)
+
+1. Include cstdint to build with GCC 13
+    * [Pull request #517](https://github.com/gazebosim/gz-common/pull/517)
+
+1. Fix missing cstdint header in latest gcc build
+    * [Pull request #513](https://github.com/gazebosim/gz-common/pull/513)
+
+1. Fix for ffmpeg v6
+    * [Pull request #497](https://github.com/gazebosim/gz-common/pull/497)
+
+1. Include cstring for memcpy
+    * [Pull request #501](https://github.com/gazebosim/gz-common/pull/501)
+
+1. Fixed MeshManager Singleton
+    * [Pull request #451](https://github.com/gazebosim/gz-common/pull/451)
+
+1. Rename COPYING to LICENSE
+    * [Pull request #494](https://github.com/gazebosim/gz-common/pull/494)
+
+1. Add marcoag as codeowner
+    * [Pull request #493](https://github.com/gazebosim/gz-common/pull/493)
+
+1. CI workflow: use checkout v3
+    * [Pull request #490](https://github.com/gazebosim/gz-common/pull/490)
+
+1. Improved coverage remotery
+    * [Pull request #467](https://github.com/gazebosim/gz-common/pull/467)
+
+1. Added BVH and STL loader tests
+    * [Pull request #466](https://github.com/gazebosim/gz-common/pull/466)
+
+1. Increased Image coverage
+    * [Pull request #465](https://github.com/gazebosim/gz-common/pull/465)
+
 ## Gazebo Common 3.15.1 (2022-10-11)
 
 1. Fix build on case-insensitive filesystems

av/BUILD.bazel

@@ -1,10 +1,20 @@
 load(
     "@gz//bazel/skylark:build_defs.bzl",
+    "GZ_FEATURES",
     "GZ_ROOT",
     "GZ_VISIBILITY",
     "gz_export_header",
     "gz_include_header",
 )
+load(
+    "@gz//bazel/lint:lint.bzl",
+    "add_lint_tests",
+)
+
+package(
+    default_applicable_licenses = [GZ_ROOT + "common:license"],
+    features = GZ_FEATURES,
+)
 
 public_headers_no_gen = glob([
     "include/gz/common/*.hh",
@@ -68,3 +78,5 @@ cc_library(
         "@gtest//:gtest_main",
     ],
 ) for src in test_sources]
+
+add_lint_tests()

av/src/AudioDecoder.cc

@@ -52,7 +52,13 @@ common::AudioDecoder::Implementation::~Implementation()
 {
   // Close the codec
   if (this->codecCtx)
+  {
+#if LIBAVFORMAT_VERSION_MAJOR < 59
     avcodec_close(this->codecCtx);
+#else
+    avcodec_free_context(&this->codecCtx);
+#endif
+  }
 
   // Close the audio file
   if (this->formatCtx)

av/src/Video.cc

@@ -114,7 +114,11 @@ void Video::Cleanup()
   avformat_close_input(&this->dataPtr->formatCtx);
 
   // Close the codec
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
+  avcodec_free_context(&this->dataPtr->codecCtx);
+#else
   avcodec_close(this->dataPtr->codecCtx);
+#endif
 
   av_free(this->dataPtr->avFrameDst);
 }

events/BUILD.bazel

@@ -1,10 +1,20 @@
 load(
     "@gz//bazel/skylark:build_defs.bzl",
+    "GZ_FEATURES",
     "GZ_ROOT",
     "GZ_VISIBILITY",
     "gz_export_header",
     "gz_include_header",
 )
+load(
+    "@gz//bazel/lint:lint.bzl",
+    "add_lint_tests",
+)
+
+package(
+    default_applicable_licenses = [GZ_ROOT + "common:license"],
+    features = GZ_FEATURES,
+)
 
 public_headers_no_gen = glob([
     "include/gz/common/*.hh",
@@ -59,3 +69,5 @@ cc_library(
         "@gtest//:gtest_main",
     ],
 ) for src in test_sources]
+
+add_lint_tests()