diff --git a/baselibs.conf b/baselibs.conf index 84b1ea0..cb5f568 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -6,4 +6,4 @@ libjpeg62 libjpeg62-devel conflicts "jpeg-devel-" provides "jpeg-devel-" - +libjpegturbo0 diff --git a/libjpeg-turbo-1.2.1.tar.gz b/libjpeg-turbo-1.2.1.tar.gz deleted file mode 100644 index 0bc4102..0000000 --- a/libjpeg-turbo-1.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb3323f054a02cedad193bd0ca418d46934447f995d19e678ea64f78e4903770 -size 1755264 diff --git a/libjpeg-turbo-1.2.1-int32.patch b/libjpeg-turbo-1.3.0-int32.patch similarity index 100% rename from libjpeg-turbo-1.2.1-int32.patch rename to libjpeg-turbo-1.3.0-int32.patch diff --git a/libjpeg-turbo-1.2.1-tiff-ojpeg.patch b/libjpeg-turbo-1.3.0-tiff-ojpeg.patch similarity index 100% rename from libjpeg-turbo-1.2.1-tiff-ojpeg.patch rename to libjpeg-turbo-1.3.0-tiff-ojpeg.patch diff --git a/libjpeg-turbo-1.3.0.tar.gz b/libjpeg-turbo-1.3.0.tar.gz new file mode 100644 index 0000000..424ec7f --- /dev/null +++ b/libjpeg-turbo-1.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234 +size 1361603 diff --git a/libjpeg-turbo.changes b/libjpeg-turbo.changes index b88b070..90e562d 100644 --- a/libjpeg-turbo.changes +++ b/libjpeg-turbo.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 10 12:42:45 UTC 2013 - pgajdos@suse.com + +- update do 1.3.0: + * Fixed a Huffman encoder bug that prevented I/O suspension from + working properly. + * Added support for additional scaling factors (3/8, 5/8, 3/4, + 7/8, 9/8, 5/4, 11/8, 3/2, 13/8, 7/4, 15/8, and 2) when + decompressing. Note that the IDCT will not be SIMD-accelerated + when using any of these new scaling factors. + * The tjDecompressToYUV() function now supports the TJFLAG_FASTDCT + flag. + * cjpeg can now be used to generate JPEG files with the RGB + colorspace (feature ported from jpeg-8d.) + * etc. see ChangeLog.txt + ------------------------------------------------------------------- Mon May 27 18:21:55 UTC 2013 - crrodriguez@opensuse.org diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 4c76e76..5b2845e 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -16,12 +16,15 @@ # -%define major 8 -%define minor 0 -%define micro 2 -%define srcver 1.2.1 -%define libver %{major}.%{minor}.%{micro} -# major number of library from jpeg8 +%define srcver 1.3.0 +%define major 8 +%define minor 0 +%define micro 2 +%define libver %{major}.%{minor}.%{micro} +%define tmajor 0 +%define tminor 0 +%define tmicro 0 +%define tlibver %{tmajor}.%{tminor}.%{tmicro} Name: libjpeg-turbo Version: %{srcver} @@ -65,6 +68,17 @@ Obsoletes: libjpeg-64bit < %{version} This library contains MMX/SSE accelerated functions for manipulating JPEG images. +%package -n libturbojpeg%{tmajor} + +Version: %{version} +Release: 0 +Summary: The MMX/SSE accelerated JPEG compression/decompression library +Group: System/Libraries + +%description -n libturbojpeg%{tmajor} +This library contains MMX/SSE accelerated functions for manipulating +JPEG images. + %package -n libjpeg%{major}-devel Version: %{libver} Release: 0 @@ -103,18 +117,10 @@ make test libdir=%{_libdir} %install %makeinstall - # 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 - -# 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/ @@ -122,10 +128,14 @@ rm -rf %{buildroot}%{_datadir}/doc/ %postun -n libjpeg%{major} -p /sbin/ldconfig +%post -n libturbojpeg%{tmajor} -p /sbin/ldconfig + +%postun -n libturbojpeg%{tmajor} -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README README-turbo.txt change.log ChangeLog.txt -%doc release/copyright usage.txt wizard.txt +%doc usage.txt wizard.txt %{_bindir}/* %doc %{_mandir}/man1/* @@ -134,10 +144,16 @@ rm -rf %{buildroot}%{_datadir}/doc/ %{_libdir}/libjpeg.so.%{libver} %{_libdir}/libjpeg.so.%{major} +%files -n libturbojpeg%{tmajor} +%defattr(-,root,root) +%{_libdir}/libturbojpeg.so.%{tmajor} +%{_libdir}/libturbojpeg.so.%{tlibver} + %files -n libjpeg%{major}-devel %defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libjpeg.so +%{_libdir}/libturbojpeg.so %doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c %changelog diff --git a/libjpeg62-turbo.changes b/libjpeg62-turbo.changes index 9794fc6..2c07379 100644 --- a/libjpeg62-turbo.changes +++ b/libjpeg62-turbo.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 10 12:51:24 UTC 2013 - pgajdos@suse.com + +- update do 1.3.0: + * Fixed a Huffman encoder bug that prevented I/O suspension from + working properly. + * Added support for additional scaling factors (3/8, 5/8, 3/4, + 7/8, 9/8, 5/4, 11/8, 3/2, 13/8, 7/4, 15/8, and 2) when + decompressing. Note that the IDCT will not be SIMD-accelerated + when using any of these new scaling factors. + * The tjDecompressToYUV() function now supports the TJFLAG_FASTDCT + flag. + * cjpeg can now be used to generate JPEG files with the RGB + colorspace (feature ported from jpeg-8d.) + * etc. see ChangeLog.txt + ------------------------------------------------------------------- Fri Jun 14 09:24:19 UTC 2013 - pgajdos@suse.com diff --git a/libjpeg62-turbo.spec b/libjpeg62-turbo.spec index 18a85d4..d4a89a7 100644 --- a/libjpeg62-turbo.spec +++ b/libjpeg62-turbo.spec @@ -17,9 +17,9 @@ %define major 62 -%define minor 0 +%define minor 1 %define micro 0 -%define srcver 1.2.1 +%define srcver 1.3.0 %define libver %{major}.%{minor}.%{micro} Name: libjpeg62-turbo @@ -99,19 +99,15 @@ make test libdir=%{_libdir} %install %makeinstall - # 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 %{buildroot}%{_bindir}/* rm %{buildroot}%{_mandir}/man1/* - -# Don't distribute libjpegturbo because it is unversioned +# libjpegturbo is provided with libjpeg-turbo.spec yet rm %{buildroot}%{_includedir}/turbojpeg.h -rm %{buildroot}%{_libdir}/libturbojpeg.so - +rm %{buildroot}%{_libdir}/libturbojpeg.so* # Remove docs, we'll select docs manually rm -rf %{buildroot}%{_datadir}/doc/ @@ -122,12 +118,12 @@ rm -rf %{buildroot}%{_datadir}/doc/ %files %defattr(-,root,root) %doc README README-turbo.txt change.log ChangeLog.txt -%doc release/copyright usage.txt wizard.txt +%doc usage.txt wizard.txt %files -n libjpeg%{major} %defattr(-,root,root) -%{_libdir}/libjpeg.so.%{libver} %{_libdir}/libjpeg.so.%{major} +%{_libdir}/libjpeg.so.%{libver} %files -n libjpeg%{major}-devel %defattr(-,root,root)