LAB-linuxserver/docker-ffmpeg
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ffmpeg.git synced 2026-02-20 04:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from linuxserver/jammy-bin

Browse Source
This commit is contained in:
Adam 2022-12-18 15:34:06 +00:00 committed by GitHub
commit 24420a18c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/call_invalid_helper.yml vendored Normal file
View File

@ -0,0 +1,12 @@
name: Comment on invalid interaction
on:
issues:
types:
- labeled
jobs:
add-comment-on-invalid:
if: github.event.label.name == 'invalid'
permissions:
issues: write
uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
secrets: inherit

2
.github/workflows/external_trigger.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
fi
echo "**** External trigger running off of bin branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_FFMPEG_BIN\". ****"
echo "**** Retrieving external version ****"
EXT_RELEASE=$(echo 4.4)
EXT_RELEASE=$(echo 5.1.2)
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for ffmpeg branch bin"

34
Dockerfile
View File

@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal as buildstage
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage
# set version label
ARG FFMPEG_VERSION
@ -12,14 +14,14 @@ ENV \
ENV \
AOM=v1.0.0 \
FDKAAC=2.0.1 \
FFMPEG_HARD=4.4 \
FFMPEG_HARD=5.1.2 \
FONTCONFIG=2.13.92 \
FREETYPE=2.9.1 \
FRIBIDI=1.0.8 \
KVAZAAR=2.0.0 \
LAME=3.100 \
LIBASS=0.14.0 \
LIBDRM=2.4.100 \
LIBDRM=2.4.114 \
LIBVA=2.6.0 \
LIBVDPAU=1.2 \
LIBVIDSTAB=1.1.0 \
@ -42,9 +44,7 @@ RUN \
autoconf \
automake \
bzip2 \
ca-certificates \
cmake \
curl \
diffutils \
doxygen \
g++ \
@ -53,7 +53,7 @@ RUN \
gperf \
libexpat1-dev \
libxext-dev \
libgcc-7-dev \
libgcc-10-dev \
libgomp1 \
libpciaccess-dev \
libssl-dev \
@ -67,7 +67,6 @@ RUN \
ocl-icd-opencl-dev \
perl \
pkg-config \
python \
python3 \
python3-pip\
python3-setuptools \
@ -224,16 +223,16 @@ RUN \
echo "**** grabbing libdrm ****" && \
mkdir -p /tmp/libdrm && \
curl -Lf \
https://dri.freedesktop.org/libdrm/libdrm-${LIBDRM}.tar.gz | \
tar -zx --strip-components=1 -C /tmp/libdrm
https://dri.freedesktop.org/libdrm/libdrm-${LIBDRM}.tar.xz | \
tar -xJ --strip-components=1 -C /tmp/libdrm
RUN \
echo "**** compiling libdrm ****" && \
cd /tmp/libdrm && \
./configure \
--disable-static \
--enable-shared && \
make && \
make install
meson \
-Dvalgrind=disabled \
. build && \
ninja -C build && \
ninja -C build install
RUN \
echo "**** grabbing libva ****" && \
mkdir -p /tmp/libva && \
@ -476,7 +475,6 @@ RUN \
--disable-doc \
--disable-ffplay \
--enable-ffprobe \
--enable-avresample \
--enable-cuvid \
--enable-gpl \
--enable-libaom \
@ -516,7 +514,7 @@ RUN \
ldconfig && \
mkdir -p \
/buildout/usr/local/bin \
/buildout/usr/lib \
/buildout/usr/lib/x86_64-linux-gnu \
/buildout/etc/OpenCL/vendors && \
cp \
/tmp/ffmpeg/ffmpeg \
@ -528,8 +526,8 @@ RUN \
| awk '/local/ {print $3}' \
| xargs -i cp -L {} /buildout/usr/lib/ && \
cp -a \
/usr/local/lib/libdrm_* \
/buildout/usr/lib/ && \
/usr/local/lib/x86_64-linux-gnu/libdrm_* \
/buildout/usr/lib/x86_64-linux-gnu/ && \
echo \
'libnvidia-opencl.so.1' > \
/buildout/etc/OpenCL/vendors/nvidia.icd

15
Dockerfile.aarch64
View File

@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal as buildstage
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy as buildstage
# set version label
ARG FFMPEG_VERSION
@ -12,13 +14,13 @@ ENV \
ENV \
AOM=v1.0.0 \
FDKAAC=2.0.1 \
FFMPEG_HARD=4.4 \
FFMPEG_HARD=5.1.2 \
FREETYPE=2.9.1 \
FRIBIDI=1.0.8 \
KVAZAAR=2.0.0 \
LAME=3.100 \
LIBASS=0.14.0 \
LIBDRM=2.4.98 \
LIBDRM=2.4.114 \
LIBVA=2.6.0 \
LIBVDPAU=1.2 \
LIBVIDSTAB=1.1.0 \
@ -40,9 +42,7 @@ RUN \
autoconf \
automake \
bzip2 \
ca-certificates \
cmake \
curl \
diffutils \
g++ \
gcc \
@ -51,7 +51,7 @@ RUN \
libexpat1-dev \
libfontconfig1-dev \
libxext-dev \
libgcc-7-dev \
libgcc-10-dev \
libgomp1 \
libpciaccess-dev \
libssl-dev \
@ -63,7 +63,7 @@ RUN \
nasm \
perl \
pkg-config \
python \
python3 \
x11proto-xext-dev \
xserver-xorg-dev \
yasm \
@ -386,7 +386,6 @@ RUN \
--disable-doc \
--disable-ffplay \
--enable-ffprobe \
--enable-avresample \
--enable-gpl \
--enable-libaom \
--enable-libass \

15
Dockerfile.armhf
View File

@ -1,4 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal as buildstage
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy as buildstage
# set version label
ARG FFMPEG_VERSION
@ -12,13 +14,13 @@ ENV \
ENV \
AOM=v1.0.0 \
FDKAAC=2.0.1 \
FFMPEG_HARD=4.4 \
FFMPEG_HARD=5.1.2 \
FREETYPE=2.9.1 \
FRIBIDI=1.0.8 \
KVAZAAR=2.0.0 \
LAME=3.100 \
LIBASS=0.14.0 \
LIBDRM=2.4.98 \
LIBDRM=2.4.114 \
LIBVA=2.6.0 \
LIBVDPAU=1.2 \
LIBVIDSTAB=1.1.0 \
@ -40,9 +42,7 @@ RUN \
autoconf \
automake \
bzip2 \
ca-certificates \
cmake \
curl \
diffutils \
g++ \
gcc \
@ -51,7 +51,7 @@ RUN \
libexpat1-dev \
libfontconfig1-dev \
libxext-dev \
libgcc-7-dev \
libgcc-10-dev \
libgomp1 \
libpciaccess-dev \
libssl-dev \
@ -63,7 +63,7 @@ RUN \
nasm \
perl \
pkg-config \
python \
python3 \
x11proto-xext-dev \
xserver-xorg-dev \
yasm \
@ -396,7 +396,6 @@ RUN \
--disable-doc \
--disable-ffplay \
--enable-ffprobe \
--enable-avresample \
--enable-gpl \
--enable-libaom \
--enable-libass \

2
Jenkinsfile vendored
View File

@ -97,7 +97,7 @@ pipeline {
steps{
script{
env.EXT_RELEASE = sh(
script: ''' echo 4.4 ''',
script: ''' echo 5.1.2 ''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}

2
jenkins-vars.yml
View File

@ -2,7 +2,7 @@
# jenkins variables
project_name: docker-ffmpeg
external_type: na
custom_version_command: "echo 4.4"
custom_version_command: "echo 5.1.2"
release_type: prerelease
release_tag: bin
ls_branch: bin