diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index dd30066..11f770e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,15 +11,9 @@ RUN sudo apt-get update && sudo apt-get install --no-install-recommends -y \ python3-setuptools \ python3-wheel \ libgcrypt20 \ - libcairo-gobject2 \ - libpangocairo-1.0-0 \ - libgdk-pixbuf2.0-0 \ - libsoup2.4-1 \ - libsoup-gnome2.4-1 \ libgirepository-1.0-1 \ glib-networking \ libglib2.0-0 \ - libjson-glib-1.0-0 \ libgudev-1.0-0 \ alsa-utils \ jackd2 \ @@ -49,7 +43,6 @@ RUN sudo apt-get update && sudo apt-get install --no-install-recommends -y \ xserver-xorg-core \ libx11-xcb1 \ libxcb-dri3-0 \ - libxkbcommon0 \ libxdamage1 \ libxfixes3 \ libxv1 \ diff --git a/.devcontainer/features/desktop-selkies/src/install.sh b/.devcontainer/features/desktop-selkies/src/install.sh index fd355e9..f0c4d8e 100755 --- a/.devcontainer/features/desktop-selkies/src/install.sh +++ b/.devcontainer/features/desktop-selkies/src/install.sh @@ -16,15 +16,9 @@ apt-get update && apt-get install --no-install-recommends -y \ python3-setuptools \ python3-wheel \ libgcrypt20 \ - libcairo-gobject2 \ - libpangocairo-1.0-0 \ - libgdk-pixbuf2.0-0 \ - libsoup2.4-1 \ - libsoup-gnome2.4-1 \ libgirepository-1.0-1 \ glib-networking \ libglib2.0-0 \ - libjson-glib-1.0-0 \ libgudev-1.0-0 \ alsa-utils \ jackd2 \ @@ -54,7 +48,6 @@ apt-get update && apt-get install --no-install-recommends -y \ xserver-xorg-core \ libx11-xcb1 \ libxcb-dri3-0 \ - libxkbcommon0 \ libxdamage1 \ libxfixes3 \ libxv1 \ diff --git a/addons/conda/Dockerfile b/addons/conda/Dockerfile index 4b3b21e..738ac02 100644 --- a/addons/conda/Dockerfile +++ b/addons/conda/Dockerfile @@ -29,7 +29,7 @@ COPY --from=selkies-web /usr/share/nginx/html ${SELKIES_SOURCE}/gst-web WORKDIR /opt RUN . /opt/conda/bin/activate && \ conda install -c conda-forge -y conda-build conda-pack && \ - SELKIES_VERSION="${PKG_VERSION}" conda-build -c conda-forge -c nvidia "${SELKIES_BUILD}" && \ + SELKIES_VERSION="${PKG_VERSION}" conda-build -c conda-forge -c nvidia --error-overlinking "${SELKIES_BUILD}" && \ conda create -n selkies-gstreamer -y --use-local -c conda-forge -c nvidia selkies-gstreamer && \ conda-pack -f -n selkies-gstreamer --arcroot selkies-gstreamer -o /opt/selkies-gstreamer-conda.tar.gz --format tar.gz --compress-level 7 -j -1 && \ conda-build purge-all && conda clean --all -f -y diff --git a/addons/conda/build/meta.yaml b/addons/conda/build/meta.yaml index ee1dc8e..7367e54 100644 --- a/addons/conda/build/meta.yaml +++ b/addons/conda/build/meta.yaml @@ -106,22 +106,17 @@ requirements: - abseil-cpp - libdrm - openssl - - libxml2 + - libzlib - glib - glib-networking - gnutls - - gdk-pixbuf - - cairo - - pango - pygobject - setuptools - - libsoup - libvpx - openh264 - x264 - x265 - aom - - rav1e - svt-av1 - libopus - libva # [linux] @@ -132,29 +127,14 @@ requirements: - alsa-lib # [linux] - mesalib # [linux] - libxcb # [linux] - - libxkbcommon # [linux] - - libxkbfile # [linux] - - xorg-libxcursor # [linux] - xorg-libxdamage # [linux] - - xorg-libxft # [linux] - - xorg-libxxf86vm # [linux] - - xorg-libxau # [linux] - - xorg-libxdmcp # [linux] - - xorg-libxcomposite # [linux] - xorg-libxfixes # [linux] - - xorg-libice # [linux] - xorg-libxext # [linux] - - xorg-libxmu # [linux] - xorg-libxrandr # [linux] - xorg-libxrender # [linux] - - xorg-libsm # [linux] - xorg-libxtst # [linux] - - xorg-libxt # [linux] - xorg-libxi # [linux] - - xorg-libxpm # [linux] - - xorg-libxinerama # [linux] - xorg-libx11 # [linux] - - expat # [linux] - wayland-protocols # [linux] - wayland # [linux] run: @@ -176,30 +156,14 @@ requirements: - pulseaudio-client # [linux] - libva-utils # [linux] - libxcb # [linux] - - libxkbcommon # [linux] - - libxkbfile # [linux] - - xorg-libxcursor # [linux] - - xorg-libxcvt # [linux] - xorg-libxdamage # [linux] - - xorg-libxft # [linux] - - xorg-libxxf86vm # [linux] - - xorg-libxau # [linux] - - xorg-libxdmcp # [linux] - - xorg-libxcomposite # [linux] - xorg-libxfixes # [linux] - - xorg-libice # [linux] - xorg-libxext # [linux] - - xorg-libxmu # [linux] - xorg-libxrandr # [linux] - xorg-libxrender # [linux] - - xorg-libsm # [linux] - xorg-libxtst # [linux] - - xorg-libxt # [linux] - xorg-libxi # [linux] - - xorg-libxpm # [linux] - - xorg-libxinerama # [linux] - xorg-libx11 # [linux] - - expat # [linux] - wayland-protocols # [linux] - wayland # [linux] - bash # [linux] diff --git a/addons/example/Dockerfile b/addons/example/Dockerfile index 3214cca..a989f7a 100644 --- a/addons/example/Dockerfile +++ b/addons/example/Dockerfile @@ -72,15 +72,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ python3-setuptools \ python3-wheel \ libgcrypt20 \ - libcairo-gobject2 \ - libpangocairo-1.0-0 \ - libgdk-pixbuf2.0-0 \ - libsoup2.4-1 \ - libsoup-gnome2.4-1 \ libgirepository-1.0-1 \ glib-networking \ libglib2.0-0 \ - libjson-glib-1.0-0 \ libgudev-1.0-0 \ alsa-utils \ jackd2 \ @@ -110,7 +104,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ xserver-xorg-core \ libx11-xcb1 \ libxcb-dri3-0 \ - libxkbcommon0 \ libxdamage1 \ libxfixes3 \ libxv1 \ @@ -126,8 +119,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ mesa-vulkan-drivers \ vulkan-tools \ radeontop && \ - if [ "$(dpkg --print-architecture)" = "amd64" ]; then apt-get install --no-install-recommends -y intel-gpu-tools nvtop va-driver-all i965-va-driver-shaders intel-media-va-driver-non-free; fi && \ if [ "$(grep VERSION_ID= /etc/os-release | cut -d= -f2 | tr -d '\"')" \> "20.04" ]; then apt-get install --no-install-recommends -y xcvt libopenh264-dev svt-av1 aom-tools; else apt-get install --no-install-recommends -y mesa-utils-extra; fi && \ + if [ "$(dpkg --print-architecture)" = "amd64" ]; then apt-get install --no-install-recommends -y intel-gpu-tools nvtop va-driver-all i965-va-driver-shaders intel-media-va-driver-non-free; fi && \ apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/debconf/* /var/log/* /tmp/* /var/tmp/* && \ echo "/usr/local/nvidia/lib" >> /etc/ld.so.conf.d/nvidia.conf && \ echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf && \ diff --git a/addons/gstreamer/Dockerfile b/addons/gstreamer/Dockerfile index 9840e3d..d4cc70f 100644 --- a/addons/gstreamer/Dockerfile +++ b/addons/gstreamer/Dockerfile @@ -34,25 +34,18 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ nasm \ valgrind \ yasm \ - libgcrypt20-dev \ libgmp-dev \ libgsl-dev \ - libcairo2-dev \ - libpango1.0-dev \ - libgdk-pixbuf2.0-dev \ - libsoup2.4-dev \ - libsoup-gnome2.4-dev \ + libgcrypt20-dev \ libgirepository1.0-dev \ glib-networking \ libglib2.0-dev \ - libjson-glib-dev \ libgudev-1.0-dev \ libasound2-dev \ libjack-jackd2-dev \ libopus-dev \ libpulse-dev \ libssl-dev \ - libvdpau-dev \ libva-dev \ libvpx-dev \ libx264-dev \ @@ -69,7 +62,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ libwayland-egl-backend-dev \ libx11-xcb-dev \ libxcb-dri3-dev \ - libxkbcommon-dev \ libxdamage-dev \ libxfixes-dev \ libxv-dev \ diff --git a/docs/start.md b/docs/start.md index 07b412f..405e06b 100644 --- a/docs/start.md +++ b/docs/start.md @@ -115,7 +115,7 @@ While this instruction assumes that you are installing this project systemwide, **1. Install the dependencies, for Ubuntu or Debian-based distributions, run this command:** ```bash -sudo apt-get update && sudo apt-get install --no-install-recommends -y jq tar gzip ca-certificates curl build-essential python3-pip python3-dev python3-gi python3-setuptools python3-wheel libgcrypt20 libcairo-gobject2 libpangocairo-1.0-0 libgdk-pixbuf2.0-0 libsoup2.4-1 libsoup-gnome2.4-1 libgirepository-1.0-1 glib-networking libglib2.0-0 libjson-glib-1.0-0 libgudev-1.0-0 alsa-utils jackd2 libjack-jackd2-0 libpulse0 libopus0 libvpx-dev x264 x265 libdrm2 libegl1 libgl1 libopengl0 libgles1 libgles2 libglvnd0 libglx0 wayland-protocols libwayland-dev libwayland-egl1 wmctrl xsel xdotool x11-utils x11-xkb-utils x11-xserver-utils xserver-xorg-core libx11-xcb1 libxcb-dri3-0 libxkbcommon0 libxdamage1 libxfixes3 libxv1 libxtst6 libxext6 +sudo apt-get update && sudo apt-get install --no-install-recommends -y jq tar gzip ca-certificates curl build-essential python3-pip python3-dev python3-gi python3-setuptools python3-wheel libgcrypt20 libgirepository-1.0-1 glib-networking libglib2.0-0 libgudev-1.0-0 alsa-utils jackd2 libjack-jackd2-0 libpulse0 libopus0 libvpx-dev x264 x265 libdrm2 libegl1 libgl1 libopengl0 libgles1 libgles2 libglvnd0 libglx0 wayland-protocols libwayland-dev libwayland-egl1 wmctrl xsel xdotool x11-utils x11-xkb-utils x11-xserver-utils xserver-xorg-core libx11-xcb1 libxcb-dri3-0 libxdamage1 libxfixes3 libxv1 libxtst6 libxext6 ``` Install additional dependencies if using Ubuntu ≥ 22.04 (Mint 21) or a higher equivalent version of another operating system: