Make builds parallel and add bookworm and ubuntu 24.04 builds

diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 64fb7fab1af084b54af8ec08bf1100e2fc0e6bc4..53cfc0c6b9814660f29d360de51dabd1d5a7851d 100644 (file)
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -66,7 +66,7 @@ jobs:
     strategy:
       matrix:
        arch: [ armv7, aarch64]
-       distro: [ stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04 ]
+       distro: [ stretch, buster, bullseye, bookworm, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest ]
        include:
          - arch: armv6
            distro: jessie
@@ -158,7 +158,7 @@ jobs:
     name: Build on native ${{ matrix.container }}
     strategy:
       matrix:
-        container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "ubuntu:lunar", "ubuntu:mantic", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "debian:sid"]
+        container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "ubuntu:lunar", "ubuntu:mantic", "ubuntu:noble", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "debian:sid"]
     container:
       image: ${{ matrix.container }}
     steps:
@@ -222,7 +222,7 @@ jobs:
       - name: Workaround safe directory
         run: git config --global --add safe.directory /__w/tvheadend/tvheadend
       - name: build
-        run: ./configure --disable-dvbscan --disable-libfdkaac_static --disable-ffmpeg_static --disable-hdhomerun_static --disable-libfdkaac_static --disable-libopus_static --disable-libtheora_static --disable-libvorbis_static --disable-libvpx_static --disable-libx264_static --disable-libx265_static --enable-libfdkaac --enable-hdhomerun_client --enable-libsystemd_daemon --python=/usr/bin/python3 && make -C rpm build
+        run: ./configure --disable-dvbscan --disable-libfdkaac_static --disable-ffmpeg_static --disable-hdhomerun_static --disable-libfdkaac_static --disable-libopus_static --disable-libtheora_static --disable-libvorbis_static --disable-libvpx_static --disable-libx264_static --disable-libx265_static --enable-libfdkaac --enable-hdhomerun_client --enable-libsystemd_daemon --python=/usr/bin/python3 && make -C rpm build -j$(nproc)
       - name: copy-result
         run: cp rpm/RPMS/*/tvheadend*.rpm .
       - uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml
index d5aa5b3197c76012778c064a09bd37fd999b4950..cad45f6497f77ff83b38ec9594a9bef349e2cc16 100644 (file)
--- a/.github/workflows/build-cloudsmith.yml
+++ b/.github/workflows/build-cloudsmith.yml
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
        arch: [ armv7, aarch64]
-       distro: [ stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04 ]
+       distro: [ stretch, buster, bullseye, bookworm, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest ]
        include:
          - arch: armv6
            distro: jessie
@@ -166,7 +166,7 @@ jobs:
     name: Build on native ${{ matrix.container }}
     strategy:
       matrix:
-        container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "i386/debian:sid", "debian:sid"]
+        container: ["i386/ubuntu:trusty", "ubuntu:trusty", "i386/ubuntu:xenial", "ubuntu:xenial", "ubuntu:bionic", "ubuntu:focal", "ubuntu:jammy", "ubuntu:noble", "i386/debian:stretch", "debian:stretch", "i386/debian:buster", "debian:buster", "i386/debian:bullseye", "debian:bullseye", "i386/debian:bookworm", "debian:bookworm", "i386/debian:trixie", "debian:trixie", "i386/debian:sid", "debian:sid"]
     container:
       image: ${{ matrix.container }}
     steps:

diff --git a/Autobuild/bookworm-armv7l.sh b/Autobuild/bookworm-armv7l.sh
index 5e9e36de82b7a3f7e168506fde3874fde9a0be14..a6bb41f66c31ac39bc08aaca45bb208979467853 100644 (file)
--- a/Autobuild/bookworm-armv7l.sh
+++ b/Autobuild/bookworm-armv7l.sh
@@ -1,2 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265"
 source Autobuild/armv7l.sh
 source Autobuild/bookworm.sh

diff --git a/Autobuild/noble-aarch64.sh b/Autobuild/noble-aarch64.sh
new file mode 100644 (file)
index 0000000..1dd8598
--- /dev/null
+++ b/Autobuild/noble-aarch64.sh
@@ -0,0 +1,2 @@
+source Autobuild/aarch64.sh
+source Autobuild/noble.sh

diff --git a/Autobuild/noble-armv7l.sh b/Autobuild/noble-armv7l.sh
new file mode 100644 (file)
index 0000000..e8aa13c
--- /dev/null
+++ b/Autobuild/noble-armv7l.sh
@@ -0,0 +1,3 @@
+AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --disable-libx265_static --disable-libx265"
+source Autobuild/armv7l.sh
+source Autobuild/noble.sh

diff --git a/Autobuild/noble-x86_64.sh b/Autobuild/noble-x86_64.sh
new file mode 100644 (file)
index 0000000..9decfde
--- /dev/null
+++ b/Autobuild/noble-x86_64.sh
@@ -0,0 +1,2 @@
+source Autobuild/x86_64.sh
+source Autobuild/noble.sh

diff --git a/Autobuild/noble.sh b/Autobuild/noble.sh
new file mode 100644 (file)
index 0000000..b0eb2f5
--- /dev/null
+++ b/Autobuild/noble.sh
@@ -0,0 +1,2 @@
+DEBDIST=noble
+source Autobuild/debian.sh

diff --git a/debian/rules b/debian/rules
index 883e095a2e7aa589405d3e666cc5403a8a747713..15402bfc81c400e289d0b29341e6816f5894db2d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    EXTRAMAKEFLAGS += -j$(NUMJOBS)
+endif
+
 %:
        dh $@ --with-systemd
 
@@ -12,7 +17,7 @@ override_dh_auto_configure:
        dh_auto_configure -- ${AUTOBUILD_CONFIGURE_EXTRA} ${JOBSARGS}
 
 override_dh_auto_build:
-       make ${JARGS}
+       make ${JARGS} ${EXTRAMAKEFLAGS}
 
 override_dh_strip:
        dh_strip --dbg-package=tvheadend-dbg

diff --git a/support/cloudsmith.sh b/support/cloudsmith.sh
index 990feb6db6be1ef4c291f3ce5fc9e7fafead17b8..75ff0cf5f0daa3c571d5759a8609e17a858d9a98 100755 (executable)
--- a/support/cloudsmith.sh
+++ b/support/cloudsmith.sh
@@ -51,7 +51,7 @@ fi
 case $OSPREFIX$TARGET in
     bookworm|bullseye|buster|sid|stretch|jessie|trixie)
         OS="debian";;
-    trusty|xenial|bionic|focal|impish|jammy|kinetic|lunar|mantic)
+    trusty|xenial|bionic|focal|impish|jammy|kinetic|lunar|mantic|noble)
         OS="ubuntu";;
     raspios*)
         OS="raspbian";;