[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2024-04-15 Thread Arthur Zamarin 
commit: efd207e61608ac20a1ce06a06107f4bd730b7ab6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr 15 07:32:44 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr 15 07:32:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd207e6

media-video/dvdauthor: drop 0.7.2-r2, EAPI6--

Closes: https://bugs.gentoo.org/929941
Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild | 55 -
 1 file changed, 55 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
deleted file mode 100644
index 89f11e102235..
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools 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 +imagemagick"
-REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
-
-RDEPEND=">=dev-libs/fribidi-0.19.2
-   dev-libs/libxml2
-   >=media-libs/freetype-2
-   media-libs/libdvdread
-   media-libs/libpng:0=
-   graphicsmagick? ( media-gfx/graphicsmagick:= )
-   imagemagick? ( media-gfx/imagemagick:= )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-PATCHES=(
-   "${FILESDIR}"/${P}-freetype-pkgconfig.patch
-)
-
-src_prepare() {
-   default
-
-   eautoreconf
-
-   if use imagemagick && 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
-   fi
-}
-
-src_configure() {
-   use graphicsmagick && \
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags 
GraphicsMagick)" #459976
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
-   econf
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2024-04-15 Thread Arthur Zamarin 
commit: ea578e3bb1b85847edca6f20c7c021922cbc4a47
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr 15 07:07:08 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr 15 07:07:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea578e3b

media-video/dvdauthor: Stabilize 0.7.2-r3 sparc, #929941

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
index 18a2d7e665b8..2ad99789f374 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="graphicsmagick +imagemagick"
 
 RDEPEND=">=dev-libs/fribidi-0.19.2

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2024-04-13 Thread Arthur Zamarin 
commit: 91eabf3e724a82e39922b4d29a9f635198b21336
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:54:23 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:54:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91eabf3e

media-video/dvdauthor: Stabilize 0.7.2-r3 x86, #929941

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
index bdacf14ffa1b..18a2d7e665b8 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="graphicsmagick +imagemagick"
 
 RDEPEND=">=dev-libs/fribidi-0.19.2

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2024-04-13 Thread Arthur Zamarin 
commit: 46eb5e6567b8b974b56d51faa20b81b7ec001527
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:53:51 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:53:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46eb5e65

media-video/dvdauthor: Stabilize 0.7.2-r3 amd64, #929941

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
index 0a2a23e73c3e..bdacf14ffa1b 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
 IUSE="graphicsmagick +imagemagick"
 
 RDEPEND=">=dev-libs/fribidi-0.19.2

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2024-04-13 Thread Arthur Zamarin 
commit: 58dcdef134452b545f8a66cda995173278c7b709
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:50:45 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:50:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58dcdef1

media-video/dvdauthor: Stabilize 0.7.2-r3 ppc, #929941

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
index e6def892a58b..0a2a23e73c3e 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
 IUSE="graphicsmagick +imagemagick"
 
 RDEPEND=">=dev-libs/fribidi-0.19.2

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2024-04-13 Thread Arthur Zamarin 
commit: 1a304d94ffc474561bc23ca63502798096ad317d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:39:24 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:39:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a304d94

media-video/dvdauthor: Stabilize 0.7.2-r3 ppc64, #929941

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
index bac3629b21c1..e6def892a58b 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE="graphicsmagick +imagemagick"
 
 RDEPEND=">=dev-libs/fribidi-0.19.2

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2023-12-25 Thread Conrad Kostecki 
commit: 49ec06dfd7c927b61924c1ce4cc3f5f669e5e3fc
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Dec 23 12:01:41 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Dec 26 02:37:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ec06df

media-video/dvdauthor: EAPI8 bump, fix #914235

Signed-off-by: Michael Mair-Keimberger  levelnine.at>

Closes: https://bugs.gentoo.org/914235
Closes: https://github.com/gentoo/gentoo/pull/34441
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild | 54 +
 1 file changed, 54 insertions(+)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
new file mode 100644
index ..bac3629b21c1
--- /dev/null
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools for generating DVD files to be played on standalone DVD 
players"
+HOMEPAGE="https://dvdauthor.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="graphicsmagick +imagemagick"
+
+RDEPEND=">=dev-libs/fribidi-0.19.2
+   dev-libs/libxml2
+   >=media-libs/freetype-2
+   media-libs/libdvdread
+   media-libs/libpng:0=
+   imagemagick? (
+   graphicsmagick? ( media-gfx/graphicsmagick:= )
+   imagemagick? ( media-gfx/imagemagick:= )
+   )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-freetype-pkgconfig.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+
+   if use imagemagick && 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
+   fi
+}
+
+src_configure() {
+   use graphicsmagick && \
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags 
GraphicsMagick)" #459976
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
+   econf
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2023-05-10 Thread Sam James 
commit: cb1e1be53328d98213bd9f19459963c0b7a47752
Author: Sam James  gentoo  org>
AuthorDate: Wed May 10 22:11:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 10 22:11:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb1e1be5

media-video/dvdauthor: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 media-video/dvdauthor/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/dvdauthor/metadata.xml 
b/media-video/dvdauthor/metadata.xml
index 01dfeec842c4..1479cf0f2ecd 100644
--- a/media-video/dvdauthor/metadata.xml
+++ b/media-video/dvdauthor/metadata.xml
@@ -6,5 +6,6 @@
   
   
 dvdauthor
+ldo/dvdauthor

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/

2023-05-10 Thread Sam James 
commit: 041c12502cfa9f7b83a3c6194e65cf33cc03012c
Author: Sam James  gentoo  org>
AuthorDate: Wed May 10 22:10:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 10 22:10:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=041c1250

media-video/dvdauthor: rename patch; add upstream ref

Was looking at the ebuild for libxml2 but no need now (was a macro issue
that was fixed upstream since in libxml2).

Signed-off-by: Sam James  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild | 6 --
 ...ype_pkgconfig.patch => dvdauthor-0.7.2-freetype-pkgconfig.patch} | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index dcd1561b0b16..89f11e102235 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,9 @@ S="${WORKDIR}/${PN}"
 
 DOCS=( AUTHORS ChangeLog README TODO )
 
-PATCHES=( "${FILESDIR}/${PN}-freetype_pkgconfig.patch" )
+PATCHES=(
+   "${FILESDIR}"/${P}-freetype-pkgconfig.patch
+)
 
 src_prepare() {
default

diff --git a/media-video/dvdauthor/files/dvdauthor-freetype_pkgconfig.patch 
b/media-video/dvdauthor/files/dvdauthor-0.7.2-freetype-pkgconfig.patch
similarity index 93%
rename from media-video/dvdauthor/files/dvdauthor-freetype_pkgconfig.patch
rename to media-video/dvdauthor/files/dvdauthor-0.7.2-freetype-pkgconfig.patch
index bb9858f437d4..1ddf49403e46 100644
--- a/media-video/dvdauthor/files/dvdauthor-freetype_pkgconfig.patch
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.2-freetype-pkgconfig.patch
@@ -1,3 +1,5 @@
+https://github.com/ldo/dvdauthor/commit/d5bb0bdd542c33214855a7062fcc485f8977934e
+
 From 259f892fe61f16c26733506d2511eec7ff136dc4 Mon Sep 17 00:00:00 2001
 From: Lars Wendler 
 Date: Mon, 7 May 2018 09:18:48 +0200

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/

2022-11-15 Thread Conrad Kostecki 
commit: 73209371ee2a932dd9e47da8a9085815f86453fc
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Nov 14 17:48:18 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Nov 15 22:43:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73209371

media-video/dvdauthor: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../dvdauthor/files/dvdauthor-0.7.1-glibc220.patch | 162 -
 1 file changed, 162 deletions(-)

diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch 
b/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch
deleted file mode 100644
index 880c63aa79d7..
--- a/media-video/dvdauthor/files/dvdauthor-0.7.1-glibc220.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= 
-Date: Sat, 19 Jul 2014 21:06:58 +0300
-Subject: [PATCH] compat.h needs stuff from config.h so include it there
-
-This was brought up by dvdvml.* not including it and thus causing a
-build failure on Fedora (22) devel. While at it, uninclude config.h
-from files where it was included just for compat.h reasons.

- src/compat.h| 2 ++
- src/conffile.c  | 1 -
- src/dvdauthor.c | 2 --
- src/dvdcompile.c| 2 --
- src/dvdpgc.c| 1 -
- src/dvdunauthor.c   | 2 --
- src/dvduncompile.c  | 1 -
- src/dvdvob.c| 2 --
- src/readxml.c   | 2 --
- src/spuunmux.c  | 1 -
- src/subgen-encode.c | 2 --
- 11 files changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/src/compat.h b/src/compat.h
-index 126dcd7..93de081 100644
 a/src/compat.h
-+++ b/src/compat.h
-@@ -1,6 +1,8 @@
- // basic headers
- #define _GNU_SOURCE /* really just for strndup */
- 
-+#include "config.h"
-+
- #ifdef HAVE_STDBOOL_H
- # include 
- #else
-diff --git a/src/conffile.c b/src/conffile.c
-index cab661a..36ded07 100644
 a/src/conffile.c
-+++ b/src/conffile.c
-@@ -21,7 +21,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
- #include "compat.h"
- #include 
- #include "conffile.h"
-diff --git a/src/dvdauthor.c b/src/dvdauthor.c
-index d591d68..4860258 100644
 a/src/dvdauthor.c
-+++ b/src/dvdauthor.c
-@@ -20,8 +20,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
--
- #include "compat.h"
- 
- #include 
-diff --git a/src/dvdcompile.c b/src/dvdcompile.c
-index fd232b6..47f13e5 100644
 a/src/dvdcompile.c
-+++ b/src/dvdcompile.c
-@@ -20,8 +20,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
--
- #include "compat.h"
- #include 
- 
-diff --git a/src/dvdpgc.c b/src/dvdpgc.c
-index e0adc61..cf6eb04 100644
 a/src/dvdpgc.c
-+++ b/src/dvdpgc.c
-@@ -20,7 +20,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
- #include "compat.h"
- #include 
- #include 
-diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c
-index ccd422f..f988cdf 100644
 a/src/dvdunauthor.c
-+++ b/src/dvdunauthor.c
-@@ -23,8 +23,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
--
- #include "compat.h"
- 
- #include 
-diff --git a/src/dvduncompile.c b/src/dvduncompile.c
-index 0c5eaf1..a064011 100644
 a/src/dvduncompile.c
-+++ b/src/dvduncompile.c
-@@ -22,7 +22,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
- #include "compat.h"
- 
- #include 
-diff --git a/src/dvdvob.c b/src/dvdvob.c
-index 2d7e2b8..2146689 100644
 a/src/dvdvob.c
-+++ b/src/dvdvob.c
-@@ -20,8 +20,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
--
- #include "compat.h"
- 
- #include 
-diff --git a/src/readxml.c b/src/readxml.c
-index 61ff0a1..3b83f07 100644
 a/src/readxml.c
-+++ b/src/readxml.c
-@@ -20,8 +20,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
--
- #include "compat.h"
- 
- #include 
-diff --git a/src/spuunmux.c b/src/spuunmux.c
-index 1981e41..94fcb10 100644
 a/src/spuunmux.c
-+++ b/src/spuunmux.c
-@@ -31,7 +31,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
- #include "compat.h"
- 
- #include 
-diff --git a/src/subgen-encode.c b/src/subgen-encode.c
-index 53ed4b2..962e902 100644
 a/src/subgen-encode.c
-+++ b/src/subgen-encode.c
-@@ -21,8 +21,6 @@
-  * MA 02110-1301 USA.
-  */
- 
--#include "config.h"
--
- #include "compat.h"
- 
- #include 
- 
\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2022-11-12 Thread Matt Turner 
commit: 1bdbb0e6974badc5a72ad6910f97be661d1c58f0
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 12 17:29:15 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 12 17:32:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bdbb0e6

media-video/dvdauthor: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 media-video/dvdauthor/Manifest  |  1 -
 media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild | 48 -
 2 files changed, 49 deletions(-)

diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index dd767a2c963f..e3c6d6e347b9 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,2 +1 @@
-DIST dvdauthor-0.7.1.tar.gz 421324 BLAKE2B 
34d7f20cc7f8a5f8ea10cfd1404a15b04e909a343e008da18035f6bf78de7b4f16729b3c2ba5ebedd7bd12e72a801874d99d5c1e6f7458a311501e07afc11788
 SHA512 
0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9
 DIST dvdauthor-0.7.2.tar.gz 648305 BLAKE2B 
e3c918e101be1627b32d19a4ba17e676593ce260c72c4a1126acc691d9dec484e3d70817abfa1f1542d5a29d603ecbd9226e305caadd77abfb1278125f7d6c64
 SHA512 
202b8bba38939d122dc864921a57e89906ca99ddabf44e3b07419cc42cc052567cd892b41f1171c9c195c9a770758e9319a942ea64d14ee8fa847588c7761125

diff --git a/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild
deleted file mode 100644
index ec4f4b64bb34..
--- a/media-video/dvdauthor/dvdauthor-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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 +imagemagick"
-REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
-
-RDEPEND=">=dev-libs/fribidi-0.19.2
-   dev-libs/libxml2
-   >=media-libs/freetype-2
-   media-libs/libdvdread
-   media-libs/libpng:0=
-   graphicsmagick? ( media-gfx/graphicsmagick:= )
-   imagemagick? ( media-gfx/imagemagick:= )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-PATCHES=(
-   "${FILESDIR}/${P}-glibc220.patch"
-)
-
-src_prepare() {
-   default
-   if use graphicsmagick ; then
-   sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
-   || die
-   fi
-}
-
-src_configure() {
-   use graphicsmagick && \
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags 
GraphicsMagick)" #459976
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
-   econf
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2021-04-28 Thread Sam James 
commit: 9c10bc054fbb35a8c19763cbfdbdda8a5828877a
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 29 05:42:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 29 05:44:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c10bc05

media-video/dvdauthor: Stabilize 0.7.2-r2 sparc, #786621

Signed-off-by: Sam James  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index f62b1cd090a..dcd1561b0b1 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="graphicsmagick +imagemagick"
 REQUIRED_USE="^^ ( graphicsmagick imagemagick )"

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/

2018-05-07 Thread Lars Wendler 
commit: 111d4b6671426385476cbc1da675b5efe6ee0e76
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  7 07:27:35 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  7 07:27:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111d4b66

media-video/dvdauthor: Use pkg-config to find freetype

Bug: https://bugs.gentoo.org/654884
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild|  6 ++-
 .../files/dvdauthor-freetype_pkgconfig.patch   | 43 ++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index 6ac055e70b4..e7b36f67d40 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD 
players"
 HOMEPAGE="http://dvdauthor.sourceforge.net/;
@@ -28,9 +28,13 @@ S="${WORKDIR}/${PN}"
 
 DOCS=( AUTHORS ChangeLog README TODO )
 
+PATCHES=( "${FILESDIR}/${PN}-freetype_pkgconfig.patch" )
+
 src_prepare() {
default
 
+   eautoreconf
+
if use imagemagick && has_version '>=media-gfx/imagemagick-7.0.1.0' ; 
then
eapply "${FILESDIR}/${PN}-0.7.2-imagemagick7.patch"
fi

diff --git a/media-video/dvdauthor/files/dvdauthor-freetype_pkgconfig.patch 
b/media-video/dvdauthor/files/dvdauthor-freetype_pkgconfig.patch
new file mode 100644
index 000..bb9858f437d
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-freetype_pkgconfig.patch
@@ -0,0 +1,43 @@
+From 259f892fe61f16c26733506d2511eec7ff136dc4 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Mon, 7 May 2018 09:18:48 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config file no longer gets installed
+by default.
+---
+ configure.ac | 10 --
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c06ac6b..1194059 100644
+--- a/configure.ac
 b/configure.ac
+@@ -79,10 +79,8 @@ PKG_CHECK_MODULES([FRIBIDI], [fribidi], 
[AC_DEFINE(HAVE_FRIBIDI, 1, [whether Fri
+ AC_SUBST(FRIBIDI_CFLAGS)
+ AC_SUBST(FRIBIDI_LIBS)
+ 
+-AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
+-if test -n "$FREETYPECONFIG"; then
+-FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`"
+-FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`"
++PKG_CHECK_MODULES(FREETYPE, [freetype2],[
++FREETYPE_CPPFLAGS="$FREETYPE_CFLAGS"
+ AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available])
+ 
+ ac_save_CPPFLAGS="$CPPFLAGS"
+@@ -91,9 +89,9 @@ if test -n "$FREETYPECONFIG"; then
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ AC_SUBST(FREETYPE_CPPFLAGS)
+ AC_SUBST(FREETYPE_LIBS)
+-else
++],
+ AC_MSG_ERROR([freetype not found])
+-fi
++)
+ 
+ 
+ AC_ARG_ENABLE([default-video-format],
+-- 
+2.17.0
+

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/

2018-02-20 Thread Lars Wendler 
commit: 070c5274a522921f52eb05ab3389c1a2356c98fd
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Feb 20 10:36:08 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb 20 10:36:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070c5274

media-video/dvdauthor: Marked 0.7.2-r2 stable where 0.7.2-r1 was stable

Renamed fixed patch file.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild|  4 +-
 .../files/dvdauthor-0.7.2-imagemagick7.patch   | 48 --
 .../files/dvdauthor-0.7.2-r2-imagemagick7.patch| 75 --
 3 files changed, 45 insertions(+), 82 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index bab0a74a5cf..6ac055e70b4 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="graphicsmagick +imagemagick"
 REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
 
@@ -32,7 +32,7 @@ src_prepare() {
default
 
if use imagemagick && has_version '>=media-gfx/imagemagick-7.0.1.0' ; 
then
-   eapply "${FILESDIR}/${PN}-0.7.2-r2-imagemagick7.patch"
+   eapply "${FILESDIR}/${PN}-0.7.2-imagemagick7.patch"
fi
 
if use graphicsmagick ; then

diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch 
b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
index 9f9e3a0b301..e7b9ac15d3c 100644
--- a/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
@@ -9,17 +9,54 @@
  #else
  #include 
  #endif
-@@ -181,7 +181,8 @@
+@@ -176,18 +176,18 @@
+ {
+ Image *im;
+ ImageInfo *ii;
+-ExceptionInfo ei;
++ExceptionInfo *ei;
+ int x,y;
  unsigned long magickver;
  unsigned char amask;
  
 -GetExceptionInfo();
-+ExceptionInfo *exception_info;
-+exception_info = AcquireExceptionInfo();
++ei = AcquireExceptionInfo();
  ii=CloneImageInfo(NULL);
  strcpy(ii->filename,s->fname);
- im=ReadImage(ii,);
-@@ -1098,13 +1099,13 @@
+-im=ReadImage(ii,);
++im=ReadImage(ii,ei);
+ 
+ if( !im ) {
+-MagickError(ei.severity,"Unable to load file",ii->filename);
++MagickError(ei->severity,"Unable to load file",ii->filename);
+ return -1;
+ }
+ 
+@@ -202,10 +202,10 @@
+ for( y=0; yrows; y++ ) {
+ char pdata[MAXX*4];
+ 
+-
if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,)) {
+-fprintf(stderr,"ERR:  Extracting row %d from %s 
(%s,%s)\n",y,s->fname,ei.reason,ei.description);
+-CatchException();
+-MagickError(ei.severity,ei.reason,ei.description);
++
if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
++fprintf(stderr,"ERR:  Extracting row %d from %s 
(%s,%s)\n",y,s->fname,ei->reason,ei->description);
++CatchException(ei);
++MagickError(ei->severity,ei->reason,ei->description);
+ DestroyImage(im);
+ return -1;
+ }
+@@ -219,7 +219,7 @@
+ }
+ }
+ DestroyImage(im);
+-DestroyExceptionInfo();
++DestroyExceptionInfo(ei);
+ fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
+ 
+ return 0;
+@@ -1098,13 +1098,13 @@
  void image_init()
  {
  #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
@@ -35,3 +72,4 @@
 +MagickCoreTerminus();
  #endif
  }
+

diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch 
b/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch
deleted file mode 100644
index 0f6bed4372a..000
--- a/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch
+++ /dev/null
@@ -1,75 +0,0 @@
 dvdauthor/src/subgen-image.c   2014-01-21 00:12:37.0 +0100
-+++ dvdauthor/src/subgen-image.c   2017-11-27 20:26:53.682914041 +0100
-@@ -30,7 +30,7 @@
- 
- #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- #include 
--#include 
-+#include 
- #else
- #include 
- #endif
-@@ -176,18 +176,18 @@
- {
- Image *im;
- ImageInfo *ii;
--ExceptionInfo ei;
-+ExceptionInfo *ei;
- int x,y;
- unsigned long magickver;
- unsigned char amask;
- 
--GetExceptionInfo();
-+ei = AcquireExceptionInfo();
- ii=CloneImageInfo(NULL);
- strcpy(ii->filename,s->fname);
--im=ReadImage(ii,);
-+im=ReadImage(ii,ei);
- 
- if( !im ) {
--MagickError(ei.severity,"Unable to load file",ii->filename);
-+MagickError(ei->severity,"Unable to load file",ii->filename);
- return -1;
- }
- 
-@@ -202,10 +202,10 @@
- for( y=0; yrows; y++ ) {
-

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2018-02-20 Thread Lars Wendler 
commit: eb126898e3ae6ee26a7ec816feee057aedc1a3fb
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Feb 20 10:36:44 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb 20 10:36:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb126898

media-video/dvdauthor: Removed old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild | 49 -
 1 file changed, 49 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
deleted file mode 100644
index 6ac055e70b4..000
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 +imagemagick"
-REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
-
-RDEPEND=">=dev-libs/fribidi-0.19.2
-   dev-libs/libxml2
-   >=media-libs/freetype-2
-   media-libs/libdvdread
-   media-libs/libpng:0=
-   graphicsmagick? ( media-gfx/graphicsmagick:= )
-   imagemagick? ( media-gfx/imagemagick:= )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-   default
-
-   if use imagemagick && 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
-   fi
-}
-
-src_configure() {
-   use graphicsmagick && \
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags 
GraphicsMagick)" #459976
-   append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
-   econf
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/

2018-02-20 Thread Lars Wendler 
commit: 79a21bdf0ece816aa69ae848e6580aa5ade9d2d2
Author: Branko Grubic  gmail  com>
AuthorDate: Wed Feb 14 23:31:21 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb 20 10:31:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a21bdf

media-video/dvdauthor: adjust imagemagick-7 patch

Bug: https://bugs.gentoo.org/647670
Closes: https://github.com/gentoo/gentoo/pull/7189

 media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild| 49 ++
 .../files/dvdauthor-0.7.2-r2-imagemagick7.patch| 75 ++
 2 files changed, 124 insertions(+)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
new file mode 100644
index 000..bab0a74a5cf
--- /dev/null
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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 +imagemagick"
+REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
+
+RDEPEND=">=dev-libs/fribidi-0.19.2
+   dev-libs/libxml2
+   >=media-libs/freetype-2
+   media-libs/libdvdread
+   media-libs/libpng:0=
+   graphicsmagick? ( media-gfx/graphicsmagick:= )
+   imagemagick? ( media-gfx/imagemagick:= )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+   default
+
+   if use imagemagick && has_version '>=media-gfx/imagemagick-7.0.1.0' ; 
then
+   eapply "${FILESDIR}/${PN}-0.7.2-r2-imagemagick7.patch"
+   fi
+
+   if use graphicsmagick ; then
+   sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
+   || die
+   fi
+}
+
+src_configure() {
+   use graphicsmagick && \
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags 
GraphicsMagick)" #459976
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
+   econf
+}

diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch 
b/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch
new file mode 100644
index 000..0f6bed4372a
--- /dev/null
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch
@@ -0,0 +1,75 @@
+--- dvdauthor/src/subgen-image.c   2014-01-21 00:12:37.0 +0100
 dvdauthor/src/subgen-image.c   2017-11-27 20:26:53.682914041 +0100
+@@ -30,7 +30,7 @@
+ 
+ #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+ #include 
+-#include 
++#include 
+ #else
+ #include 
+ #endif
+@@ -176,18 +176,18 @@
+ {
+ Image *im;
+ ImageInfo *ii;
+-ExceptionInfo ei;
++ExceptionInfo *ei;
+ int x,y;
+ unsigned long magickver;
+ unsigned char amask;
+ 
+-GetExceptionInfo();
++ei = AcquireExceptionInfo();
+ ii=CloneImageInfo(NULL);
+ strcpy(ii->filename,s->fname);
+-im=ReadImage(ii,);
++im=ReadImage(ii,ei);
+ 
+ if( !im ) {
+-MagickError(ei.severity,"Unable to load file",ii->filename);
++MagickError(ei->severity,"Unable to load file",ii->filename);
+ return -1;
+ }
+ 
+@@ -202,10 +202,10 @@
+ for( y=0; yrows; y++ ) {
+ char pdata[MAXX*4];
+ 
+-
if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,)) {
+-fprintf(stderr,"ERR:  Extracting row %d from %s 
(%s,%s)\n",y,s->fname,ei.reason,ei.description);
+-CatchException();
+-MagickError(ei.severity,ei.reason,ei.description);
++
if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
++fprintf(stderr,"ERR:  Extracting row %d from %s 
(%s,%s)\n",y,s->fname,ei->reason,ei->description);
++CatchException(ei);
++MagickError(ei->severity,ei->reason,ei->description);
+ DestroyImage(im);
+ return -1;
+ }
+@@ -219,7 +219,7 @@
+ }
+ }
+ DestroyImage(im);
+-DestroyExceptionInfo();
++DestroyExceptionInfo(ei);
+ fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
+ 
+ return 0;
+@@ -1098,13 +1098,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
+ }
+

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2018-01-07 Thread Mikle Kolyada 
commit: 33aeeb0046163dd7fba5170a3396f2d362be8699
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jan  8 00:37:10 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jan  8 00:37:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33aeeb00

media-video/dvdauthor: amd64 stable wrt bug #641194

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
index d8ad91b8608..9a101476c60 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
 IUSE="graphicsmagick +imagemagick"
 REQUIRED_USE="^^ ( graphicsmagick imagemagick )"

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2017-12-24 Thread Sergei Trofimovich 
commit: 8352272825da28bc9d39d93f681993e3d9b27264
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec 24 13:36:41 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec 24 13:37:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83522728

media-video/dvdauthor: stable 0.7.2-r1 for ppc/ppc64, bug #641194

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc ppc64"

 media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
index b8470759771..d8ad91b8608 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~sparc ~x86"
 IUSE="graphicsmagick +imagemagick"
 REQUIRED_USE="^^ ( graphicsmagick imagemagick )"

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2017-05-23 Thread Lars Wendler 
commit: f4fb3fdf4808088e63df3888231b9733e0d3d937
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue May 23 22:32:09 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May 23 22:32:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4fb3fdf

media-video/dvdauthor: Fixed compilation with USE="-imagemagick".

Gentoo bug #619480

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
index b279738dca1..b8470759771 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
@@ -24,14 +24,14 @@ RDEPEND=">=dev-libs/fribidi-0.19.2
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 DOCS=( AUTHORS ChangeLog README TODO )
 
 src_prepare() {
default
 
-   if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+   if use imagemagick && has_version '>=media-gfx/imagemagick-7.0.1.0' ; 
then
eapply "${FILESDIR}/${PN}-0.7.2-imagemagick7.patch"
fi

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/, media-video/dvdauthor/files/

2017-05-23 Thread Lars Wendler 
commit: 3fc97f728cf9805bf2845d4c7633c0c063d77692
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue May 23 09:09:07 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May 23 09:09:34 2017 +
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 000..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 
+-#include 
++#include 
+ #else
+ #include 
+ #endif
+@@ -181,7 +181,8 @@
+ unsigned long magickver;
+ unsigned char amask;
+ 
+-GetExceptionInfo();
++ExceptionInfo *exception_info;
++exception_info = AcquireExceptionInfo();
+ ii=CloneImageInfo(NULL);
+ strcpy(ii->filename,s->fname);
+ im=ReadImage(ii,);
+@@ -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
+ }

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2017-01-03 Thread Alexis Ballier 
commit: 868c21bc29243d315cec9791bb0d19439a97414b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan  3 16:35:05 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan  3 16:35:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868c21bc

media-video/dvdauthor: bump to 0.7.2

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-video/dvdauthor/Manifest   |  1 +
 media-video/dvdauthor/dvdauthor-0.7.2.ebuild | 44 
 2 files changed, 45 insertions(+)

diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 61dcf35..bc66b13 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1 +1,2 @@
 DIST dvdauthor-0.7.1.tar.gz 421324 SHA256 
501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 SHA512 
0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9
 WHIRLPOOL 
c07526bbdbd75b4ddc0f2a1057f2bf27dbb5c63b4e4495b3a051d530af58ba4d4d75ec15dff2e3628cd1cb46b476ecb6a3d640ec30e1e6692d832549108b3e63
+DIST dvdauthor-0.7.2.tar.gz 648305 SHA256 
3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7 SHA512 
202b8bba38939d122dc864921a57e89906ca99ddabf44e3b07419cc42cc052567cd892b41f1171c9c195c9a770758e9319a942ea64d14ee8fa847588c7761125
 WHIRLPOOL 
d74d9b9d7976c5b98c9c6ebae5f5af5c201bc93f295c400b8cf7a10d4012e9b602f7817dd4acca70578a347d38fbe5bf43bbe8df398b4bc38c20bcc165ee1c3c

diff --git a/media-video/dvdauthor/dvdauthor-0.7.2.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.2.ebuild
new file mode 100644
index ..a957dcc
--- /dev/null
+++ b/media-video/dvdauthor/dvdauthor-0.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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:0=
+   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() {
+   default
+   if use graphicsmagick ; then
+   sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
+   || die
+   fi
+}
+
+src_configure() {
+   use graphicsmagick && \
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags 
GraphicsMagick)" #459976
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
+   econf
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/

2016-05-02 Thread Lars Wendler 
commit: d61345d2f75d2af77befdc719aa29d147fe67be5
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  2 06:51:48 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  2 07:51:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61345d2

media-video/dvdauthor: Added slotdep for imagemagick. Bumped to EAPI-6.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-video/dvdauthor/dvdauthor-0.7.1.ebuild | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild 
b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
index 37e3414..fd97f1b 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tools for generating DVD files to be played on standalone DVD 
players"
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/fribidi-0.19.2
media-libs/libdvdread
media-libs/libpng:0=
graphicsmagick? ( media-gfx/graphicsmagick )
-   !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14 )"
+   !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14:= )"
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
@@ -28,10 +28,16 @@ S=${WORKDIR}/${PN}
 
 DOCS=( AUTHORS ChangeLog README TODO )
 
+PATCHES=(
+   "${FILESDIR}/${P}-glibc220.patch"
+)
+
 src_prepare() {
-   epatch "${FILESDIR}/${P}-glibc220.patch"
-   use graphicsmagick && \
-   sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure
+   default
+   if use graphicsmagick ; then
+   sed -i -e 's:ExportImagePixels:dIsAbLeAuToMaGiC&:' configure \
+   || die
+   fi
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/, media-video/dvdauthor/files/

2015-10-15 Thread Alexis Ballier 
commit: 5894ac877ce8c6dea2a7b77187edafa5e6f72c35
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Oct 15 14:17:49 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Oct 15 14:17:49 2015 +
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..000
--- 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..000
--- 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..000
--- 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 
- 
-+#include 
- #include 
- 
- #include "rgb.h"
-@@ -483,7 +484,7 @@
- return -1;
- }
- 
--if (setjmp(png_ptr->jmpbuf)) {
-+if