Fix building with jpeg-8 (previous declaration of jpeg_mem_src and jpeg_mem_dest) wrt #305201, thanks to Alex. P. Burlutsky for patch.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 73 insertions, 7 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 42e415e544eb..96efb3902889 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-misc/zoneminder
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.37 2009/09/16 11:58:25 tanderson Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.38 2010/02/22 15:39:18 ssuominen Exp $
+
+  22 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/1.24.2/zm_jpeg.patch, zoneminder-1.24.2.ebuild:
+  Fix building with jpeg-8 (previous declaration of jpeg_mem_src and
+  jpeg_mem_dest) wrt #305201, thanks to Alex. P. Burlutsky for patch.
 
   16 Sep 2009; Thomas Anderson <tanderson@gentoo.org> metadata.xml:
   Fix email address.
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 8f98663a3c51..de394ba6ce2b 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -4,6 +4,7 @@ AUX 1.23.1/zm_remote_camera.patch 1551 RMD160 03024108ba012b7e39620ed950b96df1c4
 AUX 1.24.2/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8 SHA1 84024eb973f86e28d0fefa40c9a233f90c52a262 SHA256 301f23e57099c6841601017aed5a834a2ffc5e95a4b2f7e273272d4b11344ac3
 AUX 1.24.2/db_upgrade_script_location.patch 412 RMD160 368052be3fc8f32276cd59a146fd99a3b23b05f8 SHA1 a7a04bb212c0ca6ec693ca821d4c5de56b3e65c9 SHA256 3ffaa44c013dd27c3e5e937de77158c60b4cd37f28e1fc42dd7283f80075b067
 AUX 1.24.2/zm_create.sql.in.patch 16846 RMD160 c1b3b4ad6c5e70f4497f60a840a358a886125849 SHA1 7299c116be6f4a9cd97e55eb75c87d686a43d41c SHA256 edd4476e34c2b3b0e533809bce36827d8c84482cf25a9fca167453174866016f
+AUX 1.24.2/zm_jpeg.patch 2661 RMD160 e4d95b98a46a0b77874862a4afaa937e4c2814ef SHA1 58852307e7ed7df47660d2795199e91fa13319c7 SHA256 e8ac509821d9b0629c8cccb31ce25908b2b0bb7831aa7d710440b0551ad5ef3a
 AUX 1.24.2/zm_remote_camera_http.patch 1566 RMD160 644a681789d0ecf424156cde4b4ea8f6c5065197 SHA1 74dbe274d129997826b9a775c672c28286b60e3f SHA256 f554f2bcc7977e5ac151bd87aa2b8a0b7a9eeb9099839afe0d8b2b60a37ce04e
 AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
@@ -11,6 +12,6 @@ AUX init.d 392 RMD160 075f5bb61776cc55bca82b3725b8e6f0cdc877e8 SHA1 76de21342416
 DIST ZoneMinder-1.23.3.tar.gz 764528 RMD160 cf04dcd61891a5b8b1a30d738a8b1274ecefad70 SHA1 aaca4fb26b2f09d57b1901f49c538d7e46963254 SHA256 76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
 DIST ZoneMinder-1.24.2.tar.gz 965521 RMD160 3ec5ca1a6d418feeeecd6dc3c4a78a79f5ead373 SHA1 ea854c941b83374a352d7d794a4462e279fea487 SHA256 fd8475138ccee8870534f1210a3d1e3e1990e963dd73146a6d310dc71c463dca
 EBUILD zoneminder-1.23.3.ebuild 3709 RMD160 43deb29960b4d7f5a3ba3192442d9d7b6c4d95e1 SHA1 880e0cda0191f16018516cb45b2e573778c042cd SHA256 6010993db0f86bdf7b640beb17574ec55ab84dbd3a4fcee3ca14baf01c0e6a52
-EBUILD zoneminder-1.24.2.ebuild 4011 RMD160 c8935dd6c591c333b34736b08be07c238d737e05 SHA1 50acd837a158ec956bd1ab6dc171c95a6b9d0963 SHA256 746b1e17a8954be496c46e6406f731b97f59a7cadd454c9b637185083e73efe6
-MISC ChangeLog 6737 RMD160 ce244838f5be8e44a2abcafd58e8f94ab28bbfa6 SHA1 d4fdd40b5223ab6e7651e90b1ad2a76ec02c1c3e SHA256 1a98e8054ba036c0935849487ec4b0c20171d670937fa28012c2a7068a9284e2
+EBUILD zoneminder-1.24.2.ebuild 4055 RMD160 841a14e6de02013cc893af5bc482c5f8b5a55443 SHA1 5d9636bc63311bc1af0bef31c849a53578972ff3 SHA256 35f0ad713c8d5dc76d7a346a007cec546c73f804e6e8bbbf3325dcae5dc3b592
+MISC ChangeLog 6988 RMD160 b01334a704818a61805692513d716dad3f511d12 SHA1 560c62e045a8199db4db45cc307e0541e872f07b SHA256 22fbed21c9dfb0032f02d206662bd9519f7af84cd025b893536d7bed99727293
 MISC metadata.xml 260 RMD160 c12fd64bd707f1295bbe662f72c9cfa50e9774e2 SHA1 75c4629846789f80cee0e163f2822d725d1388fb SHA256 3059d89f940a19b5e4c03c954c4fe960c0f7daeff0f57540271fa0aec70a7b24
diff --git a/www-misc/zoneminder/files/1.24.2/zm_jpeg.patch b/www-misc/zoneminder/files/1.24.2/zm_jpeg.patch
new file mode 100644
index 000000000000..4d3dbaddc793
--- /dev/null
+++ b/www-misc/zoneminder/files/1.24.2/zm_jpeg.patch
@@ -0,0 +1,59 @@
+diff -ur ZoneMinder-1.24.2.orig/src/zm_image.cpp ZoneMinder-1.24.2/src/zm_image.cpp
+--- ZoneMinder-1.24.2.orig/src/zm_image.cpp	2009-05-25 21:04:00.000000000 +0300
++++ ZoneMinder-1.24.2/src/zm_image.cpp	2010-02-22 17:43:14.000000000 +0200
+@@ -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;
+diff -ur ZoneMinder-1.24.2.orig/src/zm_jpeg.c ZoneMinder-1.24.2/src/zm_jpeg.c
+--- ZoneMinder-1.24.2.orig/src/zm_jpeg.c	2009-03-20 14:07:00.000000000 +0200
++++ ZoneMinder-1.24.2/src/zm_jpeg.c	2010-02-22 17:43:14.000000000 +0200
+@@ -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,12 +350,12 @@
+  * 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;
+ 
+     /* The source object and input buffer are made permanent so that a series
+-     * of JPEG images can be read from the same file by calling jpeg_mem_src
++     * of JPEG images can be read from the same file by calling zm_jpeg_mem_src
+      * only before the first one.  (If we discarded the buffer at the end of
+      * one image, we'd likely lose the start of the next one.)
+      * This makes it unsafe to use this manager and a different source
+diff -ur ZoneMinder-1.24.2.orig/src/zm_jpeg.h ZoneMinder-1.24.2/src/zm_jpeg.h
+--- ZoneMinder-1.24.2.orig/src/zm_jpeg.h	2009-03-20 14:07:00.000000000 +0200
++++ ZoneMinder-1.24.2/src/zm_jpeg.h	2010-02-22 17:43:14.000000000 +0200
+@@ -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 );
diff --git a/www-misc/zoneminder/zoneminder-1.24.2.ebuild b/www-misc/zoneminder/zoneminder-1.24.2.ebuild
index a38b72f888b8..7a58b6dc23eb 100644
--- a/www-misc/zoneminder/zoneminder-1.24.2.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.24.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.24.2.ebuild,v 1.1 2009/08/03 11:19:59 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.24.2.ebuild,v 1.2 2010/02/22 15:39:18 ssuominen Exp $
 
 inherit eutils autotools depend.php depend.apache multilib
 
@@ -49,7 +49,7 @@ RDEPEND="dev-perl/DBD-mysql
 need_apache
 need_php_httpd
 
-S="${WORKDIR}"/${MY_PN}-${MY_PV}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
 
 pkg_setup() {
 	require_php_with_use mysql sockets apache2
@@ -63,6 +63,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch
 	epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera_http.patch
 	epatch "${FILESDIR}"/${PATCH_PV}/db_upgrade_script_location.patch
+	epatch "${FILESDIR}"/${PATCH_PV}/zm_jpeg.patch
 
 	eautoreconf
 }