Rebase to Jammy, bump to 5.1.2

This commit is contained in:
TheSpad 2022-12-13 22:12:02 +00:00
parent 763cf5a481
commit 5482bc226d
No known key found for this signature in database
GPG Key ID: 08F06191F4587860
7 changed files with 31 additions and 18 deletions

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

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"

View File

@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage
# set version label
@ -42,7 +44,6 @@ RUN \
autoconf \
automake \
bzip2 \
ca-certificates \
cmake \
diffutils \
doxygen \

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 \

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 \

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'
}

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