[libjpeg-turbo-compat] Import libjpeg-turbo-compat package.
Adam Tkac
atkac at fedoraproject.org
Wed Oct 24 13:53:46 UTC 2012
commit 1494735b03679bfbf66ec82d0359e06f13e8bc02
Author: Adam Tkac <atkac at redhat.com>
Date: Wed Oct 24 15:53:30 2012 +0200
Import libjpeg-turbo-compat package.
.gitignore | 1 +
libjpeg-turbo-compat.spec | 225 ++++++++++++++++++++++++++++++++++++++++++
libjpeg-turbo12-noinst.patch | 29 ++++++
sources | 1 +
4 files changed, 256 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..bbcea38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/libjpeg-turbo-1.2.1.tar.gz
diff --git a/libjpeg-turbo-compat.spec b/libjpeg-turbo-compat.spec
new file mode 100644
index 0000000..2d61938
--- /dev/null
+++ b/libjpeg-turbo-compat.spec
@@ -0,0 +1,225 @@
+%global _includedir %{_includedir}/libjpeg-turbo-compat
+
+Name: libjpeg-turbo-compat
+Version: 1.2.1
+Release: 5%{?dist}
+Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
+
+Group: System Environment/Libraries
+License: BSD
+URL: http://sourceforge.net/projects/libjpeg-turbo
+Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
+
+BuildRequires: autoconf, automake, libtool
+%ifarch %{ix86} x86_64
+BuildRequires: nasm
+%endif
+
+# moved this from -utils, in an attempt to get it to better override
+# libjpeg in rawhide -- Rex
+Obsoletes: libjpeg < 6b-47
+# add provides (even if it not needed) to workaround bad packages, like
+# java-1.6.0-openjdk (#rh607554) -- atkac
+Provides: libjpeg = 6b-47%{?dist}
+%if "%{?_isa}" != ""
+Provides: libjpeg%{_isa} = 6b-47%{?dist}
+%endif
+
+Patch0: libjpeg-turbo12-noinst.patch
+
+%description
+The libjpeg-turbo-compat package contains a libjpeg6b API/ABI compatible
+library of functions for manipulating JPEG images.
+
+%package devel
+Summary: Headers for the libjpeg-turbo-compat library
+Group: Development/Libraries
+Obsoletes: libjpeg-devel < 6b-47
+Provides: libjpeg-devel = 6b-47%{?dist}
+%if "%{?_isa}" != ""
+Provides: libjpeg-devel%{_isa} = 6b-47%{?dist}
+%endif
+Requires: libjpeg-turbo-compat%{?_isa} = %{version}-%{release}
+
+%description devel
+This package contains header files necessary for developing programs which
+will manipulate JPEG files using the libjpeg-turbo-compat library.
+
+%package static
+Summary: Static version of the libjpeg-turbo-compat library
+Group: Development/Libraries
+Obsoletes: libjpeg-static < 6b-47
+Provides: libjpeg-static = 6b-47%{?dist}
+%if "%{?_isa}" != ""
+Provides: libjpeg-static%{_isa} = 6b-47%{?dist}
+%endif
+Requires: libjpeg-turbo-compat-devel%{?_isa} = %{version}-%{release}
+
+%description static
+The libjpeg-turbo-compat-static package contains static library for
+manipulating JPEG images.
+
+%prep
+%setup -q -n libjpeg-turbo-%{version}
+
+%patch0 -p1 -b .noinst
+
+%build
+autoreconf -fiv
+
+%configure
+
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Fix perms
+chmod -x README-turbo.txt
+
+# Move libjpeg.{so,a} into libdir/libjpeg-turbo-compat
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/libjpeg-turbo-compat
+ln -s ../libjpeg.so.62 $RPM_BUILD_ROOT/%{_libdir}/libjpeg-turbo-compat/libjpeg.so
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.so
+mv $RPM_BUILD_ROOT/%{_libdir}/{libjpeg.a,libjpeg-turbo-compat/}
+
+# Remove unwanted files
+rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{,turbo}jpeg.la
+
+# Don't distribute libjpegturbo
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libturbojpeg.*
+rm -f $RPM_BUILD_ROOT/%{_includedir}/turbojpeg.h
+
+# Don't distribute helper utilities and their's manpages
+rm -rf $RPM_BUILD_ROOT/%{_bindir}
+rm -rf $RPM_BUILD_ROOT/%{_mandir}
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%doc README README-turbo.txt change.log ChangeLog.txt
+%{_libdir}/libjpeg.so.*
+
+%files devel
+%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
+%{_includedir}/jconfig.h
+%{_includedir}/jerror.h
+%{_includedir}/jmorecfg.h
+%{_includedir}/jpeglib.h
+%{_libdir}/libjpeg-turbo-compat/libjpeg.so
+
+%files static
+%{_libdir}/libjpeg-turbo-compat/libjpeg.a
+
+%changelog
+* Wed Oct 24 2012 Adam Tkac <atkac redhat com> 1.2.1-5
+- move libjpeg.a into libdir/libjpeg-turbo-compat/
+- some review related fixes
+
+* Mon Oct 22 2012 Adam Tkac <atkac redhat com> 1.2.1-4
+- split out libjpeg-turbo compat library for jpeg6b API/ABI compatible library
+
+* Thu Oct 18 2012 Adam Tkac <atkac redhat com> 1.2.1-3
+- minor provides tuning (#863231)
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jul 16 2012 Adam Tkac <atkac redhat com> 1.2.1-1
+- update to 1.2.1
+
+* Thu Mar 08 2012 Adam Tkac <atkac redhat com> 1.2.0-1
+- update to 1.2.0
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Nov 21 2011 Orion Poplawski <orion cora nwra com> 1.1.1-3
+- Make turobojpeg-devel depend on turbojpeg
+
+* Fri Oct 7 2011 Orion Poplawski <orion cora nwra com> 1.1.1-2
+- Ship the turbojpeg library (#744258)
+
+* Mon Jul 11 2011 Adam Tkac <atkac redhat com> 1.1.1-1
+- update to 1.1.1
+ - ljt11-rh688712.patch merged
+
+* Tue Mar 22 2011 Adam Tkac <atkac redhat com> 1.1.0-2
+- handle broken JPEGs better (#688712)
+
+* Tue Mar 01 2011 Adam Tkac <atkac redhat com> 1.1.0-1
+- update to 1.1.0
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.90-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 17 2011 Adam Tkac <atkac redhat com> 1.0.90-1
+- update to 1.0.90
+- libjpeg-turbo10-rh639672.patch merged
+
+* Fri Oct 29 2010 Adam Tkac <atkac redhat com> 1.0.1-3
+- add support for arithmetic coded files into decoder (#639672)
+
+* Wed Sep 29 2010 jkeating - 1.0.1-2
+- Rebuilt for gcc bug 634757
+
+* 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)
+
+* Fri Jul 02 2010 Adam Tkac <atkac redhat com> 1.0.0-2
+- add libjpeg-devel%%{_isa} provides to -devel subpkg to satisfy imlib-devel
+ deps
+
+* Fri Jul 02 2010 Adam Tkac <atkac redhat com> 1.0.0-1
+- update to 1.0.0
+- patches merged
+ - libjpeg-turbo-programs.patch
+ - libjpeg-turbo-nosimd.patch
+- add libjpeg provides to the main package to workaround problems with broken
+ java-1.6.0-openjdk package
+
+* Fri Jul 02 2010 Adam Tkac <atkac redhat com> 0.0.93-13
+- remove libjpeg provides from -utils subpkg
+
+* Wed Jun 30 2010 Rex Dieter <rdieter at fedoraproject.org> 0.0.93-12
+- move Obsoletes: libjpeg to main pkg
+
+* Wed Jun 30 2010 Rex Dieter <rdieter at fedoraproject.org> 0.0.93-11
+- -utils: Requires: %%name ...
+
+* Wed Jun 30 2010 Adam Tkac <atkac redhat com> 0.0.93-10
+- add Provides = libjpeg to -utils subpackage
+
+* Mon Jun 28 2010 Adam Tkac <atkac redhat com> 0.0.93-9
+- merge review related fixes (#600243)
+
+* Wed Jun 16 2010 Adam Tkac <atkac redhat com> 0.0.93-8
+- merge review related fixes (#600243)
+
+* Mon Jun 14 2010 Adam Tkac <atkac redhat com> 0.0.93-7
+- obsolete -static libjpeg subpackage (#600243)
+
+* Mon Jun 14 2010 Adam Tkac <atkac redhat com> 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 <atkac redhat com> 0.0.93-5
+- don't use "fc12" disttag in obsoletes/provides (#600243)
+
+* Thu Jun 10 2010 Adam Tkac <atkac redhat com> 0.0.93-4
+- fix compilation on platforms without MMX/SSE (#600243)
+
+* Thu Jun 10 2010 Adam Tkac <atkac redhat com> 0.0.93-3
+- package review related fixes (#600243)
+
+* Wed Jun 09 2010 Adam Tkac <atkac redhat com> 0.0.93-2
+- package review related fixes (#600243)
+
+* Fri Jun 04 2010 Adam Tkac <atkac redhat com> 0.0.93-1
+- initial package
diff --git a/libjpeg-turbo12-noinst.patch b/libjpeg-turbo12-noinst.patch
new file mode 100644
index 0000000..dc3a7ad
--- /dev/null
+++ b/libjpeg-turbo12-noinst.patch
@@ -0,0 +1,29 @@
+diff -up libjpeg-turbo-1.2.0/Makefile.am.noinst_tjbench libjpeg-turbo-1.2.0/Makefile.am
+--- libjpeg-turbo-1.2.0/Makefile.am.noinst_tjbench 2012-02-10 04:47:55.000000000 +0100
++++ libjpeg-turbo-1.2.0/Makefile.am 2012-03-08 15:56:43.081230011 +0100
+@@ -72,8 +72,8 @@ libjpeg_la_SOURCES += jsimd_none.c
+
+ endif
+
+-bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom tjbench
+-noinst_PROGRAMS = tjunittest jcstest
++bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
++noinst_PROGRAMS = tjunittest jcstest tjbench
+
+ tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \
+ wrbmp.c wrppm.c
+@@ -123,14 +123,6 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtra
+ DOCS= install.txt coderules.txt filelist.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 \
+ jccolext.c jdcolext.c jdmrgext.c
diff --git a/sources b/sources
index e69de29..0e8a5e2 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f61e60ff01381ece4d2fe65eeb52669e libjpeg-turbo-1.2.1.tar.gz
More information about the scm-commits
mailing list