Make dvdauthor work with imagemagick-6*, bug #66226

diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index e8d814445c58a69ef9787d9569bd05b79908dd11..2ad621453b4aee052f8e8b37ab4e52c54625a034 100644 (file)
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvdauthor
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.16 2004/10/04 14:39:08 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.17 2004/11/08 00:35:24 sekretarz Exp $
+
+  08 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/dvdauthor-0.6.10-im6.patch, dvdauthor-0.6.10.ebuild:
+  Make dvdauthor work with imagemagick-6*, bug #66226
 
   04 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> dvdauthor-0.5.0.ebuild,
   dvdauthor-0.5.3.ebuild, dvdauthor-0.6.10.ebuild:

diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 8d6051fec6c94a561d9b35ee4ccf1bbaacfa638f..dbd759bfb06dcac81c80b548c81c33d6f4b56c22 100644 (file)
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 0cd55695a53648d05264f65e56bf29d5 dvdauthor-0.5.3.ebuild 766
 MD5 94f8c40a300d20168435748824dcd948 dvdauthor-0.5.0.ebuild 758
-MD5 5dbbd365e54894f65bb5b11b24029e5c dvdauthor-0.6.10.ebuild 823
-MD5 4733dd826844f48eeade483e157c5a18 ChangeLog 2398
+MD5 684747dbf9757a64da251cbd4d6708fd dvdauthor-0.6.10.ebuild 860
+MD5 933e0a7bc2b9627d7adad92087cf6424 ChangeLog 2570
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 d121c9be3efefbcbf6b07a1fba9a8afc files/dvdauthor-0.6.10-im6.patch 360
 MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/0.6.10-gcc34.patch 427
 MD5 8a50d588492e032aad69586764b81edf files/dvdauthor-0.6.10-utf8.patch 464
 MD5 237f7b3b119dec02712a341e3b1ea458 files/digest-dvdauthor-0.5.0 66
 MD5 1c2c588351a939107a17280fd17f351c files/digest-dvdauthor-0.5.3 66
 MD5 7dc0471c612f68f8c3cc66a8064e4263 files/digest-dvdauthor-0.6.10 68
 MD5 cf7c72d03d03abd9ecd2ba645d5cecd6 files/dvdauthor-0.6.10-gcc34.patch 427
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjr9WZ/iYVBmujdURAsiVAKCM0P6cB8hgajN+NB3FeGwTWHDh7ACgnu4r
+q+czVVv5YHqPmi99GwRIdnM=
+=jg9f
+-----END PGP SIGNATURE-----

diff --git a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
index 8585f2fc1d31434871ed50ef53e83f4b7d4bf6bf..52fe1a46632dbbb7e50fd6627dcef31a93286521 100644 (file)
--- a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.9 2004/10/04 14:39:08 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.10 2004/11/08 00:35:24 sekretarz Exp $
 
 inherit eutils 64-bit
 
@@ -22,6 +22,7 @@ src_unpack() {
        cd ${S}
        epatch ${FILESDIR}/${P}-gcc34.patch
        64-bit && epatch ${FILESDIR}/${P}-utf8.patch
+       epatch ${FILESDIR}/${P}-im6.patch
 }
 
 src_install() {

diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.10-im6.patch b/media-video/dvdauthor/files/dvdauthor-0.6.10-im6.patch
new file mode 100644 (file)
index 0000000..04bfe3f
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.6.10-im6.patch
@@ -0,0 +1,11 @@
+--- src/subgen-image.c.orig    2004-10-21 21:24:21.515919208 +0200
++++ src/subgen-image.c 2004-10-21 21:24:39.728150528 +0200
+@@ -177,7 +177,7 @@
+             p.r=pdata[x*4];
+             p.g=pdata[x*4+1];
+             p.b=pdata[x*4+2];
+-            p.t=255-pdata[x*4+3];
++            p.t=pdata[x*4+3];
+             putpixel(s,y*s->width+x,&p);
+         }
+     }