From 9e2709582ff6387a76b97c427c7d83cde4f832a0 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 14:40:01 +0200 Subject: [PATCH 01/17] Preparation for version 1.7 --- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- deps/libMXF/CMakeLists.txt | 2 +- deps/libMXFpp/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c22fc8e7..5757851d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # bmx Changelog -## Version next +## v1.7 ### Breaking changes diff --git a/CMakeLists.txt b/CMakeLists.txt index cb73d177..29b68138 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ else() endif() project(bmx - VERSION 1.6 + VERSION 1.7 DESCRIPTION "A C++ library and set of utilities to read and write the SMPTE ST 377-1 MXF file format" HOMEPAGE_URL https://github.com/bbc/bmx LANGUAGES C CXX diff --git a/deps/libMXF/CMakeLists.txt b/deps/libMXF/CMakeLists.txt index b1b01c5b..648ea435 100644 --- a/deps/libMXF/CMakeLists.txt +++ b/deps/libMXF/CMakeLists.txt @@ -13,7 +13,7 @@ else() endif() project(libMXF - VERSION 1.6 + VERSION 1.7 DESCRIPTION "Low-level C library for reading and writing the SMPTE ST 377-1 MXF file format" HOMEPAGE_URL https://github.com/bbc/libMXF LANGUAGES C CXX diff --git a/deps/libMXFpp/CMakeLists.txt b/deps/libMXFpp/CMakeLists.txt index e4ae81ec..dd6c66d3 100644 --- a/deps/libMXFpp/CMakeLists.txt +++ b/deps/libMXFpp/CMakeLists.txt @@ -13,7 +13,7 @@ else() endif() project(libMXF++ - VERSION 1.6 + VERSION 1.7 DESCRIPTION "C++ wrapper library for libMXF that supports reading and writing the SMPTE ST 377-1 MXF file format" HOMEPAGE_URL https://github.com/bbc/libMXFpp LANGUAGES CXX From a378977ee66960eb79e24f7452a4f04a4f42256d Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 14:45:41 +0200 Subject: [PATCH 02/17] updating available github runners --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50a26d4f..c936fd57 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,9 +36,9 @@ jobs: matrix: include: - name: windows - os: windows-2019 + os: windows-2022 - name: macos-xcode-universal - os: macos-13 + os: macos-14 - name: ubuntu os: ubuntu-latest From 58840956028713f6db8ab1d31ca1e0d8e9b5d583 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 15:05:51 +0200 Subject: [PATCH 03/17] Updating checkout workflow on Github --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 64d5e4a7..c3412e6b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -86,7 +86,7 @@ jobs: git --version cmake --version - - uses: actions/checkout@v4 + - uses: actions/checkout@v6.0.2 with: fetch-depth: 0 From 1cb6f1df3db6821756b7528ddeac4d39704add24 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 15:24:39 +0200 Subject: [PATCH 04/17] updating Xcode setup workflow to 1.7.0 --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index c3412e6b..bd995706 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -76,7 +76,7 @@ jobs: - name: Install dependencies (macos-xcode-universal) if: ${{ matrix.name == 'macos-xcode-universal' }} - uses: maxim-lobanov/setup-xcode@v1 + uses: maxim-lobanov/setup-xcode@v1.7.0 with: xcode-version: latest-stable From 2ec37b89f9fd601015e98b9b0e342b535bbc76d1 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 16:21:02 +0200 Subject: [PATCH 05/17] more tools updating --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c936fd57..6f810d6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6.0.2 with: fetch-depth: 0 @@ -23,7 +23,7 @@ jobs: mv ../source_release . - name: Upload source release - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7.0.1 with: name: source-release path: | @@ -60,12 +60,12 @@ jobs: uuid-dev \ libcurl4-openssl-dev - - uses: maxim-lobanov/setup-xcode@v1 + - uses: maxim-lobanov/setup-xcode@v1.7.0 if: ${{ contains(matrix.name, 'xcode') }} with: xcode-version: latest-stable - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8.0.1 with: name: source-release @@ -108,7 +108,7 @@ jobs: - name: Upload binary release if: ${{ !contains(matrix.os, 'ubuntu') }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7.0.1 with: name: binary-release-${{ matrix.name }} path: | From 86457ef046d0b35dcab54b59402082c7d212bb65 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 17:49:44 +0200 Subject: [PATCH 06/17] updating VS version to match Gitlab version --- release/win64_binary_release.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/win64_binary_release.cmake b/release/win64_binary_release.cmake index 04ba8706..650c371d 100644 --- a/release/win64_binary_release.cmake +++ b/release/win64_binary_release.cmake @@ -47,7 +47,7 @@ set(bmx_package_dir "${package_dir}/bmx-win64-binary-${bmx_version}") file(MAKE_DIRECTORY ${bmx_package_dir}) # Configure, build, test and install -run_command("${build_dir}" cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=../install ../../) +run_command("${build_dir}" cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=../install ../../) run_command("${build_dir}" cmake --build . --config Release) run_command("${build_dir}" ctest -C Release) run_command("${build_dir}" cmake --build . --config Release --target install) From 31da92cc1f76f574a70e406d87d1515f70697860 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 18:11:06 +0200 Subject: [PATCH 07/17] changing all repository links to EBU from BBC. TODO: Decide how to handle docker registry --- CMakeLists.txt | 2 +- Dockerfile | 2 +- README.md | 2 +- docs/release.md | 10 +++++----- meta/rdd6_xml_creator/index.html | 8 ++++---- release/macos_universal_binary_release.cmake | 2 +- release/source_release.cmake | 2 +- release/ubuntu_binary_release_build_only.cmake | 2 +- release/win64_binary_release.cmake | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29b68138..23807229 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ endif() project(bmx VERSION 1.7 DESCRIPTION "A C++ library and set of utilities to read and write the SMPTE ST 377-1 MXF file format" - HOMEPAGE_URL https://github.com/bbc/bmx + HOMEPAGE_URL https://github.com/ebu/bmx LANGUAGES C CXX ) diff --git a/Dockerfile b/Dockerfile index ad6e6e2d..f0b7cba3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN mkdir build && cd build && \ ################################################## FROM debian:latest as runtime -LABEL org.opencontainers.image.source=https://github.com/bbc/bmx +LABEL org.opencontainers.image.source=https://github.com/ebu/bmx LABEL org.opencontainers.image.description="A useful set of tools for handling MXF and related files" LABEL org.opencontainers.image.licenses=BSD-3-Clause diff --git a/README.md b/README.md index add89d8e..96713dac 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ project(example_project LANGUAGES CXX) include(FetchContent) FetchContent_Declare(bmx - GIT_REPOSITORY "https://github.com/bbc/bmx" + GIT_REPOSITORY "https://github.com/ebu/bmx" GIT_TAG "origin/main" ) FetchContent_MakeAvailable(bmx) diff --git a/docs/release.md b/docs/release.md index 46115b84..cd128ab2 100644 --- a/docs/release.md +++ b/docs/release.md @@ -9,10 +9,10 @@ This describes the steps for making a release. * Go through the PRs since the last release and add each PR and descriptive text to the `Breaking changes`, `Features`, `Bug fixes` or `Build changes` sections * Update the versions in the 3 main CMakeLists.txt files in the `project` blocks, where `VERSION` has the form `.` * The files are [bmx CMakeLists.txt](../CMakeLists.txt), [libMXF CmakeLists.txt](../deps/libMXF/CMakeLists.txt) and [libMXFpp CmakeLists.txt](../deps/libMXFpp/CMakeLists.txt) -* Run the [Build & Test](https://github.com/bbc/bmx/actions/workflows/build_and_test.yml) workflow in GitHub Actions using the release branch and fix any build errors and warnings +* Run the [Build & Test](https://github.com/ebu/bmx/actions/workflows/build_and_test.yml) workflow in GitHub Actions using the release branch and fix any build errors and warnings * Check the [runner versions](https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners) (e.g. `windows-2019` and `macos-13`) in the [release.yml](../.github/workflows/release.yml) workflow file are still available * Select the oldest macOS version available to help with compatibility -* Run the [Release](https://github.com/bbc/bmx/actions/workflows/release.yml) workflow in GitHub Actions using the release branch to check it succeeds +* Run the [Release](https://github.com/ebu/bmx/actions/workflows/release.yml) workflow in GitHub Actions using the release branch to check it succeeds * On the release branch, create a temporary tag and then delete the tag once the workflow succeeds: ```bash @@ -43,18 +43,18 @@ git push origin v${BMX_VERSION} ## Create the Release Packages -* Run the [Release](https://github.com/bbc/bmx/actions/workflows/release.yml) workflow in GitHub Actions +* Run the [Release](https://github.com/ebu/bmx/actions/workflows/release.yml) workflow in GitHub Actions * Download the Artifacts and extract the individual source and binary zips for the release ## Create a GitHub Release -* Create a [new release](https://github.com/bbc/bmx/releases) +* Create a [new release](https://github.com/bbc/ebu/releases) * Copy the previous release's text as a starting point * Select the `v.` tag * Change the CHANGELOG link * Update the zip filenames with the new version * Update the compiler versions used for the binaries - * These can be found in the actions output in the `Win64 binary release` and `MacOS Universal binary release` build steps in the 2 jobs of the [Release](https://github.com/bbc/bmx/actions/workflows/release.yml) workflow in GitHub Actions + * These can be found in the actions output in the `Win64 binary release` and `MacOS Universal binary release` build steps in the 2 jobs of the [Release](https://github.com/bbc/ebu/actions/workflows/release.yml) workflow in GitHub Actions * Upload the source and binary zips to the release ## Create a Docker Image for the GitHub Container Registry diff --git a/meta/rdd6_xml_creator/index.html b/meta/rdd6_xml_creator/index.html index dd8b088d..d75a2791 100644 --- a/meta/rdd6_xml_creator/index.html +++ b/meta/rdd6_xml_creator/index.html @@ -17,10 +17,10 @@
-

bmx RDD 6 XML Creator

-
The RDD 6 XML Schema - and documentation - can be found in bmx. +

bmx RDD 6 XML Creator

+
The RDD 6 XML Schema + and documentation + can be found in bmx.
diff --git a/release/macos_universal_binary_release.cmake b/release/macos_universal_binary_release.cmake index fb238dbc..0d632f1a 100644 --- a/release/macos_universal_binary_release.cmake +++ b/release/macos_universal_binary_release.cmake @@ -26,7 +26,7 @@ if(USE_GIT_CLONE) if(EXISTS ${bmx_dir}) message(FATAL_ERROR "Can't continue with clean release as 'bmx' directory already exists") endif() - run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/bbc/bmx.git) + run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/ebu/bmx.git) run_command("${bmx_dir}" git checkout ${BMX_BRANCH}) else() get_filename_component(bmx_dir "${CMAKE_CURRENT_LIST_DIR}/.." REALPATH) diff --git a/release/source_release.cmake b/release/source_release.cmake index 21a1709b..5d907098 100644 --- a/release/source_release.cmake +++ b/release/source_release.cmake @@ -69,7 +69,7 @@ if(USE_GIT_CLONE) if(EXISTS ${bmx_dir}) message(FATAL_ERROR "Can't continue with clean release as 'bmx' directory already exists") endif() - run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/bbc/bmx.git) + run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/ebu/bmx.git) run_command("${bmx_dir}" git checkout ${BMX_BRANCH}) else() get_filename_component(bmx_dir "${CMAKE_CURRENT_LIST_DIR}/.." REALPATH) diff --git a/release/ubuntu_binary_release_build_only.cmake b/release/ubuntu_binary_release_build_only.cmake index f6e824ac..476c9475 100644 --- a/release/ubuntu_binary_release_build_only.cmake +++ b/release/ubuntu_binary_release_build_only.cmake @@ -26,7 +26,7 @@ if(USE_GIT_CLONE) if(EXISTS ${bmx_dir}) message(FATAL_ERROR "Can't continue with clean release as 'bmx' directory already exists") endif() - run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/bbc/bmx.git) + run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/ebu/bmx.git) run_command("${bmx_dir}" git checkout ${BMX_BRANCH}) else() get_filename_component(bmx_dir "${CMAKE_CURRENT_LIST_DIR}/.." REALPATH) diff --git a/release/win64_binary_release.cmake b/release/win64_binary_release.cmake index 650c371d..0fa625c0 100644 --- a/release/win64_binary_release.cmake +++ b/release/win64_binary_release.cmake @@ -26,7 +26,7 @@ if(USE_GIT_CLONE) if(EXISTS ${bmx_dir}) message(FATAL_ERROR "Can't continue with clean release as 'bmx' directory already exists") endif() - run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/bbc/bmx.git) + run_command("${CMAKE_CURRENT_BINARY_DIR}" git clone https://github.com/ebu/bmx.git) run_command("${bmx_dir}" git checkout ${BMX_BRANCH}) else() get_filename_component(bmx_dir "${CMAKE_CURRENT_LIST_DIR}/.." REALPATH) From d64112353ad6d19402766f0701779f3d31463ecc Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Mon, 13 Apr 2026 20:28:35 +0200 Subject: [PATCH 08/17] with URIParser 1.0.0 license filename (COPYING) has changed --- release/macos_universal_binary_release.cmake | 4 ++-- release/win64_binary_release.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/macos_universal_binary_release.cmake b/release/macos_universal_binary_release.cmake index 0d632f1a..1ba24d8d 100644 --- a/release/macos_universal_binary_release.cmake +++ b/release/macos_universal_binary_release.cmake @@ -66,9 +66,9 @@ else() copy_and_rename_file(${build_dir}/_deps/bmx_git_version-src/LICENSE ${bmx_package_dir}/licenses/LICENSE_cmake_git_version_tracking.txt) endif() if(EXISTS ${bmx_dir}/deps/uriparser) - copy_and_rename_file(${bmx_dir}/deps/uriparser/COPYING ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) + copy_and_rename_file(${bmx_dir}/deps/uriparser/COPYING.BSD-3-Clause ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) else() - copy_and_rename_file(${build_dir}/_deps/liburiparser-src/COPYING ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) + copy_and_rename_file(${build_dir}/_deps/liburiparser-src/COPYING.BSD-3-Clause ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) endif() file(COPY ${bmx_dir}/COPYING DESTINATION ${bmx_package_dir}) diff --git a/release/win64_binary_release.cmake b/release/win64_binary_release.cmake index 0fa625c0..e69f5c25 100644 --- a/release/win64_binary_release.cmake +++ b/release/win64_binary_release.cmake @@ -71,9 +71,9 @@ else() copy_and_rename_file(${build_dir}/_deps/ft_libexpat-src/COPYING ${bmx_package_dir}/licenses/LICENSE_expat.txt) endif() if(EXISTS ${bmx_dir}/deps/uriparser) - copy_and_rename_file(${bmx_dir}/deps/uriparser/COPYING ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) + copy_and_rename_file(${bmx_dir}/deps/uriparser/COPYING.BSD-3-Clause ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) else() - copy_and_rename_file(${build_dir}/_deps/liburiparser-src/COPYING ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) + copy_and_rename_file(${build_dir}/_deps/liburiparser-src/COPYING.BSD-3-Clause ${bmx_package_dir}/licenses/LICENSE_uriparser.txt) endif() file(COPY ${bmx_dir}/COPYING DESTINATION ${bmx_package_dir}) From 20f21043f8b442d2be3bc8df64ce011447f05010 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Tue, 14 Apr 2026 13:59:46 +0200 Subject: [PATCH 09/17] Fixing incorrect links --- README.md | 2 +- docs/release.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 96713dac..db8d0d60 100644 --- a/README.md +++ b/README.md @@ -240,7 +240,7 @@ This example runs `bmxtranswrap` from input `./sources/in.mxf` to output `./dest ## Source and Binary Distributions -Source distributions, including dependencies, and binaries are made available in the [Releases](https://github.com/bbc/bmx/releases) on GitHub. Older distributions can be found on [SourceForge](https://sourceforge.net/projects/bmxlib/files/). +Source distributions, including dependencies, and binaries are made available in the [Releases](https://github.com/ebu/bmx/releases) on GitHub. Older distributions can be found on [SourceForge](https://sourceforge.net/projects/bmxlib/files/). Source and binary distributions are generally only created when a new feature is required for creating standard compliant sample files for example, or when a release hasn't been made for a long time. diff --git a/docs/release.md b/docs/release.md index cd128ab2..8b4ce552 100644 --- a/docs/release.md +++ b/docs/release.md @@ -48,13 +48,13 @@ git push origin v${BMX_VERSION} ## Create a GitHub Release -* Create a [new release](https://github.com/bbc/ebu/releases) +* Create a [new release](https://github.com/ebu/bmx/releases) * Copy the previous release's text as a starting point * Select the `v.` tag * Change the CHANGELOG link * Update the zip filenames with the new version * Update the compiler versions used for the binaries - * These can be found in the actions output in the `Win64 binary release` and `MacOS Universal binary release` build steps in the 2 jobs of the [Release](https://github.com/bbc/ebu/actions/workflows/release.yml) workflow in GitHub Actions + * These can be found in the actions output in the `Win64 binary release` and `MacOS Universal binary release` build steps in the 2 jobs of the [Release](https://github.com/ebu/bmx/actions/workflows/release.yml) workflow in GitHub Actions * Upload the source and binary zips to the release ## Create a Docker Image for the GitHub Container Registry From 9c2c2bfb8687f04e60dfe840227bbb158fe4bc11 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Tue, 14 Apr 2026 17:24:41 +0200 Subject: [PATCH 10/17] updating codeQL workflow to latest versions --- .github/workflows/codeql.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d7b468a5..e18ad8d1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,9 +16,7 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] - schedule: - - cron: '45 10 * * 3' - + jobs: analyze: name: Analyze (${{ matrix.language }}) @@ -57,7 +55,7 @@ jobs: # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6.0.2 # Add any setup steps before running the `github/codeql-action/init` action. # This includes steps like installing compilers or runtimes (`actions/setup-node` @@ -67,7 +65,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v4 + uses: github/codeql-action/init@v4.35.1 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} @@ -96,6 +94,6 @@ jobs: exit 1 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 + uses: github/codeql-action/analyze@v4.35.1 with: category: "/language:${{matrix.language}}" From 6a2b89943185752c80e0060bd6f6a2e24415dc5b Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Tue, 21 Apr 2026 17:11:09 +0200 Subject: [PATCH 11/17] Removing not needed installation of curl, git and cmake --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index bd995706..cf39ffa3 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -72,7 +72,7 @@ jobs: if: ${{ matrix.name == 'macos-brew' }} shell: bash run: | - brew install git cmake expat uriparser curl + brew install expat uriparser - name: Install dependencies (macos-xcode-universal) if: ${{ matrix.name == 'macos-xcode-universal' }} From 4ba5486668277d64bb3346f9f1b5435e318482da Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Wed, 22 Apr 2026 13:41:09 +0200 Subject: [PATCH 12/17] Adding explicit permission set to workflows --- .github/workflows/build_and_test.yml | 3 +++ .github/workflows/release.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index cf39ffa3..ec311dd2 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,4 +1,7 @@ name: Build and Test +permissions: + contents: read + pull-requests: write on: workflow_dispatch: pull_request: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f810d6e..eede5862 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,7 @@ name: Release +permissions: + contents: read + pull-requests: write on: workflow_dispatch: jobs: From 491c1d58a364646f170a34f4072f080307e9f682 Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Wed, 22 Apr 2026 14:03:59 +0200 Subject: [PATCH 13/17] more housekeeping: Fixing warning in Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f0b7cba3..6531ffd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ################################################## # Build layer ################################################## -FROM debian:latest as build +FROM debian:latest AS build WORKDIR /build @@ -33,7 +33,7 @@ RUN mkdir build && cd build && \ ################################################## # Runtime layer ################################################## -FROM debian:latest as runtime +FROM debian:latest AS runtime LABEL org.opencontainers.image.source=https://github.com/ebu/bmx LABEL org.opencontainers.image.description="A useful set of tools for handling MXF and related files" From dd76db557697a10659534365efa0400d965976dd Mon Sep 17 00:00:00 2001 From: Nicolai Otto Date: Thu, 23 Apr 2026 16:35:32 +0200 Subject: [PATCH 14/17] Updating writing application identifier to EBU --- src/common/Version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/Version.cpp b/src/common/Version.cpp index d51da64a..c0a5b845 100644 --- a/src/common/Version.cpp +++ b/src/common/Version.cpp @@ -54,7 +54,7 @@ bool BMX_REGRESSION_TEST = false; }; -static const char* BMX_COMPANY_NAME = "BBC"; +static const char* BMX_COMPANY_NAME = "EBU"; static const bmx::UUID BMX_PRODUCT_UID = {0xb8, 0x60, 0x4d, 0x31, 0x2e, 0x15, 0x47, 0x99, 0xa3, 0xc6, 0x04, 0x7e, 0xd0, 0xe6, 0xf9, 0xa1}; static const bmx::UUID REGTEST_PRODUCT_UID = From 6b019c840be84b92d5f68518c9d3df4868f4700c Mon Sep 17 00:00:00 2001 From: Illya Litkin Date: Fri, 24 Apr 2026 12:47:27 +0200 Subject: [PATCH 15/17] update libexpat version --- cmake/ext_expat.cmake | 20 +++++--------------- cmake/options.cmake | 3 +++ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/cmake/ext_expat.cmake b/cmake/ext_expat.cmake index a8f9d00a..c6995b3e 100644 --- a/cmake/ext_expat.cmake +++ b/cmake/ext_expat.cmake @@ -3,7 +3,7 @@ if(expat_link_lib) endif() -if(MSVC OR BMX_BUILD_EXPAT_SOURCE) +if(BMX_BUILD_EXPAT_SOURCE) include(FetchContent) set(EXPAT_BUILD_DOCS OFF CACHE INTERNAL "") @@ -22,26 +22,16 @@ if(MSVC OR BMX_BUILD_EXPAT_SOURCE) ) else() FetchContent_Declare(FT_libexpat + SOURCE_SUBDIR expat GIT_REPOSITORY https://github.com/libexpat/libexpat - GIT_TAG R_2_5_0 + GIT_TAG R_2_8_0 ) endif() - # Use FetchContent_Populate because the CMakeLists.txt is in the expat/ sub-directory - FetchContent_GetProperties(FT_libexpat) - if(NOT FT_libexpat_POPULATED) - FetchContent_Populate(FT_libexpat) - - add_subdirectory("${ft_libexpat_SOURCE_DIR}/expat" ${ft_libexpat_BINARY_DIR}) - endif() + FetchContent_MakeAvailable(FT_libexpat) set(expat_link_lib expat) else() - include(FindEXPAT) - - if(NOT EXPAT_FOUND) - message(FATAL_ERROR "expat dependency not found") - endif() - + find_package(EXPAT REQUIRED) set(expat_link_lib EXPAT::EXPAT) endif() diff --git a/cmake/options.cmake b/cmake/options.cmake index a13a3add..667a5965 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -41,6 +41,9 @@ if(UNIX) elseif(MSVC) # Shared library currently not supported set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build using shared libraries") + + # Option to build expat from source in deps/ or from the git repo + option(BMX_BUILD_EXPAT_SOURCE "Build expat from source" ON) # Option to set to use the runtime set(BMX_SET_MSVC_RUNTIME "MD" CACHE STRING "Set MSVC debug/release runtime to 'MD' (MultiThreadedDLL), 'MT' (MultiThreaded) or 'default' (use the default)") From 23e07e5144bef87926c7b48a665e35b10a032448 Mon Sep 17 00:00:00 2001 From: emcodem Date: Wed, 29 Apr 2026 16:55:50 +0200 Subject: [PATCH 16/17] CodeQL scan all branches --- .github/workflows/codeql.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e18ad8d1..9e3618b9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,7 @@ name: "CodeQL Advanced" on: push: - branches: [ "main" ] pull_request: - branches: [ "main" ] jobs: analyze: From 6de5da3c5897c16c634d9c3a49e481fd82212ae7 Mon Sep 17 00:00:00 2001 From: Nicolai Otto <19413840+scenarnick@users.noreply.github.com> Date: Mon, 4 May 2026 11:57:00 +0200 Subject: [PATCH 17/17] Simplify permissions in codeql.yml Removed unnecessary permissions from CodeQL workflow. --- .github/workflows/codeql.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9e3618b9..36e75ef6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -24,16 +24,6 @@ jobs: # - https://gh.io/using-larger-runners (GitHub.com only) # Consider using larger runners or machines with greater resources for possible analysis time improvements. runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - permissions: - # required for all workflows - security-events: write - - # required to fetch internal or private CodeQL packs - packages: read - - # only required for workflows in private repositories - actions: read - contents: read strategy: fail-fast: false