From 9c2250df694b222fa88c9fd10cbffe64cb79e2a8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jun 16 2015 18:46:53 +0000 Subject: new upstream version 1.4.1, nasm available on all arches, run tests with SMP --- diff --git a/.gitignore b/.gitignore index b52c5fd..cc00780 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -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 -/libjpeg-turbo-1.2.0.tar.gz -/libjpeg-turbo-1.2.1.tar.gz -/libjpeg-turbo-1.2.90-20130204svn922.tar.gz -/libjpeg-turbo-1.2.90.tar.gz -/libjpeg-turbo-1.3.0.tar.gz -/libjpeg-turbo-1.3.1.tar.gz -/libjpeg-turbo-1.3.90.tar.gz -/libjpeg-turbo-1.4.0.tar.gz +/libjpeg-turbo-*.tar.gz diff --git a/libjpeg-turbo-remove-test.patch b/libjpeg-turbo-remove-test.patch deleted file mode 100644 index da7aea9..0000000 --- a/libjpeg-turbo-remove-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 2792067..bfdd7d8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -362,10 +362,6 @@ endif - # CC: RGB->YCC SAMP: fullsize/int FDCT: float ENT: prog huff - ./cjpeg -sample 3x2 -dct float -prog -outfile testout_3x2_float_prog.jpg $(srcdir)/testimages/testorig.ppm - md5/md5cmp $(MD5_JPEG_3x2_FLOAT_PROG) testout_3x2_float_prog.jpg --# CC: YCC->RGB SAMP: fullsize/int IDCT: float ENT: prog huff -- ./djpeg -dct float -outfile testout_3x2_float.ppm testout_3x2_float_prog.jpg -- md5/md5cmp $(MD5_PPM_3x2_FLOAT) testout_3x2_float.ppm -- rm testout_3x2_float.ppm testout_3x2_float_prog.jpg - - if WITH_ARITH_ENC - # CC: YCC->RGB SAMP: fullsize/h2v2 FDCT: islow ENT: arith diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index 51525a6..d360ab5 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,22 +1,18 @@ Name: libjpeg-turbo -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files License: IJG URL: http://sourceforge.net/projects/libjpeg-turbo Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: libjpeg-turbo12-noinst.patch -Patch1: libjpeg-turbo-header-files.patch -Patch2: libjpeg-turbo-remove-test.patch +Patch0: libjpeg-turbo14-noinst.patch +Patch1: libjpeg-turbo-header-files.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool - -%ifarch %{ix86} x86_64 BuildRequires: nasm -%endif Obsoletes: libjpeg < 6b-47 # add provides (even if it not needed) to workaround bad packages, like @@ -75,10 +71,9 @@ manipulate JPEG files using the TurboJPEG library. %setup -q %patch0 -p1 -b .noinst %patch1 -p1 -b .header-files -%patch2 -p1 -b .remove-test %build -autoreconf -fiv +autoreconf -vif %configure --disable-static make %{?_smp_mflags} @@ -90,7 +85,7 @@ find %{buildroot} -name "*.la" -delete chmod -x README-turbo.txt %check -make test +make test %{?_smp_mflags} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -99,7 +94,7 @@ make test %postun -n turbojpeg -p /sbin/ldconfig %files -%doc README README-turbo.txt change.log ChangeLog.txt +%doc README README-turbo.txt ChangeLog.txt %{_libdir}/libjpeg.so.62* %files devel @@ -132,6 +127,11 @@ make test %{_libdir}/libturbojpeg.so %changelog +* Tue Jun 16 2015 Peter Robinson 1.4.1-1 +- new upstream version 1.4.1 +- nasm available on all arches +- run tests with SMP + * Tue Jan 20 2015 Petr Hracek - 1.4.0-1 - new upstream version 1.4.0 (#1180442) diff --git a/libjpeg-turbo12-noinst.patch b/libjpeg-turbo12-noinst.patch deleted file mode 100644 index db9db35..0000000 --- a/libjpeg-turbo12-noinst.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index b32a41b..1758e5f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -90,9 +90,7 @@ noinst_PROGRAMS = jcstest - - if WITH_TURBOJPEG - --bin_PROGRAMS += tjbench -- --noinst_PROGRAMS += tjunittest -+noinst_PROGRAMS += tjbench tjunittest - - tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \ - wrbmp.c wrppm.c -@@ -158,14 +156,6 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 - DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.txt \ - ChangeLog.txt - --docdir = $(datadir)/doc --dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \ -- wizard.txt -- --exampledir = $(datadir)/doc --dist_example_DATA = example.c -- -- - EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \ - sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \ - doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \ diff --git a/libjpeg-turbo14-noinst.patch b/libjpeg-turbo14-noinst.patch new file mode 100644 index 0000000..c7631bb --- /dev/null +++ b/libjpeg-turbo14-noinst.patch @@ -0,0 +1,27 @@ +--- libjpeg-turbo-1.4.1/Makefile.am.orig 2015-06-16 19:23:23.866620985 +0100 ++++ libjpeg-turbo-1.4.1/Makefile.am 2015-06-16 19:26:38.070227353 +0100 +@@ -90,9 +90,7 @@ + + if WITH_TURBOJPEG + +-bin_PROGRAMS += tjbench +- +-noinst_PROGRAMS += tjunittest ++noinst_PROGRAMS += tjbench tjunittest + + tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \ + wrbmp.c wrppm.c +@@ -158,13 +156,6 @@ + DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.txt \ + ChangeLog.txt + +-dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \ +- wizard.txt +- +-exampledir = $(docdir) +-dist_example_DATA = example.c +- +- + EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \ + sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \ + doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \ diff --git a/sources b/sources index 149037f..ca724b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -039153dabe61e1ac8d9323b5522b56b0 libjpeg-turbo-1.4.0.tar.gz +b1f6b84859a16b8ebdcda951fa07c3f2 libjpeg-turbo-1.4.1.tar.gz