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

LOG New version 1.3.0, merge spec with Cooker and drop uclibc part

Browse source
This commit is contained in:
Andrey Bondrov 2013-06-18 18:14:46 +11:00
parent 8d4757707d
commit 69dd667b73
3 changed files with 51 additions and 115 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.2.1.tar.gz": a4992e102c6d88146709e8e6ce5896d5d0b5a361 libjpeg-turbo-1.3.0.tar.gz: 1792c964b35604cebd3a8846f1ca6de5976e9c28

32
jpegexiforient.c
View file

@ -13,8 +13,8 @@
* Value | 0th Row | 0th Column * Value | 0th Row | 0th Column
* ------+-------------+----------- * ------+-------------+-----------
* 1 | top | left side * 1 | top | left side
* 2 | top | rigth side * 2 | top | right side
* 3 | bottom | rigth side * 3 | bottom | right side
* 4 | bottom | left side * 4 | bottom | left side
* 5 | left side | top * 5 | left side | top
* 6 | right side | top * 6 | right side | top
@ -79,17 +79,19 @@ read_2_bytes (void)
static const char * progname; /* program name for error messages */ static const char * progname; /* program name for error messages */
static void static void
usage (void) usage (FILE *out)
/* complain about bad command line */ /* complain about bad command line */
{ {
fprintf(stderr, "jpegexiforient reads or writes the Exif Orientation Tag "); fprintf(out, "jpegexiforient reads or writes the Exif Orientation Tag ");
fprintf(stderr, "in a JPEG Exif file.\n"); fprintf(out, "in a JPEG Exif file.\n");
fprintf(stderr, "Usage: %s [switches] jpegfile\n", progname); fprintf(out, "Usage: %s [switches] jpegfile\n", progname);
fprintf(stderr, "Switches:\n"); fprintf(out, "Switches:\n");
fprintf(stderr, " -n Do not output the trailing newline\n"); fprintf(out, " --help display this help and exit\n");
fprintf(stderr, " -1 .. -8 Set orientation value 1 .. 8\n"); fprintf(out, " --version output version information and exit\n");
fprintf(out, " -n Do not output the trailing newline\n");
fprintf(out, " -1 .. -8 Set orientation value 1 .. 8\n");
} }
/* /*
@ -108,13 +110,19 @@ main (int argc, char **argv)
if (progname == NULL || progname[0] == 0) if (progname == NULL || progname[0] == 0)
progname = "jpegexiforient"; /* in case C library doesn't provide it */ progname = "jpegexiforient"; /* in case C library doesn't provide it */
if (argc < 2) { usage(); return 0; } if (argc < 2) { usage(stderr); return 1; }
n_flag = 0; set_flag = 0; n_flag = 0; set_flag = 0;
i = 1; i = 1;
while (argv[i][0] == '-') { while (argv[i][0] == '-') {
switch (argv[i][1]) { switch (argv[i][1]) {
case '-':
switch (argv[i][2]) {
case 'h': usage(stdout); return 0;
case 'v': fprintf(stdout,"jpegexiforient\n"); return 0;
default: usage(stderr); return 1;
}
case 'n': case 'n':
n_flag = 1; n_flag = 1;
break; break;
@ -129,9 +137,9 @@ main (int argc, char **argv)
set_flag = argv[i][1] - '0'; set_flag = argv[i][1] - '0';
break; break;
default: default:
usage(); return 0; usage(stderr); return 1;
} }
if (++i >= argc) { usage(); return 0; } if (++i >= argc) { usage(stderr); return 1; }
} }
if (set_flag) { if (set_flag) {

122
libjpeg-turbo.spec
View file

@ -1,20 +1,21 @@
%define major 8 %define major 8
%define majorturbo 0
%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 static %mklibname -s -d jpeg
%define turbo %mklibname turbojpeg %define turbo %mklibname turbojpeg %{majorturbo}
%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.2.1
Release: 1
Epoch: 1 Epoch: 1
Version: 1.3.0
Release: 6
License: wxWidgets Library License License: wxWidgets Library License
Group: System/Libraries Group: System/Libraries
URL: http://sourceforge.net/projects/libjpeg-turbo Url: http://sourceforge.net/projects/libjpeg-turbo
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# These two allow automatic lossless rotation of JPEG images from a digital # These two allow automatic lossless rotation of JPEG images from a digital
# camera which have orientation markings in the EXIF data. After rotation # camera which have orientation markings in the EXIF data. After rotation
@ -23,7 +24,8 @@ 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
BuildRequires: autoconf automake libtool >= 1.4
BuildRequires: libtool >= 1.4
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
BuildRequires: nasm BuildRequires: nasm
%endif %endif
@ -62,11 +64,12 @@ linked with libturbojpeg.
%package -n %{devname} %package -n %{devname}
Summary: Development tools for programs which will use the libjpeg library Summary: Development tools for programs which will use the libjpeg library
Group: Development/C Group: Development/C
Requires: %{libname} >= %{EVRD} Requires: %{libname} = %{EVRD}
Requires: %{turbo} = %{EVRD}
Provides: jpeg-devel = %{EVRD} Provides: jpeg-devel = %{EVRD}
Provides: libjpeg-devel = %{EVRD}
Provides: jpeg%{major}-devel = %{EVRD}
Conflicts: jpeg6-devel Conflicts: jpeg6-devel
Conflicts: %{_lib}turbojpeg < 1:1.3.0
Obsoletes: %{_lib}turbojpeg < 1:1.3.0
Obsoletes: %{mklibname jpeg 62 -d} < 6b-45 Obsoletes: %{mklibname jpeg 62 -d} < 6b-45
%description -n %{devname} %description -n %{devname}
@ -74,30 +77,20 @@ 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 library. libjpeg library.
If you are going to develop programs which will manipulate JPEG images, %package -n %{static}
you should install this package. You'll also need to have the
libjpeg package installed.
%package -n %{statname}
Summary: Static libraries for programs which will use the libjpeg 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: jpeg-static-devel = %{EVRD} Provides: jpeg-static-devel = %{EVRD}
Provides: jpeg%{major}-static-devel = %{EVRD}
Conflicts: jpeg6-static-devel 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 %{static}
The libjpeg 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 library. the libjpeg library.
If you are going to develop programs which will manipulate JPEG images,
you should install this package. You'll also need to have the
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
Group: Graphics Group: Graphics
@ -127,11 +120,12 @@ cp %{SOURCE2} jpegexiforient.c
cp %{SOURCE3} exifautotran cp %{SOURCE3} exifautotran
%build %build
CONFIGURE_TOP="$PWD"
mkdir -p jpeg8 mkdir -p jpeg8
pushd jpeg8 pushd jpeg8
CONFIGURE_TOP=.. \ CFLAGS="%{optflags} -Ofast -funroll-loops" \
CFLAGS="%{optflags} -O3 -funroll-loops -ffast-math" \ %configure2_5x \
%configure2_5x --disable-silent-rules \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--with-jpeg8 --with-jpeg8
@ -140,19 +134,14 @@ popd
mkdir -p jpeg62 mkdir -p jpeg62
pushd jpeg62 pushd jpeg62
CONFIGURE_TOP=.. \ CFLAGS="%{optflags} -Ofast -funroll-loops" \
CFLAGS="%{optflags} -O3 -funroll-loops -ffast-math" \ %configure2_5x \
%configure2_5x --disable-silent-rules \
--enable-shared \ --enable-shared \
--disable-static --disable-static
%make %make
popd popd
gcc %{optflags} %{ldflags} -o jpegexiforient jpegexiforient.c %__cc %{optflags} %{ldflags} -o jpegexiforient jpegexiforient.c
%check
make -C jpeg8 test
make -C jpeg62 test
%install %install
make install-libLTLIBRARIES DESTDIR=%{buildroot} -C jpeg62 make install-libLTLIBRARIES DESTDIR=%{buildroot} -C jpeg62
@ -175,14 +164,15 @@ rm -f %{buildroot}%{_docdir}/*
%{_libdir}/libjpeg.so.%{major62}* %{_libdir}/libjpeg.so.%{major62}*
%files -n %{turbo} %files -n %{turbo}
%{_libdir}/libturbojpeg.so %{_libdir}/libturbojpeg.so.%{majorturbo}*
%files -n %{devname} %files -n %{devname}
%doc coderules.txt example.c jconfig.txt libjpeg.txt structure.txt filelist.txt %doc coderules.txt example.c jconfig.txt libjpeg.txt structure.txt
%{_libdir}/libjpeg.so %{_libdir}/libjpeg.so
%{_libdir}/libturbojpeg.so
%{_includedir}/*.h %{_includedir}/*.h
%files -n %{statname} %files -n %{static}
%{_libdir}/libjpeg.a %{_libdir}/libjpeg.a
%{_libdir}/libturbojpeg.a %{_libdir}/libturbojpeg.a
@ -191,65 +181,3 @@ rm -f %{buildroot}%{_docdir}/*
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/* %{_mandir}/man1/*
%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
+ Revision: 679380
- update to new version 1.1.1
* Sun Mar 06 2011 Funda Wang <fwang@mandriva.org> 1:1.1.0-3
+ Revision: 642215
- provides libjpeg-devel
* Sat Mar 05 2011 Funda Wang <fwang@mandriva.org> 1:1.1.0-2
+ Revision: 642110
- there is no need renaming to itself
* Sat Mar 05 2011 Funda Wang <fwang@mandriva.org> 1:1.1.0-1
+ Revision: 642078
- do not install jpgtest
- new version 1.1.0
* Sat Mar 05 2011 Paulo Andrade <pcpa@mandriva.com.br> 1:1.0.90-3
+ Revision: 642056
- Correct devel package to be compatible with jpeg -8c
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
- be more specific about license (Giovanni)
* Wed Mar 02 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:1.0.90-2
+ Revision: 641295
- apply misc package fixes from Giovanni Mariani <mc2374@mclink.it>
* Fri Feb 25 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:1.0.90-1
+ Revision: 639762
- imported package libjpeg-turbo