Skip to content

Commit 7fa8a93

Browse files
committed
CI Linux: download rav1e build instead of building own
Building rav1e requires nasm 2.15 (if asm is not disabled) while U20 has just 2.14.02, so that the build in CI currently fails, anyways. Pick sse4 for now but expect using avx2 version later, depending on UG_ARCH value. \+ populate PKG_CONFIG_PATH immediately
1 parent 0f47917 commit 7fa8a93

File tree

4 files changed

+18
-26
lines changed

4 files changed

+18
-26
lines changed

.github/scripts/Linux/install_others.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,21 @@ install_pipewire() {(
7878
fi
7979
)}
8080

81+
install_rav1e() {(
82+
# TODO: use avx2 later
83+
if expr "${UG_ARCH-}" : '.*avx' >/dev/null; then
84+
avx2=avx2
85+
fi
86+
fpattern="librav1e.*linux-${avx2-sse4}.tar.gz"
87+
"${GITHUB_WORKSPACE-.}"/.github/scripts/download-gh-asset.sh xiph/rav1e \
88+
"$fpattern" librav1e.tar.gz
89+
sudo tar xaf librav1e.tar.gz -C /usr/local
90+
sudo rm -rf /usr/local/lib/librav1e.so*
91+
sudo sed -i -e 's-prefix=dist-prefix=/usr/local-' \
92+
-e 's/-lrav1e/-lrav1e -lm -pthread/' \
93+
/usr/local/lib/pkgconfig/rav1e.pc
94+
)}
95+
8196
# FFmpeg master needs at least v1.3.238 as for 23th Aug '23
8297
install_vulkan() {(
8398
# TOREMOVE: FFmpeg doesn't currently build with main (2024-02-09)
@@ -101,7 +116,7 @@ if [ $# -eq 1 ] && { [ "$1" = -h ] || [ "$1" = --help ] || [ "$1" = help ]; }; t
101116
fi
102117

103118
if [ $# -eq 0 ] || [ $show_help ]; then
104-
set -- aja gpujpeg live555 ndi pipewire vulkan ximea
119+
set -- aja gpujpeg live555 ndi pipewire rav1e vulkan ximea
105120
fi
106121

107122
if [ $show_help ]; then

.github/scripts/Linux/prepare.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/bash -eux
22

3+
export PKG_CONFIG_PATH=/usr/local/qt/lib/pkgconfig:/usr/local/lib/pkgconfig
34
printf "%b" "AJA_DIRECTORY=/var/tmp/ntv2\n\
45
CPATH=/usr/local/qt/include\n\
56
LIBRARY_PATH=/usr/local/qt/lib\n\
6-
PKG_CONFIG_PATH=/usr/local/qt/lib/pkgconfig\n" >> "$GITHUB_ENV"
7+
PKG_CONFIG_PATH=$PKG_CONFIG_PATH\n" >> "$GITHUB_ENV"
78
printf "/usr/local/qt/bin\n" >> "$GITHUB_PATH"
89

910
git config --global user.name "UltraGrid Builder"

.github/scripts/Linux/rav1e.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/ccpp.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,6 @@ jobs:
7676
run: |
7777
. .github/scripts/environment.sh
7878
.github/scripts/Linux/prepare.sh
79-
- name: Cache rav1e
80-
id: cache-rav1e
81-
uses: actions/cache@main
82-
with:
83-
path: rav1e
84-
key: cache-rav1e-${{ runner.os }}-${{ hashFiles('.github/scripts/Linux/rav1e.sh') }}
85-
- name: Build rav1e
86-
if: steps.cache-rav1e.outputs.cache-hit != 'true'
87-
run: .github/scripts/Linux/rav1e.sh
88-
- name: Install rav1e
89-
run: |
90-
sudo cp -r rav1e/install/* /
91-
sudo ldconfig
9279
- name: Cache FFmpeg
9380
id: cache-ffmpeg
9481
uses: actions/cache@main

0 commit comments

Comments
 (0)