packages: zoneminder/zoneminder.spec, zoneminder/zoneminder-jpeg.patch (NEW...

[arekm]

Author: arekm                        Date: Tue Feb  9 22:04:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix build with new libjpeg

---- Files affected:
packages/zoneminder:
   zoneminder.spec (1.76 -> 1.77) , zoneminder-jpeg.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/zoneminder/zoneminder.spec
diff -u packages/zoneminder/zoneminder.spec:1.76 packages/zoneminder/zoneminder.spec:1.77
--- packages/zoneminder/zoneminder.spec:1.76	Sat Feb  6 22:15:47 2010
+++ packages/zoneminder/zoneminder.spec	Tue Feb  9 23:03:54 2010
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8):	Zone Minder - programowy wykrywacz ruchu z miłym GUI przez WWW
 Name:		zoneminder
 Version:	1.24.2
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Applications/Graphics
 Source0:	http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch0:		zm-fedora.patch
 Patch1:		%{name}-xlib_shm.patch
 Patch2:		%{name}-build.patch
+Patch3:		%{name}-jpeg.patch
 URL:		http://www.zoneminder.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -87,6 +88,7 @@
 %patch1 -p1
 cd ..
 %patch2 -p1
+%patch3 -p1
 
 sed -i -e 's#-frepo##g' src/Makefile.am
 sed -i -e 's#chown#true#g' -e 's#chmod#true#g' *.am */*.am */*/*.am
@@ -226,6 +228,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2010/02/09 22:03:54  arekm
+- rel 4; fix build with new libjpeg
+
 Revision 1.76  2010/02/06 21:15:47  arekm
 - release 3
 

================================================================
Index: packages/zoneminder/zoneminder-jpeg.patch
diff -u /dev/null packages/zoneminder/zoneminder-jpeg.patch:1.1
--- /dev/null	Tue Feb  9 23:04:02 2010
+++ packages/zoneminder/zoneminder-jpeg.patch	Tue Feb  9 23:03:54 2010
@@ -0,0 +1,50 @@
+--- ZoneMinder-1.24.2/src/zm_jpeg.h~	2009-03-20 13:07:00.000000000 +0100
++++ ZoneMinder-1.24.2/src/zm_jpeg.h	2010-02-09 22:58:08.576509968 +0100
+@@ -36,5 +36,5 @@
+ void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level );
+ 
+ // Prototypes for memory compress/decompression object */
+-void jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
+-void jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
++void zm_jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size );
++void zm_jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size );
+--- ZoneMinder-1.24.2/src/zm_jpeg.c~	2009-03-20 13:07:00.000000000 +0100
++++ ZoneMinder-1.24.2/src/zm_jpeg.c	2010-02-09 22:58:34.660048754 +0100
+@@ -173,7 +173,7 @@
+  * for closing it after finishing compression.
+  */
+ 
+-void jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
++void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
+ {
+     mem_dest_ptr dest;
+ 
+@@ -350,7 +350,7 @@
+  * for closing it after finishing decompression.
+  */
+ 
+-void jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
++void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
+ {
+     mem_src_ptr src;
+ 
+--- ZoneMinder-1.24.2/src/zm_image.cpp~	2009-05-25 20:04:00.000000000 +0200
++++ ZoneMinder-1.24.2/src/zm_image.cpp	2010-02-09 22:58:53.219635716 +0100
+@@ -461,7 +461,7 @@
+ 		return( false );
+ 	}
+ 
+-	jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
++	zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
+ 
+ 	jpeg_read_header( cinfo, TRUE );
+ 
+@@ -523,7 +523,7 @@
+ 		jpeg_create_compress( cinfo );
+ 	}
+ 
+-	jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
++	zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
+ 
+ 	cinfo->image_width = width; 	/* image width and height, in pixels */
+ 	cinfo->image_height = height;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zoneminder/zoneminder.spec?r1=1.76&r2=1.77&f=u