- added x32-java patch (jdk is available on x32, so don't disable java)

- BR: jre-X11 (FindJNI.cmake requires libjawt)

diff --git a/libjpeg-turbo-x32-java.patch b/libjpeg-turbo-x32-java.patch
new file mode 100644 (file)
index 0000000..c6a38a3
--- /dev/null
+++ b/libjpeg-turbo-x32-java.patch
@@ -0,0 +1,15 @@
+--- libjpeg-turbo-2.1.1/CMakeLists.txt.orig    2021-08-10 01:16:57.000000000 +0200
++++ libjpeg-turbo-2.1.1/CMakeLists.txt 2021-10-21 21:29:21.264419411 +0200
+@@ -185,12 +185,8 @@ option(WITH_ARITH_DEC "Include arithmeti
+ boolean_number(WITH_ARITH_DEC)
+ option(WITH_ARITH_ENC "Include arithmetic encoding support when emulating the libjpeg v6b API/ABI" TRUE)
+ boolean_number(WITH_ARITH_ENC)
+-if(CMAKE_C_COMPILER_ABI MATCHES "ELF X32")
+-  set(WITH_JAVA 0)
+-else()
+   option(WITH_JAVA "Build Java wrapper for the TurboJPEG API library (implies ENABLE_SHARED=1)" FALSE)
+   boolean_number(WITH_JAVA)
+-endif()
+ option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)" FALSE)
+ boolean_number(WITH_JPEG7)
+ option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes ${CMAKE_PROJECT_NAME} backward-incompatible with libjpeg v6b)" FALSE)

diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index a13c11a3a81d5bbfde77d952119404a3e6a75bdd..0dcf5f82267afd36c0bf0d71911bf16deb88d14c 100644 (file)
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -15,9 +15,11 @@ License:     BSD-like
 Group:         Libraries
 Source0:       https://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.gz
 # Source0-md5: cf16866976ab31cd6fc478eac8c2c54e
+Patch0:                %{name}-x32-java.patch
 URL:           https://libjpeg-turbo.org/
 BuildRequires: cmake >= 3.9.0
 %{?with_java:BuildRequires:    jdk}
+%{?with_java:BuildRequires:    jre-X11}
 BuildRequires: libstdc++-devel
 # x86* SIMD code uses NASM; ARM and MIPS use gas, PowerPC uses gcc intrinsics, no SIMD code for other archs
 %ifarch %{ix86} %{x8664}
@@ -168,6 +170,7 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build