Skip to content

Commit

Permalink
Require libyuv by default.
Browse files Browse the repository at this point in the history
It can still be disabled with -DAVIF_LIBYUV=OFF.
Also bump libyuv.
  • Loading branch information
vrabaud committed Feb 19, 2024
1 parent 9756207 commit 777cbca
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci-unix-shared-installed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
- name: Set GCC & G++ compiler (on Linux)
if: runner.os == 'Linux'
run: echo "CC=gcc-${{matrix.gcc}}" >> $GITHUB_ENV && echo "CXX=g++-${{matrix.gcc}}" >> $GITHUB_ENV
- name: Disable libyuv on macOS
if: runner.os == 'macOS'
run: echo "CMAKE_AVIF_FLAGS=\"-DAVIF_LIBYUV=OFF\"" >> $GITHUB_ENV

- name: Cache external dependencies
id: cache-ext
Expand Down Expand Up @@ -76,7 +79,7 @@ jobs:
-DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
-DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_LOCAL_GTEST=ON
-DAVIF_BUILD_GDK_PIXBUF=ON -DCMAKE_INSTALL_PREFIX=./install
-DAVIF_ENABLE_WERROR=ON
-DAVIF_ENABLE_WERROR=ON ${{ env.CMAKE_AVIF_FLAGS }}
- name: Build libavif (ninja)
working-directory: ./build
run: ninja
Expand Down Expand Up @@ -114,7 +117,8 @@ jobs:
-DAVIF_ENABLE_WUNUSED_RESULT=ON -DAVIF_ENABLE_WERROR=ON
-DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
-DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_LOCAL_GTEST=ON
-DAVIF_BUILD_GDK_PIXBUF=ON -DCMAKE_INSTALL_PREFIX=./install
-DAVIF_BUILD_GDK_PIXBUF=ON ${{ env.CMAKE_AVIF_FLAGS }}
-DCMAKE_INSTALL_PREFIX=./install
- name: Build libavif with [[nodiscard]] (ninja)
working-directory: ./build_nodiscard
run: ninja
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ The changes are relative to the previous release, unless the baseline is specifi
* Add enum aliases AVIF_COLOR_PRIMARIES_SRGB, AVIF_COLOR_PRIMARIES_BT2100,
AVIF_COLOR_PRIMARIES_DCI_P3, AVIF_TRANSFER_CHARACTERISTICS_PQ.
* Add avifResult enum entry AVIF_RESULT_INTERNAL_ERROR.
* Have libyuv required by default (but it still can be disabled with
-DAVIF_LIBYUV=OFF).

### Changed since 1.0.0
* Update aom.cmd: v3.8.1
* Update dav1d.cmd: 1.4.0
* Update libgav1.cmd: v0.19.0
* Update libyuv.cmd: a6a2ec65
* Update rav1e.cmd: v0.7.0
* Update svt.cmd/svt.sh: v1.7.0
* Update zlibpng.cmd: zlib 1.3 and libpng 1.6.40
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ if(AVIF_JPEG STREQUAL "LOCAL")
include(LocalJpeg)
endif()

set_local_or_system_option("LIBYUV" "OFF" "Use libyuv.")
set_local_or_system_option("LIBYUV" "SYSTEM" "Use libyuv.")
check_avif_option(AVIF_LIBYUV TARGET yuv::yuv PKG_NAME libyuv)
if(AVIF_LIBYUV_ENABLED)
# libyuv 1755 exposed all of the I*Matrix() functions, which libavif relies on.
Expand Down
2 changes: 1 addition & 1 deletion ext/libyuv.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cd libyuv
: # When changing the commit below to a newer version of libyuv, it is best to make sure it is being used by chromium,
: # because the test suite of chromium provides additional test coverage of libyuv.
: # It can be looked up at https://source.chromium.org/chromium/chromium/src/+/main:DEPS?q=libyuv.
git checkout 464c51a0
git checkout a6a2ec65

mkdir build
cd build
Expand Down

0 comments on commit 777cbca

Please sign in to comment.