- 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 OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=15
This commit is contained in:
parent
684526c092
commit
9428f8d2e8
@ -83,12 +83,21 @@ enough to prevent race conditions.
|
||||
}
|
||||
--- bmp.c.orig
|
||||
+++ bmp.c
|
||||
@@ -257,7 +257,7 @@ int saveppm(char *filename, unsigned cha
|
||||
FILE *fs=NULL; int retcode=0;
|
||||
unsigned char *tempbuf=NULL;
|
||||
@@ -112,7 +112,7 @@ int loadbmp(char *filename, unsigned cha
|
||||
if(!filename || !buf || !w || !h || dstpf<0 || dstpf>=TJ_NUMPF)
|
||||
_throw("loadbmp(): Invalid argument");
|
||||
|
||||
- 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");
|
||||
- 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);
|
||||
|
3
libjpeg-turbo-1.2.0.tar.gz
Normal file
3
libjpeg-turbo-1.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
|
||||
size 1752925
|
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libjpeg-turbo
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 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,33 +15,37 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%define major 62
|
||||
%define major 8
|
||||
%define minor 0
|
||||
%define micro 0
|
||||
%define srcver 1.1.1
|
||||
%define micro 2
|
||||
%define srcver 1.2.0
|
||||
%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
|
||||
BuildRequires: gcc-c++ libtool nasm
|
||||
Provides: jpeg = %{version}
|
||||
Obsoletes: jpeg
|
||||
Conflicts: jpeg%{major}
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: baselibs.conf
|
||||
Source0: http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: baselibs.conf
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch0: %{name}-%{version}-int32.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch1: %{name}-%{version}-tiff-ojpeg.patch
|
||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
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
|
||||
@ -49,18 +53,16 @@ JPEG images.
|
||||
|
||||
%package -n libjpeg%{major}
|
||||
|
||||
License: BSD-3-Clause
|
||||
Summary: The MMX/SSE accelerated JPEG compression/decompression library
|
||||
Version: %{libver}
|
||||
|
||||
|
||||
Provides: libjpeg6 = %{version}
|
||||
Obsoletes: libjpeg6
|
||||
Release: 0
|
||||
Summary: The MMX/SSE accelerated JPEG compression/decompression library
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
|
||||
Provides: libjpeg%{major} = %{version}
|
||||
Obsoletes: libjpeg%{major} < %{version}
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: libjpeg-64bit
|
||||
Obsoletes: libjpeg-64bit < %{version}
|
||||
%endif
|
||||
#
|
||||
|
||||
@ -68,63 +70,58 @@ Obsoletes: libjpeg-64bit
|
||||
This library contains MMX/SSE accelerated functions for manipulating
|
||||
JPEG images.
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Rob Hooft <hooft@EMBL-Heidelberg.DE>
|
||||
Michael Mauldin <mlm@cs.cmu.edu>
|
||||
|
||||
%package -n libjpeg%{major}-devel
|
||||
License: BSD-3-Clause
|
||||
Summary: Development Tools for applications which will use the Libjpeg Library
|
||||
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
|
||||
Obsoletes: libjpeg-devel < %{version}
|
||||
Conflicts: libjpeg%{cmajor}-devel
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: libjpeg-devel-64bit
|
||||
Obsoletes: libjpeg-devel-64bit < %{version}
|
||||
%endif
|
||||
#
|
||||
|
||||
%description -n libjpeg62-devel
|
||||
%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
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
%configure --disable-static
|
||||
%configure --disable-static \
|
||||
--with-jpeg8
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
make test libdir=%{_libdir}
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
# Fix perms
|
||||
chmod -x README-turbo.txt
|
||||
# Remove unwanted files
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/lib{,turbo}jpeg.la
|
||||
# Don't distribute libjpegturbo because it is unversioned
|
||||
rm $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.so
|
||||
rm $RPM_BUILD_ROOT%{_bindir}/jpgtest
|
||||
%makeinstall
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# Fix perms
|
||||
chmod -x README-turbo.txt release/copyright
|
||||
|
||||
# Remove unwanted files
|
||||
rm -f %{buildroot}%{_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
|
||||
|
||||
# Remove docs, we'll select docs manually
|
||||
rm -rf %{buildroot}%{_datadir}/doc/
|
||||
|
||||
%post -n libjpeg%{major} -p /sbin/ldconfig
|
||||
|
||||
@ -132,9 +129,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt
|
||||
%doc LICENSE.txt usage.txt wizard.txt
|
||||
/usr/bin/*
|
||||
%doc README README-turbo.txt change.log ChangeLog.txt
|
||||
%doc release/copyright usage.txt wizard.txt
|
||||
%{_bindir}/*
|
||||
%doc %{_mandir}/man1/*
|
||||
|
||||
%files -n libjpeg%{major}
|
||||
@ -144,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -n libjpeg%{major}-devel
|
||||
%defattr(-,root,root)
|
||||
/usr/include/*.h
|
||||
%{_includedir}/*.h
|
||||
%{_libdir}/libjpeg.so
|
||||
%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user