diff --git a/CMakeLists.txt b/CMakeLists.txt index 869635284..7a05be605 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,6 +150,8 @@ set(JPEGXL_FORCE_SYSTEM_LCMS2 false CACHE BOOL "Force using system installed lcms2 instead of third_party/lcms source.") set(JPEGXL_FORCE_SYSTEM_HWY false CACHE BOOL "Force using system installed highway (libhwy-dev) instead of third_party/highway source.") +set(JPEGXL_DEBIAN_LIBJPEG_TURBO_HEADERS false CACHE BOOL + "Force using Debian-installed libjpeg62-turbo-dev headers instead of third_party/libjpeg-turbo.") # Check minimum compiler versions. Older compilers are not supported and fail # with hard to understand errors. diff --git a/debian/changelog b/debian/changelog index 0722b1bd4..f00d95106 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,113 +1,5 @@ -jpeg-xl (0.10.2) unstable; urgency=medium - - * Bump JPEG XL version to 0.10.2. - - -- JPEG XL Maintainers Thu, 07 Mar 2024 13:50:05 +0100 - -jpeg-xl (0.10.1) unstable; urgency=medium - - * Bump JPEG XL version to 0.10.1. - - -- JPEG XL Maintainers Wed, 28 Feb 2024 12:52:20 +0100 - -jpeg-xl (0.10.0) unstable; urgency=medium - - * Bump JPEG XL version to 0.10.0. - - -- JPEG XL Maintainers Wed, 21 Feb 2024 08:37:00 +0100 - -jpeg-xl (0.9.0) unstable; urgency=medium - - * Bump JPEG XL version to 0.9.0. - - -- JPEG XL Maintainers Tue, 21 Nov 2023 10:32:59 +0100 - -jpeg-xl (0.8) unstable; urgency=medium - - * Bump JPEG XL version to 0.8. - - -- JPEG XL Maintainers Wed, 11 Jan 2023 16:12:34 +0000 - -jpeg-xl (0.7) unstable; urgency=medium - - * Bump JPEG XL version to 0.7. - - -- JPEG XL Maintainers Mon, 08 Aug 2022 14:43:58 +0000 - -jpeg-xl (0.6) unstable; urgency=medium - - * Bump JPEG XL version to 0.6. - - -- JPEG XL Maintainers Fri, 10 Sep 2021 16:08:17 +0200 - -jpeg-xl (0.5.0) unstable; urgency=medium - - * Bump JPEG XL version to 0.5.0. - - -- JPEG XL Maintainers Thu, 12 Aug 2021 23:49:40 +0200 - -jpeg-xl (0.3.7) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3.7. - - -- Sami Boukortt Mon, 29 Mar 2021 12:14:20 +0200 - -jpeg-xl (0.3.6) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3.6. - - -- Sami Boukortt Thu, 25 Mar 2021 17:40:58 +0100 - -jpeg-xl (0.3.5) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3.5. - - -- Sami Boukortt Tue, 23 Mar 2021 15:20:44 +0100 - -jpeg-xl (0.3.4) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3.4. - - -- Sami Boukortt Tue, 16 Mar 2021 12:13:59 +0100 - -jpeg-xl (0.3.3) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3.3. - - -- Sami Boukortt Fri, 5 Mar 2021 19:15:26 +0100 - -jpeg-xl (0.3.2) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3.2. - - -- Alex Deymo Fri, 12 Feb 2021 21:00:12 +0100 - -jpeg-xl (0.3.1) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3.1. - - -- Alex Deymo Tue, 09 Feb 2021 09:48:43 +0100 - -jpeg-xl (0.3) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.3. - - -- Alex Deymo Wed, 27 Jan 2021 22:36:32 +0100 - -jpeg-xl (0.2) UNRELEASED; urgency=medium - - * Bump JPEG XL version to 0.2. - - -- Alex Deymo Wed, 23 Nov 2020 20:42:10 +0100 - -jpeg-xl (0.1) UNRELEASED; urgency=medium - - * JPEG XL format release candidate. - - -- Alex Deymo Fri, 13 Nov 2020 17:42:24 +0100 - -jpeg-xl (0.0.2-1) UNRELEASED; urgency=medium +jpegli (0.0.1-1) UNRELEASED; urgency=medium * Initial debian package. - -- Alex Deymo Tue, 27 Oct 2020 15:27:59 +0100 + -- Martin Bruse Wed, 18 Sep 2024 10:51:00 +0100 diff --git a/debian/control b/debian/control index e0169a348..d33e481fc 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: jpeg-xl +Source: jpegli Maintainer: JPEG XL Maintainers Section: misc Priority: optional @@ -21,67 +21,33 @@ Build-Depends: pkg-config, xdg-utils, xmlto, -Homepage: https://github.com/libjxl/libjxl + libjpeg62-turbo-dev, +Homepage: https://github.com/google/jpegli Rules-Requires-Root: no -Package: jxl +Package: jpegli Architecture: any Section: utils Depends: ${misc:Depends}, ${shlibs:Depends} -Description: JPEG XL Image Coding System - "JXL" (command line utility) - The JPEG XL Image Coding System (ISO/IEC 18181) is a lossy and - lossless image compression format. It has a rich feature set and is - particularly optimized for responsive web environments, so that - content renders well on a wide range of devices. Moreover, it includes - several features that help transition from the legacy JPEG format. +Description: TODO . This package installs the command line utilities. -Package: libjxl-dev +Package: libjpegli-dev Architecture: any Section: libdevel -Depends: libjxl (= ${binary:Version}), ${misc:Depends} +Depends: libjpegli (= ${binary:Version}), ${misc:Depends} libhwy-dev, -Description: JPEG XL Image Coding System - "JXL" (development files) - The JPEG XL Image Coding System (ISO/IEC 18181) is a lossy and - lossless image compression format. It has a rich feature set and is - particularly optimized for responsive web environments, so that - content renders well on a wide range of devices. Moreover, it includes - several features that help transition from the legacy JPEG format. +Description: TODO . This package installs development files. -Package: libjxl +Package: libjpegli Architecture: any Multi-Arch: same Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} -Description: JPEG XL Image Coding System - "JXL" (shared libraries) - The JPEG XL Image Coding System (ISO/IEC 18181) is a lossy and - lossless image compression format. It has a rich feature set and is - particularly optimized for responsive web environments, so that - content renders well on a wide range of devices. Moreover, it includes - several features that help transition from the legacy JPEG format. +Description: TODO . This package installs shared libraries. - -Package: libjxl-gdk-pixbuf -Architecture: any -Multi-Arch: same -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} -Description: JPEG XL Plugin for gdk-pixbuf - This package installs the required files for reading JPEG XL files in - GTK applications. - -Package: libjxl-gimp-plugin -Architecture: any -Multi-Arch: same -Section: graphics -Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} -Enhances: gimp -Description: JPEG XL Import and Export Plugin for GIMP - This is a plugin for GIMP version 2.10.x to import and export JPEG XL images. diff --git a/debian/copyright b/debian/copyright index 7786a8775..bc3359e24 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: jpeg-xl +Upstream-Name: jpegli Files: * Copyright: 2020 the JPEG XL Project diff --git a/debian/jxl.install b/debian/jxl.install deleted file mode 100644 index c3bae3ed1..000000000 --- a/debian/jxl.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/* -usr/share/man/man1/cjxl.1 -usr/share/man/man1/djxl.1 diff --git a/debian/libjxl-dev.install b/debian/libjxl-dev.install deleted file mode 100644 index ebe4ac4ae..000000000 --- a/debian/libjxl-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/jxl/*.h -usr/lib/*/*.so -usr/lib/*/pkgconfig/*.pc diff --git a/debian/libjxl-gdk-pixbuf.install b/debian/libjxl-gdk-pixbuf.install deleted file mode 100644 index 12d2ab250..000000000 --- a/debian/libjxl-gdk-pixbuf.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/gdk-pixbuf-*/*/loaders/* -usr/share/mime/packages/image-jxl.xml -usr/share/thumbnailers/jxl.thumbnailer diff --git a/debian/libjxl-gimp-plugin.install b/debian/libjxl-gimp-plugin.install deleted file mode 100644 index 353431dba..000000000 --- a/debian/libjxl-gimp-plugin.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/gimp diff --git a/debian/libjxl.install b/debian/libjxl.install deleted file mode 100644 index cd157a7a5..000000000 --- a/debian/libjxl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libjxl*.so.* diff --git a/debian/rules b/debian/rules index 6259dbfc6..02f27cdaf 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,10 @@ override_dh_auto_configure: -DJPEGXL_FORCE_SYSTEM_GTEST=ON \ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ -DJPEGXL_FORCE_SYSTEM_HWY=ON \ - -DJPEGXL_ENABLE_JPEGLI=OFF \ - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF \ - -DJPEGXL_ENABLE_PLUGINS=ON + -DJPEGXL_ENABLE_JPEGLI=ON \ + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=ON \ + -DJPEGXL_ENABLE_PLUGINS=ON \ + -DJPEGXL_ENABLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_LCMS2=ON \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_DEBIAN_LIBJPEG_TURBO_HEADERS=ON diff --git a/lib/jpegli.cmake b/lib/jpegli.cmake index 0fb0a79cd..bd0584617 100644 --- a/lib/jpegli.cmake +++ b/lib/jpegli.cmake @@ -24,12 +24,21 @@ elseif(JPEGLI_LIBJPEG_LIBRARY_SOVERSION STREQUAL "8") set(JPEG_LIB_VERSION 80) endif() -configure_file( - ../third_party/libjpeg-turbo/jconfig.h.in include/jpegli/jconfig.h) -configure_file( - ../third_party/libjpeg-turbo/jpeglib.h include/jpegli/jpeglib.h COPYONLY) -configure_file( - ../third_party/libjpeg-turbo/jmorecfg.h include/jpegli/jmorecfg.h COPYONLY) +if(JPEGXL_DEBIAN_LIBJPEG_TURBO_HEADERS) + configure_file( + /usr/include/x86_64-linux-gnu/jconfig.h include/jpegli/jconfig.h COPYONLY) + configure_file( + /usr/include/jpeglib.h include/jpegli/jpeglib.h COPYONLY) + configure_file( + /usr/include/jmorecfg.h COPYONLY) +else() + configure_file( + ../third_party/libjpeg-turbo/jconfig.h.in include/jpegli/jconfig.h) + configure_file( + ../third_party/libjpeg-turbo/jpeglib.h include/jpegli/jpeglib.h COPYONLY) + configure_file( + ../third_party/libjpeg-turbo/jmorecfg.h include/jpegli/jmorecfg.h COPYONLY) +endif() add_library(jpegli-static STATIC EXCLUDE_FROM_ALL "${JPEGXL_INTERNAL_JPEGLI_SOURCES}") target_compile_options(jpegli-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}")