Merge branch 'master' into plugfest

Author: peternewman

.github/workflows/build.yaml

@@ -62,6 +62,7 @@ jobs:
         run: apt-get -y install git
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0 # Fetch all tags for generating OLA_BUILD_NAME
           persist-credentials: false
       - name: Install build tools
         shell: bash
@@ -99,6 +100,11 @@ jobs:
         # Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
         run: |
           echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }}" >> $GITHUB_ENV
+      - name: Set additional Linux configure arguments
+        if: runner.os == 'Linux'
+        # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
+        run: |
+          echo "DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV
       - name: Print configure command
         run: echo "./configure $DISTCHECK_CONFIGURE_FLAGS"
       - name: Configure

.github/workflows/debian.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_tag: [bullseye, bookworm, trixie, sid]
+        image_tag: [bullseye, bookworm, trixie, forky, sid]
         architecture: [amd64]
     container: debian:${{ matrix.image_tag }}
     steps:
@@ -29,13 +29,37 @@ jobs:
       # create a .git folder or .git.config. The Problem Matcher looks for
       # .git/config to find where the root of the repo is, so it must be
       # present.
-      - name: Install Git
-        run: apt-get -y install git
+      - name: Install Git and lsb-release
+        run: apt-get -y install git lsb-release
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0 # Fetch all tags for generating OLA_BUILD_NAME
           persist-credentials: false
+      - name: Generate build name
+        shell: bash
+        run: |
+          chown root:root . # workaround Git security precaution, see https://github.com/actions/runner-images/issues/6775
+          export OLA_BUILD_NAME=$(./scripts/build_name.sh)
+          # No docker number tag for testing, so must use lsb_release
+          export OLA_DEBIAN_BUILD_VERSION=$(./scripts/build_name.sh --debian)
+
+          echo "OLA_BUILD_NAME=$OLA_BUILD_NAME" >> $GITHUB_OUTPUT
+          echo "OLA_BUILD_NAME=$OLA_BUILD_NAME" >> $GITHUB_ENV # Set build name globally so that modifications don't cause -dirty
+          echo "OLA_DEBIAN_BUILD_VERSION=$OLA_DEBIAN_BUILD_VERSION" >> $GITHUB_OUTPUT
+
+          echo "Build name: $OLA_BUILD_NAME"
+          echo "Debian Build Version: $OLA_DEBIAN_BUILD_VERSION"
+        id: generate-build-name
       - name: Install build tools
-        run: apt-get -y install devscripts adduser fakeroot sudo
+        run: apt-get -y install devscripts adduser fakeroot sudo equivs
+      - name: Create Debian version for build
+        shell: bash
+        run: |
+          DEBFULLNAME="GitHub Actions" DEBEMAIL=actions@github.com \
+          debchange --force-bad-version \
+          --newversion ${{ steps.generate-build-name.outputs.OLA_DEBIAN_BUILD_VERSION }} \
+          "GitHub Actions Build \
+          ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
       - name: Install build dependencies
         run: mk-build-deps -t "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" -i -r
       - name: Set up build user
@@ -44,7 +68,7 @@ jobs:
           chown -R builduser:builduser .
           chown builduser:builduser ..
       - name: Build
-        run: sudo -u builduser dpkg-buildpackage -b -rfakeroot -j${{ steps.num-cpu-cores.outputs.NUM_CPU_CORES }}
+        run: sudo -u builduser env "OLA_BUILD_NAME=$OLA_BUILD_NAME" dpkg-buildpackage -v${{ steps.generate-build-name.outputs.OLA_DEBIAN_BUILD_VERSION }} -b -rfakeroot -j${{ steps.num-cpu-cores.outputs.NUM_CPU_CORES }}
       - name: Move built files
         if: always()
         run: |
@@ -62,7 +86,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: ola-built-debian-${{ matrix.image_tag }}-${{ matrix.architecture }}
+          name: ola-built-debian-${{ matrix.image_tag }}-${{ steps.generate-build-name.outputs.OLA_DEBIAN_BUILD_VERSION }}_${{ matrix.architecture }}
           path: ./built
   debian-test:
     name: 'Debian Test ${{ matrix.image_tag }} ${{ matrix.architecture }}'
@@ -72,17 +96,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_tag: [bullseye, bookworm, trixie, sid]
+        image_tag: [bullseye, bookworm, trixie, forky, sid]
         architecture: [amd64]
     container: debian:${{ matrix.image_tag }}
     steps:
+      - name: Update package database
+        run: apt-get update -y
+      - name: Install Git and lsb-release
+        run: apt-get -y install git lsb-release
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0 # Fetch all tags for generating OLA_DEBIAN_BUILD_VERSION
           persist-credentials: false
+      - name: Generate build name # Job step outputs can't be passed between builds for matrix jobs, so we re-generate
+        shell: bash
+        run: |
+          chown root:root . # workaround Git security precaution, see https://github.com/actions/runner-images/issues/6775
+          # No docker number tag for testing, so must use lsb_release
+          export OLA_DEBIAN_BUILD_VERSION=$(./scripts/build_name.sh --debian)
+          echo "OLA_DEBIAN_BUILD_VERSION=$OLA_DEBIAN_BUILD_VERSION" >> $GITHUB_OUTPUT
+          echo "Debian Build Version: $OLA_DEBIAN_BUILD_VERSION"
+        id: generate-build-name
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: ola-built-debian-${{ matrix.image_tag }}-${{ matrix.architecture }}
+          name: ola-built-debian-${{ matrix.image_tag }}-${{ steps.generate-build-name.outputs.OLA_DEBIAN_BUILD_VERSION }}_${{ matrix.architecture }}
           path: built
       - name: Display structure of artifact files
         run: ls -alR
@@ -96,5 +134,5 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: always() # Always upload the test output, even on failed tests
         with:
-          name: ola-test-output-debian-${{ matrix.image_tag }}-${{ matrix.architecture }}
+          name: ola-test-output-debian-${{ matrix.image_tag }}-${{ steps.generate-build-name.outputs.OLA_DEBIAN_BUILD_VERSION }}_${{ matrix.architecture }}
           path: test-output

.travis-ci.sh

@@ -294,7 +294,7 @@ else
   # Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
   if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
     # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
-    export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-java-libs --enable-ja-rule --enable-e133'
+    export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-java-libs --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'
   else
     export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-java-libs --enable-ja-rule --enable-e133'
   fi

Makefile.am

@@ -65,10 +65,19 @@ if ! USING_WIN32
 if FATAL_WARNINGS
   COMMON_CXXFLAGS += -Werror
   COMMON_PROTOBUF_CXXFLAGS += -Werror -Wno-error=unused-parameter \
+                              -Wno-error=deprecated-declarations \
                               -Wno-error=sign-compare \
                               -Wno-error=ignored-qualifiers
   COMMON_TESTING_FLAGS += -Werror
-  COMMON_TESTING_PROTOBUF_FLAGS += -Werror -Wno-error=unused-parameter
+  COMMON_TESTING_PROTOBUF_FLAGS += -Werror -Wno-error=unused-parameter \
+                                   -Wno-error=deprecated-declarations
+
+if GNU_PLUS_PLUS_11_DEPRECATIONS
+    # We have to use gnu++11 for some reason, so stop it complaining about
+    # auto_ptr
+    COMMON_CXXFLAGS += -Wno-error=deprecated-declarations
+    COMMON_TESTING_FLAGS += -Wno-error=deprecated-declarations
+endif
 endif
 endif
 

common/base/Flags.cpp

@@ -291,6 +291,7 @@ void FlagRegistry::DisplayUsage() {
  */
 void FlagRegistry::DisplayVersion() {
   cout << "OLA " << m_argv0 << " version: " << ola::base::Version::GetVersion()
+       << ", build: " << ola::base::Version::GetBuildName()
        << endl;
 }
 

common/base/Version.cpp

@@ -40,6 +40,10 @@ unsigned int Version::GetRevision() {
   return OLA_VERSION_REVISION;
 }
 
+string Version::GetBuildName() {
+  return OLA_BUILD_NAME;
+}
+
 string Version::GetVersion() {
   std::ostringstream str;
   str << GetMajor() << "." << GetMinor() << "." << GetRevision();

common/rdm/RDMHelper.cpp

@@ -883,6 +883,12 @@ string SlotInfoToString(uint8_t slot_type, uint16_t slot_label) {
         return "Primary, saturation";
       case SD_COLOR_ADD_UV:
         return "Primary, additive UV";
+      case SD_CIE_X:
+        return "Primary, CIE X color coordinate";
+      case SD_CIE_Y:
+        return "Primary, CIE Y color coordinate";
+      case SD_MAGENTA_GREEN_CORRECTION:
+        return "Primary, CCT magenta-green adjustment";
       case SD_STATIC_GOBO_WHEEL:
         return "Primary, static gobo wheel";
       case SD_ROTO_GOBO_WHEEL:

common/utils/StringUtils.cpp

@@ -454,12 +454,12 @@ bool HexStringToInt(const string &value, int64_t *output) {
 
 void ToLower(string *s) {
   std::transform(s->begin(), s->end(), s->begin(),
-                 [](int value){return std::tolower(value);});
+                 std::ptr_fun<int, int>(std::tolower));
 }
 
 void ToUpper(string *s) {
   std::transform(s->begin(), s->end(), s->begin(),
-                 [](int value){return std::toupper(value);});
+                 std::ptr_fun<int, int>(std::toupper));
 }
 
 void CapitalizeLabel(string *s) {

configure.ac

@@ -23,6 +23,17 @@ AC_SUBST([ola_revision_version])
 OLA_REVISION_VERSION=ola_revision_version
 AC_SUBST(OLA_REVISION_VERSION)
 
+# Build name is separate because AC_CHECK_PROG must come after AC_INIT
+# build_name.sh also checks for Git, but this allows that check to show
+# up in ./configure for troubleshooting
+AC_CHECK_PROG([git],[git],[yes],[no])
+AM_CONDITIONAL([FOUND_GIT], [test "x$git" = xyes])
+AC_SUBST(OLA_BUILD_NAME)
+AC_ARG_VAR([OLA_BUILD_NAME], [Override the build name])
+AS_IF([test "x$OLA_BUILD_NAME" = x], [
+  OLA_BUILD_NAME="$(./scripts/build_name.sh)"
+])
+
 # Checks for programs.
 AC_LANG([C++])
 AC_PROG_CXX
@@ -132,6 +143,7 @@ AS_IF([test "x$ac_cv_gnu_plus_plus_11" = xyes],
       ])
 AS_IF([test "x$require_gnu_plus_plus_11" = xyes],
       [CXXFLAGS="$CXXFLAGS -std=gnu++11"])
+AM_CONDITIONAL([GNU_PLUS_PLUS_11_DEPRECATIONS], [test "x$require_gnu_plus_plus_11" = xyes])
 
 # Checks for header files.
 AC_HEADER_DIRENT
@@ -1025,6 +1037,7 @@ echo \
 "-------------------------------------------------------
 ${PACKAGE_NAME} Version ${PACKAGE_VERSION}
 
+Build Name: ${OLA_BUILD_NAME}
 Prefix: '${prefix}'
 Compiler: '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
 Linker: '${LD} ${AM_LDFLAGS} ${LIBS}'

debian/Makefile.mk

@@ -1,7 +1,6 @@
 # Debian build files
 EXTRA_DIST += \
     debian/changelog \
-    debian/compat \
     debian/control \
     debian/copyright \
     debian/libola-dev.dirs \
@@ -10,20 +9,17 @@ EXTRA_DIST += \
     debian/ola-python.dirs \
     debian/ola-python.install \
     debian/ola-rdm-tests.bash-completion \
-    debian/ola-rdm-tests.config \
     debian/ola-rdm-tests.dirs \
     debian/ola-rdm-tests.install \
-    debian/ola-rdm-tests.postinst \
     debian/ola-rdm-tests.rdm_test_server.init \
-    debian/ola-rdm-tests.templates \
+    debian/ola-rdm-tests.rdm_test_server.service \
     debian/ola.bash-completion \
-    debian/ola.config \
     debian/ola.dirs \
     debian/ola.docs \
     debian/ola.install \
     debian/ola.olad.init \
+    debian/ola.olad.service \
     debian/ola.postinst \
-    debian/ola.templates \
     debian/ola.udev \
     debian/org.openlighting.ola.ola.metainfo.xml \
     debian/rules \