summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-04-10 14:16:13 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-04-10 14:16:13 +0000
commitecc234e7cb588a2419ba05fe5ffb2abd1108057b (patch)
tree6d0e4e9e9de4e93f0ea016ebbe099dffd572bcbc /media-video/dvdauthor
parentUpdate / fix to 0.5_pre2306-r2 subsequent to migrating deps (diff)
downloadhistorical-ecc234e7cb588a2419ba05fe5ffb2abd1108057b.tar.gz
historical-ecc234e7cb588a2419ba05fe5ffb2abd1108057b.tar.bz2
historical-ecc234e7cb588a2419ba05fe5ffb2abd1108057b.zip
Fix building with USE="graphicsmagick" wrt #459976 by Erik Zeek, Andrew John Hughes, and others.
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'media-video/dvdauthor')
-rw-r--r--media-video/dvdauthor/ChangeLog8
-rw-r--r--media-video/dvdauthor/Manifest14
-rw-r--r--media-video/dvdauthor/dvdauthor-0.7.1.ebuild10
3 files changed, 21 insertions, 11 deletions
diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog
index 6c7e9707cc8a..61bb83b8903a 100644
--- a/media-video/dvdauthor/ChangeLog
+++ b/media-video/dvdauthor/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/dvdauthor
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.50 2012/11/21 00:41:22 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.51 2013/04/10 14:16:02 ssuominen Exp $
+
+ 10 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> dvdauthor-0.7.1.ebuild:
+ Fix building with USE="graphicsmagick" wrt #459976 by Erik Zeek, Andrew John
+ Hughes, and others.
*dvdauthor-0.7.1 (21 Nov 2012)
diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index 404ee4a82533..5d0f1c4faba0 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -8,13 +8,17 @@ DIST dvdauthor-0.7.0.tar.gz 414191 SHA256 aea6af7b99eba38ffa9dc5ad1521c2cc652e04
DIST dvdauthor-0.7.1.tar.gz 421324 SHA256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9 WHIRLPOOL c07526bbdbd75b4ddc0f2a1057f2bf27dbb5c63b4e4495b3a051d530af58ba4d4d75ec15dff2e3628cd1cb46b476ecb6a3d640ec30e1e6692d832549108b3e63
EBUILD dvdauthor-0.6.18.ebuild 811 SHA256 1a7baed80ae13c9172d52a60bfe6362df2ce204cfe84abcc4c165b97e39a7a1c SHA512 071a095fbc9684b2e4677d3687c080f46ff12d359f45e28b5197135f67c1616b2f87a47c95e63184a39fe2ddc978de621c94bdffad34791b81c18d832d27941c WHIRLPOOL 7e30fad595de08e7afc1c726eefc771bcf4d3c7a4b4370cc90f92df6df9d8458cc1e648210d716db348d592d83917c06f07ca0622d2bf8b1fcb2c3db678eefd8
EBUILD dvdauthor-0.7.0.ebuild 1110 SHA256 6316aa47e9dfa533bec33fd25235ef29db13521c1f32006f65f181128c8e1a64 SHA512 03d47b043e60c6afc5d0ad1a40cf4763851c71055047c5f215d8a151ad5976f24d09ac15c8c1aa16bd9b66355d84c47560ac57eb4d9dbe9007348397e2333b75 WHIRLPOOL e4c3336ec1b128d9d36afe136c6a4d51334d67ee7089cae6ebf05f1274c066fa0ce1d72789885530c0a510b0c5e6200e58c027911c7c8017328fb67aacd13bcf
-EBUILD dvdauthor-0.7.1.ebuild 1073 SHA256 be18634f37420b9432bd3a07674810566ab1d4438c076517851b175f3eaa27e4 SHA512 796d40690e7c2c8c33b3f2dc1a326c56db15e7058025747724386d824319615d6e5f102b9daa64fb8ffae8399ab7644c51d150a0f6d988eef544cb190487ef6f WHIRLPOOL a8504e8a7f98541f3e7391deb7c098d0b143f4efc6d96342ba7f1c4ef7dbbce3772c047dcaa9f2692684e426b15ddbf6db30ae32cb568da4bb55b6084386ebad
-MISC ChangeLog 6811 SHA256 73b504ccec4023378de707f55c8db23a29b3cdc8a46260a628ee20b9b575edd8 SHA512 ca4d3325eaa1964215c51a28eb99b0c9fb93a39bb829f34ac75971beb1c0d17acc887caced7074407b8ace55cd6221b314c96584a74ab5261e6e29c9f1044992 WHIRLPOOL 6959a0adc37fbb390c5d5f31481c56b4587f19b2689f1938507d293c4b5d40f0bb23eef09c9c4d94a93c169890e4a11882dde3822e0e1759d13f16cf9bb94e20
+EBUILD dvdauthor-0.7.1.ebuild 1177 SHA256 167ae5c57c6d1f4ead3c487d8304198c7e459818091d68d2503cdc6fc6fc31b1 SHA512 095ea3b0f2845a192f4c0a62fd19c9da7f0543cab8a5fa4fd40271ef251419ac55c004f3abe8e09f5c969acd5060d01d8e776f96fcf4e7c50381212474182f1c WHIRLPOOL 135464239105a9d7fcd50e650c7be40db7d740071f69a772122a2ab6027a827515a9db6668bac3adb73d080eafd69f81c360d36d261674494c830f44ac5ad7be
+MISC ChangeLog 6992 SHA256 b46698dfeb4eef0c2c3c30af5a433f4cabedf9792f90aeb987e2408e47227062 SHA512 153a826b9ab593b8fbe101e147e9b430cbe4ee39d20a445ca4e7c27830f929fedb09c459e2418b6e7fe0985b84b09e16f6ee824f7fc7d532e4665d3ab304f0e6 WHIRLPOOL 74052b0ef8c3d5408946d942eff9a986dc8e54498fb8227bb7f17c279c20ad7d6fc3ad78e239ff58a500d02e78dfc04b0340a1ff9ca8a9e3d96d1a167fe9bb52
MISC metadata.xml 373 SHA256 8a2dd4df029e4eb8c389dbe2856dfba73f0c38e1951bd58c403f37fcecb09c0d SHA512 f4ebaa386dd093ab3e5c19c6444258d84afb6b45665ef405e382c0f12e10b0d51d1ed2883401689a3b152919b2070eb2a0c0638fcfc70b18e3aabe7bf115a9ed WHIRLPOOL c09d88037ac0f2d909faee7def8bbea1b440533b04bbf8bd8efd84d8f731f1dbe5e97d720bb21bde220e46a7ab1c5ec3ae1ca933d2ada1466afa4a3af858ba2b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlCsIzMACgkQvFcC4BYPU0qY/wCgs1zwvFl34kFfmHSK73li2xhP
-OPUAmwdwNcwgz6SptcOKPJudQl94NZmT
-=AFp+
+iQEbBAEBCAAGBQJRZXQdAAoJEEdUh39IaPFNsQsH8wVW3et7Bi5QXCGv5lODYFMF
+q4P7T4iUQCrwtl7ajtjKfTSxnCSdZ06e6a5H16KeT98Xj1MtH2zhmwZ6ZpgqzJxT
+emzF68UYl15dMirHrsgT+b/g+V5gO2uVjV30KC0K4EL1vfevlxPF43FkHVrPsszu
+KwfF3qALAb7i7tJ6oDq+icpa5UKGw2XYcXj1AhsOLsxSPbsYdLsiPRcpWFDjsanX
+pnzL6tj/YuM6ZjSc91w/Zi6r5OH/aBqRzlZ0RleU/Q3t0DkFW8+ZuQiNh5kqjo0I
+GmXo/ngHPLh46/NOapn5wVExn6ULQQu9ugszYVuIFwjtm8Ifn5MlLl8n898vgQ==
+=3M6D
-----END PGP SIGNATURE-----
diff --git a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild
index e6bde9de5419..2331dd08ebc7 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-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.7.1.ebuild,v 1.1 2012/11/21 00:41:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.7.1.ebuild,v 1.2 2013/04/10 14:16:02 ssuominen Exp $
-EAPI=4
+EAPI=5
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players"
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/fribidi-0.19.2
dev-libs/libxml2
>=media-libs/freetype-2
media-libs/libdvdread
- media-libs/libpng
+ media-libs/libpng:0=
graphicsmagick? ( media-gfx/graphicsmagick )
!graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14 )"
DEPEND="${RDEPEND}
@@ -34,6 +34,8 @@ src_prepare() {
}
src_configure() {
+ use graphicsmagick && \
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags GraphicsMagick)" #459976
append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041
econf
}