Hello community, here is the log from the commit of package libjpeg-turbo for openSUSE:Factory checked in at 2018-08-07 09:40:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjpeg-turbo (Old) and /work/SRC/openSUSE:Factory/.libjpeg-turbo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjpeg-turbo" Tue Aug 7 09:40:00 2018 rev:40 rq:626896 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/libjpeg-turbo/libjpeg-turbo.changes 2018-06-22 13:16:29.216582154 +0200 +++ /work/SRC/openSUSE:Factory/.libjpeg-turbo.new/libjpeg-turbo.changes 2018-08-07 09:40:03.352994142 +0200 @@ -1,0 +2,14 @@ +Wed Aug 1 11:39:01 UTC 2018 - [email protected] + +- Version update to 2.0.0: + * Cmake as a buildsystem + * avx support + * Better error handling + * More use of SSE2 +- Drop patch libjpeg-1.4.0-ocloexec.patch; conflicts, would be better + handled by upstream anyway +- Drop patches merged upstream: + * libjpeg-turbo-CVE-2018-11813.patch + * libjpeg-turbo-CVE-2018-1152.patch + +------------------------------------------------------------------- libjpeg62-turbo.changes: same change Old: ---- libjpeg-1.4.0-ocloexec.patch libjpeg-turbo-1.5.3.tar.gz libjpeg-turbo-CVE-2018-1152.patch libjpeg-turbo-CVE-2018-11813.patch New: ---- libjpeg-turbo-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg-turbo.spec ++++++ --- /var/tmp/diff_new_pack.rUIahP/_old 2018-08-07 09:40:03.920995133 +0200 +++ /var/tmp/diff_new_pack.rUIahP/_new 2018-08-07 09:40:03.928995146 +0200 @@ -16,40 +16,35 @@ # -%define srcver 1.5.3 +%define srcver 2.0.0 %define major 8 -%define minor 1 +%define minor 2 %define micro 2 %define libver %{major}.%{minor}.%{micro} %define tmajor 0 -%define tminor 1 +%define tminor 2 %define tmicro 0 %define tlibver %{tmajor}.%{tminor}.%{tmicro} - Name: libjpeg-turbo Version: %{srcver} Release: 0 Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files License: BSD-3-Clause Group: Productivity/Graphics/Convertors -Url: http://sourceforge.net/projects/libjpeg-turbo +URL: https://github.com/libjpeg-turbo/libjpeg-turbo Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz Source1: baselibs.conf Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch -Patch2: libjpeg-1.4.0-ocloexec.patch -Patch3: libjpeg-turbo-CVE-2018-11813.patch -Patch4: libjpeg-turbo-CVE-2018-1152.patch +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: yasm +Conflicts: jpeg%{major} Obsoletes: jpeg = 6b Obsoletes: jpeg = 8.0.1 Obsoletes: jpeg = 8.0.2 Provides: jpeg = %{version} Obsoletes: jpeg < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: jpeg%{major} %description The libjpeg-turbo package contains a library of functions for manipulating @@ -64,12 +59,7 @@ Version: %{libver} Release: 0 Summary: The MMX/SSE accelerated JPEG compression/decompression library -# bug437293 Group: System/Libraries -%ifarch ppc64 -Obsoletes: libjpeg-64bit < %{version} -%endif -# %description -n libjpeg%{major} This library contains MMX/SSE accelerated functions for manipulating @@ -92,14 +82,9 @@ Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} Requires: libturbojpeg%{tmajor} = %{version} +Conflicts: libjpeg-devel Provides: libjpeg-devel = %{version} Obsoletes: libjpeg-devel < %{version} -Conflicts: otherproviders(libjpeg-devel) -# bug437293 -%ifarch ppc64 -Obsoletes: libjpeg-devel-64bit < %{version} -%endif -# %description -n libjpeg%{major}-devel The libjpeg-devel package includes the header files and libraries @@ -109,59 +94,50 @@ %prep %setup -q %patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 %build export LDFLAGS="-Wl,-z,relro,-z,now" -%configure --disable-static \ - --with-build-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d) \ - --with-jpeg8 +%cmake \ + -DENABLE_STATIC=OFF \ + -DWITH_JPEG8=ON make %{?_smp_mflags} %check -make test libdir=%{_libdir} +export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +%ctest %install -%make_install -# Remove unwanted files -rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la +%cmake_install # Remove docs, we'll select docs manually rm -rf %{buildroot}%{_datadir}/doc/ %post -n libjpeg%{major} -p /sbin/ldconfig - %postun -n libjpeg%{major} -p /sbin/ldconfig - %post -n libturbojpeg%{tmajor} -p /sbin/ldconfig - %postun -n libturbojpeg%{tmajor} -p /sbin/ldconfig %files -%defattr(-,root,root) %doc README.md change.log ChangeLog.md %doc usage.txt wizard.txt %{_bindir}/* -%doc %{_mandir}/man1/* +%{_mandir}/man1/* %files -n libjpeg%{major} -%defattr(-,root,root) +%license LICENSE.md %{_libdir}/libjpeg.so.%{libver} %{_libdir}/libjpeg.so.%{major} %files -n libturbojpeg%{tmajor} -%defattr(-,root,root) +%license LICENSE.md %{_libdir}/libturbojpeg.so.%{tmajor} %{_libdir}/libturbojpeg.so.%{tlibver} %files -n libjpeg%{major}-devel -%defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libjpeg.so %{_libdir}/libturbojpeg.so %{_libdir}/pkgconfig/libjpeg.pc %{_libdir}/pkgconfig/libturbojpeg.pc -%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c +%doc coderules.txt jconfig.txt libjpeg.txt structure.txt tjexample.c %changelog ++++++ libjpeg62-turbo.spec ++++++ --- /var/tmp/diff_new_pack.rUIahP/_old 2018-08-07 09:40:03.944995175 +0200 +++ /var/tmp/diff_new_pack.rUIahP/_new 2018-08-07 09:40:03.944995175 +0200 @@ -17,29 +17,26 @@ %define major 62 -%define minor 2 +%define minor 3 %define micro 0 -%define srcver 1.5.3 +%define srcver 2.0.0 %define libver %{major}.%{minor}.%{micro} - Name: libjpeg62-turbo Version: %{srcver} Release: 0 Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files License: BSD-3-Clause Group: Productivity/Graphics/Convertors -Url: http://sourceforge.net/projects/libjpeg-turbo +URL: http://sourceforge.net/projects/libjpeg-turbo Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz Source1: baselibs.conf Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch -Patch2: libjpeg-1.4.0-ocloexec.patch -Patch3: libjpeg-turbo-CVE-2018-11813.patch -Patch4: libjpeg-turbo-CVE-2018-1152.patch +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libtool +# needed for tests as we remove the lib here +BuildRequires: libturbojpeg0 >= 8.2.2 BuildRequires: pkgconfig BuildRequires: yasm -BuildRoot: %{_tmppath}/%{name}-%{version}-build Conflicts: jpeg%{major} %description @@ -52,11 +49,6 @@ Summary: The MMX/SSE accelerated JPEG compression/decompression library Group: System/Libraries Obsoletes: libjpeg = 6.2.0 -# bug437293 -%ifarch ppc64 -Obsoletes: libjpeg-64bit < %{version} -%endif -# %description -n libjpeg%{major} This library contains MMX/SSE accelerated functions for manipulating @@ -68,14 +60,9 @@ Summary: Development Tools for applications which will use the Libjpeg Library Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} +Conflicts: libjpeg-devel Provides: libjpeg-devel = %{version} Obsoletes: libjpeg-devel < %{version} -Conflicts: otherproviders(libjpeg-devel) -# bug437293 -%ifarch ppc64 -Obsoletes: libjpeg-devel-64bit < %{version} -%endif -# %description -n libjpeg%{major}-devel The libjpeg-devel package includes the header files and libraries @@ -85,51 +72,41 @@ %prep %setup -q -n libjpeg-turbo-%{srcver} %patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 %build export LDFLAGS="-Wl,-z,relro,-z,now" -%configure --disable-static \ - --with-build-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d) +%cmake \ + -DENABLE_STATIC=OFF make %{?_smp_mflags} %check -make test libdir=%{_libdir} +export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +%ctest %install -%make_install +%cmake_install # Remove unwanted files -rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la 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 # Remove docs, we'll select docs manually rm -rf %{buildroot}%{_datadir}/doc/ %post -n libjpeg%{major} -p /sbin/ldconfig - %postun -n libjpeg%{major} -p /sbin/ldconfig -%files -%defattr(-,root,root) -%doc README.md change.log ChangeLog.md -%doc usage.txt wizard.txt - %files -n libjpeg%{major} -%defattr(-,root,root) +%license LICENSE.md %{_libdir}/libjpeg.so.%{major} %{_libdir}/libjpeg.so.%{libver} %files -n libjpeg%{major}-devel -%defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libjpeg.so %{_libdir}/pkgconfig/libjpeg.pc -%{_libdir}/pkgconfig/libturbojpeg.pc -%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c +%doc coderules.txt jconfig.txt libjpeg.txt structure.txt tjexample.c %changelog ++++++ libjpeg-turbo-1.5.3.tar.gz -> libjpeg-turbo-2.0.0.tar.gz ++++++ ++++ 225858 lines of diff (skipped)
