Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libjpeg-turbo for openSUSE:Factory checked in at 2023-06-29 17:27:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjpeg-turbo (Old) and /work/SRC/openSUSE:Factory/.libjpeg-turbo.new.13546 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjpeg-turbo" Thu Jun 29 17:27:28 2023 rev:69 rq:1095708 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/libjpeg-turbo/libjpeg-turbo.changes 2023-05-05 15:57:07.220028488 +0200 +++ /work/SRC/openSUSE:Factory/.libjpeg-turbo.new.13546/libjpeg-turbo.changes 2023-06-29 17:27:35.105998089 +0200 @@ -1,0 +2,5 @@ +Fri Jun 23 17:39:37 UTC 2023 - [email protected] + +- merge two spec files into one + +------------------------------------------------------------------- Old: ---- libjpeg62-turbo.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg-turbo.spec ++++++ --- /var/tmp/diff_new_pack.W6A1zu/_old 2023-06-29 17:27:37.970014865 +0200 +++ /var/tmp/diff_new_pack.W6A1zu/_new 2023-06-29 17:27:37.974014888 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libjpeg-turbo +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -16,18 +16,31 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "" +%global flavor libjpeg-turbo +%endif + %define asan_build 0 %define debug_build 0 +%define srcver 2.1.5.1 +%if "%{flavor}" == "libjpeg-turbo" %define major 8 %define minor 2 %define micro 2 -%define libver %{major}.%{minor}.%{micro} %define tmajor 0 %define tminor 2 %define tmicro 0 %define tlibver %{tmajor}.%{tminor}.%{tmicro} -Name: libjpeg-turbo -Version: 2.1.5.1 +%endif +%if "%{flavor}" == "libjpeg62-turbo" +%define major 62 +%define minor 3 +%define micro 0 +%endif +%define libver %{major}.%{minor}.%{micro} +Name: %{flavor} +Version: %{srcver} Release: 0 Summary: A SIMD-accelerated library for manipulating JPEG image files License: BSD-3-Clause @@ -41,6 +54,7 @@ BuildRequires: gcc-c++ BuildRequires: nasm BuildRequires: pkgconfig +%if "%{flavor}" == "libjpeg-turbo" Conflicts: jpeg%{major} Obsoletes: jpeg = 6b Obsoletes: jpeg = 8.0.1 @@ -49,18 +63,25 @@ Obsoletes: jpeg < %{version} Provides: jpegtran = %{version} %{?suse_build_hwcaps_libs} +%endif +%if "%{flavor}" == "libjpeg62-turbo" +# needed for tests as we remove the lib here +BuildRequires: libturbojpeg0 >= 8.2.2 +Conflicts: jpeg%{major} +%endif %description The libjpeg-turbo package contains a library of functions for manipulating JPEG images. It supports architecture-specific SIMD instructions, such as SSE/SSE2/AVX2, AltiVec, NEON, MIPS DSPR2, and Loongson MMI. - +%if "%{flavor}" == "libjpeg-turbo" It also includes the following command line utilities: djpeg - decompress a JPEG file to an image file jpegtran - lossless transformation of JPEG files rdjpgcom - display text comments from a JPEG file wrjpgcom - insert text comments into a JPEG file tjbench - a JPEG decompression/compression benchmark +%endif %package -n libjpeg%{major} Version: %{libver} @@ -72,6 +93,7 @@ architecture-specific SIMD instructions, such as SSE/SSE2/AVX2, AltiVec, NEON, MIPS DSPR2, and Loongson MMI. +%if "%{flavor}" == "libjpeg-turbo" %package -n libturbojpeg%{tmajor} Version: %{version} Release: 0 @@ -81,13 +103,16 @@ A library for manipulating JPEG images. It supports architecture-specific SIMD instructions, such as SSE/SSE2/AVX2, AltiVec, NEON, MIPS DSPR2, and Loongson MMI. +%endif %package -n libjpeg%{major}-devel Version: %{libver} Release: 0 Summary: Development Tools for applications which will use the Libjpeg Library Requires: libjpeg%{major} = %{version} +%if "%{flavor}" == "libjpeg-turbo" Requires: libturbojpeg%{tmajor} = %{version} +%endif Conflicts: libjpeg-devel Provides: libjpeg-devel = %{version} Obsoletes: libjpeg-devel < %{version} @@ -98,8 +123,7 @@ files using the libjpeg library. %prep -%setup -q -%patch1 +%autosetup -p1 -n libjpeg-turbo-%{srcver} %build MYLDFLAGS="-Wl,-z,relro,-z,now" @@ -112,6 +136,9 @@ MYCFLAGS="$MYCFLAGS -O0 -g" %endif %cmake \ +%if "%{flavor}" == "libjpeg-turbo" + -DWITH_JPEG8=ON \ +%endif %if %{debug_build} || %{asan_build} -DCMAKE_BUILD_TYPE=DEBUG \ -DCMAKE_C_FLAGS_DEBUG="$MYCFLAGS" \ @@ -121,7 +148,6 @@ %endif -DCMAKE_SHARED_LINKER_FLAGS="$MYLDFLAGS" \ -DENABLE_STATIC=OFF \ - -DWITH_JPEG8=ON \ %ifarch s390x riscv64 -DFLOATTEST=fp-contract \ %endif @@ -148,36 +174,54 @@ %endif # Remove docs, we'll select docs manually rm -rf %{buildroot}%{_datadir}/doc/ +%if "%{flavor}" == "libjpeg62-turbo" +# Remove unwanted files +rm %{buildroot}%{_bindir}/* +rm %{buildroot}%{_mandir}/man1/* +# libjpegturbo is provided with libjpeg-turbo.spec yet +rm %{buildroot}%{_includedir}/turbojpeg.h +rm %{buildroot}%{_libdir}/libturbojpeg.so* +rm %{buildroot}%{_libdir}/pkgconfig/libturbojpeg.pc +rm -r %{buildroot}%{_libdir}/cmake +%endif %post -n libjpeg%{major} -p /sbin/ldconfig %postun -n libjpeg%{major} -p /sbin/ldconfig +%if "%{flavor}" == "libjpeg-turbo" %post -n libturbojpeg%{tmajor} -p /sbin/ldconfig %postun -n libturbojpeg%{tmajor} -p /sbin/ldconfig +%endif +%if "%{flavor}" == "libjpeg-turbo" %files %doc README.md change.log ChangeLog.md %doc usage.txt wizard.txt %{_bindir}/* %{_mandir}/man1/* +%endif %files -n libjpeg%{major} %license LICENSE.md %{_libdir}/libjpeg.so.%{libver} %{_libdir}/libjpeg.so.%{major} +%if "%{flavor}" == "libjpeg-turbo" %files -n libturbojpeg%{tmajor} %license LICENSE.md %{_libdir}/libturbojpeg.so.%{tmajor} %{_libdir}/libturbojpeg.so.%{tlibver} +%endif %files -n libjpeg%{major}-devel %{_includedir}/*.h %{_libdir}/libjpeg.so -%{_libdir}/libturbojpeg.so %{_libdir}/pkgconfig/libjpeg.pc +%doc coderules.txt jconfig.txt libjpeg.txt structure.txt tjexample.c +%if "%{flavor}" == "libjpeg-turbo" +%{_libdir}/libturbojpeg.so %{_libdir}/pkgconfig/libturbojpeg.pc %dir %{_libdir}/cmake/libjpeg-turbo %{_libdir}/cmake/libjpeg-turbo/* -%doc coderules.txt jconfig.txt libjpeg.txt structure.txt tjexample.c +%endif %changelog ++++++ libjpeg-turbo-1.3.0-tiff-ojpeg.patch ++++++ --- /var/tmp/diff_new_pack.W6A1zu/_old 2023-06-29 17:27:38.022015170 +0200 +++ /var/tmp/diff_new_pack.W6A1zu/_new 2023-06-29 17:27:38.022015170 +0200 @@ -1,5 +1,5 @@ ---- jdhuff.c -+++ jdhuff.c +--- a/jdhuff.c ++++ b/jdhuff.c @@ -649,3 +649,35 @@ entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL; }
