Djam/libjpeg-turbo
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libjpeg-turbo.git synced 2025-02-23 19:02:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New version 1.2.1 (sync with Cooker)

Browse source
This commit is contained in:
abondrov 2012-08-03 03:38:33 +02:00
parent 619d2d79b6
commit 8d4757707d
3 changed files with 71 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
"libjpeg-turbo-1.1.1.tar.gz": 131cef514c34e0b3f6952000968796d5a87a59e9 "libjpeg-turbo-1.2.1.tar.gz": a4992e102c6d88146709e8e6ce5896d5d0b5a361

118
libjpeg-turbo.spec
View file

@ -1,15 +1,16 @@
%define major 8 %define major 8
%define libname %mklibname jpeg %{major} %define libname %mklibname jpeg %{major}
%define devname %mklibname -d jpeg %define devname %mklibname -d jpeg
%define statname %mklibname -s -d jpeg %define statname %mklibname -s -d jpeg
%define turbo %mklibname turbojpeg
%define major62 62 %define major62 62
%define libname62 %mklibname jpeg %{major62} %define libname62 %mklibname jpeg %{major62}
Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files
Name: libjpeg-turbo Name: libjpeg-turbo
Version: 1.1.1 Version: 1.2.1
Release: 2 Release: 1
Epoch: 1 Epoch: 1
License: wxWidgets Library License License: wxWidgets Library License
Group: System/Libraries Group: System/Libraries
@ -22,9 +23,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source2: http://jpegclub.org/jpegexiforient.c Source2: http://jpegclub.org/jpegexiforient.c
Source3: http://jpegclub.org/exifautotran.txt Source3: http://jpegclub.org/exifautotran.txt
Patch0: jpeg-6b-c++fixes.patch Patch0: jpeg-6b-c++fixes.patch
Patch1: libjpeg-turbo11-noinst_jpgtest.patch BuildRequires: autoconf automake libtool >= 1.4
BuildRequires: libtool >= 1.4
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
BuildRequires: nasm BuildRequires: nasm
%endif %endif
@ -36,16 +35,13 @@ processors which uses SIMD instructions (MMX, SSE2, etc.) to accelerate
baseline JPEG compression and decompression. It is generally 2-4x as fast baseline JPEG compression and decompression. It is generally 2-4x as fast
as the unmodified version of libjpeg, all else being equal. as the unmodified version of libjpeg, all else being equal.
Install the libjpeg-turbo package if you need to manipulate JPEG files.
You should also install the jpeg-progs package.
%package -n %{libname} %package -n %{libname}
Summary: A library for manipulating JPEG image format files Summary: A library for manipulating JPEG image format files
Group: System/Libraries Group: System/Libraries
%description -n %{libname} %description -n %{libname}
This package contains the library needed to run programs dynamically This package contains the library needed to run programs dynamically
linked with libjpeg-turbo. linked with libjpeg.
%package -n %{libname62} %package -n %{libname62}
Summary: A library for manipulating JPEG image format files Summary: A library for manipulating JPEG image format files
@ -53,12 +49,20 @@ Group: System/Libraries
%description -n %{libname62} %description -n %{libname62}
This package contains the library needed to run programs dynamically This package contains the library needed to run programs dynamically
linked with libjpeg-turbo. linked with libjpeg.
%package -n %{turbo}
Summary: TurboJPEG library
Group: System/Libraries
%description -n %{turbo}
This package contains the library needed to run programs dynamically
linked with libturbojpeg.
%package -n %{devname} %package -n %{devname}
Summary: Development tools for programs which will use the libjpeg-turbo library Summary: Development tools for programs which will use the libjpeg library
Group: Development/C Group: Development/C
Requires: %{libname} = %{EVRD} Requires: %{libname} >= %{EVRD}
Provides: jpeg-devel = %{EVRD} Provides: jpeg-devel = %{EVRD}
Provides: libjpeg-devel = %{EVRD} Provides: libjpeg-devel = %{EVRD}
Provides: jpeg%{major}-devel = %{EVRD} Provides: jpeg%{major}-devel = %{EVRD}
@ -68,14 +72,14 @@ Obsoletes: %{mklibname jpeg 62 -d} < 6b-45
%description -n %{devname} %description -n %{devname}
The libjpeg-turbo devel package includes the header files necessary for The libjpeg-turbo devel package includes the header files necessary for
developing programs which will manipulate JPEG files using the developing programs which will manipulate JPEG files using the
libjpeg-turbo library. libjpeg library.
If you are going to develop programs which will manipulate JPEG images, If you are going to develop programs which will manipulate JPEG images,
you should install this package. You'll also need to have the you should install this package. You'll also need to have the
libjpeg-turbo package installed. libjpeg package installed.
%package -n %{statname} %package -n %{statname}
Summary: Static libraries for programs which will use the libjpeg-turbo library Summary: Static libraries for programs which will use the libjpeg library
Group: Development/C Group: Development/C
Requires: %{devname} = %{EVRD} Requires: %{devname} = %{EVRD}
Provides: libjpeg-static-devel = %{EVRD} Provides: libjpeg-static-devel = %{EVRD}
@ -85,14 +89,14 @@ Conflicts: jpeg6-static-devel
Obsoletes: %{mklibname jpeg 62 -d -s} < 6b-45 Obsoletes: %{mklibname jpeg 62 -d -s} < 6b-45
Obsoletes: %{mklibname jpeg 7 -d -s} < 7-3 Obsoletes: %{mklibname jpeg 7 -d -s} < 7-3
%description -n %{statname} %description -n %{statname}
The libjpeg-turbo static devel package includes the static libraries The libjpeg static devel package includes the static libraries
necessary for developing programs which will manipulate JPEG files using necessary for developing programs which will manipulate JPEG files using
the libjpeg-turbo library. the libjpeg library.
If you are going to develop programs which will manipulate JPEG images, If you are going to develop programs which will manipulate JPEG images,
you should install this package. You'll also need to have the you should install this package. You'll also need to have the
libjpeg-turbo package installed. libjpeg package installed.
%package -n jpeg-progs %package -n jpeg-progs
Summary: Programs for manipulating JPEG format image files Summary: Programs for manipulating JPEG format image files
@ -102,7 +106,7 @@ Group: Graphics
%description -n jpeg-progs %description -n jpeg-progs
This package contains simple client programs for accessing the This package contains simple client programs for accessing the
libjpeg-turbo functions. The library client programs include cjpeg, djpeg, libjpeg functions. The library client programs include cjpeg, djpeg,
jpegtran, rdjpgcom, wrjpgcom and jpegexiforient, coupled with the script jpegtran, rdjpgcom, wrjpgcom and jpegexiforient, coupled with the script
exifautotran. Cjpeg compresses an image file into JPEG format. Djpeg exifautotran. Cjpeg compresses an image file into JPEG format. Djpeg
decompresses a JPEG file into a regular image file. Jpegtran can perform decompresses a JPEG file into a regular image file. Jpegtran can perform
@ -116,13 +120,13 @@ have orientation markings in the EXIF data.
%prep %prep
%setup -q %setup -q
%patch0 -p0 %patch0 -p0
%patch1 -p1 # Fix perms
chmod -x README-turbo.txt
cp %{SOURCE2} jpegexiforient.c cp %{SOURCE2} jpegexiforient.c
cp %{SOURCE3} exifautotran cp %{SOURCE3} exifautotran
%build %build
autoreconf -fi
mkdir -p jpeg8 mkdir -p jpeg8
pushd jpeg8 pushd jpeg8
CONFIGURE_TOP=.. \ CONFIGURE_TOP=.. \
@ -151,9 +155,8 @@ make -C jpeg8 test
make -C jpeg62 test make -C jpeg62 test
%install %install
%makeinstall_std -C jpeg8
make install-libLTLIBRARIES DESTDIR=%{buildroot} -C jpeg62 make install-libLTLIBRARIES DESTDIR=%{buildroot} -C jpeg62
%makeinstall_std -C jpeg8
install -m755 jpegexiforient -D %{buildroot}%{_bindir}/jpegexiforient install -m755 jpegexiforient -D %{buildroot}%{_bindir}/jpegexiforient
install -m755 exifautotran -D %{buildroot}%{_bindir}/exifautotran install -m755 exifautotran -D %{buildroot}%{_bindir}/exifautotran
@ -161,24 +164,8 @@ install -m755 exifautotran -D %{buildroot}%{_bindir}/exifautotran
#(neoclust) Provide jpegint.h because it is needed by certain software #(neoclust) Provide jpegint.h because it is needed by certain software
install -m644 jpegint.h -D %{buildroot}%{_includedir}/jpegint.h install -m644 jpegint.h -D %{buildroot}%{_includedir}/jpegint.h
# Fix perms # cleanup
chmod -x README-turbo.txt rm -f %{buildroot}%{_docdir}/*
# Remove unwanted files
rm -f %{buildroot}%{_libdir}/libturbojpeg.la
# keep libjpeg.la to allow using jpeg-turbo where jpeg-8c would have been
# and correct link of -devel .so to proper version, and not .so.62 one
pushd %{buildroot}%{_libdir}
ln -sf libjpeg.so.8.0.2 libjpeg.so
popd
# Don't distribute libjpegturbo because it is unversioned
rm -f %{buildroot}%{_includedir}/turbojpeg.h
rm -f %{buildroot}%{_libdir}/libturbojpeg.{so,a}
%clean
rm -rf %{buildroot}
%files -n %{libname} %files -n %{libname}
%doc change.log ChangeLog.txt README README-turbo.txt %doc change.log ChangeLog.txt README README-turbo.txt
@ -187,14 +174,17 @@ rm -rf %{buildroot}
%files -n %{libname62} %files -n %{libname62}
%{_libdir}/libjpeg.so.%{major62}* %{_libdir}/libjpeg.so.%{major62}*
%files -n %{turbo}
%{_libdir}/libturbojpeg.so
%files -n %{devname} %files -n %{devname}
%doc coderules.txt example.c jconfig.txt libjpeg.txt LICENSE.txt structure.txt filelist.txt %doc coderules.txt example.c jconfig.txt libjpeg.txt structure.txt filelist.txt
%{_libdir}/*.la %{_libdir}/libjpeg.so
%{_libdir}/*.so
%{_includedir}/*.h %{_includedir}/*.h
%files -n %{statname} %files -n %{statname}
%{_libdir}/*.a %{_libdir}/libjpeg.a
%{_libdir}/libturbojpeg.a
%files -n jpeg-progs %files -n jpeg-progs
%doc usage.txt wizard.txt %doc usage.txt wizard.txt
@ -203,6 +193,34 @@ rm -rf %{buildroot}
%changelog %changelog
* Mon Jul 09 2012 Alexander Khrukin <akhrukin@mandriva.org> 1:1.2.1-1
+ Revision: 808547
- version update 1.2.1
* Wed Mar 07 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:1.2.0-2
+ Revision: 782633
- rebuild with internal dependency generator
* Mon Feb 20 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:1.2.0-1
+ Revision: 777997
- drop useless details from description
- add back static library build
- don't run autoreconf, we no longer have any patches requiring it
- fix permissions of README-turbo.txt in %%prep rather than %%install
- package libturbojpeg
- update description to refer to libjpeg rather than libjpeg-turbo for standard
libjpeg library packages
- in stead of manually fixing .so symlink to link against newer libjpeg.so.8.0.2
after install, just change the order to install this library last in stead
- remove documentation installed into %%{_docdir} directly that we're already
packaging in the various subpackages..
- new version
* Sun Dec 04 2011 Oden Eriksson <oeriksson@mandriva.com> 1:1.1.1-2
+ Revision: 737609
- drop the static lib, its sub package and the libtool *.la file
- various fixes
* Fri May 27 2011 Funda Wang <fwang@mandriva.org> 1:1.1.1-1 * Fri May 27 2011 Funda Wang <fwang@mandriva.org> 1:1.1.1-1
+ Revision: 679380 + Revision: 679380
- update to new version 1.1.1 - update to new version 1.1.1

14
libjpeg-turbo11-noinst_jpgtest.patch
View file

@ -1,14 +0,0 @@
diff -up libjpeg-turbo-1.1.0/Makefile.am.noinst_jpgtest libjpeg-turbo-1.1.0/Makefile.am
--- libjpeg-turbo-1.1.0/Makefile.am.noinst_jpgtest 2011-03-01 14:40:04.291829489 +0100
+++ libjpeg-turbo-1.1.0/Makefile.am 2011-03-01 14:40:13.081814233 +0100
@@ -58,8 +58,8 @@ endif
TSTHDRS = rrutil.h rrtimer.h
-bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpgtest
-noinst_PROGRAMS = jpegut
+bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+noinst_PROGRAMS = jpegut jpgtest
jpgtest_SOURCES = $(TSTHDRS) jpgtest.c bmp.h bmp.c