Skip to content

Commit 9d7e78f

Browse files
committed
test
1 parent e6e6509 commit 9d7e78f

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,10 @@ jobs:
8282
- name: Pack
8383
shell: msys2 {0}
8484
run: |
85+
CWD=$(pwd)
8586
cd /usr/local
86-
zip -9 ../${{env.name}}.zip -r .
87-
cd ..
87+
zip -9 ${CWD}/${{env.name}}.zip -r .
88+
cd ${CWD}
8889
sha1sum ${{env.name}}.zip >${{env.name}}.sha1
8990
./build-changelog.sh > changelog
9091
- name: Release

build.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ git -C x265_git apply ../x265_git.patch
4242

4343
if [ "$BUILD_LICENSE" == "gpl" ]; then
4444

45+
if [ "$BUILD_ARCH" == arm ]; then
46+
X265_ARGS="$X265_ARGS -DCMAKE_SYSTEM_PROCESSOR=armv7l -DENABLE_ASSEMBLY=ON -DCROSS_COMPILE_ARM=ON"
47+
elif [ "$BUILD_ARCH" == arm64 ]; then
48+
X265_ARGS="$X265_ARGS -DCMAKE_SYSTEM_PROCESSOR=arm64 -DENABLE_ASSEMBLY=ON -DCROSS_COMPILE_ARM64=ON"
49+
fi
50+
51+
git -C x265_git fetch --tags
52+
./build-cmake-dep.sh x265_git/source -DENABLE_SHARED=on -DENABLE_CLI=off $X265_ARGS
53+
FF_ARGS="$FF_ARGS --enable-libx265"
54+
4555
if [[ "$BUILD_ARCH" =~ arm ]]; then
4656
X264_ARGS="--disable-asm"
4757
fi
@@ -52,16 +62,6 @@ if [ "$BUILD_LICENSE" == "gpl" ]; then
5262
if [ "$BUILD_TYPE" == "static" ]; then
5363
X265_ARGS="-DSTATIC_LINK_CRT=on"
5464
fi
55-
56-
if [ "$BUILD_ARCH" == arm ]; then
57-
X265_ARGS="$X265_ARGS -DCMAKE_SYSTEM_PROCESSOR=armv7l -DENABLE_ASSEMBLY=ON -DCROSS_COMPILE_ARM=ON"
58-
elif [ "$BUILD_ARCH" == arm64 ]; then
59-
X265_ARGS="$X265_ARGS -DCMAKE_SYSTEM_PROCESSOR=arm64 -DENABLE_ASSEMBLY=ON -DCROSS_COMPILE_ARM64=ON"
60-
fi
61-
62-
git -C x265_git fetch --tags
63-
./build-cmake-dep.sh x265_git/source -DENABLE_SHARED=on -DENABLE_CLI=off $X265_ARGS
64-
FF_ARGS="$FF_ARGS --enable-libx265"
6565
fi
6666

6767
./build-make-dep.sh nv-codec-headers

0 commit comments

Comments
 (0)