diff options
| author |   Jory A. Pratt <anarchy@gentoo.org> | 2011-02-15 22:34:09 -0600 |
|---|---|---|
| committer | Jory A. Pratt <anarchy@gentoo.org> | 2011-02-15 22:34:09 -0600 |
| commit | 97858e56a81a81427f349483e88368df062e157b (patch) | |
| tree | 862b28bac9231b423a37afd2ca24795f33dff461 | |
| parent | more libpng-1.5 fixes (diff) | |
| download | anarchy-97858e56a81a81427f349483e88368df062e157b.tar.gz anarchy-97858e56a81a81427f349483e88368df062e157b.tar.bz2 anarchy-97858e56a81a81427f349483e88368df062e157b.zip | |
update dvdauthor to current release
| -rw-r--r-- | media-video/dvdauthor/Manifest | 6 | ||||
| -rw-r--r-- | media-video/dvdauthor/dvdauthor-0.7.0.ebuild (renamed from media-video/dvdauthor/dvdauthor-0.6.18.ebuild) | 8 | ||||
| -rw-r--r-- | media-video/dvdauthor/files/dvdauthor-0.7.0-libpng1.5.patch (renamed from media-video/dvdauthor/files/dvdauthor-0.6.18-libpng-1.5.patch) | 20 |
3 files changed, 16 insertions, 18 deletions
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest index 335b881..0e28625 100644 --- a/media-video/dvdauthor/Manifest +++ b/media-video/dvdauthor/Manifest @@ -1,3 +1,3 @@ -AUX dvdauthor-0.6.18-libpng-1.5.patch 631 RMD160 51b0e0e4b36947163153a52a59907978b1c34812 SHA1 3c01fcd6a6f9667994af8e94822bb19e5eb88341 SHA256 7a16d0dd5a37525a345b2e75f122b9ecfb43beed388eb7a8f33f0ab7b8b9e176 -DIST dvdauthor-0.6.18.tar.gz 392809 RMD160 d7571a8371305aefb283f433440b3be2264e9e34 SHA1 7b6e190a3903f617d08368e3cc5e6fd80677e2fb SHA256 0e21c2d9c09f7e347c4c9bd7b691455f524ec2e91bcafc18b84d7b7fb3a9cb26 -EBUILD dvdauthor-0.6.18.ebuild 855 RMD160 0fe7354da217a9020bd34308c1a0fcfda9bb50f1 SHA1 aaf7f2b1104673a0fdd618596dd4fe2ae670ec4f SHA256 136156d874204a94b13d1bc8fc13ba8fe1e16f9061fea6f6f000d3d82b1ef4fc +AUX dvdauthor-0.7.0-libpng1.5.patch 661 RMD160 a52235c6737b0d2e0495ce49ad2277fa34251f68 SHA1 dbb5dfc8e43f656229c1abb390a804fc92d09f6d SHA256 6404d26dc7a088edb9e459f392167d28b911e2aad30dd81a17b54eada52b1471 +DIST dvdauthor-0.7.0.tar.gz 414191 RMD160 fa45f92cfc18a9f3327abd3c5b94fae6d4de22d0 SHA1 39501f826ae9cc6b334160ebb9c01ce9c91b31d4 SHA256 aea6af7b99eba38ffa9dc5ad1521c2cc652e043cea0e7482e239d2a3fc2f34d0 +EBUILD dvdauthor-0.7.0.ebuild 845 RMD160 8e78dccba9db538c230d4d00a62f5d2f3fd1995c SHA1 e825ed0e5817354ea9806ff2898a704f039b4e75 SHA256 49e7fffb3b7d27b776429d33771c73335a79aa78fef9a95a11cace5cbc76fbd3 diff --git a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild b/media-video/dvdauthor/dvdauthor-0.7.0.ebuild index 0dbb672..9155b9d 100644 --- a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild +++ b/media-video/dvdauthor/dvdauthor-0.7.0.ebuild @@ -15,6 +15,8 @@ SLOT="0" KEYWORDS="amd64 ppc ~ppc64 ~sparc x86" IUSE="" +S="${WORKDIR}/${PN}" + DEPEND="media-libs/libdvdread >=media-gfx/imagemagick-5.5.7.14 >=dev-libs/libxml2-2.6.0 @@ -22,12 +24,8 @@ DEPEND="media-libs/libdvdread dev-libs/fribidi media-libs/libpng" -src_unpack() { - unpack ${A} -} - src_prepare() { - epatch "${FILESDIR}/${P}-libpng-1.5.patch" + epatch "${FILESDIR}"/${P}-libpng1.5.patch } src_install() { diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng-1.5.patch b/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng1.5.patch index d234187..dfc33f9 100644 --- a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng-1.5.patch +++ b/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng1.5.patch @@ -6,7 +6,7 @@ https://github.com/ldo/dvdauthor/commit/c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5 --- src/spuunmux.c.orig 2010-03-05 06:37:06.000000000 +0000 +++ src/spuunmux.c -@@ -38,6 +38,7 @@ +@@ -39,6 +39,7 @@ #include <netinet/in.h> #include <png.h> @@ -14,12 +14,12 @@ https://github.com/ldo/dvdauthor/commit/c82aaa4eb1a1c36bf7e2b7ae3c9140d0bf8000b5 #include "rgb.h" #include "common.h" -@@ -483,7 +484,7 @@ static int write_png(char *file_name,str - return -1; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(fp); - return -1; +@@ -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); |