From e1cda27622472c5d3eb2f45d59e7b484ccfec18a904cea42cdcc9f1dd304c16c Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 17 May 2013 07:19:55 +0000 Subject: [PATCH] Accepting request 175935 from home:pgajdos - remove %{_bindir}/* %doc %{_mandir}/man1/* https://bugzilla.novell.com/show_bug.cgi?id=807183#c14 - libjpeg62-turbo package created - selfconflicts are not possible, remove it - Update to version 1.2.1: * fixed heap overflow [bnc#771791] - 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 - add libtool as buildrequire to avoid implicit dependency OBS-URL: https://build.opensuse.org/request/show/175935 OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=25 --- baselibs.conf | 2 + libjpeg-turbo.spec | 12 ++-- libjpeg62-turbo.changes | 110 +++++++++++++++++++++++++++++++ libjpeg62-turbo.spec | 143 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 260 insertions(+), 7 deletions(-) create mode 100644 libjpeg62-turbo.changes create mode 100644 libjpeg62-turbo.spec diff --git a/baselibs.conf b/baselibs.conf index 47865d7..002e1b3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ libjpeg8 libjpeg8-devel +libjpeg62 +libjpeg62-devel diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index a8f5e52..1413f7f 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,7 +1,7 @@ # # spec file for package libjpeg-turbo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -31,10 +31,10 @@ 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 -Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/libjpeg-turbo-%{version}.tar.gz Source1: baselibs.conf -Patch0: %{name}-%{version}-int32.patch -Patch1: %{name}-%{version}-tiff-ojpeg.patch +Patch0: libjpeg-turbo-%{version}-int32.patch +Patch1: libjpeg-turbo-%{version}-tiff-ojpeg.patch Patch2: libjpeg-ocloexec.patch BuildRequires: gcc-c++ BuildRequires: libtool @@ -54,7 +54,6 @@ Version: %{libver} Release: 0 Summary: The MMX/SSE accelerated JPEG compression/decompression library Group: System/Libraries - Provides: libjpeg%{major} = %{version} Obsoletes: libjpeg%{major} < %{version} # bug437293 @@ -72,7 +71,6 @@ Version: %{libver} Release: 0 Summary: Development Tools for applications which will use the Libjpeg Library Group: Development/Libraries/C and C++ - Requires: libjpeg%{major} = %{version} Provides: libjpeg-devel = %{version} Obsoletes: libjpeg-devel < %{version} @@ -91,7 +89,7 @@ necessary for compiling and linking programs which will manipulate JPEG files using the libjpeg library. %prep -%setup -q +%setup -q %patch0 %patch1 %patch2 diff --git a/libjpeg62-turbo.changes b/libjpeg62-turbo.changes new file mode 100644 index 0000000..e109fbb --- /dev/null +++ b/libjpeg62-turbo.changes @@ -0,0 +1,110 @@ +------------------------------------------------------------------- +Wed Mar 6 11:19:02 UTC 2013 - pgajdos@suse.com + +- remove + %{_bindir}/* + %doc %{_mandir}/man1/* + https://bugzilla.novell.com/show_bug.cgi?id=807183#c14 + +------------------------------------------------------------------- +Wed Mar 6 07:58:46 UTC 2013 - pgajdos@suse.com + +- libjpeg62-turbo package created + +------------------------------------------------------------------- +Mon Aug 13 17:05:35 UTC 2012 - dmueller@suse.com + +- selfconflicts are not possible, remove it + +------------------------------------------------------------------- +Mon Jul 23 11:33:56 UTC 2012 - pgajdos@suse.com + +- Update to version 1.2.1: + * fixed heap overflow [bnc#771791] + +------------------------------------------------------------------- +Thu Mar 22 13:25:09 UTC 2012 - idonmez@suse.com + +- 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 + +------------------------------------------------------------------- +Sat Nov 19 20:38:03 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Sat Nov 12 22:54:58 UTC 2011 - crrodriguez@opensuse.org + +- Open all file descriptors with O_CLOEXEC, extended description + in the patch file. + +------------------------------------------------------------------- +Thu May 19 14:44:56 CEST 2011 - pgajdos@suse.cz + +- updated to 1.1.1: + * Fixed a 1-pixel error in row 0, column 21 of the luminance + plane generated by tjEncodeYUV(). + * libjpeg-turbo's accelerated Huffman decoder previously + ignored unexpected markers found in the middle of the + JPEG data stream during decompression. It will now + hand off decoding of a particular block to the unaccelerated + Huffman decoder if an unexpected marker is found, so that + the unaccelerated Huffman decoder can generate an appropriate + warning. + * Fixed a bug in jpeg_read_coefficients() whereby it would + not initialize cinfo->image_width and cinfo->image_height + if libjpeg v7 or v8 emulation was enabled. This specifically + caused the jpegoptim program to fail if it was linked against + a version of libjpeg-turbo that was built with libjpeg v7 or + v8 emulation. + * Eliminated excessive I/O overhead that occurred when reading + BMP files in cjpeg. + * + +------------------------------------------------------------------- +Thu Mar 3 13:53:18 CET 2011 - pgajdos@suse.cz + +- updated to 1.1.0: + * Added further protections against invalid Huffman codes. + * Added an extended version of tjDecompressHeader(). + * Added arithmetic encoding and decoding support. + * TurboJPEG/OSS can now compress from/decompress to + grayscale bitmaps. + * Added emulation of the libjpeg v7 and v8 APIs and ABIs. + * Added two new TurboJPEG API functions, tjEncodeYUV() and + tjDecompressToYUV(). + * The TurboJPEG dynamic library now uses versioned symbols. + * Fixed visual artifacts in grayscale JPEG compression + caused by a typo in the RGB-to-chrominance lookup tables. +- see ChangeLog.txt for details. +- removed upstreamed jpegtran.patch and rh639672.patch + +------------------------------------------------------------------- +Tue Dec 14 14:32:56 CET 2010 - pgajdos@suse.cz + +- spec file cleanup + +------------------------------------------------------------------- +Fri Dec 10 13:02:58 UTC 2010 - pgajdos@novell.com + +- this jpeg version will be the default to the prejudice of jpeg8 + from now on + +------------------------------------------------------------------- +Sun Nov 7 12:53:26 UTC 2010 - prusnak@opensuse.org + +- created package based on Fedora one (v 1.0.1) + diff --git a/libjpeg62-turbo.spec b/libjpeg62-turbo.spec new file mode 100644 index 0000000..1963882 --- /dev/null +++ b/libjpeg62-turbo.spec @@ -0,0 +1,143 @@ +# +# spec file for package libjpeg62-turbo +# +# Copyright (c) 2013 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define major 62 +%define minor 0 +%define micro 0 +%define srcver 1.2.1 +%define libver %{major}.%{minor}.%{micro} +# major number of library from jpeg8 +%define cmajor 8 + +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 +Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/libjpeg-turbo-%{version}.tar.gz +Source1: baselibs.conf +Patch0: libjpeg-turbo-%{version}-int32.patch +Patch1: libjpeg-turbo-%{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 +JPEG images. + +%package -n libjpeg%{major} + +Version: %{libver} +Release: 0 +Summary: The MMX/SSE accelerated JPEG compression/decompression library +Group: System/Libraries +Provides: libjpeg%{major} = %{version} +Obsoletes: libjpeg%{major} < %{version} +# bug437293 +%ifarch ppc64 +Obsoletes: libjpeg-64bit < %{version} +%endif +# + +%description -n libjpeg%{major} +This library contains MMX/SSE accelerated functions for manipulating +JPEG images. + +%package -n libjpeg%{major}-devel +Version: %{libver} +Release: 0 +Summary: Development Tools for applications which will use the Libjpeg Library +Group: Development/Libraries/C and C++ +Requires: libjpeg%{major} = %{version} +Provides: libjpeg-devel = %{version} +Obsoletes: libjpeg-devel < %{version} +%if "%{major}" != "%{cmajor}" +Conflicts: libjpeg%{cmajor}-devel +%endif +# bug437293 +%ifarch ppc64 +Obsoletes: libjpeg-devel-64bit < %{version} +%endif +# + +%description -n libjpeg%{major}-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 -n libjpeg-turbo-%{srcver} +%patch0 +%patch1 +%patch2 + +%build +autoreconf -fiv +%configure --disable-static +make %{?_smp_mflags} + +%check +make test libdir=%{_libdir} + +%install +%makeinstall + +# Fix perms +chmod -x README-turbo.txt release/copyright + +# Remove unwanted files +rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la +rm %{buildroot}%{_bindir}/* +rm %{buildroot}%{_mandir}/man1/* + +# Don't distribute libjpegturbo because it is unversioned +rm %{buildroot}%{_includedir}/turbojpeg.h +rm %{buildroot}%{_libdir}/libturbojpeg.so + +# 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 README-turbo.txt change.log ChangeLog.txt +%doc release/copyright usage.txt wizard.txt + +%files -n libjpeg%{major} +%defattr(-,root,root) +%{_libdir}/libjpeg.so.%{libver} +%{_libdir}/libjpeg.so.%{major} + +%files -n libjpeg%{major}-devel +%defattr(-,root,root) +%{_includedir}/*.h +%{_libdir}/libjpeg.so +%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c + +%changelog