* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/, media-video/dvdauthor/files/
@ 2015-10-15 14:18 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2015-10-15 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 5894ac877ce8c6dea2a7b77187edafa5e6f72c35
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:17:49 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 14:17:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5894ac87
media-video/dvdauthor: remove old.
Package-Manager: portage-2.2.23
media-video/dvdauthor/Manifest | 2 --
media-video/dvdauthor/dvdauthor-0.6.18.ebuild | 32 -----------------
media-video/dvdauthor/dvdauthor-0.7.0.ebuild | 41 ----------------------
.../files/dvdauthor-0.6.18-libpng15.patch | 19 ----------
.../dvdauthor/files/dvdauthor-0.7.0-libpng15.patch | 19 ----------
5 files changed, 113 deletions(-)
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 8e4bf08..61dcf35 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,3 +1 @@
-DIST dvdauthor-0.6.18.tar.gz 392809 SHA256 0e21c2d9c09f7e347c4c9bd7b691455f524ec2e91bcafc18b84d7b7fb3a9cb26 SHA512 15bed459a77ad83c998007aab54619954adf0ba63a71978c3374c64a3506e82583cdb042383c1b2e1ccef83243c968d8f66ccb7182333c02aef30678124242c0 WHIRLPOOL aac6101559c74c1f64648c84555d7c0608dc92219600d0a7b355f0752143ce06950ca544750dcdaa1a79ecee252d04e201635d4248c95052f5f3dd0689c6a5f9
-DIST dvdauthor-0.7.0.tar.gz 414191 SHA256 aea6af7b99eba38ffa9dc5ad1521c2cc652e043cea0e7482e239d2a3fc2f34d0 SHA512 2f450ef02dac774a8611f3398f71a8d9d4f7ebb3c9de56ec1c4ec2d54350f371bf32387f95bc90dcd399618819f46cd589cacfef6f7aae68ee3addda5e9ce892 WHIRLPOOL af960e9ad82c8e0da7c67dfde6c471803ed1d53eda8f373a4f1d3dd54edb2a0a91b654d65855a6171032e12230db0d2bb7e2e016d76c5222591e0ea70dbeb65b
DIST dvdauthor-0.7.1.tar.gz 421324 SHA256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9 WHIRLPOOL c07526bbdbd75b4ddc0f2a1057f2bf27dbb5c63b4e4495b3a051d530af58ba4d4d75ec15dff2e3628cd1cb46b476ecb6a3d640ec30e1e6692d832549108b3e63
diff --git a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild b/media-video/dvdauthor/dvdauthor-0.6.18.ebuild
deleted file mode 100644
index f4b581b..0000000
--- a/media-video/dvdauthor/dvdauthor-0.6.18.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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=""
-
-RDEPEND="media-libs/libdvdread
- >=media-gfx/imagemagick-5.5.7.14
- >=dev-libs/libxml2-2.6.0
- media-libs/freetype
- dev-libs/fribidi
- media-libs/libpng"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libpng15.patch
-}
diff --git a/media-video/dvdauthor/dvdauthor-0.7.0.ebuild b/media-video/dvdauthor/dvdauthor-0.7.0.ebuild
deleted file mode 100644
index f842a04..0000000
--- a/media-video/dvdauthor/dvdauthor-0.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs
-
-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-0.19.2
- 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}
- virtual/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
-}
-
-src_configure() {
- append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
- econf
-}
diff --git a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch b/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch
deleted file mode 100644
index 6ecd44c..0000000
--- a/media-video/dvdauthor/files/dvdauthor-0.6.18-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -37,6 +37,7 @@
-
- #include <netinet/in.h>
-
-+#include <zlib.h>
- #include <png.h>
-
- #include "rgb.h"
-@@ -483,7 +484,7 @@
- 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;
diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch b/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch
deleted file mode 100644
index 2bb6363..0000000
--- a/media-video/dvdauthor/files/dvdauthor-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
-
- #include <png.h>
-+#include <zlib.h>
-
- #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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/, media-video/dvdauthor/files/
@ 2017-05-23 9:09 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2017-05-23 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 3fc97f728cf9805bf2845d4c7633c0c063d77692
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 09:09:07 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 23 09:09:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc97f72
media-video/dvdauthor: Fixed build with imagemagick-7 (bug #610574).
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild | 5 +++
.../files/dvdauthor-0.7.2-imagemagick7.patch | 37 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
index 035baec1312..b279738dca1 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
@@ -30,6 +30,11 @@ DOCS=( AUTHORS ChangeLog README TODO )
src_prepare() {
default
+
+ if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+ eapply "${FILESDIR}/${PN}-0.7.2-imagemagick7.patch"
+ fi
+
if use graphicsmagick ; then
sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
|| die
diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
new file mode 100644
index 00000000000..9f9e3a0b301
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
@@ -0,0 +1,37 @@
+--- dvdauthor/src/subgen-image.c
++++ dvdauthor/src/subgen-image.c
+@@ -30,7 +30,7 @@
+
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+ #include <stdarg.h>
+-#include <magick/api.h>
++#include <MagickWand/MagickWand.h>
+ #else
+ #include <png.h>
+ #endif
+@@ -181,7 +181,8 @@
+ unsigned long magickver;
+ unsigned char amask;
+
+- GetExceptionInfo(&ei);
++ ExceptionInfo *exception_info;
++ exception_info = AcquireExceptionInfo();
+ ii=CloneImageInfo(NULL);
+ strcpy(ii->filename,s->fname);
+ im=ReadImage(ii,&ei);
+@@ -1098,13 +1099,13 @@
+ void image_init()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+- InitializeMagick(NULL);
++ MagickCoreGenesis("", MagickFalse);
+ #endif
+ }
+
+ void image_shutdown()
+ {
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+- DestroyMagick();
++ MagickCoreTerminus();
+ #endif
+ }
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-23 9:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-15 14:18 [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/, media-video/dvdauthor/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-05-23 9:09 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox