Hello community, here is the log from the commit of package libjpeg-turbo for openSUSE:12.2 checked in at 2012-07-25 08:16:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/libjpeg-turbo (Old) and /work/SRC/openSUSE:12.2/.libjpeg-turbo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjpeg-turbo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/libjpeg-turbo/libjpeg-turbo.changes 2012-07-24 22:44:12.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.libjpeg-turbo.new/libjpeg-turbo.changes 2012-07-25 08:16:46.000000000 +0200 @@ -2,24 +1,0 @@ -Mon Jul 23 11:33:56 UTC 2012 - [email protected] - -- Update to version 1.2.1: - * fixed heap overflow [bnc#771791] - -------------------------------------------------------------------- -Thu Mar 22 13:25:09 UTC 2012 - [email protected] - -- Update to version 1.2.0 - * Fixed out-of-bounds read in SSE2 SIMD code - * Added a compile-time macro (LIBJPEG_TURBO_VERSION) that can - be used to check the version of libjpeg-turbo against which - an application was compiled. - * Added new RGBA/BGRA/ABGR/ARGB colorspace extension constants - * libjpeg-turbo will now correctly decompress erroneous - CMYK/YCCK JPEGs whose K component is assigned a component ID - of 1 instead of 4. - * Added SIMD routines for RGB-to-grayscale color conversion - * Improved the performance of the C color conversion routines - * Added a function to the TurboJPEG API that performs lossless - transforms. - * Added support for 4:4:0 (transposed 4:2:2) subsampling - -------------------------------------------------------------------- Old: ---- libjpeg-turbo-1.2.1-int32.patch libjpeg-turbo-1.2.1-tiff-ojpeg.patch libjpeg-turbo-1.2.1.tar.gz New: ---- libjpeg-turbo-1.1.1-int32.patch libjpeg-turbo-1.1.1-tiff-ojpeg.patch libjpeg-turbo-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg-turbo.spec ++++++ --- /var/tmp/diff_new_pack.HTCKql/_old 2012-07-25 08:16:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HTCKql/_new 2012-07-25 08:16:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libjpeg-turbo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,34 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild -%define major 8 +%define major 62 %define minor 0 -%define micro 2 -%define srcver 1.2.1 +%define micro 0 +%define srcver 1.1.1 %define libver %{major}.%{minor}.%{micro} # major number of library from jpeg8 %define cmajor 8 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 +Version: %{srcver} +Release: 1 +Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Url: http://sourceforge.net/projects/libjpeg-turbo -Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz +BuildRequires: gcc-c++ libtool nasm +Provides: jpeg = %{version} +Obsoletes: jpeg +Conflicts: jpeg%{major} +Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch0: %{name}-%{version}-int32.patch Patch1: %{name}-%{version}-tiff-ojpeg.patch Patch2: libjpeg-ocloexec.patch -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: yasm -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 @@ -50,16 +49,18 @@ %package -n libjpeg%{major} -Version: %{libver} -Release: 0 +License: BSD-3-Clause Summary: The MMX/SSE accelerated JPEG compression/decompression library -Group: System/Libraries +Version: %{libver} + -Provides: libjpeg%{major} = %{version} -Obsoletes: libjpeg%{major} < %{version} +Provides: libjpeg6 = %{version} +Obsoletes: libjpeg6 +Group: System/Libraries +AutoReqProv: on # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-64bit < %{version} +Obsoletes: libjpeg-64bit %endif # @@ -67,27 +68,36 @@ This library contains MMX/SSE accelerated functions for manipulating JPEG images. + +Authors: +-------- + Rob Hooft <[email protected]> + Michael Mauldin <[email protected]> + %package -n libjpeg%{major}-devel -Version: %{libver} -Release: 0 +License: BSD-3-Clause Summary: Development Tools for applications which will use the Libjpeg Library -Group: Development/Libraries/C and C++ +Version: %{libver} + +Group: Development/Libraries/C and C++ Requires: libjpeg%{major} = %{version} Provides: libjpeg-devel = %{version} -Obsoletes: libjpeg-devel < %{version} +Obsoletes: libjpeg-devel Conflicts: libjpeg%{cmajor}-devel # bug437293 %ifarch ppc64 -Obsoletes: libjpeg-devel-64bit < %{version} +Obsoletes: libjpeg-devel-64bit %endif # -%description -n libjpeg%{major}-devel +%description -n libjpeg62-devel The libjpeg-devel package includes the header files and libraries necessary for compiling and linking programs which will manipulate JPEG files using the libjpeg library. + + %prep %setup -q %patch0 @@ -96,29 +106,25 @@ %build autoreconf -fiv -%configure --disable-static \ - --with-jpeg8 +%configure --disable-static make %{?_smp_mflags} %check make test libdir=%{_libdir} %install -%makeinstall - +make install DESTDIR=$RPM_BUILD_ROOT # Fix perms -chmod -x README-turbo.txt release/copyright - +chmod -x README-turbo.txt # Remove unwanted files -rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la - +rm -f $RPM_BUILD_ROOT%{_libdir}/lib{,turbo}jpeg.la # Don't distribute libjpegturbo because it is unversioned -rm %{buildroot}%{_includedir}/turbojpeg.h -rm %{buildroot}%{_libdir}/libturbojpeg.so -rm %{buildroot}%{_bindir}/tjbench +rm $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h +rm $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.so +rm $RPM_BUILD_ROOT%{_bindir}/jpgtest -# Remove docs, we'll select docs manually -rm -rf %{buildroot}%{_datadir}/doc/ +%clean +rm -rf $RPM_BUILD_ROOT %post -n libjpeg%{major} -p /sbin/ldconfig @@ -126,9 +132,9 @@ %files %defattr(-,root,root) -%doc README README-turbo.txt change.log ChangeLog.txt -%doc release/copyright usage.txt wizard.txt -%{_bindir}/* +%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt +%doc LICENSE.txt usage.txt wizard.txt +/usr/bin/* %doc %{_mandir}/man1/* %files -n libjpeg%{major} @@ -138,7 +144,7 @@ %files -n libjpeg%{major}-devel %defattr(-,root,root) -%{_includedir}/*.h +/usr/include/*.h %{_libdir}/libjpeg.so %doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.HTCKql/_old 2012-07-25 08:16:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HTCKql/_new 2012-07-25 08:16:46.000000000 +0200 @@ -1,2 +1,2 @@ -libjpeg8 -libjpeg8-devel +libjpeg62 +libjpeg62-devel ++++++ libjpeg-ocloexec.patch ++++++ --- /var/tmp/diff_new_pack.HTCKql/_old 2012-07-25 08:16:46.000000000 +0200 +++ /var/tmp/diff_new_pack.HTCKql/_new 2012-07-25 08:16:46.000000000 +0200 @@ -83,21 +83,12 @@ } --- bmp.c.orig +++ bmp.c -@@ -112,7 +112,7 @@ int loadbmp(char *filename, unsigned cha - if(!filename || !buf || !w || !h || dstpf<0 || dstpf>=TJ_NUMPF) - _throw("loadbmp(): Invalid argument"); +@@ -257,7 +257,7 @@ int saveppm(char *filename, unsigned cha + FILE *fs=NULL; int retcode=0; + unsigned char *tempbuf=NULL; -- if((file=fopen(filename, "rb"))==NULL) -+ if((file=fopen(filename, READ_BINARY))==NULL) - _throwunix("loadbmp(): Cannot open input file"); - - cinfo.err=jpeg_std_error(&jerr.pub); -@@ -196,7 +196,7 @@ int savebmp(char *filename, unsigned cha - if(!filename || !buf || w<1 || h<1 || srcpf<0 || srcpf>=TJ_NUMPF) - _throw("savebmp(): Invalid argument"); - -- if((file=fopen(filename, "wb"))==NULL) -+ if((file=fopen(filename, WRITE_BINARY))==NULL) - _throwunix("savebmp(): Cannot open output file"); - - dinfo.err=jpeg_std_error(&jerr.pub); +- if((fs=fopen(filename, "wb"))==NULL) _throw(strerror(errno)); ++ if((fs=fopen(filename, "wbe"))==NULL) _throw(strerror(errno)); + if(fprintf(fs, "P6\n")<1) _throw("Write error"); + if(fprintf(fs, "%d %d\n", w, h)<1) _throw("Write error"); + if(fprintf(fs, "255\n")<1) _throw("Write error"); ++++++ libjpeg-turbo-1.2.1-int32.patch -> libjpeg-turbo-1.1.1-int32.patch ++++++ ++++++ libjpeg-turbo-1.2.1-tiff-ojpeg.patch -> libjpeg-turbo-1.1.1-tiff-ojpeg.patch ++++++ ++++++ libjpeg-turbo-1.2.1.tar.gz -> libjpeg-turbo-1.1.1.tar.bz2 ++++++ ++++ 42941 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
