packages: libshjpeg/libshjpeg.spec, libshjpeg/libshjpeg-Werror.patch (NEW), ...

[qboosh]

Author: qboosh                       Date: Tue Jul 12 19:16:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.3.6
- added flock,Werror patches

---- Files affected:
packages/libshjpeg:
   libshjpeg.spec (1.1 -> 1.2) , libshjpeg-Werror.patch (NONE -> 1.1)  (NEW), libshjpeg-flock.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libshjpeg/libshjpeg.spec
diff -u packages/libshjpeg/libshjpeg.spec:1.1 packages/libshjpeg/libshjpeg.spec:1.2
--- packages/libshjpeg/libshjpeg.spec:1.1	Sat Apr 23 06:56:01 2011
+++ packages/libshjpeg/libshjpeg.spec	Tue Jul 12 21:16:49 2011
@@ -2,15 +2,17 @@
 Summary:	Hardware-accelerated JPEG encoder/decoder library for SH Mobile
 Summary(pl.UTF-8):	Biblioteka sprzętowo wspomaganego kodera/dekodera JPEG dla SH Mobile
 Name:		libshjpeg
-Version:	1.3.5
-%define	gitver	3b78698
+Version:	1.3.6
+%define	gitver	79973e7
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
 # trailing /%{name}-%{version}.tar.gz is a hack for df
 Source0:	https://github.com/dhobsong/libshjpeg/tarball/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	1e19ff8dc908d518114fe237750d327b
+# Source0-md5:	9f4fe9f81394c55beda06818c56082ee
 Patch0:		%{name}-pc.patch
+Patch1:		%{name}-flock.patch
+Patch2:		%{name}-Werror.patch
 URL:		http://github.com/dhobsong/libshjpeg
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -67,6 +69,8 @@
 %prep
 %setup -q -n dhobsong-%{name}-%{gitver}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -86,7 +90,7 @@
 # obsoleted by pkgconfig (with pc patch)
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libshjpeg.la
 # tests not packaged
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/{libjpeg,shjpeg}test \
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{libjpegtest,shjpegtest,shjpegshow} \
 	$RPM_BUILD_ROOT%{_mandir}/man1/{libjpegtest,shjpegtest,shjpegshow}.1
 # HTML packaged in -apidocs
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libshjpeg
@@ -125,5 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/07/12 19:16:49  qboosh
+- updated to 1.3.6
+- added flock,Werror patches
+
 Revision 1.1  2011/04/23 04:56:01  qboosh
 - new

================================================================
Index: packages/libshjpeg/libshjpeg-Werror.patch
diff -u /dev/null packages/libshjpeg/libshjpeg-Werror.patch:1.1
--- /dev/null	Tue Jul 12 21:16:54 2011
+++ packages/libshjpeg/libshjpeg-Werror.patch	Tue Jul 12 21:16:49 2011
@@ -0,0 +1,20 @@
+--- dhobsong-libshjpeg-79973e7/tests/shjpegtest.c.orig	2011-07-04 06:54:23.000000000 +0200
++++ dhobsong-libshjpeg-79973e7/tests/shjpegtest.c	2011-07-12 20:22:04.895498917 +0200
+@@ -88,7 +88,7 @@
+ 	       unsigned long phys, int pitch, int width, int height)
+ {
+     bmp_header_t bmp_header;
+-    int h, w, bw, size, raw_size, stride;
++    int h, w, size, raw_size, stride;
+     void *mem, *ptr;
+     FILE *file;
+     char *buffer = NULL, tmp;
+@@ -149,8 +149,6 @@
+     fprintf(file, "BM");
+     fwrite(&bmp_header, 1, sizeof(bmp_header), file);
+ 
+-    /* Write data */
+-    bw = bpp >> 3;
+ //    mem += (height - 1) * pitch;
+     ptr = mem;
+     for (h = 0; h < height; h++) {

================================================================
Index: packages/libshjpeg/libshjpeg-flock.patch
diff -u /dev/null packages/libshjpeg/libshjpeg-flock.patch:1.1
--- /dev/null	Tue Jul 12 21:16:54 2011
+++ packages/libshjpeg/libshjpeg-flock.patch	Tue Jul 12 21:16:49 2011
@@ -0,0 +1,30 @@
+--- dhobsong-libshjpeg-79973e7/src/shjpeg_common.c.orig	2011-07-04 06:54:23.000000000 +0200
++++ dhobsong-libshjpeg-79973e7/src/shjpeg_common.c	2011-07-12 20:20:15.245495244 +0200
+@@ -24,6 +24,7 @@
+ #include <stdarg.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <sys/file.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <sys/param.h>
+--- dhobsong-libshjpeg-79973e7/src/shjpeg_decode.c.orig	2011-07-04 06:54:23.000000000 +0200
++++ dhobsong-libshjpeg-79973e7/src/shjpeg_decode.c	2011-07-12 20:20:38.392162687 +0200
+@@ -24,6 +24,7 @@
+ #include <stdarg.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <sys/file.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ #include <setjmp.h>
+--- dhobsong-libshjpeg-79973e7/src/shjpeg_encode.c.orig	2011-07-04 06:54:23.000000000 +0200
++++ dhobsong-libshjpeg-79973e7/src/shjpeg_encode.c	2011-07-12 20:20:55.245496585 +0200
+@@ -24,6 +24,7 @@
+ #include <stdarg.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <sys/file.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libshjpeg/libshjpeg.spec?r1=1.1&r2=1.2&f=u