From d59f4ab6da7c5655c27a843c400ebef167565e31 Mon Sep 17 00:00:00 2001 From: Matt McClaskey Date: Tue, 12 Nov 2024 21:20:00 +0500 Subject: [PATCH] add vpx dependency --- builder/dockerfile.debian_bookworm.build | 2 +- builder/dockerfile.debian_bullseye.build | 2 +- builder/dockerfile.fedora_42.build | 3 ++- builder/dockerfile.fedora_43.build | 3 ++- builder/dockerfile.kali_kali-rolling.build | 2 +- builder/dockerfile.opensuse_15.build | 3 ++- builder/dockerfile.oracle_8.build | 3 ++- builder/dockerfile.oracle_9.build | 4 +++- builder/dockerfile.ubuntu_focal.build | 2 +- opensuse/kasmvncserver.spec | 2 +- oracle/kasmvncserver.spec | 2 +- oracle/kasmvncserver9.spec | 2 +- 12 files changed, 18 insertions(+), 12 deletions(-) diff --git a/builder/dockerfile.debian_bookworm.build b/builder/dockerfile.debian_bookworm.build index bda5926..e37dac4 100644 --- a/builder/dockerfile.debian_bookworm.build +++ b/builder/dockerfile.debian_bookworm.build @@ -24,7 +24,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tz RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev RUN apt-get update && apt-get -y install ninja-build cmake nasm git libgnutls28-dev vim wget tightvncserver curl RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev \ - libxcursor-dev libavformat-dev libswscale-dev + libxcursor-dev libavformat-dev libswscale-dev libvpx-dev ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.debian_bullseye.build b/builder/dockerfile.debian_bullseye.build index bd950e7..1bb8a04 100644 --- a/builder/dockerfile.debian_bullseye.build +++ b/builder/dockerfile.debian_bullseye.build @@ -14,7 +14,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tz RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev RUN apt-get update && apt-get -y install ninja-build nasm git libgnutls28-dev vim wget tightvncserver curl RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev \ - libxcursor-dev libavformat-dev libswscale-dev + libxcursor-dev libavformat-dev libswscale-dev libvpx-dev RUN CMAKE_URL="https://cmake.org/files/v3.22/cmake-3.22.0" && \ ARCH=$(arch) && \ diff --git a/builder/dockerfile.fedora_42.build b/builder/dockerfile.fedora_42.build index 1fa878b..aa964a6 100644 --- a/builder/dockerfile.fedora_42.build +++ b/builder/dockerfile.fedora_42.build @@ -75,7 +75,8 @@ RUN \ xorg-x11-xtrans-devel \ xsltproc \ libavformat-free-devel \ - libswscale-free-devel + libswscale-free-devel \ + libvpx-devel ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.fedora_43.build b/builder/dockerfile.fedora_43.build index 8b566a0..3c85f9f 100644 --- a/builder/dockerfile.fedora_43.build +++ b/builder/dockerfile.fedora_43.build @@ -75,7 +75,8 @@ RUN \ xorg-x11-xtrans-devel \ xsltproc \ libavformat-free-devel \ - libswscale-free-devel + libswscale-free-devel \ + libvpx-devel ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.kali_kali-rolling.build b/builder/dockerfile.kali_kali-rolling.build index 7dad223..f60a99f 100644 --- a/builder/dockerfile.kali_kali-rolling.build +++ b/builder/dockerfile.kali_kali-rolling.build @@ -17,7 +17,7 @@ RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev RUN apt-get update && apt-get -y install gcc g++ curl RUN apt-get update && apt-get -y install ninja-build cmake nasm git libgnutls28-dev vim wget tightvncserver RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev \ - libxcursor-dev libavformat-dev libswscale-dev + libxcursor-dev libavformat-dev libswscale-dev libvpx-dev ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.opensuse_15.build b/builder/dockerfile.opensuse_15.build index c7685f3..057fcd0 100644 --- a/builder/dockerfile.opensuse_15.build +++ b/builder/dockerfile.opensuse_15.build @@ -46,7 +46,8 @@ RUN zypper install -ny \ xorg-x11-devel \ xorg-x11-server-sdk \ xorg-x11-util-devel \ - zlib-devel + zlib-devel \ + libvpx-devel RUN useradd -u 1000 docker && \ groupadd -g 1000 docker && \ diff --git a/builder/dockerfile.oracle_8.build b/builder/dockerfile.oracle_8.build index 4a2a13a..6d0c6d9 100644 --- a/builder/dockerfile.oracle_8.build +++ b/builder/dockerfile.oracle_8.build @@ -52,7 +52,8 @@ RUN dnf install -y \ libXrandr-devel \ libXtst-devel \ libXcursor-devel \ - libSM-devel + libSM-devel \ + libvpx-devel ENV SCRIPTS_DIR=/tmp/scripts ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:${PKG_CONFIG_PATH:-/opt/rh/gcc-toolset-14/root/usr/lib64/pkgconfig} diff --git a/builder/dockerfile.oracle_9.build b/builder/dockerfile.oracle_9.build index 8053bd5..fde3840 100644 --- a/builder/dockerfile.oracle_9.build +++ b/builder/dockerfile.oracle_9.build @@ -52,7 +52,9 @@ RUN dnf install -y \ libXrandr-devel \ libXtst-devel \ libXcursor-devel \ - libSM-devel + libSM-devel \ + libvpx-devel + ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.ubuntu_focal.build b/builder/dockerfile.ubuntu_focal.build index 0ecb1ee..7f91c4b 100644 --- a/builder/dockerfile.ubuntu_focal.build +++ b/builder/dockerfile.ubuntu_focal.build @@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends tzdata RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev RUN apt-get update && apt-get -y install ninja-build nasm git vim wget curl RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev \ - libxcursor-dev libavformat-dev libswscale-dev + libxcursor-dev libavformat-dev libswscale-dev libvpx-dev ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/opensuse/kasmvncserver.spec b/opensuse/kasmvncserver.spec index 4e276b5..e573d71 100644 --- a/opensuse/kasmvncserver.spec +++ b/opensuse/kasmvncserver.spec @@ -7,7 +7,7 @@ License: GPL-2.0-or-later URL: https://github.com/kasmtech/KasmVNC BuildRequires: rsync -Requires: xauth, hostname, libxkbcommon-x11-0, xkeyboard-config, x11-tools, openssl, perl, libpixman-1-0, libjpeg8, libgomp1, libXfont2-2, libXdmcp6, libglvnd, xkbcomp, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, perl-DateTime, perl-DateTime-TimeZone, libgbm1, libxshmfence1 +Requires: xauth, hostname, libxkbcommon-x11-0, xkeyboard-config, x11-tools, openssl, perl, libpixman-1-0, libjpeg8, libgomp1, libXfont2-2, libXdmcp6, libglvnd, xkbcomp, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, perl-DateTime, perl-DateTime-TimeZone, libgbm1, libxshmfence1, libvpx Conflicts: tigervnc, tigervnc-x11vnc %description diff --git a/oracle/kasmvncserver.spec b/oracle/kasmvncserver.spec index 998ceaa..1048a2c 100644 --- a/oracle/kasmvncserver.spec +++ b/oracle/kasmvncserver.spec @@ -7,7 +7,7 @@ License: GPLv2+ URL: https://github.com/kasmtech/KasmVNC BuildRequires: rsync -Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-utils, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, perl-DateTime-TimeZone, hostname, mesa-libgbm, libxshmfence +Requires: xorg-x11-xauth, xorg-x11-xkb-utils, xkeyboard-config, xorg-x11-server-utils, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, perl-DateTime-TimeZone, hostname, mesa-libgbm, libxshmfence, libvpx Conflicts: tigervnc-server, tigervnc-server-minimal %description diff --git a/oracle/kasmvncserver9.spec b/oracle/kasmvncserver9.spec index 9267097..deeed09 100644 --- a/oracle/kasmvncserver9.spec +++ b/oracle/kasmvncserver9.spec @@ -7,7 +7,7 @@ License: GPLv2+ URL: https://github.com/kasmtech/KasmVNC BuildRequires: rsync -Requires: xorg-x11-xauth, xkeyboard-config, xorg-x11-server-utils, xkbcomp, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, perl-DateTime-TimeZone, hostname, mesa-libgbm, libxshmfence +Requires: xorg-x11-xauth, xkeyboard-config, xorg-x11-server-utils, xkbcomp, openssl, perl, perl-Switch, perl-YAML-Tiny, perl-Hash-Merge-Simple, perl-Scalar-List-Utils, perl-List-MoreUtils, perl-Try-Tiny, perl-DateTime-TimeZone, hostname, mesa-libgbm, libxshmfence, libvpx Conflicts: tigervnc-server, tigervnc-server-minimal %description