[neon/backports-jammy/libjxl-jammy/Neon/release] debian: merge salsa debian/rules

[Scarlett Moore]

Git commit dfb50155dc8dcd088017069b68cdeac0eb1115c4 by Scarlett Moore.
Committed on 06/09/2023 at 19:00.
Pushed by scarlettmoore into branch 'Neon/release'.

merge salsa debian/rules

M  +11   -11   debian/rules

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

diff --git a/debian/rules b/debian/rules
index 759eea2..20f5dd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,6 @@ else
   ENABLE_JNI=OFF
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
-  # gcc-12 12.2.0-3 produces wrong code with -O2:
-  # https://buildd.debian.org/status/fetch.php?pkg=jpeg-xl&arch=armhf&ver=0.7.0-2&stamp=1664702466&raw=0
-  DEB_CXXFLAGS_MAINT_APPEND += -fno-tree-vectorize
-endif
-
 ifneq (,$(filter $(DEB_HOST_ARCH), arm64 armel armhf ppc64el))
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77728
   DEB_CXXFLAGS_MAINT_APPEND += -Wno-psabi
@@ -51,15 +45,20 @@ endif
 # JPEGXL_ENABLE_PLUGINS is currently OFF see #1001786 for rational
 CMAKE_EXTRA_FLAGS += \
 	-DBUILD_TESTING:BOOL=$(BUILD_TESTING) \
-	-DCMAKE_SKIP_RPATH:BOOL=ON \
+	-DCMAKE_BUILD_RPATH_USE_ORIGIN=ON \
 	-DJPEGXL_BUNDLE_SKCMS:BOOL=OFF \
 	-DJPEGXL_ENABLE_BENCHMARK:BOOL=ON \
 	-DJPEGXL_ENABLE_DEVTOOLS:BOOL=ON \
 	-DJPEGXL_ENABLE_DOXYGEN:BOOL=$(ENABLE_DOXYGEN) \
 	-DJPEGXL_ENABLE_EXAMPLES:BOOL=ON \
 	-DJPEGXL_ENABLE_JNI:BOOL=$(ENABLE_JNI) \
+	-DJPEGXL_ENABLE_JPEGLI:BOOL=ON \
+	-DJPEGXL_ENABLE_JPEGLI_LIBJPEG:BOOL=ON \
 	-DJPEGXL_ENABLE_OPENEXR:BOOL=ON \
-	-DJPEGXL_ENABLE_PLUGINS:BOOL=OFF \
+	-DJPEGXL_ENABLE_PLUGINS:BOOL=ON \
+	-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF:BOOL=ON \
+	-DJPEGXL_ENABLE_PLUGIN_GIMP210:BOOL=OFF \
+	-DJPEGXL_ENABLE_PLUGIN_MIME:BOOL=OFF \
 	-DJPEGXL_ENABLE_SJPEG:BOOL=OFF \
 	-DJPEGXL_ENABLE_SKCMS:BOOL=OFF \
 	-DJPEGXL_ENABLE_TCMALLOC:BOOL=$(ENABLE_TCMALLOC) \
@@ -86,7 +85,8 @@ override_dh_install-indep:
 override_dh_auto_test-indep:
 
 override_dh_auto_test-arch:
-	timeout 4h dh_auto_test --
+	# armel requires 6h to run complete testsuite:
+	timeout 6h dh_auto_test --
 
 override_dh_installman-arch: tools_manpages devtools_manpages jpegli_manpages
 	dh_installman
@@ -109,10 +109,10 @@ debian/%.1: debian/%.1.in
 
 .PHONY: tools_manpages devtools_manpages jpegli_manpages get-orig-source
 
-tools_manpages: debian/cjpeg_hdr.1 debian/jxlinfo.1
+tools_manpages: debian/jxlinfo.1
 	echo "all tools manpages generated"
 
-devtools_manpages: debian/butteraugli_main.1 debian/decode_and_encode.1 debian/display_to_hlg.1 debian/fuzzer_corpus.1 debian/generate_lut_template.1 debian/jxl_from_tree.1 debian/pq_to_hlg.1 debian/render_hlg.1 debian/ssimulacra_main.1 debian/texture_to_cube.1 debian/tone_map.1 debian/xyb_range.1 debian/benchmark_xl.1
+devtools_manpages: debian/butteraugli_main.1 debian/decode_and_encode.1 debian/display_to_hlg.1 debian/djxl_fuzzer_corpus.1 debian/generate_lut_template.1 debian/jxl_from_tree.1 debian/pq_to_hlg.1 debian/render_hlg.1 debian/ssimulacra_main.1 debian/texture_to_cube.1 debian/tone_map.1 debian/xyb_range.1 debian/benchmark_xl.1
 	echo $(DEVTOOLS)
 	echo "all devtools manpages generated"