Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libheif to 1.17.3 #166

Merged
merged 2 commits into from
Nov 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/analysis-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ jobs:

- name: Install from source
run: |
brew update && brew upgrade libheif
python3 -m pip -v install ".[dev]"

- name: LibHeif info
Expand Down Expand Up @@ -173,17 +174,11 @@ jobs:
- uses: msys2/setup-msys2@v2
with:
location: C:/temp
update: true
install: >-
mingw-w64-x86_64-binutils
mingw-w64-x86_64-libheif

- name: Build libheif and dependencies
shell: msys2 {0}
run: |
cd libheif/windows/mingw-w64-libheif
makepkg-mingw --syncdeps --noconfirm -f
pacman -U mingw-w64-x86_64-libheif-*-any.pkg.tar.zst --noconfirm

# In release or building from source we do not build `dav1d`,`rav1e` and `libSvtAv1Enc` libraries.
# Here we just test working with original package from MSYS.
- name: Copy DLLs from MSYS2
Expand All @@ -198,9 +193,12 @@ jobs:
cp ${{ env.MSYS2_PREFIX }}/bin/libgcc_s_seh-1.dll $site_packages/
cp ${{ env.MSYS2_PREFIX }}/bin/libstdc++-6.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libsharpyuv-0.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libdav1d.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libdav1d-7.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/rav1e.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libSvtAv1Enc.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libjpeg-8.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/libopenjp2-7.dll $site_packages/
cp -ErrorAction SilentlyContinue ${{ env.MSYS2_PREFIX }}/bin/zlib1.dll $site_packages/

- name: Install from source
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.

### Changed

- Libheif updated from `1.16.2` to `1.17.3` version. #166
- Minimum supported Pillow version raised to `9.2.0`.
- Linux: When building from source, `libheif` and other libraries are no longer try built automatically. #158
- Pi-Heif: As last libheif version `1.17.3` requires minimum `cmake>=3.16.3` dropped Debian `10 armv7` wheels. #160
Expand Down
8 changes: 4 additions & 4 deletions LICENSES_bundled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Binary wheels combine several license-compatible libraries. Here they are listed
Name: libheif
License: LGPLv3
Files: libheif.[dylib|so|dll]
For details, see https://github.com/strukturag/libheif/tree/v1.14.2/COPYING
Source code: https://github.com/strukturag/libheif/tree/v1.16.2
For details, see https://github.com/strukturag/libheif/tree/v1.17.3/COPYING
Source code: https://github.com/strukturag/libheif/tree/v1.17.3

Name: libde265
License: LGPLv3
Expand All @@ -23,5 +23,5 @@ Files: libx265.[dylib|so|dll]
Name: libaom
License: BSD 3-Clause
Files: libaom.[dylib|so|dll]
For details, see https://aomedia.googlesource.com/aom/+/refs/tags/v3.5.0/LICENSE
Source code: https://aomedia.googlesource.com/aom/+/refs/tags/v3.5.0
For details, see https://aomedia.googlesource.com/aom/+/refs/tags/v3.6.1/LICENSE
Source code: https://aomedia.googlesource.com/aom/+/refs/tags/v3.6.1
2 changes: 1 addition & 1 deletion libheif/linux_build_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
LIBX265_URL = "https://bitbucket.org/multicoreware/x265_git/get/0b75c44c10e605fe9e9ebed58f04a46271131827.tar.gz"
LIBAOM_URL = "https://aomedia.googlesource.com/aom/+archive/v3.6.1.tar.gz"
LIBDE265_URL = "https://github.com/strukturag/libde265/releases/download/v1.0.12/libde265-1.0.12.tar.gz"
LIBHEIF_URL = "https://github.com/strukturag/libheif/releases/download/v1.16.2/libheif-1.16.2.tar.gz"
LIBHEIF_URL = "https://github.com/strukturag/libheif/releases/download/v1.17.3/libheif-1.17.3.tar.gz"


def download_file(url: str, out_path: str) -> bool:
Expand Down
10 changes: 7 additions & 3 deletions libheif/macos/libheif.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# https://github.com/Homebrew/homebrew-core/blob/master/Formula/libheif.rb
# https://github.com/Homebrew/homebrew-core/blob/master/Formula/lib/libheif.rb

class Libheif < Formula
desc "ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
homepage "https://www.libde265.org/"
url "https://github.com/strukturag/libheif/releases/download/v1.16.2/libheif-1.16.2.tar.gz"
sha256 "7f97e4205c0bd9f9b8560536c8bd2e841d1c9a6d610401eb3eb87ed9cdfe78ea"
url "https://github.com/strukturag/libheif/releases/download/v1.17.3/libheif-1.17.3.tar.gz"
sha256 "8d5b6292e7931324f81f871f250ecbb9f874aa3c66b4f6f35ceb0bf3163b53ea"
license "LGPL-3.0-only"
# Set current revision from what it was taken plus 10
revision 10
Expand All @@ -25,6 +25,10 @@ def install
-DWITH_SvtEnc=OFF
-DWITH_LIBSHARPYUV=OFF
-DENABLE_PLUGIN_LOADING=OFF
-DWITH_JPEG_DECODER=OFF
-DWITH_JPEG_ENCODER=OFF
-DWITH_OpenJPEG_DECODER=OFF
-DWITH_OpenJPEG_ENCODER=OFF
-DCMAKE_INSTALL_RPATH=#{rpath}
]
system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
Expand Down
10 changes: 7 additions & 3 deletions libheif/windows/mingw-w64-libheif/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
_realname=libheif
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.16.2
pkgrel=2
pkgver=1.17.3
pkgrel=1
pkgdesc="HEIF image decoder/encoder library and tools (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
Expand All @@ -20,7 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-libde265"
"${MINGW_PACKAGE_PREFIX}-x265")
source=("https://github.com/strukturag/libheif/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
sha256sums=('7f97e4205c0bd9f9b8560536c8bd2e841d1c9a6d610401eb3eb87ed9cdfe78ea')
sha256sums=('8d5b6292e7931324f81f871f250ecbb9f874aa3c66b4f6f35ceb0bf3163b53ea')

build() {
mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
Expand All @@ -40,6 +40,10 @@ build() {
-DWITH_SvtEnc=OFF \
-DWITH_LIBSHARPYUV=OFF \
-DENABLE_PLUGIN_LOADING=OFF \
-DWITH_JPEG_DECODER=OFF \
-DWITH_JPEG_ENCODER=OFF \
-DWITH_OpenJPEG_DECODER=OFF \
-DWITH_OpenJPEG_ENCODER=OFF \
-DX265_CFLAGS="-DX265_API_IMPORTS" \
../${_realname}-${pkgver}

Expand Down
4 changes: 2 additions & 2 deletions pi-heif/LICENSES_bundled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Binary wheels combine several license-compatible libraries. Here they are listed
Name: libheif
License: LGPLv3
Files: libheif.[dylib|so|dll]
For details, see https://github.com/strukturag/libheif/tree/v1.14.2/COPYING
Source code: https://github.com/strukturag/libheif/tree/v1.16.2
For details, see https://github.com/strukturag/libheif/tree/v1.17.3/COPYING
Source code: https://github.com/strukturag/libheif/tree/v1.17.3

Name: libde265
License: LGPLv3
Expand Down
10 changes: 7 additions & 3 deletions pi-heif/libheif/macos/libheif.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# https://github.com/Homebrew/homebrew-core/blob/master/Formula/libheif.rb
# https://github.com/Homebrew/homebrew-core/blob/master/Formula/lib/libheif.rb

class Libheif < Formula
desc "ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
homepage "https://www.libde265.org/"
url "https://github.com/strukturag/libheif/releases/download/v1.16.2/libheif-1.16.2.tar.gz"
sha256 "7f97e4205c0bd9f9b8560536c8bd2e841d1c9a6d610401eb3eb87ed9cdfe78ea"
url "https://github.com/strukturag/libheif/releases/download/v1.17.3/libheif-1.17.3.tar.gz"
sha256 "8d5b6292e7931324f81f871f250ecbb9f874aa3c66b4f6f35ceb0bf3163b53ea"
license "LGPL-3.0-only"
# Set current revision from what it was taken plus 10
revision 10
Expand All @@ -22,6 +22,10 @@ def install
-DWITH_X265=OFF
-DWITH_LIBSHARPYUV=OFF
-DENABLE_PLUGIN_LOADING=OFF
-DWITH_JPEG_DECODER=OFF
-DWITH_JPEG_ENCODER=OFF
-DWITH_OpenJPEG_DECODER=OFF
-DWITH_OpenJPEG_ENCODER=OFF
-DCMAKE_INSTALL_RPATH=#{rpath}
]
system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
Expand Down
10 changes: 7 additions & 3 deletions pi-heif/libheif/windows/mingw-w64-libheif/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
_realname=libheif
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.16.2
pkgrel=2
pkgver=1.17.3
pkgrel=1
pkgdesc="HEIF image decoder/encoder library and tools (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
Expand All @@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-libde265")
source=("https://github.com/strukturag/libheif/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
sha256sums=('7f97e4205c0bd9f9b8560536c8bd2e841d1c9a6d610401eb3eb87ed9cdfe78ea')
sha256sums=('8d5b6292e7931324f81f871f250ecbb9f874aa3c66b4f6f35ceb0bf3163b53ea')

build() {
mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
Expand All @@ -39,6 +39,10 @@ build() {
-DWITH_SvtEnc=OFF \
-DWITH_LIBSHARPYUV=OFF \
-DENABLE_PLUGIN_LOADING=OFF \
-DWITH_JPEG_DECODER=OFF \
-DWITH_JPEG_ENCODER=OFF \
-DWITH_OpenJPEG_DECODER=OFF \
-DWITH_OpenJPEG_ENCODER=OFF \
../${_realname}-${pkgver}

${MINGW_PREFIX}/bin/cmake --build .
Expand Down
4 changes: 2 additions & 2 deletions tests/basic_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_full_build():
info = pillow_heif.libheif_info()
assert info["AVIF"]
assert info["HEIF"]
expected_version = os.getenv("EXP_PH_LIBHEIF_VERSION", "1.16.2")
expected_version = os.getenv("EXP_PH_LIBHEIF_VERSION", "1.17.3")
if expected_version:
assert info["libheif"] == expected_version

Expand All @@ -120,6 +120,6 @@ def test_light_build():
info = pillow_heif.libheif_info()
assert not info["AVIF"]
assert not info["HEIF"]
expected_version = os.getenv("EXP_PH_LIBHEIF_VERSION", "1.16.2")
expected_version = os.getenv("EXP_PH_LIBHEIF_VERSION", "1.17.3")
if expected_version:
assert info["libheif"] == expected_version