Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest VAAPI for building ffmpeg on linux (x86, x86_64) #1296

Merged
merged 8 commits into from
May 5, 2023
7 changes: 5 additions & 2 deletions .github/actions/deploy-centos/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Deploy on CentOS
description: Deploy on CentOS
runs:
using: composite
steps:
Expand Down Expand Up @@ -26,7 +27,9 @@ runs:
if [[ "$CENTOS_VERSION" == "6" ]]; then
sed -i 's/mirror\.centos\.org\/centos/vault.centos.org/g;s/6\/sclo/6.10\/sclo/g;s/mirrorlist/#mirrorlist/g;s/#baseurl/baseurl/g' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
fi
yum -y install $SCL_ENABLE rh-java-common-ant boost-devel ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python3-devel python3-pip swig file which wget unzip tar bzip2 gzip xz patch autoconf-archive automake make libtool bison flex perl-core nasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel curl-devel expat-devel gettext-devel openssl-devel bzip2-devel zlib-devel SDL2-devel libva-devel libxkbcommon-devel libxkbcommon-x11-devel xcb-util* fontconfig-devel libffi-devel ragel ocl-icd-devel GeoIP-devel pcre-devel ssdeep-devel yajl-devel
curl -L "https://negativo17.org/repos/epel-multimedia.repo" -o /etc/yum.repos.d/epel-multimedia.repo
saudet marked this conversation as resolved.
Show resolved Hide resolved
yum -y install $SCL_ENABLE deltarpm rh-java-common-ant boost-devel ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python3-devel python3-pip swig file which wget unzip tar bzip2 gzip xz patch autoconf-archive automake make libtool bison flex perl-core nasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel curl-devel expat-devel gettext-devel openssl-devel bzip2-devel zlib-devel SDL2-devel libva-devel libxkbcommon-devel libxkbcommon-x11-devel xcb-util* fontconfig-devel libffi-devel ragel ocl-icd-devel GeoIP-devel pcre-devel ssdeep-devel yajl-devel

# https://gcc.gnu.org/legacy-ml/gcc-patches/2018-01/msg01962.html
sed -i 's/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/g' /opt/rh/devtoolset-9/root/usr/lib/gcc/x86_64-redhat-linux/9/include/avx512fintrin.h
source scl_source enable $SCL_ENABLE || true
Expand Down Expand Up @@ -193,7 +196,7 @@ runs:
echo Fetching $GITHUB_REPOSITORY@$GITHUB_SHA
git init
git fetch --depth 1 https://github.com/$GITHUB_REPOSITORY $GITHUB_SHA
git checkout $GITHUB_SHA
git reset --hard $GITHUB_SHA
git submodule update --init --recursive
git submodule foreach --recursive 'git reset --hard'

Expand Down
1 change: 1 addition & 0 deletions .github/actions/deploy-ubuntu/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Deploy on Ubuntu
description: Deploy on Ubuntu
runs:
using: composite
steps:
Expand Down
26 changes: 18 additions & 8 deletions .github/workflows/ffmpeg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,35 @@ jobs:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
- uses: actions/checkout@v3
- uses: ./.github/actions/deploy-centos
android-arm64:
runs-on: ubuntu-20.04
container: centos:7
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
- uses: actions/checkout@v3
- uses: ./.github/actions/deploy-centos
android-x86:
runs-on: ubuntu-20.04
container: centos:7
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
- uses: actions/checkout@v3
- uses: ./.github/actions/deploy-centos
android-x86_64:
runs-on: ubuntu-20.04
container: centos:7
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
- uses: actions/checkout@v3
- uses: ./.github/actions/deploy-centos
linux-armhf:
runs-on: ubuntu-20.04
container: ubuntu:bionic
Expand All @@ -76,20 +80,26 @@ jobs:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
linux-x86:
runs-on: ubuntu-20.04
container: centos:7
container:
image: centos:7
options: --privileged
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
- uses: actions/checkout@v3
- uses: ./.github/actions/deploy-centos
linux-x86_64:
runs-on: ubuntu-20.04
container: centos:7
container:
image: centos:7
options: --privileged
strategy:
matrix:
ext: ["", -gpl]
steps:
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
- uses: actions/checkout@v3
- uses: ./.github/actions/deploy-centos
macosx-arm64:
runs-on: macos-11
strategy:
Expand Down