[neon/backports-jammy/libjxl-jammy/Neon/release] debian: Revert "disable jpegli"

[Carlos De Maine]

Git commit 9841ad58539e5383981a7a19c7e79f2e4eea7338 by Carlos De Maine.
Committed on 07/09/2023 at 06:12.
Pushed by carlosdem into branch 'Neon/release'.

Revert "disable jpegli"

This reverts commit 78250a30f94ef2aa0ac8573be75a6b152f9ebec7

M  +47   -0    debian/control
A  +2    -0    debian/libjpegli-tools.install
A  +2    -0    debian/libjpegli-tools.manpages
A  +1    -0    debian/libjpegli62-dev.install
A  +1    -0    debian/libjpegli62.install
A  +2    -0    debian/libjpegli62.lintian-overrides
M  +2    -2    debian/rules

https://invent.kde.org/neon/backports-jammy/libjxl-jammy/-/commit/9841ad58539e5383981a7a19c7e79f2e4eea7338

diff --git a/debian/control b/debian/control
index 92c3db3..7f051a0 100644
--- a/debian/control
+++ b/debian/control
@@ -133,3 +133,50 @@ Description: JPEG XL Image Coding System - "JXL" (java bindings)
  several features that help transition from the legacy JPEG format.
  .
  This package installs the Java Bindings.
+
+Package: libjpegli62
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libjpeg62, libjpeg62-turbo
+Replaces: libjpeg62, libjpeg62-turbo
+Provides: libjpeg62-turbo (= 1:1.3.1)
+Description: Improved JPEG encoder and decoder implementation (shared libraries)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs jpegli shared libraries.
+
+Package: libjpegli62-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libc-dev, libjpegli62 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libjpeg62-dev,
+           libjpeg62-turbo-dev,
+           libjpeg7-dev,
+           libjpeg8-dev,
+           libjpeg9-dev
+Replaces: libjpeg62-dev,
+          libjpeg62-turbo-dev,
+          libjpeg7-dev,
+          libjpeg8-dev,
+          libjpeg9-dev
+Provides: libjpeg-dev
+Description: Improved JPEG encoder and decoder implementation (development files)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs jpegli jpeg62 headers.
+
+Package: libjpegli-tools
+Architecture: any
+Section: utils
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Improved JPEG encoder and decoder implementation (command line utility)
+ JPEGLIS provides a JPEG encoder and decoder implementation that is
+ API and ABI compatible with libjpeg62.
+ .
+ This package installs the JPEGLI tools command line utilities.
diff --git a/debian/libjpegli-tools.install b/debian/libjpegli-tools.install
new file mode 100644
index 0000000..d5e6af8
--- /dev/null
+++ b/debian/libjpegli-tools.install
@@ -0,0 +1,2 @@
+usr/bin/cjpegli
+usr/bin/djpegli
diff --git a/debian/libjpegli-tools.manpages b/debian/libjpegli-tools.manpages
new file mode 100644
index 0000000..af23b77
--- /dev/null
+++ b/debian/libjpegli-tools.manpages
@@ -0,0 +1,2 @@
+debian/cjpegli.1
+debian/djpegli.1
diff --git a/debian/libjpegli62-dev.install b/debian/libjpegli62-dev.install
new file mode 100644
index 0000000..97516eb
--- /dev/null
+++ b/debian/libjpegli62-dev.install
@@ -0,0 +1 @@
+usr/lib/*/libjpeg*.so
diff --git a/debian/libjpegli62.install b/debian/libjpegli62.install
new file mode 100644
index 0000000..5dd0e11
--- /dev/null
+++ b/debian/libjpegli62.install
@@ -0,0 +1 @@
+usr/lib/*/libjpeg*.so.*
diff --git a/debian/libjpegli62.lintian-overrides b/debian/libjpegli62.lintian-overrides
new file mode 100644
index 0000000..16a95b1
--- /dev/null
+++ b/debian/libjpegli62.lintian-overrides
@@ -0,0 +1,2 @@
+# Debian has libjpeg62 and it's IJG libjpeg, this one is libjpegli...
+libjpegli62: package-name-doesnt-match-sonames libjpeg62
diff --git a/debian/rules b/debian/rules
index a14335c..20f5dd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,8 +52,8 @@ CMAKE_EXTRA_FLAGS += \
 	-DJPEGXL_ENABLE_DOXYGEN:BOOL=$(ENABLE_DOXYGEN) \
 	-DJPEGXL_ENABLE_EXAMPLES:BOOL=ON \
 	-DJPEGXL_ENABLE_JNI:BOOL=$(ENABLE_JNI) \
-	-DJPEGXL_ENABLE_JPEGLI:BOOL=OFF \
-	-DJPEGXL_ENABLE_JPEGLI_LIBJPEG:BOOL=OFF \
+	-DJPEGXL_ENABLE_JPEGLI:BOOL=ON \
+	-DJPEGXL_ENABLE_JPEGLI_LIBJPEG:BOOL=ON \
 	-DJPEGXL_ENABLE_OPENEXR:BOOL=ON \
 	-DJPEGXL_ENABLE_PLUGINS:BOOL=ON \
 	-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF:BOOL=ON \