* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/
@ 2018-02-20 10:37 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-02-20 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 79a21bdf0ece816aa69ae848e6580aa5ade9d2d2
Author: Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Wed Feb 14 23:31:21 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 10:31:15 2018 +0000
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 00000000000..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 00000000000..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.000000000 +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 <stdarg.h>
+-#include <magick/api.h>
++#include <MagickWand/MagickWand.h>
+ #else
+ #include <png.h>
+ #endif
+@@ -176,18 +176,18 @@
+ {
+ Image *im;
+ ImageInfo *ii;
+- ExceptionInfo ei;
++ ExceptionInfo *ei;
+ int x,y;
+ unsigned long magickver;
+ unsigned char amask;
+
+- GetExceptionInfo(&ei);
++ ei = AcquireExceptionInfo();
+ ii=CloneImageInfo(NULL);
+ strcpy(ii->filename,s->fname);
+- im=ReadImage(ii,&ei);
++ 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; y<im->rows; y++ ) {
+ char pdata[MAXX*4];
+
+- 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);
++ 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(&ei);
++ 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
+ }
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/
@ 2018-02-20 10:37 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-02-20 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 070c5274a522921f52eb05ab3389c1a2356c98fd
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 10:36:08 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 10:36:08 2018 +0000
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 <png.h>
#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(&ei);
-+ ExceptionInfo *exception_info;
-+ exception_info = AcquireExceptionInfo();
++ ei = AcquireExceptionInfo();
ii=CloneImageInfo(NULL);
strcpy(ii->filename,s->fname);
- im=ReadImage(ii,&ei);
-@@ -1098,13 +1099,13 @@
+- im=ReadImage(ii,&ei);
++ 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; y<im->rows; y++ ) {
+ char pdata[MAXX*4];
+
+- 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);
++ 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(&ei);
++ 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..00000000000
--- 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.000000000 +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 <stdarg.h>
--#include <magick/api.h>
-+#include <MagickWand/MagickWand.h>
- #else
- #include <png.h>
- #endif
-@@ -176,18 +176,18 @@
- {
- Image *im;
- ImageInfo *ii;
-- ExceptionInfo ei;
-+ ExceptionInfo *ei;
- int x,y;
- unsigned long magickver;
- unsigned char amask;
-
-- GetExceptionInfo(&ei);
-+ ei = AcquireExceptionInfo();
- ii=CloneImageInfo(NULL);
- strcpy(ii->filename,s->fname);
-- im=ReadImage(ii,&ei);
-+ 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; y<im->rows; y++ ) {
- char pdata[MAXX*4];
-
-- 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);
-+ 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(&ei);
-+ 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
- }
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/
@ 2018-05-07 7:27 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-05-07 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 111d4b6671426385476cbc1da675b5efe6ee0e76
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 07:27:35 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 7 07:27:49 2018 +0000
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 00000000000..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 <polynomial-c@gentoo.org>
+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
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/
@ 2023-05-10 22:17 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-05-10 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 041c12502cfa9f7b83a3c6194e65cf33cc03012c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 22:10:43 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 22:10:55 2023 +0000
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 <sam <AT> 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 <polynomial-c@gentoo.org>
Date: Mon, 7 May 2018 09:18:48 +0200
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-10 22:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-10 22:17 [gentoo-commits] repo/gentoo:master commit in: media-video/dvdauthor/files/, media-video/dvdauthor/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-05-07 7:27 Lars Wendler
2018-02-20 10:37 Lars Wendler
2018-02-20 10:37 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox