patch from upstream to use >=libpng-1.2.10 as per bug #137059.

Package-Manager: portage-2.1.1_pre2-r1

5 files changed, 240 insertions, 8 deletions

diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index bc14f315a546..73150dc44cac 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/electricsheep
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.33 2006/06/29 06:44:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.34 2006/07/04 09:06:04 dragonheart Exp $
+
+*electricsheep-2.6.7-r1 (04 Jul 2006)
+
+  04 Jul 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/electricsheep-2.6.7-libpng-1.2.10.patch,
+  +electricsheep-2.6.7-r1.ebuild:
+  patch from upstream to use >=libpng-1.2.10 as per bug #137059. Thanks to Ed
+  and Mike
 
   29 Jun 2006; Daniel Black <dragonheart@gentoo.org>
   electricsheep-2.6.7.ebuild:
diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest
index 7afeaa972eb8..2effe98c5fea 100644
--- a/x11-misc/electricsheep/Manifest
+++ b/x11-misc/electricsheep/Manifest
@@ -17,6 +17,10 @@ AUX electricsheep-2.6.7-cflagsfix.patch 16890 RMD160 2ee5709fb7bfd2ae5a3fa11f271
 MD5 d73734597cf76749bb649d73d7e7f3bb files/electricsheep-2.6.7-cflagsfix.patch 16890
 RMD160 2ee5709fb7bfd2ae5a3fa11f271f5d8b8b9633fd files/electricsheep-2.6.7-cflagsfix.patch 16890
 SHA256 b4d6343d1159c5c755d75412548c20ef6b27b18aeee6386e64cc84acc46f9ff0 files/electricsheep-2.6.7-cflagsfix.patch 16890
+AUX electricsheep-2.6.7-libpng-1.2.10.patch 3598 RMD160 c1afb1197377c26c7a200d20eb90cbbcc488fa48 SHA1 0b024bad34d10141ad75d1a478dff05e8845c4b8 SHA256 9eada8e6a6f43185af306302ddb3b22df84d9798025a773773f13ffecb300ca9
+MD5 18c9a7fad20e00d07f391db754c1105f files/electricsheep-2.6.7-libpng-1.2.10.patch 3598
+RMD160 c1afb1197377c26c7a200d20eb90cbbcc488fa48 files/electricsheep-2.6.7-libpng-1.2.10.patch 3598
+SHA256 9eada8e6a6f43185af306302ddb3b22df84d9798025a773773f13ffecb300ca9 files/electricsheep-2.6.7-libpng-1.2.10.patch 3598
 AUX electricsheep.desktop 3973 RMD160 d765b848da913d773617817612fe4f6ac961c644 SHA1 fa9ec961fb025a9c02b40889b9ed4953e95cd8f3 SHA256 56884adb9d05705617f37874b72de83b4d37ef411f3d90d7fb7ca78019045fe1
 MD5 cf3d6d65b467f83063fea471d22e2f37 files/electricsheep.desktop 3973
 RMD160 d765b848da913d773617817612fe4f6ac961c644 files/electricsheep.desktop 3973
@@ -32,14 +36,18 @@ EBUILD electricsheep-2.6.4.ebuild 2107 RMD160 3c2526bd7798dd8c2bcf76ddfc4d70c321
 MD5 7c76f020fd1c00d3f881200462d83b28 electricsheep-2.6.4.ebuild 2107
 RMD160 3c2526bd7798dd8c2bcf76ddfc4d70c321279f0b electricsheep-2.6.4.ebuild 2107
 SHA256 5888a9e267d5624cba21c26feb550905a7fed735ef1b071cf470892d8bd936ae electricsheep-2.6.4.ebuild 2107
+EBUILD electricsheep-2.6.7-r1.ebuild 2194 RMD160 13425e62c1ae901c9ec939f0074a6466da9a67b8 SHA1 addb60f31b2ecfc2155e99be04a6190d09e46f1d SHA256 98219b5a7bfebe2ed0e6b6e60ab054210c0abfb7fe307476112f8e6b4be85b41
+MD5 2e70db0befa8ac8413a7e36439997ca9 electricsheep-2.6.7-r1.ebuild 2194
+RMD160 13425e62c1ae901c9ec939f0074a6466da9a67b8 electricsheep-2.6.7-r1.ebuild 2194
+SHA256 98219b5a7bfebe2ed0e6b6e60ab054210c0abfb7fe307476112f8e6b4be85b41 electricsheep-2.6.7-r1.ebuild 2194
 EBUILD electricsheep-2.6.7.ebuild 2136 RMD160 106edbf42f634b6120c53231a2699d782238c933 SHA1 552f77947bc870dcef5b457341cc16b39f4a1c76 SHA256 097946f9fbc1a92276b7718c74d317d3ce35d00bab454356a8a3941887f19f2f
 MD5 ffbc054cf4efafb199f0aaa7394fee75 electricsheep-2.6.7.ebuild 2136
 RMD160 106edbf42f634b6120c53231a2699d782238c933 electricsheep-2.6.7.ebuild 2136
 SHA256 097946f9fbc1a92276b7718c74d317d3ce35d00bab454356a8a3941887f19f2f electricsheep-2.6.7.ebuild 2136
-MISC ChangeLog 5542 RMD160 07fea751a9ca9cbd9f29175e0389a14b55a52724 SHA1 a80879760d3de8e02f165300be7226267063cdd7 SHA256 27ec7508cd7c486b761e4dd1927f364dd7ded4fd4f82bce5c82dc1329474462f
-MD5 9e319e364d35c2438224c65e6761bacb ChangeLog 5542
-RMD160 07fea751a9ca9cbd9f29175e0389a14b55a52724 ChangeLog 5542
-SHA256 27ec7508cd7c486b761e4dd1927f364dd7ded4fd4f82bce5c82dc1329474462f ChangeLog 5542
+MISC ChangeLog 5808 RMD160 a169d85a54adc29c5be09d2f7fb2d69a058b352f SHA1 918b47efd9289b031aa2ea29954fa9780f86ddae SHA256 6e7eff456780b297682497135a45e28d4e3f2464b0c58d8d7977b9d9c46b7a9a
+MD5 1f042169d3f7258ee43f58efda529296 ChangeLog 5808
+RMD160 a169d85a54adc29c5be09d2f7fb2d69a058b352f ChangeLog 5808
+SHA256 6e7eff456780b297682497135a45e28d4e3f2464b0c58d8d7977b9d9c46b7a9a ChangeLog 5808
 MISC metadata.xml 319 RMD160 8d2b4fb22841a8e8465a2cd5b6ebe73524b34a7a SHA1 eef4c6d4f7d83fecca5844d10e6efd0b9566a5e3 SHA256 ff313e851d928bdcbd4d7a4ee641ac93aef523b1524ff5bd72acb60ddfc2d2ed
 MD5 f84d0865990260d30b1b5180364dd6a8 metadata.xml 319
 RMD160 8d2b4fb22841a8e8465a2cd5b6ebe73524b34a7a metadata.xml 319
@@ -53,10 +61,13 @@ SHA256 30d7ca195b124a61702061d005f46acb1958a0621d73ee5149b55d38c2ef40a8 files/di
 MD5 c2de50fded303fac66eadc4d38c6869b files/digest-electricsheep-2.6.7 262
 RMD160 199d17c30d2f9340c91fb02399fafa8c9d53595c files/digest-electricsheep-2.6.7 262
 SHA256 4bd8a14d43ec63eb5f662cec2cb62c5a5a8690ea2617259954ea12c3c67edd5a files/digest-electricsheep-2.6.7 262
+MD5 c2de50fded303fac66eadc4d38c6869b files/digest-electricsheep-2.6.7-r1 262
+RMD160 199d17c30d2f9340c91fb02399fafa8c9d53595c files/digest-electricsheep-2.6.7-r1 262
+SHA256 4bd8a14d43ec63eb5f662cec2cb62c5a5a8690ea2617259954ea12c3c67edd5a files/digest-electricsheep-2.6.7-r1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEo3cxmdTrptrqvGERAhCPAJ93LBwrmwzDFG1gY0eaExSsiMJGggCgmEMR
-8dHRSwhZSSeeCVJktDfoUe8=
-=JC8o
+iD8DBQFEqjDsmdTrptrqvGERAg3zAJ9x/Jzx19ai23aemqxXU+AiBCbA4ACgiiKB
+GMzeAWhEHRBGUz6ZmoRDVME=
+=FjvL
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild b/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild
new file mode 100644
index 000000000000..73ec285d52ec
--- /dev/null
+++ b/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild,v 1.1 2006/07/04 09:06:04 dragonheart Exp $
+
+inherit eutils flag-o-matic kde-functions
+
+DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
+HOMEPAGE="http://electricsheep.org/"
+SRC_URI="http://electricsheep.org/${P}.tar.gz"
+IUSE="kde"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libXv
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+		virtual/x11
+	)
+	dev-libs/expat
+	net-misc/curl
+	media-libs/jpeg
+	>=media-libs/libpng-1.2.10
+	media-libs/libsdl
+	virtual/libc
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)
+	sys-apps/groff
+	dev-lang/perl
+	>=sys-apps/sed-4
+	media-libs/libmpeg2
+	sys-apps/gawk
+	sys-apps/grep
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	# Detect PIC requirement from direct from compiler instead of
+	# macro PIC.
+	sed -i -e 's/def PIC/def __PIC__/' ${S}/mpeg2dec/src/cpu_accel.c
+	epatch ${FILESDIR}/${P}-cflagsfix.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-libpng-1.2.10.patch
+}
+
+# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
+# if they exist on the user machine although these aren't deps.
+
+src_install() {
+
+
+	# prevent writing for xscreensaver
+	sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
+		Makefile || die "sed Makefile failed"
+
+	# install the xscreensaver config file
+	insinto /usr/share/xscreensaver/config
+	doins electricsheep.xml
+
+	make install DESTDIR="${D}" || die "make install failed"
+
+	dodir /usr/share/electricsheep
+	if [ ! -f "${ROOT}/usr/share/electricsheep/electricsheep-uniqueid" ]
+	then
+		"${D}/usr/bin/uniqueid" > \
+			"${D}/usr/share/electricsheep/electricsheep-uniqueid"
+	fi
+
+	if use kde;
+	then
+		set-kdedir
+		insinto /usr/share/applications
+		doins "${FILESDIR}/${PN}.desktop"
+		insinto "${KDEDIR}//share/applnk/System/ScreenSavers"
+		doins "${FILESDIR}/${PN}.desktop"
+	fi
+
+	# remove header files that are installed over libmpeg2
+	rm -rf "${D}/usr/include"
+}
diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.7-r1 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.7-r1
new file mode 100644
index 000000000000..4d907db17fd0
--- /dev/null
+++ b/x11-misc/electricsheep/files/digest-electricsheep-2.6.7-r1
@@ -0,0 +1,3 @@
+MD5 1a484c9b7ef8c7843bf3ba608753ac00 electricsheep-2.6.7.tar.gz 1387836
+RMD160 b842ec3761294bb6501127daf9fc377752bd830d electricsheep-2.6.7.tar.gz 1387836
+SHA256 f7b91f7a81a556a213543ab76c9595a738dd931fe2bc2acac6b704b5d09253f0 electricsheep-2.6.7.tar.gz 1387836
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch b/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch
new file mode 100644
index 000000000000..8f41e1f296c5
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch
@@ -0,0 +1,123 @@
+--- electricsheep/client/flam3/png.c	2005/07/20 06:06:16	1.8
++++ electricsheep/client/flam3/png.c	2006/06/26 19:36:49	1.9
+@@ -14,6 +14,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <png.h>
++#include <setjmp.h>
+ 
+ #include "img.h"
+ 
+@@ -67,7 +68,7 @@
+   unsigned char sig_buf [SIG_CHECK_SIZE];
+   png_struct *png_ptr;
+   png_info *info_ptr;
+-  png_byte **png_image;
++  png_byte **png_image = NULL;
+   int linesize, x, y;
+   unsigned char *p, *q;
+ 
+@@ -85,6 +86,16 @@
+     fprintf (stderr, "cannot allocate LIBPNG structure\n");
+     return 0;
+   }
++  if (setjmp(png_jmpbuf(png_ptr))) {
++     if (png_image) {
++	 for (y = 0 ; y < info_ptr->height ; y++)
++	     free (png_image[y]);
++	 free (png_image);
++     }
++     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
++     perror("reading file");
++     return;
++  }
+   info_ptr = png_create_info_struct (png_ptr);
+   if (info_ptr == NULL) {
+     png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+@@ -155,9 +166,7 @@
+   for (y = 0 ; y < info_ptr->height ; y++)
+     free (png_image[y]);
+   free (png_image);
+-  png_read_destroy (png_ptr, info_ptr, (png_info *)0);  
+-  free (png_ptr);
+-  free (info_ptr);
++  png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
+ 
+   return q;
+ }
+--- electricsheep/client/mpeg2dec/libvo/video_out_x11.c	2005/07/20 03:03:00	1.6
++++ electricsheep/client/mpeg2dec/libvo/video_out_x11.c	2006/06/26 19:36:49	1.7
+@@ -39,6 +39,8 @@
+ #include <X11/extensions/XShm.h>
+ #include <inttypes.h>
+ #include <sys/time.h>
++#include <png.h>
++#include <setjmp.h>
+ 
+ #include "vroot.h"
+ #include <sys/types.h>
+@@ -124,8 +126,6 @@
+     tv_rate = tv_end;
+ }
+ 
+-#include <png.h>
+-
+ static char *overlay_luma = NULL;
+ static char *overlay_alpha = NULL;
+ static int overlay_width;
+@@ -165,7 +165,7 @@
+   unsigned char sig_buf [SIG_CHECK_SIZE];
+   png_struct *png_ptr;
+   png_info *info_ptr;
+-  png_byte **png_image;
++  png_byte **png_image = NULL;
+   int linesize, x, y;
+   unsigned char *p, *q;
+ 
+@@ -183,6 +183,16 @@
+     fprintf (stderr, "cannot allocate LIBPNG structure\n");
+     return;
+   }
++  if (setjmp(png_jmpbuf(png_ptr))) {
++     if (png_image) {
++	 for (y = 0 ; y < info_ptr->height ; y++)
++	     free (png_image[y]);
++	 free (png_image);
++     }
++     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
++     perror("reading file");
++     return;
++  }
+   info_ptr = png_create_info_struct (png_ptr);
+   if (info_ptr == NULL) {
+     png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+@@ -271,10 +281,7 @@
+   for (y = 0 ; y < info_ptr->height ; y++)
+     free (png_image[y]);
+   free (png_image);
+-  png_read_destroy (png_ptr, info_ptr, (png_info *)0);  
+-  free (png_ptr);
+-  free (info_ptr);
+-
++  png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
+ }
+ 
+ static void overlay_read_ppm(FILE *fin)
+@@ -535,6 +542,8 @@
+       instance->corner_x = (w - instance->width)/2;
+       instance->corner_y = (h - instance->height)/2;
+     } else if (window_id == -1) {
++      XTextProperty xname;
++      char *nm = "Electric Sheep";
+       /* create a window the same size as the video */
+       instance->window =
+ 	XCreateWindow (instance->display,
+@@ -544,6 +553,8 @@
+ 		       InputOutput, instance->vinfo.visual,
+ 		       (CWBackPixmap | CWBackingStore | CWBorderPixel |
+ 			CWEventMask | CWColormap), &attr);
++      XStringListToTextProperty(&nm, 1, &xname);
++      XSetWMName(instance->display, instance->window, &xname);
+     } else {
+ 	/* zoomed to fit the window specified on the command line */
+ 	XWindowAttributes xgwa;