diff --git a/libjpeg-turbo-3.0.1.tar.gz b/libjpeg-turbo-3.0.1.tar.gz deleted file mode 100644 index 72dd68ae9c4688c80d6122bc7a1cd0bbc17c9c7d..0000000000000000000000000000000000000000 Binary files a/libjpeg-turbo-3.0.1.tar.gz and /dev/null differ diff --git a/libjpeg-turbo-3.0.4.tar.gz b/libjpeg-turbo-3.0.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bbf694cd281c1ce8cb19e42992910511fcfb3d6e Binary files /dev/null and b/libjpeg-turbo-3.0.4.tar.gz differ diff --git a/Add-loongarch64.patch b/libjpeg-turbo-add-loongarch64-and-riscv64.patch similarity index 49% rename from Add-loongarch64.patch rename to libjpeg-turbo-add-loongarch64-and-riscv64.patch index 4233ef687525ec793bede38f5cfb41e8d4ef8be5..bf7ce4be7396e5b701948cabe3f4e5c2ed853c8c 100644 --- a/Add-loongarch64.patch +++ b/libjpeg-turbo-add-loongarch64-and-riscv64.patch @@ -4,22 +4,28 @@ Date: Tue, 16 Apr 2024 03:18:45 +0000 Subject: [PATCH] Add loongarch64 --- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + CMakeLists.txt | 4 +- + 1 file changed, 2 insertion(+), 2 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ad0718..3fd78b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -894,7 +894,7 @@ if(CPU_TYPE STREQUAL "x86_64" OR CPU_TYPE STREQUAL "i386") +@@ -926,7 +926,7 @@ elseif(CPU_TYPE STREQUAL "x86_64") set(DEFAULT_FLOATTEST8 no-fp-contract) endif() -elseif(CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64") -+elseif(CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64" OR CPU_TYPE STREQUAL "loongarch64") - if(CMAKE_C_COMPILER_ID STREQUAL "Clang") ++elseif(CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64" OR CPU_TYPE STREQUAL "loongarch64" OR CPU_TYPE STREQUAL "riscv64") + if(CMAKE_C_COMPILER_ID MATCHES "Clang") + if(CMAKE_C_COMPILER_VERSION VERSION_EQUAL 14.0.0 OR + CMAKE_C_COMPILER_VERSION VERSION_GREATER 14.0.0) +@@ -968,7 +968,7 @@ + + if(CPU_TYPE STREQUAL "x86_64") + set(DEFAULT_FLOATTEST12 no-fp-contract) +-elseif(CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64") ++elseif(CPU_TYPE STREQUAL "powerpc" OR CPU_TYPE STREQUAL "arm64" OR CPU_TYPE STREQUAL "loongarch64" OR CPU_TYPE STREQUAL "riscv64") + if(CMAKE_C_COMPILER_ID MATCHES "Clang") if(CMAKE_C_COMPILER_VERSION VERSION_EQUAL 14.0.0 OR CMAKE_C_COMPILER_VERSION VERSION_GREATER 14.0.0) --- -2.43.0 - diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index da47ce4b65634e2e6fb519cb52d38d8df215a7e8..3da839ddbc054278b6ecaa428686e1b127ac393e 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,14 +1,13 @@ Name: libjpeg-turbo -Version: 3.0.1 -Release: 2 +Version: 3.0.4 +Release: 1 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 -Patch0001: Add-loongarch64.patch +URL: https://libjpeg-turbo.org/ +Source0: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%{version}/%{name}-%{version}.tar.gz +Patch0001: libjpeg-turbo-add-loongarch64-and-riscv64.patch -BuildRequires: gcc cmake libtool nasm -BuildRequires: guile +BuildRequires: gcc cmake nasm Obsoletes: libjpeg < 6b-47 turbojpeg < %{version}-%{release} Provides: libjpeg = 6b-47 turbojpeg = %{version}-%{release} @@ -61,24 +60,23 @@ manipulate JPEG files using the TurboJPEG library. %autosetup -n %{name}-%{version} -p1 %build -%{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 +%{cmake} \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES -DENABLE_STATIC:BOOL=NO \ %{nil} -%make_build V=1 +%cmake_build %install -%make_install -%delete_la +%cmake_install + +rm -fr %{buildroot}%{_datadir}/doc/libjpeg-turbo chmod -x README.md -%ifarch x86_64 - %global wordsize "64" -%else +%ifarch %{ix86} %global wordsize "" +%else + %global wordsize "64" %endif if test -n "$wordsize" @@ -104,24 +102,23 @@ EOF fi %check -LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags} - -%ldconfig_scriptlets +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +%ctest %files -%defattr(-,root,root) %doc README.* %license LICENSE.md %{_libdir}/libjpeg.so.62* -%exclude /usr/share/doc/libjpeg-turbo/* %files devel %doc coderules.txt jconfig.txt libjpeg.txt structure.txt -%exclude %{_includedir}/turbojpeg.h -%{_includedir}/*.h +%{_includedir}/jconfig.h +%{_includedir}/jerror.h +%{_includedir}/jmorecfg.h +%{_includedir}/jpeglib.h %{_libdir}/libjpeg.so %{_libdir}/pkgconfig/libjpeg.pc -%{_libdir}/cmake/%{name}/%{name}*.cmake +%{_libdir}/cmake/%{name} %files utils %doc usage.txt wizard.txt @@ -147,6 +144,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags} %{_mandir}/man1/*.1* %changelog +* Tue Sep 17 2024 Funda Wang - 3.0.4-1 +- update to 3.0.4 + * Tue Apr 16 2024 Wenlong Zhang - 3.0.1-2 - add loongarch64 support for libjpeg-turbo diff --git a/libjpeg-turbo.yaml b/libjpeg-turbo.yaml index 3aafdbe8fe25ad1dd37a81e1a38cb665c793f36a..5261f177bc84d5cbed0e094c224f867ac21e0e0d 100644 --- a/libjpeg-turbo.yaml +++ b/libjpeg-turbo.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: libjpeg-turbo/libjpeg-turbo tag_prefix: ^v -seperator: "." +separator: "."