Merge branch 'main' into start-after

selkies-project · Dec 19, 2024 · 4f40752 · 4f40752
2 parents 8510942 + 02d6b3c
commit 4f40752
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/addons/conda/build/meta.yaml b/addons/conda/build/meta.yaml
@@ -3,7 +3,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 {% set name = "selkies-gstreamer" %}
-{% set gstreamer_version = "1.24.9" %}
+{% set gstreamer_version = "1.24.10" %}
 {% set python = "3.12" %}
 {% set posix = 'm2-' if win else '' %}
 
@@ -33,7 +33,6 @@ build:
 
 outputs:
   - name: "{{ name|lower }}"
-    type: conda_v2
 
 requirements:
   build:

diff --git a/addons/gstreamer/Dockerfile b/addons/gstreamer/Dockerfile
@@ -82,7 +82,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 
 # GStreamer monorepo build with prefix for standalone install
 WORKDIR /src
-ARG GSTREAMER_VERSION=1.24.9
+ARG GSTREAMER_VERSION=1.24.10
 RUN if { [ "$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" = "ubuntu" ] && [ "$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" \> "20.04" ]; } || { [ "$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" = "debian" ] && [ "$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" \> "11" ]; }; then export GSTREAMER_EXTRA_ARGS="-Dgst-plugins-bad:aom=enabled ${GSTREAMER_EXTRA_ARGS}"; else export GSTREAMER_EXTRA_ARGS="${GSTREAMER_EXTRA_ARGS}"; fi && \
     if { [ "$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" = "ubuntu" ] && [ "$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" \> "22.04" ]; } || { [ "$(grep '^ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" = "debian" ] && [ "$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2 | tr -d '\"')" \> "12" ]; }; then export GSTREAMER_EXTRA_ARGS="-Dgst-plugins-bad:svtav1=enabled ${GSTREAMER_EXTRA_ARGS}"; fi && \
     curl --proto '=https' --tlsv1.2 -fsSL "https://sh.rustup.rs" | sh -s -- -y && \