diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-04 19:00:40 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-02-04 19:00:40 +0000 |
| commit | 3661877b588f9953f4525167e8d0e5fb07632f56 (patch) | |
| tree | 951c3f54f241f30cd6bbe84a0d4a791cbbc36d34 /media-video/dvdauthor | |
| parent | new version with several bug fixes that should solve some amd64 issues. Close... (diff) | |
| download | historical-3661877b588f9953f4525167e8d0e5fb07632f56.tar.gz historical-3661877b588f9953f4525167e8d0e5fb07632f56.tar.bz2 historical-3661877b588f9953f4525167e8d0e5fb07632f56.zip | |
added a patch contributed by Danny van Dyk <kugelfang@gentoo.org>. please see #62836
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'media-video/dvdauthor')
| -rw-r--r-- | media-video/dvdauthor/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/dvdauthor/Manifest | 5 | ||||
| -rw-r--r-- | media-video/dvdauthor/dvdauthor-0.6.10.ebuild | 5 | ||||
| -rw-r--r-- | media-video/dvdauthor/files/dvdauthor-0.6.10-debugsegfault.patch | 36 |
4 files changed, 49 insertions, 4 deletions
diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog index 7c18852a2474..0bf1aca15f6f 100644 --- a/media-video/dvdauthor/ChangeLog +++ b/media-video/dvdauthor/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/dvdauthor # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.18 2005/01/08 00:56:54 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.19 2005/02/04 19:00:40 luckyduck Exp $ + + 04 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> + +files/dvdauthor-0.6.10-debugsegfault.patch, dvdauthor-0.6.10.ebuild: + added a patch contributed by Danny van Dyk <kugelfang@gentoo.org>. please see + #62836 08 Jan 2005; Jan Brinkmann <luckyduck@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 c8cbde1d37a7..4c93fbc3233e 100644 --- a/media-video/dvdauthor/Manifest +++ b/media-video/dvdauthor/Manifest @@ -1,8 +1,9 @@ MD5 1a59ae2b8b346bd0975340933646b873 dvdauthor-0.5.3.ebuild 786 MD5 456c8700edeb660dc2288d86d617adc4 dvdauthor-0.5.0.ebuild 778 -MD5 59dc736dafb4e00c6f11ae0bb7f95e18 dvdauthor-0.6.10.ebuild 879 -MD5 9844943f321c4689a1e9f53f92951e08 ChangeLog 2762 +MD5 2d6be818699883eb6009ceaeef8742a9 dvdauthor-0.6.10.ebuild 939 +MD5 996eaac73c68d85ff0677487d9a64d60 ChangeLog 2976 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 +MD5 f98a1701d0a682dcbaa5be92cfe177d8 files/dvdauthor-0.6.10-debugsegfault.patch 1274 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 diff --git a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild index 6e92d6578667..613db368e5d0 100644 --- a/media-video/dvdauthor/dvdauthor-0.6.10.ebuild +++ b/media-video/dvdauthor/dvdauthor-0.6.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.11 2005/01/08 00:56:54 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.6.10.ebuild,v 1.12 2005/02/04 19:00:40 luckyduck Exp $ inherit eutils 64-bit @@ -24,6 +24,9 @@ src_unpack() { epatch ${FILESDIR}/${P}-gcc34.patch 64-bit && epatch ${FILESDIR}/${P}-utf8.patch epatch ${FILESDIR}/${P}-im6.patch + + # see #62836 + epatch ${FILESDIR}/${P}-debugsegfault.patch } src_install() { diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.10-debugsegfault.patch b/media-video/dvdauthor/files/dvdauthor-0.6.10-debugsegfault.patch new file mode 100644 index 000000000000..55f68492ee31 --- /dev/null +++ b/media-video/dvdauthor/files/dvdauthor-0.6.10-debugsegfault.patch @@ -0,0 +1,36 @@ +--- src/subgen.c.old 2004-09-04 19:12:19.609738456 +0200 ++++ src/subgen.c 2004-09-04 19:15:16.979774112 +0200 +@@ -393,24 +393,23 @@ + if( !newsti ) + { + fprintf(stderr, "INFO: Found EOF in .sub file.\n"); ++ fprintf(stderr, "spts: %d sd: %d\n",\ ++ cursti->spts / 90000, cursti->sd / 90000); + } +- +- if(newsti) /* not last sub */ ++ else /* not last sub */ + { + if(cursti->spts + cursti->sd + tbs > newsti->spts) + { +- if (debug > 4) +- fprintf(stderr, "WARN: Overlapping sub\n"); + cursti->sd = -1; ++ if (debug > 4) ++ { ++ fprintf(stderr, "WARN: Overlapping sub\n"); ++ fprintf(stderr, "spts: %d sd: %d nspts: %d\n",\ ++ cursti->spts / 90000, cursti->sd / 90000, newsti->spts / 90000); ++ } + } + } /* end if ! last sub */ + +- if(debug > 4) +- { +- fprintf(stderr, "spts: %d sd: %d nspts: %d\n",\ +- cursti->spts / 90000, cursti->sd / 90000, newsti->spts / 90000); +- } +- + if( (cursti->sd == -1) && newsti && ( (!svcd) || until_next_sub) ) + { + if(newsti->spts > cursti->spts + tbs) cursti->sd = newsti->spts - cursti->spts - tbs; |