diff --git a/.cvsignore b/.cvsignore index e69de29..1d40c79 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libjpeg-turbo-0.0.93.tar.gz diff --git a/libjpeg-turbo-nosimd.patch b/libjpeg-turbo-nosimd.patch new file mode 100644 index 0000000..303510e --- /dev/null +++ b/libjpeg-turbo-nosimd.patch @@ -0,0 +1,13 @@ +diff -up libjpeg-turbo-0.0.93/configure.ac.nosimd libjpeg-turbo-0.0.93/configure.ac +--- libjpeg-turbo-0.0.93/configure.ac.nosimd 2010-06-10 12:02:48.903884378 +0200 ++++ libjpeg-turbo-0.0.93/configure.ac 2010-06-10 12:27:11.721539379 +0200 +@@ -145,7 +145,8 @@ if test "x${with_simd}" != "xno"; then + ;; + *) + AC_MSG_RESULT([no ("$host_cpu")]) +- AC_MSG_ERROR([CPU is not supported]) ++ AC_MSG_WARN([SIMD is not supported on this CPU, performance will suffer]) ++ with_simd=no; + ;; + esac + diff --git a/libjpeg-turbo-programs.patch b/libjpeg-turbo-programs.patch new file mode 100644 index 0000000..bd1fd9a --- /dev/null +++ b/libjpeg-turbo-programs.patch @@ -0,0 +1,31 @@ +diff -up libjpeg-turbo-1.0.0-20100601svn195/Makefile.am.programs libjpeg-turbo-1.0.0-20100601svn195/Makefile.am +--- libjpeg-turbo-1.0.0-20100601svn195/Makefile.am.programs 2010-05-11 01:39:22.000000000 +0200 ++++ libjpeg-turbo-1.0.0-20100601svn195/Makefile.am 2010-06-03 17:20:58.658321122 +0200 +@@ -39,7 +39,8 @@ endif + + TSTHDRS = rrutil.h rrtimer.h + +-noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg jpegtran rdjpgcom wrjpgcom ++bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom ++noinst_PROGRAMS = jpgtest jpegut + + jpgtest_SOURCES = $(TSTHDRS) jpgtest.cxx bmp.h bmp.c + +@@ -78,7 +79,7 @@ wrjpgcom_SOURCES = wrjpgcom.c + wrjpgcom_LDADD = libjpeg.la + + +-DISTMANS= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 ++man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1 + + DOCS= README install.doc usage.doc wizard.doc example.c libjpeg.doc \ + structure.doc coderules.doc filelist.doc jconfig.doc change.log \ +@@ -88,7 +89,7 @@ DOCS= README install.doc usage.doc wizar + TESTFILES= testorig.jpg testorig.ppm testimg.bmp testimgflt.jpg \ + testimgfst.jpg testimgint.jpg testimgp.jpg testimgfst.ppm testimgint.ppm + +-EXTRA_DIST = win release $(DOCS) $(DISTMANS) $(TESTFILES) ++EXTRA_DIST = win release $(DOCS) $(TESTFILES) + + dist-hook: + rm -rf `find $(distdir) -name .svn` diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec new file mode 100644 index 0000000..edc20e2 --- /dev/null +++ b/libjpeg-turbo.spec @@ -0,0 +1,139 @@ +Name: libjpeg-turbo +Version: 0.0.93 +Release: 9%{?dist} +Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files + +Group: System Environment/Libraries +License: wxWidgets +URL: http://sourceforge.net/projects/libjpeg-turbo +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: autoconf, automake, libtool +%ifarch %{ix86} x86_64 +BuildRequires: nasm +%endif + +Patch0: libjpeg-turbo-programs.patch +Patch1: libjpeg-turbo-nosimd.patch + +%description +The libjpeg-turbo package contains a library of functions for manipulating +JPEG images + +%package devel +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 +Requires: libjpeg-turbo%{?_isa} = %{version}-%{release} + +%description devel +This package contains header files necessary for developing programs which +will manipulate JPEG files using the libjpeg-turbo library + +%package utils +Summary: Utilities for manipulating JPEG images +Group: Applications/Multimedia +Obsoletes: libjpeg < 6b-47 + +%description utils +The libjpeg-turbo-utils package contains simple client programs for +accessing the libjpeg functions. It contains cjpeg, djpeg, jpegtran, +rdjpgcom and wrjpgcom. Cjpeg compresses an image file into JPEG format. +Djpeg decompresses a JPEG file into a regular image file. Jpegtran +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. + +%prep +%setup -q + +%patch0 -p1 -b .programs +%patch1 -p1 -b .nosimd + +%build +autoreconf -fiv + +%configure --disable-static + +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +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 -f $RPM_BUILD_ROOT/%{_includedir}/turbojpeg.h +rm -f $RPM_BUILD_ROOT/%{_libdir}/libturbojpeg.so + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt +%{_libdir}/libjpeg.so.62.0.0 +%{_libdir}/libjpeg.so.62 + +%files devel +%defattr(-,root,root,-) +%doc coderules.doc jconfig.doc libjpeg.doc structure.doc example.c +%{_includedir}/jconfig.h +%{_includedir}/jerror.h +%{_includedir}/jmorecfg.h +%{_includedir}/jpeglib.h +%{_libdir}/libjpeg.so + +%files utils +%defattr(-,root,root,-) +%doc usage.doc wizard.doc +%{_bindir}/cjpeg +%{_bindir}/djpeg +%{_bindir}/jpegtran +%{_bindir}/rdjpgcom +%{_bindir}/wrjpgcom +%{_mandir}/man1/cjpeg.1* +%{_mandir}/man1/djpeg.1* +%{_mandir}/man1/jpegtran.1* +%{_mandir}/man1/rdjpgcom.1* +%{_mandir}/man1/wrjpgcom.1* + +%changelog +* Mon Jun 28 2010 Adam Tkac 0.0.93-9 +- merge review related fixes (#600243) + +* Wed Jun 16 2010 Adam Tkac 0.0.93-8 +- merge review related fixes (#600243) + +* Mon Jun 14 2010 Adam Tkac 0.0.93-7 +- obsolete -static libjpeg subpackage (#600243) + +* Mon Jun 14 2010 Adam Tkac 0.0.93-6 +- improve package description a little (#600243) +- include example.c as %%doc in the -devel subpackage + +* Fri Jun 11 2010 Adam Tkac 0.0.93-5 +- don't use "fc12" disttag in obsoletes/provides (#600243) + +* Thu Jun 10 2010 Adam Tkac 0.0.93-4 +- fix compilation on platforms without MMX/SSE (#600243) + +* Thu Jun 10 2010 Adam Tkac 0.0.93-3 +- package review related fixes (#600243) + +* Wed Jun 09 2010 Adam Tkac 0.0.93-2 +- package review related fixes (#600243) + +* Fri Jun 04 2010 Adam Tkac 0.0.93-1 +- initial package diff --git a/sources b/sources index e69de29..8bd3dd7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +ac8bb8b00558b077c159a2f35dc196a0 libjpeg-turbo-0.0.93.tar.gz