Update shotcut-build to Qt 6.9.1 on Ubuntu 22.04

Author: ddennedy

.github/workflows/shotcut-build.yml

@@ -29,4 +29,4 @@ jobs:
         with:
           context: "{{defaultContext}}:docker/shotcut-build"
           push: true
-          tags: mltframework/shotcut-build:qt6.4.3-ubuntu20.04
+          tags: mltframework/shotcut-build:qt6.9.1-ubuntu22.04

build/build-melt.sh

@@ -34,7 +34,7 @@ SWFDEC_REVISION=
 ENABLE_MOVIT=1
 MOVIT_HEAD=0
 MOVIT_REVISION="origin/shotcut-opengl3"
-LIBEPOXY_REVISION="v1.3.1"
+LIBEPOXY_REVISION="v1.5.10"
 X264_HEAD=1
 X264_REVISION=
 X265_HEAD=1

docker/README.md

@@ -2,15 +2,18 @@
 
 ## Build Qt 6 for Linux
 
+    Note: outdated and no longer used for now since upgrading Shotcut to Qt 6.9.1 on Ubuntu 22.04,
+    which is using Qt SDK's binaries.
+
     docker build --rm -t mltframework/qt:6.4.3-ubuntu20.04 docker/qt6-build
     docker run -it --rm -v $PWD:/mnt mltframework/qt:6.4.3-ubuntu20.04
     s3cmd --acl-public put qt-6.4.3-ubuntu20.04-x86_64.txz s3://misc.meltymedia/shotcut-build/
 
 ## Build Shotcut for Linux
 
-    docker build --rm -t mltframework/shotcut-build:qt6.4.3-ubuntu20.04 docker/shotcut-build
+    docker build --rm -t mltframework/shotcut-build:qt6.9.1-ubuntu22.04 docker/shotcut-build
     mkdir work; cd work
     wget --no-check-certificate https://raw.githubusercontent.com/mltframework/shotcut/master/scripts/build-shotcut.sh
-    docker run -it --rm -v $PWD:/root/shotcut mltframework/shotcut-build:qt6.4.3-ubuntu20.04 ./build-shotcut.sh
+    docker run -it --rm -v "$PWD":/root/shotcut mltframework/shotcut-build:qt6.9.1-ubuntu22.04 ./build-shotcut.sh
 
 Artifacts will be in work.

docker/shotcut-build/Dockerfile

@@ -1,32 +1,28 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL maintainer="dan@dennedy.org"
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -qq && \
-  apt-get -yqq upgrade && \
-  apt-get install -yqq git automake autoconf libmp3lame-dev libepoxy-dev \
-    libtool intltool nasm yasm python3-pip ninja-build gfortran \
-    libmp3lame-dev libsamplerate-dev libarchive-dev libpotrace-dev \
-    libxml2-dev ladspa-sdk libjack-dev libsox-dev libsdl2-dev libgtk2.0-dev \
-    libxslt1-dev libexif-dev libdv-dev libtheora-dev libwebp-dev libfftw3-dev \
-    libvorbis-dev libeigen3-dev libxkbcommon-x11-0 libegl1-mesa-dev \
-    gettext gperf intltool swig python3.9-dev python-is-python3 flex bison make \
-    xutils-dev libffi-dev libltdl-dev libssl-dev libxml-parser-perl \
-    openssl patch perl pkg-config ruby scons sed unzip wget xz-utils \
-    libcurl4-openssl-dev autopoint p7zip bzip2 zip curl libva-dev \
-    apt-transport-https ca-certificates gnupg software-properties-common \
-    libdouble-conversion-dev va-driver-all libxcb-xinerama0 libxcb-icccm4 \
-    libxcb-image0 libxcb-keysyms1 libxcb-render-util0 liblist-moreutils-perl && \
-  curl https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - >/etc/apt/trusted.gpg.d/kitware.gpg && \
-  apt-add-repository 'ppa:ubuntu-toolchain-r/test' && \
-  apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
-  apt-get update -qq && \
-  apt-get install -yqq g++-10 cmake libclang-cpp10 && \
-  pip3 install meson
+    apt-get -yqq upgrade && \
+    apt-get install -yqq git automake autoconf libmp3lame-dev libepoxy-dev \
+        libtool intltool nasm yasm ninja-build gfortran \
+        libmp3lame-dev libsamplerate-dev libarchive-dev libpotrace-dev \
+        libxml2-dev ladspa-sdk libjack-dev libsox-dev libsdl2-dev libgtk2.0-dev \
+        libxslt1-dev libexif-dev libdv-dev libtheora-dev libwebp-dev libfftw3-dev \
+        libvorbis-dev libeigen3-dev libxkbcommon-x11-0 libegl1-mesa-dev \
+        gettext gperf intltool swig python3-dev python-is-python3 flex bison make \
+        xutils-dev libffi-dev libltdl-dev libssl-dev libxml-parser-perl \
+        openssl patch perl pkg-config ruby scons sed unzip wget xz-utils \
+        libcurl4-openssl-dev autopoint p7zip bzip2 zip curl libva-dev \
+        apt-transport-https ca-certificates gnupg software-properties-common \
+        libdouble-conversion-dev va-driver-all libxcb-xinerama0 libxcb-icccm4 \
+        libxcb-image0 libxcb-keysyms1 libxcb-render-util0 liblist-moreutils-perl \
+        cmake clang-15 curl g++-12 libgomp1 meson s3cmd
 
-ENV CC=gcc-10 CXX=g++-10
-WORKDIR /root
-COPY --from=mltframework/qt:6.4.3-ubuntu20.04 /root/Qt Qt
+WORKDIR /root/Qt
+RUN curl -kLO --no-progress-meter https://s3.amazonaws.com/misc.meltymedia/shotcut-build/qt-6.9.1-ubuntu22.04-x86_64.txz && \
+    tar -xJf qt-6.9.1-ubuntu22.04-x86_64.txz && \
+    rm qt-6.9.1-ubuntu22.04-x86_64.txz
 
 WORKDIR /root/shotcut
 ENTRYPOINT ["/bin/bash"]