Merge pull request #21 from ebu/task/v1.7

Preparation for initial EBU release v1.7. Housekeeping, updating build and infrastructure, dependencies, updating links in documentation

Author: scenarnick

.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:
@@ -72,11 +75,11 @@ 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' }}
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: maxim-lobanov/setup-xcode@v1.7.0
         with:
           xcode-version: latest-stable
 
@@ -86,7 +89,7 @@ jobs:
           git --version
           cmake --version
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 

.github/workflows/codeql.yml

@@ -13,12 +13,8 @@ name: "CodeQL Advanced"
 
 on:
   push:
-    branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
-  schedule:
-    - cron: '45 10 * * 3'
-
+  
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})
@@ -28,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
@@ -57,7 +43,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 +53,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 +82,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}}"

.github/workflows/release.yml

@@ -1,12 +1,15 @@
 name: Release
+permissions:
+  contents: read
+  pull-requests: write
 on:
   workflow_dispatch:
 jobs:
   source_release:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
@@ -23,7 +26,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: |
@@ -36,9 +39,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
 
@@ -60,12 +63,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 +111,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: |

CHANGELOG.md

@@ -1,6 +1,6 @@
 # bmx Changelog
 
-## Version next
+## v1.7
 
 ### Breaking changes
 

CMakeLists.txt

@@ -13,9 +13,9 @@ 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
+    HOMEPAGE_URL https://github.com/ebu/bmx
     LANGUAGES C CXX
 )
 

Dockerfile

@@ -1,7 +1,7 @@
 ##################################################
 # Build layer
 ##################################################
-FROM debian:latest as build
+FROM debian:latest AS build
 
 WORKDIR /build
 
@@ -33,9 +33,9 @@ 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/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
 

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)
@@ -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.
 

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()

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)")

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