Skip to content

Commit bb54b70

Browse files
committed
fix build error
1 parent 1dcc6c2 commit bb54b70

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

scripts.d/50-ffnvcodec.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ SCRIPT_COMMIT4="9934f17316b66ce6de12f3b82203a298bc9351d8"
1616
SCRIPT_BRANCH4="sdk/12.2"
1717

1818
ffbuild_enabled() {
19-
# [[ $TARGET == winarm64 ]] && return -1
20-
# return 0
21-
return -1
19+
[[ $TARGET == winarm64 ]] && return -1
20+
return 0
2221
}
2322

2423
ffbuild_dockerdl() {
@@ -29,15 +28,16 @@ ffbuild_dockerdl() {
2928
}
3029

3130
ffbuild_dockerbuild() {
32-
if [[ $ADDINS_STR == *4.4* || $ADDINS_STR == *5.0* || $ADDINS_STR == *5.1* || $ADDINS_STR == *6.0* || $ADDINS_STR == *6.1* ]]; then
33-
cd ffnvcodec2
34-
elif [[ $ADDINS_STR == *7.0* ]]; then
35-
cd ffnvcodec3
36-
elif [[ $ADDINS_STR == *7.1* ]]; then
37-
cd ffnvcodec4
38-
else
39-
cd ffnvcodec
40-
fi
31+
# if [[ $ADDINS_STR == *4.4* || $ADDINS_STR == *5.0* || $ADDINS_STR == *5.1* || $ADDINS_STR == *6.0* || $ADDINS_STR == *6.1* ]]; then
32+
# cd ffnvcodec2
33+
# elif [[ $ADDINS_STR == *7.0* ]]; then
34+
# cd ffnvcodec3
35+
# elif [[ $ADDINS_STR == *7.1* ]]; then
36+
# cd ffnvcodec4
37+
# else
38+
# cd ffnvcodec
39+
# fi
40+
cd ffnvcodec2
4141

4242
make PREFIX="$FFBUILD_PREFIX" install
4343
}

scripts.d/50-vulkan/45-vulkan.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ SCRIPT_COMMIT="v1.4.324"
55
SCRIPT_TAGFILTER="v?.*.*"
66

77
ffbuild_enabled() {
8-
[[ $ADDINS_STR == *4.4* ]] && return -1
9-
return 0
8+
# [[ $ADDINS_STR == *4.4* ]] && return -1
9+
# return 0
10+
return -1
1011
}
1112

1213
ffbuild_dockerbuild() {

scripts.d/50-vulkan/99-enable.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
SCRIPT_SKIP="1"
44

55
ffbuild_enabled() {
6-
[[ $ADDINS_STR == *4.4* ]] && return -1
7-
return 0
6+
# [[ $ADDINS_STR == *4.4* ]] && return -1
7+
# return 0
8+
return -1
89
}
910

1011
ffbuild_dockerdl() {

0 commit comments

Comments
 (0)