media-gfx/synfig: Version Bump

svn path=/sunrise/; revision=12015

5 files changed, 56 insertions, 4 deletions

diff --git a/media-gfx/synfig/ChangeLog b/media-gfx/synfig/ChangeLog
index 10cc5a516..0859dff6e 100644
--- a/media-gfx/synfig/ChangeLog
+++ b/media-gfx/synfig/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> -synfig-0.62.00.ebuild,
+  +synfig-0.62.02.ebuild, +files/synfig-0.62.02-gcc46.patch,
+  +files/synfig-0.62.02-png.patch:
+  Version Bump
+
   30 Apr 2011; Justin Lecher <jlec@gentoo.org> synfig-0.62.00.ebuild:
   Fix dev-libs/libsigc++ slot
 
diff --git a/media-gfx/synfig/Manifest b/media-gfx/synfig/Manifest
index 7138f971c..1b468c921 100644
--- a/media-gfx/synfig/Manifest
+++ b/media-gfx/synfig/Manifest
@@ -1,4 +1,6 @@
-DIST synfig-0.62.00.tar.gz 2916586 RMD160 82bed0d0ed5e558a2e14e05651182c7ee1713597 SHA1 10c5ffcffac0a3d2d2290a98fde2bc079aaaaca3 SHA256 982a2c86b4eaa807e4dfd410020771bd84f6f4ca4b3088c7f71bb19b649280a8
-EBUILD synfig-0.62.00.ebuild 1078 RMD160 fa8671ae7447d3e19092e4fa4d5b890086e338ee SHA1 894eba19da935388a09165cf44ae592f4727bfcd SHA256 2a4059d5eb62c8a56e4d48154dce7496ac6e8df64179b0cb948613617ba77422
-MISC ChangeLog 2736 RMD160 2dc8d6102ed690abecd4d1bc621669abc7d79d46 SHA1 6284700de712c7a0aba1b1922787d430333fce81 SHA256 9bcf34d7e0fa285e5b30c87e9befe408790cd3b4f7e0d14f3e92356453403acb
+AUX synfig-0.62.02-gcc46.patch 856 RMD160 5ea237975521a31481925ae2f0fe12b9cdd8a342 SHA1 5c7a406ea70eaec0e19f0a9ef3d02aa56fd768fb SHA256 c946514c2bb214b39b1d7646ff1383e5e24111047b4ce310d1e670dbb3b1ca7a
+AUX synfig-0.62.02-png.patch 684 RMD160 935a845663a024f67b49811e2e2823b392b6f951 SHA1 ace6bc23c63f7643370b79ec2412669d944d93ac SHA256 caef13abd547d3a207c1acc5ae162f5e31bec21f172b834e502c895ca3c9a359
+DIST synfig-0.62.02.tar.gz 3118478 RMD160 3242b9aa85d76eb462f8e294f9241a499370e4ba SHA1 dd571f8a382d97fc45171527938ac36efab9274b SHA256 e5895a3cb66572701b98180ad2be7538db0d5e50c764b421a0474bab2a79d9b5
+EBUILD synfig-0.62.02.ebuild 1185 RMD160 c93487a912d2c54decc9b112f67fa8ac5005d099 SHA1 e1d98de2eea6e2a7ab856cbc858a6735c1e6a5d2 SHA256 db413d63c391e09a19e522e2af1a0aa333c0d41437988673185bd0534c3055a6
+MISC ChangeLog 2919 RMD160 e2b6d94650b91ff9a5844fc4371cc5723d9e0b25 SHA1 ff6f32d1e10e6e43df4c22a0ab3eeb27c335f27f SHA256 5486f08e603d528758ae55f352e711b8ba346c175418055f19fd2d1522d33cec
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-gfx/synfig/files/synfig-0.62.02-gcc46.patch b/media-gfx/synfig/files/synfig-0.62.02-gcc46.patch
new file mode 100644
index 000000000..1f4272cc3
--- /dev/null
+++ b/media-gfx/synfig/files/synfig-0.62.02-gcc46.patch
@@ -0,0 +1,25 @@
+ src/synfig/canvas.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/synfig/canvas.cpp b/src/synfig/canvas.cpp
+index 417a1b5..87b6088 100644
+--- a/src/synfig/canvas.cpp
++++ b/src/synfig/canvas.cpp
+@@ -714,7 +714,7 @@ Canvas::insert(iterator iter,etl::handle<Layer> x)
+ 	Layer::LooseHandle loose_layer(x);
+ 
+ 	add_connection(loose_layer,
+-				   sigc::connection::connection(
++				   sigc::connection(
+ 					   x->signal_added_to_group().connect(
+ 						   sigc::bind(
+ 							   sigc::mem_fun(
+@@ -722,7 +722,7 @@ Canvas::insert(iterator iter,etl::handle<Layer> x)
+ 								   &Canvas::add_group_pair),
+ 							   loose_layer))));
+ 	add_connection(loose_layer,
+-				   sigc::connection::connection(
++				   sigc::connection(
+ 					   x->signal_removed_from_group().connect(
+ 						   sigc::bind(
+ 							   sigc::mem_fun(
diff --git a/media-gfx/synfig/files/synfig-0.62.02-png.patch b/media-gfx/synfig/files/synfig-0.62.02-png.patch
new file mode 100644
index 000000000..4e894154f
--- /dev/null
+++ b/media-gfx/synfig/files/synfig-0.62.02-png.patch
@@ -0,0 +1,12 @@
+diff -wbBur synfig-0.62.01/src/modules/mod_png/mptr_png.cpp synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp
+--- synfig-0.62.01/src/modules/mod_png/mptr_png.cpp	2010-05-31 18:12:14.000000000 +0000
++++ synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp	2010-06-03 15:43:39.000000000 +0000
+@@ -309,7 +309,7 @@
+ 				float b=gamma().b_U8_to_F32((unsigned char)png_ptr->palette[row_pointers[y][x]].blue);
+ 				float a=1.0;
+ 				if(info_ptr->valid & PNG_INFO_tRNS)
+-				    a = (float)(unsigned char)png_ptr->trans[row_pointers[y][x]]*(1.0/255.0);
++				    a = (float)(unsigned char)png_ptr->trans_alpha[row_pointers[y][x]]*(1.0/255.0);
+ 				surface_buffer[y][x]=Color(
+ 					r,
+ 					g,
diff --git a/media-gfx/synfig/synfig-0.62.00.ebuild b/media-gfx/synfig/synfig-0.62.02.ebuild
index e0c6230fd..ca6ae3fbe 100644
--- a/media-gfx/synfig/synfig-0.62.00.ebuild
+++ b/media-gfx/synfig/synfig-0.62.02.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=4
 
+inherit eutils
+
 DESCRIPTION="Film-Quality Vector Animation (core engine)"
 HOMEPAGE="http://www.synfig.org/"
 SRC_URI="mirror://sourceforge/synfig/${P}.tar.gz"
@@ -28,6 +30,12 @@ RDEPEND="${DEPEND}
 	dv? ( media-libs/libdv )
 	imagemagick? ( media-gfx/imagemagick )"
 
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-png.patch
+}
+
 src_configure() {
 	econf \
 		$(use_with ffmpeg) \
@@ -43,5 +51,5 @@ src_install() {
 	default
 	dodoc doc/*.txt
 	insinto /usr/share/${PN}/examples
-	doins examples/*.si{f,fz}
+	doins examples/*.sifz
 }