diff --git a/.gitignore b/.gitignore index df44e1e..4506b86 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libjpeg-turbo-1.0.0.tar.gz /libjpeg-turbo-1.0.1.tar.gz /libjpeg-turbo-1.0.90.tar.gz /libjpeg-turbo-1.1.0.tar.gz +/libjpeg-turbo-1.1.1.tar.gz diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index a589470..bac21d9 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,6 +1,6 @@ Name: libjpeg-turbo -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Group: System Environment/Libraries @@ -22,7 +22,6 @@ Obsoletes: libjpeg < 6b-47 Provides: libjpeg = 6b-47 Patch0: libjpeg-turbo11-noinst_jpgtest.patch -Patch1: ljt11-rh688712.patch %description The libjpeg-turbo package contains a library of functions for manipulating @@ -74,7 +73,6 @@ JPEG images %setup -q %patch0 -p1 -b .noinst_jpgtest -%patch1 -p0 -b .rh688712 %build autoreconf -fiv @@ -137,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libjpeg.a %changelog +* Mon Jul 11 2011 Adam Tkac 1.1.1-1 +- update to 1.1.1 + - ljt11-rh688712.patch merged + * Tue Mar 22 2011 Adam Tkac 1.1.0-2 - handle broken JPEGs better (#688712) diff --git a/ljt11-rh688712.patch b/ljt11-rh688712.patch deleted file mode 100644 index 35a27d3..0000000 --- a/ljt11-rh688712.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: jdhuff.c -=================================================================== ---- jdhuff.c (revision 520) -+++ jdhuff.c (revision 521) -@@ -623,6 +623,7 @@ - if (val0 == 0xFF) { \ - buffer++; \ - if (val1 != 0) { \ -+ cinfo->unread_marker = val1; \ - buffer -= 2; \ - get_buffer &= ~0xFF; \ - } \ -@@ -739,6 +740,11 @@ - } - } - -+ if (cinfo->unread_marker != 0 && ! cinfo->entropy->insufficient_data) { -+ WARNMS(cinfo, JWRN_HIT_MARKER); -+ cinfo->entropy->insufficient_data = TRUE; -+ } -+ - br_state.bytes_in_buffer -= (buffer - br_state.next_input_byte); - br_state.next_input_byte = buffer; - BITREAD_SAVE_STATE(cinfo,entropy->bitstate); diff --git a/sources b/sources index 4d59361..425db53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -83e6914a281d649ad289445dc20f9de4 libjpeg-turbo-1.1.0.tar.gz +03b9c1406c7bfdc204313c2917ce6962 libjpeg-turbo-1.1.1.tar.gz