!42 [sync] PR-39: add loongarch64 support for libjpeg-turbo

From: @openeuler-sync-bot 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl

Add-loongarch64.patch

@@ -1,6 +1,6 @@
-From 97ca1ba6c5db46675e08899cfda80edf326a21af Mon Sep 17 00:00:00 2001
+From 3b9fb5b5e4c3435b6d8956743936f3566515e749 Mon Sep 17 00:00:00 2001
-From: doupengda <doupengda@loongson.cn>
+From: Wenlong Zhang <zhangwenlong@loongson.cn>
-Date: Mon, 5 Dec 2022 02:46:49 +0000
+Date: Tue, 16 Apr 2024 03:18:45 +0000
 Subject: [PATCH] Add loongarch64
 
 ---
@@ -8,18 +8,18 @@ Subject: [PATCH] Add loongarch64
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c01ec25..693cfc4 100644
+index 5ad0718..3fd78b9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -927,7 +927,7 @@ if(CPU_TYPE STREQUAL "x86_64" OR CPU_TYPE STREQUAL "i386")
+@@ -894,7 +894,7 @@ if(CPU_TYPE STREQUAL "x86_64" OR CPU_TYPE STREQUAL "i386")
-   # manually.
+   elseif(CPU_TYPE STREQUAL "x86_64")
+     set(DEFAULT_FLOATTEST8 no-fp-contract)
    endif()
- else()
+-elseif(CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64")
--  if((CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64") AND
++elseif(CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64" OR CPU_TYPE STREQUAL "loongarch64")
-+  if((CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64" OR CPU_TYPE STREQUAL "loongarch64") AND
+   if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-     NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MSVC)
+     if(CMAKE_C_COMPILER_VERSION VERSION_EQUAL 14.0.0 OR
-     set(DEFAULT_FLOATTEST fp-contract)
+       CMAKE_C_COMPILER_VERSION VERSION_GREATER 14.0.0)
-   else()
 -- 
-2.33.0
+2.43.0
 

libjpeg-turbo.spec

@@ -1,13 +1,11 @@
 Name:           libjpeg-turbo
-Version:        2.1.1
+Version:        3.0.1
-Release:        4
+Release:        2
 Summary:        MMX/SSE2/SIMD accelerated libjpeg-compatible JPEG codec library
 License:        IJG
 URL:            http://sourceforge.net/projects/libjpeg-turbo
 Source0:        http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
-%ifarch loongarch64
 Patch0001:      Add-loongarch64.patch
-%endif
 
 BuildRequires:  gcc cmake libtool nasm
 BuildRequires:  guile
@@ -63,7 +61,11 @@ manipulate JPEG files using the TurboJPEG library.
 %autosetup -n %{name}-%{version} -p1
 
 %build
-%{cmake} -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES -DENABLE_STATIC:BOOL=NO .
+%{cmake} -DCMAKE_INSTALL_LIBDIR=%{_libdir} -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES -DENABLE_STATIC:BOOL=NO . \
+%ifarch riscv64
+    -DFLOATTEST=fp-contract \
+%endif
+    %{nil}
 
 %make_build V=1
 
@@ -114,7 +116,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags}
 %exclude /usr/share/doc/libjpeg-turbo/*
 
 %files devel
-%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.txt 
+%doc coderules.txt jconfig.txt libjpeg.txt structure.txt
 %exclude %{_includedir}/turbojpeg.h
 %{_includedir}/*.h
 %{_libdir}/libjpeg.so
@@ -145,6 +147,21 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags}
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Apr 16 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 3.0.1-2
+- add loongarch64 support for libjpeg-turbo
+
+* Mon Jan 8 2024 zhangpan <zhangpan103@h-partners.com> - 3.0.1-1
+- update to 3.0.1
+
+* Fri Jul 21 2023 zhangpan <zhangpan103@h-partners.com> - 3.0.0-1
+- update to 3.0.0
+
+* Mon Jul 10 2023 Jingwiw  <wangjingwei@iscas.ac.cn> - 2.1.1-6
+- add riscv64 support
+
+* Mon Apr 24 2023 guoqinglan <guoqinglan@kylinsec.com.cn> - 2.1.1-5
+- fix build error for sw_64
+
 * Thu Nov 17 2022 doupengda <doupengda@loongson.cn> - 2.1.1-4
 - add loongarch64 support