From 1c3cfa34851c3cfe60098a29b9f7aa3c0bfc5e67 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 9 Oct 2011 09:37:29 +0000 Subject: [PATCH] Version bump wrt #308899 by Daniel Pielmeier Package-Manager: portage-2.2.0_alpha63/cvs/Linux x86_64 --- media-video/dvdauthor/ChangeLog | 8 ++++- media-video/dvdauthor/Manifest | 21 +++++++---- media-video/dvdauthor/dvdauthor-0.7.0.ebuild | 36 +++++++++++++++++++ .../files/dvdauthor-0.7.0-libpng15.patch | 19 ++++++++++ media-video/dvdauthor/metadata.xml | 11 +++--- 5 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 media-video/dvdauthor/dvdauthor-0.7.0.ebuild create mode 100644 media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog index b61f8e4939bd..7653c211c3ba 100644 --- a/media-video/dvdauthor/ChangeLog +++ b/media-video/dvdauthor/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/dvdauthor # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.35 2011/10/08 16:43:15 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.36 2011/10/09 09:37:29 ssuominen Exp $ + +*dvdauthor-0.7.0 (09 Oct 2011) + + 09 Oct 2011; Samuli Suominen +dvdauthor-0.7.0.ebuild, + +files/dvdauthor-0.7.0-libpng15.patch, metadata.xml: + Version bump wrt #308899 by Daniel Pielmeier 08 Oct 2011; Pawel Hajdan jr dvdauthor-0.6.18.ebuild: x86 stable wrt bug #385973 diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest index 72bb0d978d73..978f4da7b84b 100644 --- a/media-video/dvdauthor/Manifest +++ b/media-video/dvdauthor/Manifest @@ -1,20 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX dvdauthor-0.6.14-libpng-1.5.patch 488 RMD160 e28adbde9cb81457326273ac1c392672197ba19d SHA1 005f50a1aedc6969f351dbfe13ea0b064180f927 SHA256 5cbf2875e43e32733457fc02eecf567468c1e36e4f8a37ae69491a57a29645e2 AUX dvdauthor-0.6.18-libpng15.patch 348 RMD160 5ebbaec16da612e1c79342cdb0a5bb20b79e28cf SHA1 41c4b24f7019c4f6cd8f1dfaf31a98b3dfe7a7a3 SHA256 61c28dc61470afa828df44ab46fcf5ec2cc8527313b9f02691f4b7f64faf3e31 +AUX dvdauthor-0.7.0-libpng15.patch 438 RMD160 8e4b8aa927b33103b3888ad3526706e207faef59 SHA1 5724ba2d462a16926f1ed87f987b54416a45cfdf SHA256 8e5e38580d2f1a672e8bad0617e2a8edbfae6e48d14be72336c1fabb7181b518 DIST dvdauthor-0.6.11.tar.gz 288452 RMD160 6c2264a5b28063c9c7bde81496c56c213e1a18a6 SHA1 a99ea7ef6e50646b77ad47a015127925053d34ea SHA256 253415ec75fe6dc5a9bc8da1f7291ba5ab42906729c2381fb42eae1dff46c575 DIST dvdauthor-0.6.14.tar.gz 319371 RMD160 b5d75b613c3be1e41ea5c3f247a993723430977a SHA1 493412bf103069b9261af3be1bc23da56d7d112a SHA256 dd1b1512f3ed64938d40541b1f5aff6682898782469992d8caa81e2587a48ef4 DIST dvdauthor-0.6.18.tar.gz 392809 RMD160 d7571a8371305aefb283f433440b3be2264e9e34 SHA1 7b6e190a3903f617d08368e3cc5e6fd80677e2fb SHA256 0e21c2d9c09f7e347c4c9bd7b691455f524ec2e91bcafc18b84d7b7fb3a9cb26 +DIST dvdauthor-0.7.0.tar.gz 414191 RMD160 fa45f92cfc18a9f3327abd3c5b94fae6d4de22d0 SHA1 39501f826ae9cc6b334160ebb9c01ce9c91b31d4 SHA256 aea6af7b99eba38ffa9dc5ad1521c2cc652e043cea0e7482e239d2a3fc2f34d0 EBUILD dvdauthor-0.6.11.ebuild 704 RMD160 aa676669d20a561f0b757767d8c00dfdd7a6b565 SHA1 41aad1a53acfc29b543e2174b52e5781ff180acf SHA256 b94f071c8d2bf9bed8606bfc8b25615fcadd9d80197282554332ff9ecdecb750 EBUILD dvdauthor-0.6.14.ebuild 811 RMD160 7d4e143bb4cde40e90815c462733f3d1231fae9c SHA1 71d821f3d5d6ff0a03badd2b6c86efeffc067ffa SHA256 3054dfad408cc187baf1ce89e9ed83573c1bc17e2296137ab2d0b41011cec3df EBUILD dvdauthor-0.6.18.ebuild 799 RMD160 0c21ea72e6ba46dcb4378c28a21f5ffe015d4296 SHA1 ac949284d6327a7b6e75f8da049e4d59bd699a6f SHA256 f48458b6f01f7ca4821eff4f7cd3c56e325aaf65eeb31f474843febdb0188da0 -MISC ChangeLog 5017 RMD160 6898b26b63f3da7cd0e1da6aa548fb8af7cd3218 SHA1 6c6dd828f195156f28756d3e511644470e200928 SHA256 1b10cd73140744492b7e641cf4010458643b1a3cf64adfc1dcddd367789eb977 -MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 +EBUILD dvdauthor-0.7.0.ebuild 985 RMD160 af555991f2e3db80eef548242324525825c44f05 SHA1 3c30c4d0b0ee1f3c88f7aa373a1072b4523a0042 SHA256 d3cba0d07a7f4b841899097324145ce97a50cf7c3b8b621cebcdae8f4e679636 +MISC ChangeLog 5230 RMD160 f75e5ddd958d02c566af0ab9ecb0cfea56b819d3 SHA1 90b8e76a39c2a3f1c1be40e7aa2ea9216f183842 SHA256 85333049cc533a6b53b9b3cd2ada06cd2565ef9f6d7c06aac2b469de9d66469f +MISC metadata.xml 373 RMD160 1210bc025d2b07dca83f9b3e4036af1e81bbb959 SHA1 4e060b1bf54d0c2ebdf37417acee6ef39ae3466d SHA256 8a2dd4df029e4eb8c389dbe2856dfba73f0c38e1951bd58c403f37fcecb09c0d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk6QfakACgkQuUQtlDBCeQItsgCeIXbIQKWECUuEnBP8f2/Pg13y -SEUAnAig+S4JONLLTTPQqJUzQcLt6NFy -=XVBL +iQEcBAEBAgAGBQJOkWtzAAoJEEdUh39IaPFN1EgH/196PadgxWRlM3LUrtbK5N3r +QxpwSlzrI0LX1xmZj65qURTvbWjPAnoRboB0naFL4vjG5RxvwuwfUyK1gFpXab3o +0Ucy3MFnswRsGbcXVkE2BamE9GEOgvM2KP8yt4D5ByGHruFhxeZ30TQ8ZXz5ojnR +Y9COUtptmP8U3EIMPDnzkOfVFUbUI7fH8fCMcFgopCdHsQxXxqj+6Po26B4+cE+O +VNpYih9ao4VGKSw6imC9Tmd0HBVbmpeUwl6OKei7NiYAMZ9mNZ6Fh7SD/vexzC3C +tomFoQqjHLKiQFEmWgwe+lSAxh7byjj1I5+y0nt/O/nu6zJ+4an8vmbolvSI7Mk= +=orII -----END PGP SIGNATURE----- diff --git a/media-video/dvdauthor/dvdauthor-0.7.0.ebuild b/media-video/dvdauthor/dvdauthor-0.7.0.ebuild new file mode 100644 index 000000000000..00b143e657e1 --- /dev/null +++ b/media-video/dvdauthor/dvdauthor-0.7.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.7.0.ebuild,v 1.1 2011/10/09 09:37:29 ssuominen Exp $ + +EAPI=4 +inherit eutils + +DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players" +HOMEPAGE="http://dvdauthor.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="graphicsmagick" + +RDEPEND="dev-libs/fribidi + dev-libs/libxml2 + >=media-libs/freetype-2 + media-libs/libdvdread + media-libs/libpng + graphicsmagick? ( media-gfx/graphicsmagick ) + !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +S=${WORKDIR}/${PN} + +DOCS=( AUTHORS ChangeLog README TODO ) + +src_prepare() { + use graphicsmagick && \ + sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure + + epatch "${FILESDIR}"/${P}-libpng15.patch +} diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch b/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch new file mode 100644 index 000000000000..2bb63638032f --- /dev/null +++ b/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch @@ -0,0 +1,19 @@ +--- src/spuunmux.c ++++ src/spuunmux.c +@@ -39,6 +39,7 @@ + #include + + #include ++#include + + #include "rgb.h" + #include "common.h" +@@ -610,7 +611,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + return -1; + } /*if*/ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + fclose(fp); diff --git a/media-video/dvdauthor/metadata.xml b/media-video/dvdauthor/metadata.xml index edccfe5754d2..442225a824b0 100644 --- a/media-video/dvdauthor/metadata.xml +++ b/media-video/dvdauthor/metadata.xml @@ -1,8 +1,11 @@ -video - -media-video@gentoo.org - + video + + media-video@gentoo.org + + + Use media-gfx/graphicsmagick instead of media-gfx/imagemagick + -- 2.26.2