diff --git a/.abf.yml b/.abf.yml index be283aa..da00f5f 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "libjpeg-turbo-1.2.1.tar.gz": a4992e102c6d88146709e8e6ce5896d5d0b5a361 + libjpeg-turbo-1.3.0.tar.gz: 1792c964b35604cebd3a8846f1ca6de5976e9c28 diff --git a/jpegexiforient.c b/jpegexiforient.c index ac17d7d..a9f2873 100644 --- a/jpegexiforient.c +++ b/jpegexiforient.c @@ -13,8 +13,8 @@ * Value | 0th Row | 0th Column * ------+-------------+----------- * 1 | top | left side - * 2 | top | rigth side - * 3 | bottom | rigth side + * 2 | top | right side + * 3 | bottom | right side * 4 | bottom | left side * 5 | left side | top * 6 | right side | top @@ -79,17 +79,19 @@ read_2_bytes (void) static const char * progname; /* program name for error messages */ static void -usage (void) +usage (FILE *out) /* complain about bad command line */ { - fprintf(stderr, "jpegexiforient reads or writes the Exif Orientation Tag "); - fprintf(stderr, "in a JPEG Exif file.\n"); + fprintf(out, "jpegexiforient reads or writes the Exif Orientation Tag "); + 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(stderr, " -n Do not output the trailing newline\n"); - fprintf(stderr, " -1 .. -8 Set orientation value 1 .. 8\n"); + fprintf(out, "Switches:\n"); + fprintf(out, " --help display this help and exit\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) 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; i = 1; while (argv[i][0] == '-') { 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': n_flag = 1; break; @@ -129,9 +137,9 @@ main (int argc, char **argv) set_flag = argv[i][1] - '0'; break; default: - usage(); return 0; + usage(stderr); return 1; } - if (++i >= argc) { usage(); return 0; } + if (++i >= argc) { usage(stderr); return 1; } } if (set_flag) { diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index a905355..f7c9c60 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -1,20 +1,21 @@ %define major 8 +%define majorturbo 0 %define libname %mklibname jpeg %{major} %define devname %mklibname -d jpeg -%define statname %mklibname -s -d jpeg -%define turbo %mklibname turbojpeg +%define static %mklibname -s -d jpeg +%define turbo %mklibname turbojpeg %{majorturbo} %define major62 62 %define libname62 %mklibname jpeg %{major62} Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Name: libjpeg-turbo -Version: 1.2.1 -Release: 1 Epoch: 1 +Version: 1.3.0 +Release: 6 License: wxWidgets Library License 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 # These two allow automatic lossless rotation of JPEG images from a digital # 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 Source3: http://jpegclub.org/exifautotran.txt Patch0: jpeg-6b-c++fixes.patch -BuildRequires: autoconf automake libtool >= 1.4 + +BuildRequires: libtool >= 1.4 %ifarch %{ix86} x86_64 BuildRequires: nasm %endif @@ -62,11 +64,12 @@ linked with libturbojpeg. %package -n %{devname} Summary: Development tools for programs which will use the libjpeg library Group: Development/C -Requires: %{libname} >= %{EVRD} +Requires: %{libname} = %{EVRD} +Requires: %{turbo} = %{EVRD} Provides: jpeg-devel = %{EVRD} -Provides: libjpeg-devel = %{EVRD} -Provides: jpeg%{major}-devel = %{EVRD} Conflicts: jpeg6-devel +Conflicts: %{_lib}turbojpeg < 1:1.3.0 +Obsoletes: %{_lib}turbojpeg < 1:1.3.0 Obsoletes: %{mklibname jpeg 62 -d} < 6b-45 %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 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 %{statname} +%package -n %{static} Summary: Static libraries for programs which will use the libjpeg library Group: Development/C Requires: %{devname} = %{EVRD} -Provides: libjpeg-static-devel = %{EVRD} Provides: jpeg-static-devel = %{EVRD} -Provides: jpeg%{major}-static-devel = %{EVRD} Conflicts: jpeg6-static-devel Obsoletes: %{mklibname jpeg 62 -d -s} < 6b-45 Obsoletes: %{mklibname jpeg 7 -d -s} < 7-3 -%description -n %{statname} +%description -n %{static} The libjpeg static devel package includes the static libraries necessary for developing programs which will manipulate JPEG files using 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 Summary: Programs for manipulating JPEG format image files Group: Graphics @@ -127,32 +120,28 @@ cp %{SOURCE2} jpegexiforient.c cp %{SOURCE3} exifautotran %build +CONFIGURE_TOP="$PWD" + mkdir -p jpeg8 pushd jpeg8 -CONFIGURE_TOP=.. \ -CFLAGS="%{optflags} -O3 -funroll-loops -ffast-math" \ -%configure2_5x --disable-silent-rules \ - --enable-shared \ - --enable-static \ - --with-jpeg8 +CFLAGS="%{optflags} -Ofast -funroll-loops" \ +%configure2_5x \ + --enable-shared \ + --enable-static \ + --with-jpeg8 %make popd mkdir -p jpeg62 pushd jpeg62 -CONFIGURE_TOP=.. \ -CFLAGS="%{optflags} -O3 -funroll-loops -ffast-math" \ -%configure2_5x --disable-silent-rules \ - --enable-shared \ - --disable-static +CFLAGS="%{optflags} -Ofast -funroll-loops" \ +%configure2_5x \ + --enable-shared \ + --disable-static %make popd -gcc %{optflags} %{ldflags} -o jpegexiforient jpegexiforient.c - -%check -make -C jpeg8 test -make -C jpeg62 test +%__cc %{optflags} %{ldflags} -o jpegexiforient jpegexiforient.c %install make install-libLTLIBRARIES DESTDIR=%{buildroot} -C jpeg62 @@ -175,14 +164,15 @@ rm -f %{buildroot}%{_docdir}/* %{_libdir}/libjpeg.so.%{major62}* %files -n %{turbo} -%{_libdir}/libturbojpeg.so +%{_libdir}/libturbojpeg.so.%{majorturbo}* %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}/libturbojpeg.so %{_includedir}/*.h -%files -n %{statname} +%files -n %{static} %{_libdir}/libjpeg.a %{_libdir}/libturbojpeg.a @@ -191,65 +181,3 @@ rm -f %{buildroot}%{_docdir}/* %{_bindir}/* %{_mandir}/man1/* - -%changelog -* Mon Jul 09 2012 Alexander Khrukin 1:1.2.1-1 -+ Revision: 808547 -- version update 1.2.1 - -* Wed Mar 07 2012 Per Øyvind Karlsen 1:1.2.0-2 -+ Revision: 782633 -- rebuild with internal dependency generator - -* Mon Feb 20 2012 Per Øyvind Karlsen 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 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 1:1.1.1-1 -+ Revision: 679380 -- update to new version 1.1.1 - -* Sun Mar 06 2011 Funda Wang 1:1.1.0-3 -+ Revision: 642215 -- provides libjpeg-devel - -* Sat Mar 05 2011 Funda Wang 1:1.1.0-2 -+ Revision: 642110 -- there is no need renaming to itself - -* Sat Mar 05 2011 Funda Wang 1:1.1.0-1 -+ Revision: 642078 -- do not install jpgtest -- new version 1.1.0 - -* Sat Mar 05 2011 Paulo Andrade 1:1.0.90-3 -+ Revision: 642056 -- Correct devel package to be compatible with jpeg -8c - - + Per Øyvind Karlsen - - be more specific about license (Giovanni) - -* Wed Mar 02 2011 Per Øyvind Karlsen 1:1.0.90-2 -+ Revision: 641295 -- apply misc package fixes from Giovanni Mariani - -* Fri Feb 25 2011 Per Øyvind Karlsen 1:1.0.90-1 -+ Revision: 639762 -- imported package libjpeg-turbo -