Skip to content

Commit

Permalink
add x265 dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
zoff99 committed Mar 15, 2024
1 parent 89b5e56 commit 2030c6b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/amalgamation_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
libavformat-dev \
libavfilter-dev \
libx264-dev \
libx265-dev \
libasan4
- name: compile test without ToxAV
Expand All @@ -48,7 +49,7 @@ jobs:
- name: compile test with ToxAV
run: |
cd amalgamation
gcc -O3 -fPIC -g -fsanitize=address -fno-omit-frame-pointer amalgamation_test.c -DTEST_WITH_TOXAV $(pkg-config --cflags --libs libsodium opus vpx libavcodec libavutil x264) -pthread -o amalgamation_test_av
gcc -O3 -fPIC -g -fsanitize=address -fno-omit-frame-pointer amalgamation_test.c -DTEST_WITH_TOXAV $(pkg-config --cflags --libs libsodium opus vpx libavcodec libavutil x264 x265) -pthread -o amalgamation_test_av
- name: check binary with ToxAV
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ jobs:
libavcodec-dev \
libavformat-dev \
libavfilter-dev \
libx264-dev
libx264-dev \
libx265-dev
- run: git submodule update --init --recursive
- run: CC=clang .circleci/cmake-asan

Expand Down Expand Up @@ -59,6 +60,7 @@ jobs:
libavcodec-dev \
libavformat-dev \
libavfilter-dev \
libx264-dev
libx264-dev \
libx265-dev
- run: git submodule update --init --recursive
- run: CC=clang .circleci/cmake-tsan
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
languages: ${{ matrix.language }}

- name: install deps
run: sudo apt-get update ; sudo apt-get install -y --force-yes --no-install-recommends cmake libconfig-dev libgtest-dev libopus-dev libsodium-dev libvpx-dev pkg-config binutils libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libx264-dev
run: sudo apt-get update ; sudo apt-get install -y --force-yes --no-install-recommends cmake libconfig-dev libgtest-dev libopus-dev libsodium-dev libvpx-dev pkg-config binutils libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libx264-dev libx265-dev
- name: Autobuild
uses: github/codeql-action/autobuild@v3

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/custom_tests_asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
libavcodec-dev \
libavformat-dev \
libavfilter-dev \
libx264-dev
libx264-dev \
libx265-dev
- name: setup tor
run: |
sudo /etc/init.d/tor restart
Expand Down Expand Up @@ -76,8 +77,8 @@ jobs:
rm -f test
clang -g -O1 -fno-omit-frame-pointer -fsanitize=address \
-Wno-everything -Wno-missing-variable-declarations \
$(pkg-config --cflags toxcore libavcodec libavutil x264 opus vpx libsodium) \
$(pkg-config --libs toxcore libavcodec libavutil x264 opus vpx libsodium) \
$(pkg-config --cflags toxcore libavcodec libavutil x264 x265 opus vpx libsodium) \
$(pkg-config --libs toxcore libavcodec libavutil x264 x265 opus vpx libsodium) \
"$i" \
-o test
echo "RUN:--------------- ""$i"" ---------------"
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/custom_tests_tsan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
libavcodec-dev \
libavformat-dev \
libavfilter-dev \
libx264-dev
libx264-dev \
libx265-dev
- name: setup tor
run: |
sudo /etc/init.d/tor restart
Expand Down Expand Up @@ -88,8 +89,8 @@ jobs:
rm -f test
clang -g -O1 -fno-omit-frame-pointer -fsanitize=thread \
-Wno-everything -Wno-missing-variable-declarations \
$(pkg-config --cflags toxcore libavcodec libavutil x264 opus vpx libsodium) \
$(pkg-config --libs toxcore libavcodec libavutil x264 opus vpx libsodium) \
$(pkg-config --cflags toxcore libavcodec libavutil x264 x265 opus vpx libsodium) \
$(pkg-config --libs toxcore libavcodec libavutil x264 x265 opus vpx libsodium) \
"$i" \
-o test
echo "RUN:--------------- ""$i"" ---------------"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ jobs:
libavcodec-dev \
libavformat-dev \
libavfilter-dev \
libx264-dev
libx264-dev \
libx265-dev
- run: .localrun/run_tcc.sh

- name: Run the test
Expand Down

0 comments on commit 2030c6b

Please sign in to comment.