Update to 1.0.1 and add -static subpkg (#632859).
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac
parent
07c1e5ec40
commit
822bec6d22
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
libjpeg-turbo-1.0.0.tar.gz
|
||||
/libjpeg-turbo-1.0.1.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: libjpeg-turbo
|
||||
Version: 1.0.0
|
||||
Release: 3%{?dist}
|
||||
Version: 1.0.1
|
||||
Release: 1%{?dist}
|
||||
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
|
||||
|
||||
Group: System Environment/Libraries
|
||||
@ -21,8 +21,6 @@ Obsoletes: libjpeg < 6b-47
|
||||
# java-1.6.0-openjdk (#rh607554) -- atkac
|
||||
Provides: libjpeg = 6b-47
|
||||
|
||||
Patch0: libjpeg-turbo10-rh617469.patch
|
||||
|
||||
%description
|
||||
The libjpeg-turbo package contains a library of functions for manipulating
|
||||
JPEG images
|
||||
@ -31,7 +29,6 @@ JPEG images
|
||||
Summary: Headers for the libjpeg-turbo library
|
||||
Group: Development/Libraries
|
||||
Obsoletes: libjpeg-devel < 6b-47
|
||||
Obsoletes: libjpeg-static < 6b-47
|
||||
Provides: libjpeg-devel = 6b-47
|
||||
%if "%{?_isa}" != ""
|
||||
Provides: libjpeg-devel%{_isa} = 6b-47
|
||||
@ -56,15 +53,27 @@ can perform various useful transformations on JPEG files. Rdjpgcom
|
||||
displays any text comments included in a JPEG file. Wrjpgcom inserts
|
||||
text comments into a JPEG file.
|
||||
|
||||
%package static
|
||||
Summary: Static version of the libjpeg-turbo library
|
||||
Group: Development/Libraries
|
||||
Obsoletes: libjpeg-static < 6b-47
|
||||
Provides: libjpeg-static = 6b-47
|
||||
%if "%{?_isa}" != ""
|
||||
Provides: libjpeg-static%{_isa} = 6b-47
|
||||
%endif
|
||||
Requires: libjpeg-turbo-devel%{_isa} = %{version}-%{release}
|
||||
|
||||
%description static
|
||||
The libjpeg-turbo-static package contains static library for manipulating
|
||||
JPEG images
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p0 -b .rh617469
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
|
||||
%configure --disable-static
|
||||
%configure
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -80,7 +89,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{,turbo}jpeg.la
|
||||
|
||||
# Don't distribute libjpegturbo because it is unversioned
|
||||
rm -f $RPM_BUILD_ROOT/%{_includedir}/turbojpeg.h
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/libturbojpeg.so
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/libturbojpeg.{so,a}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -117,7 +126,16 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/rdjpgcom.1*
|
||||
%{_mandir}/man1/wrjpgcom.1*
|
||||
|
||||
%files static
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libjpeg.a
|
||||
|
||||
%changelog
|
||||
* Mon Sep 13 2010 Adam Tkac <atkac redhat com> 1.0.1-1
|
||||
- update to 1.0.1
|
||||
- libjpeg-turbo10-rh617469.patch merged
|
||||
- add -static subpkg (#632859)
|
||||
|
||||
* Wed Aug 04 2010 Adam Tkac <atkac redhat com> 1.0.0-3
|
||||
- fix huffman decoder to handle broken JPEGs well (#617469)
|
||||
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
Index: jdhuff.c
|
||||
===================================================================
|
||||
--- jdhuff.c (revision 220)
|
||||
+++ jdhuff.c (revision 221)
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
/* Modifications:
|
||||
* Copyright (C)2007 Sun Microsystems, Inc.
|
||||
- * Copyright (C)2009 D. R. Commander
|
||||
+ * Copyright (C)2009-2010 D. R. Commander
|
||||
*
|
||||
* This library is free software and may be redistributed and/or modified under
|
||||
* the terms of the wxWindows Library License, Version 3.1 or (at your option)
|
||||
@@ -240,6 +240,7 @@
|
||||
dtbl->maxcode[l] = -1; /* -1 if no codes of this length */
|
||||
}
|
||||
}
|
||||
+ dtbl->valoffset[17] = 0;
|
||||
dtbl->maxcode[17] = 0xFFFFFL; /* ensures jpeg_huff_decode terminates */
|
||||
|
||||
/* Compute lookahead tables to speed up decoding.
|
||||
Index: jdhuff.h
|
||||
===================================================================
|
||||
--- jdhuff.h (revision 220)
|
||||
+++ jdhuff.h (revision 221)
|
||||
@@ -2,6 +2,7 @@
|
||||
* jdhuff.h
|
||||
*
|
||||
* Copyright (C) 1991-1997, Thomas G. Lane.
|
||||
+ * Copyright (C) 2010, D. R. Commander.
|
||||
* This file is part of the Independent JPEG Group's software.
|
||||
* For conditions of distribution and use, see the accompanying README file.
|
||||
*
|
||||
@@ -27,7 +28,7 @@
|
||||
/* Basic tables: (element [0] of each array is unused) */
|
||||
INT32 maxcode[18]; /* largest code of length k (-1 if none) */
|
||||
/* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */
|
||||
- INT32 valoffset[17]; /* huffval[] offset for codes of length k */
|
||||
+ INT32 valoffset[18]; /* huffval[] offset for codes of length k */
|
||||
/* valoffset[k] = huffval[] index of 1st symbol of code length k, less
|
||||
* the smallest code of length k; so given a code of length k, the
|
||||
* corresponding symbol is huffval[code + valoffset[k]]
|
||||
Index: ChangeLog.txt
|
||||
===================================================================
|
||||
--- ChangeLog.txt (revision 220)
|
||||
+++ ChangeLog.txt (revision 221)
|
||||
@@ -1,3 +1,11 @@
|
||||
+Significant changes since 1.0.0
|
||||
+===============================
|
||||
+
|
||||
+[1] The Huffman decoder will now handle erroneous Huffman codes (for instance,
|
||||
+from a corrupt JPEG image.) Previously, these would cause libjpeg-turbo to
|
||||
+crash under certain circumstances.
|
||||
+
|
||||
+
|
||||
Significant changes since 0.0.93
|
||||
================================
|
||||
|
||||
Loading…
Reference in New Issue
Block a user