Skip to content

Commit a0654eb

Browse files
committed
chore: update branch names in scripts and add new scripts
* Changed GIT_BRANCH values to remove 'release/' prefix in 6.0.sh, 6.1.sh, 7.0.sh, and 7.1.sh. * Added new scripts: 50-mpp.sh and 50-rkrga.sh for additional functionality. * Updated build configurations to streamline the build process.
1 parent 25337e9 commit a0654eb

File tree

7 files changed

+122
-16
lines changed

7 files changed

+122
-16
lines changed

.github/workflows/build.yml

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ name: Build FFmpeg
33
on:
44
push:
55
paths-ignore:
6-
- '**.md'
7-
- 'LICENSE'
6+
- "**.md"
7+
- "LICENSE"
88
workflow_dispatch:
99
inputs:
1010
doRelease:
11-
description: 'Publish new release'
11+
description: "Publish new release"
1212
type: boolean
1313
default: false
1414
required: false
1515
buildOnly:
16-
description: 'Only build ffmpeg'
16+
description: "Only build ffmpeg"
1717
type: boolean
1818
default: false
1919
required: false
2020
schedule:
21-
- cron: '0 12 * * *'
21+
- cron: "0 12 * * *"
2222

2323
env:
2424
DOCKER_BUILDKIT: 1
@@ -32,7 +32,7 @@ jobs:
3232
- name: Repo Check
3333
if: ${{ github.event_name == 'schedule' }}
3434
run: |
35-
if [[ "$GITHUB_REPOSITORY" != "BtbN/FFmpeg-Builds" ]]; then
35+
if [[ "$GITHUB_REPOSITORY" != "BenLocal/FFmpeg-Builds" ]]; then
3636
echo "When forking this repository to make your own builds, you have to adjust this check."
3737
echo "When doing so make sure to randomize the scheduled cron time above, in order to spread out the various build times as much as possible."
3838
echo "This has been put in place due to the enormous amounts of traffic hundreds/thousands of parallel builds can cause on external infrastructure."
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
fail-fast: false
5454
matrix:
55-
runner: [ubuntu-latest,ubuntu-24.04-arm]
55+
runner: [ubuntu-latest, ubuntu-24.04-arm]
5656
runs-on: ${{ matrix.runner }}
5757
steps:
5858
- name: Free Disk-Space
@@ -132,7 +132,7 @@ jobs:
132132
strategy:
133133
fail-fast: false
134134
matrix:
135-
target: [win64,winarm64,linux64,linuxarm64]
135+
target: [linux64, linuxarm64]
136136
steps:
137137
- name: Free Disk-Space
138138
run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
@@ -187,8 +187,22 @@ jobs:
187187
strategy:
188188
fail-fast: false
189189
matrix:
190-
target: [win64,winarm64,linux64,linuxarm64]
191-
variant: [gpl,lgpl,gpl 6.1,gpl 7.1,lgpl 6.1,lgpl 7.1,gpl-shared,lgpl-shared,gpl-shared 6.1,gpl-shared 7.1,lgpl-shared 6.1,lgpl-shared 7.1]
190+
target: [linux64, linuxarm64]
191+
variant:
192+
[
193+
gpl,
194+
lgpl,
195+
gpl 6.1,
196+
gpl 7.1,
197+
lgpl 6.1,
198+
lgpl 7.1,
199+
gpl-shared,
200+
lgpl-shared,
201+
gpl-shared 6.1,
202+
gpl-shared 7.1,
203+
lgpl-shared 6.1,
204+
lgpl-shared 7.1,
205+
]
192206
steps:
193207
- name: Free Disk-Space
194208
run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
@@ -252,8 +266,22 @@ jobs:
252266
strategy:
253267
fail-fast: false
254268
matrix:
255-
target: [win64,winarm64,linux64,linuxarm64]
256-
variant: [gpl,lgpl,gpl 6.1,gpl 7.1,lgpl 6.1,lgpl 7.1,gpl-shared,lgpl-shared,gpl-shared 6.1,gpl-shared 7.1,lgpl-shared 6.1,lgpl-shared 7.1]
269+
target: [linux64, linuxarm64]
270+
variant:
271+
[
272+
gpl,
273+
lgpl,
274+
gpl 6.1,
275+
gpl 7.1,
276+
lgpl 6.1,
277+
lgpl 7.1,
278+
gpl-shared,
279+
lgpl-shared,
280+
gpl-shared 6.1,
281+
gpl-shared 7.1,
282+
lgpl-shared 6.1,
283+
lgpl-shared 7.1,
284+
]
257285
steps:
258286
- name: Free Disk-Space
259287
run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
@@ -269,6 +297,8 @@ jobs:
269297
run: |
270298
T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
271299
./build.sh ${{ matrix.target }} ${{ matrix.variant }}
300+
env:
301+
FFMPEG_REPO: https://github.com/nyanmisaka/ffmpeg-rockchip.git
272302
- name: Replace spaces in string
273303
id: strs
274304
run: |

addins/6.0.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
GIT_BRANCH="release/6.0"
2+
GIT_BRANCH="6.0"

addins/6.1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
GIT_BRANCH="release/6.1"
2+
GIT_BRANCH="6.1"

addins/7.0.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
GIT_BRANCH="release/7.0"
2+
GIT_BRANCH="7.0"

addins/7.1.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
GIT_BRANCH="release/7.1"
2+
GIT_BRANCH="7.1"

scripts.d/51-rk/50-mpp.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
3+
SCRIPT_REPO="https://github.com/nyanmisaka/mpp.git"
4+
5+
ffbuild_enabled() {
6+
[[ $TARGET != linux* ]] && return -1
7+
return 0
8+
}
9+
10+
ffbuild_dockerdl() {
11+
echo "git clone -b jellyfin-mpp --depth=1 \"$SCRIPT_REPO\" ."
12+
}
13+
14+
ffbuild_dockerbuild() {
15+
mkdir build && cd build
16+
cmake \
17+
-DCMAKE_INSTALL_PREFIX=/usr \
18+
-DCMAKE_BUILD_TYPE=Release \
19+
-DBUILD_SHARED_LIBS=ON \
20+
-DBUILD_TEST=OFF
21+
make -j $(nproc)
22+
make install
23+
}
24+
25+
ffbuild_configure() {
26+
echo --enable-rkmpp
27+
}
28+
29+
ffbuild_unconfigure() {
30+
echo --disable-rkmpp
31+
}

scripts.d/51-rk/50-rkrga.sh

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/bin/bash
2+
3+
SCRIPT_REPO="https://github.com/nyanmisaka/rk-mirrors.git"
4+
5+
ffbuild_enabled() {
6+
[[ $TARGET != linux* ]] && return -1
7+
return 0
8+
}
9+
10+
ffbuild_dockerdl() {
11+
echo "git clone -b jellyfin-rga --depth=1 \"$SCRIPT_REPO\" rkrga"
12+
}
13+
14+
ffbuild_dockerbuild() {
15+
local myconf=(
16+
--prefix="$FFBUILD_PREFIX"
17+
--libdir=lib
18+
--buildtype=release
19+
--default-library=shared
20+
-Dcpp_args=-fpermissive
21+
-Dlibdrm=false
22+
-Dlibrga_demo=false
23+
)
24+
25+
if [[ $TARGET == win* || $TARGET == linux* ]]; then
26+
myconf+=(
27+
--cross-file=/cross.meson
28+
)
29+
else
30+
echo "Unknown target"
31+
return -1
32+
fi
33+
34+
meson setup rkrga rkrga_build "${myconf[@]}"
35+
meson configure rkrga_build
36+
ninja -C rkrga_build install
37+
}
38+
39+
ffbuild_configure() {
40+
echo --enable-rkrga
41+
}
42+
43+
ffbuild_unconfigure() {
44+
echo --disable-rkrga
45+
}

0 commit comments

Comments
 (0)