diff options
| author | Jiyong <jiyong.min@samsung.com> | 2023-12-26 17:33:03 +0900 |
|---|---|---|
| committer | Jiyong <jiyong.min@samsung.com> | 2023-12-27 08:25:11 +0900 |
| commit | a6d06c38e46e552195648836052eb909925fe5ff (patch) | |
| tree | 5b34f3947c8331dc618a5166974e4d9757f8e782 /debian | |
| parent | f3e519be675ef7922a6c1c3a682232302b55496d (diff) | |
| parent | 3b773d382e34fcfc7c8995d8bd681a6ef0529b02 (diff) | |
| download | libjxl-accepted/tizen_unified_riscv.tar.gz libjxl-accepted/tizen_unified_riscv.tar.bz2 libjxl-accepted/tizen_unified_riscv.zip | |
Merge branch 'upstream' into tizenaccepted/tizen/unified/riscv/20240103.054630accepted/tizen/unified/20231228.165749accepted/tizen_unified_riscv
Change-Id: I13b4d2c94ada4853484630800e2a8a5ae90d34c1
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 5 | ||||
| -rw-r--r-- | debian/libjxl-dev.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
5 files changed, 24 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index a63607e..dde1130 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,16 @@ -jpeg-xl (0.7) UNRELEASED; urgency=medium +jpeg-xl (0.9.0) unstable; urgency=medium + + * Bump JPEG XL version to 0.9.0. + + -- JPEG XL Maintainers <jpegxl@google.com> Wed, 11 Jan 2023 16:12:35 +0000 + +jpeg-xl (0.8) unstable; urgency=medium + + * Bump JPEG XL version to 0.8. + + -- JPEG XL Maintainers <jpegxl@google.com> Wed, 11 Jan 2023 16:12:34 +0000 + +jpeg-xl (0.7) unstable; urgency=medium * Bump JPEG XL version to 0.7. diff --git a/debian/control b/debian/control index 7a3c502..f5dc5ce 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: libgmock-dev, libgoogle-perftools-dev, libgtest-dev, - libhwy-dev (>= 0.15.0), + libhwy-dev (>= 1.0.0), libjpeg-dev, libopenexr-dev, libpng-dev, diff --git a/debian/copyright b/debian/copyright index 20225a9..7786a87 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,6 +5,11 @@ Files: * Copyright: 2020 the JPEG XL Project License: BSD-3-clause +Files: third_party/libjpeg-turbo/* +Copyright (C)2009-2023 D. R. Commander. All Rights Reserved. +Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. +License: BSD-3-clause + Files: third_party/sjpeg/* Copyright: 2017 Google, Inc License: Apache-2.0 diff --git a/debian/libjxl-dev.install b/debian/libjxl-dev.install index b735ec2..ebe4ac4 100644 --- a/debian/libjxl-dev.install +++ b/debian/libjxl-dev.install @@ -1,4 +1,3 @@ usr/include/jxl/*.h -usr/lib/*/*.a usr/lib/*/*.so usr/lib/*/pkgconfig/*.pc diff --git a/debian/rules b/debian/rules index efed75d..6259dbf 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,14 @@ include /usr/share/dpkg/pkg-info.mk override_dh_auto_configure: # TODO(deymo): Remove the DCMAKE_BUILD_TYPE once builds without NDEBUG # are as useful as Release builds. + # TODO(szabadka) Re-enable jpegli after tests are fixed on Ubuntu 20.04, + # and debian:buster dh_auto_configure -- \ -DJPEGXL_VERSION=$(DEB_VERSION) \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DJPEGXL_FORCE_SYSTEM_GTEST=ON \ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ -DJPEGXL_FORCE_SYSTEM_HWY=ON \ - -DJPEGXL_ENABLE_PLUGINS=ON + -DJPEGXL_ENABLE_JPEGLI=OFF \ + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF \ + -DJPEGXL_ENABLE_PLUGINS=ON |