summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-23 16:40:49 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-23 16:40:49 +0000
commitdab24c6cb2244562606f025cd0d4d269ed35fe34 (patch)
tree1835c7128ef1156c59ed2ca2ac232d934c7e23a7 /media-libs
parentFix broken .desktop file (bug #245822) (diff)
downloadgentoo-2-dab24c6cb2244562606f025cd0d4d269ed35fe34.tar.gz
gentoo-2-dab24c6cb2244562606f025cd0d4d269ed35fe34.tar.bz2
gentoo-2-dab24c6cb2244562606f025cd0d4d269ed35fe34.zip
Depend on an older version of imagemagick since otherwise it will fail to build, this is known as upstream (xine) bug #177, but it hasn't been fixed yet.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/xine-lib/ChangeLog8
-rw-r--r--media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild4
2 files changed, 9 insertions, 3 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index bd1f11ecc047..329eeb605522 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/xine-lib
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.575 2008/10/18 16:08:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.576 2008/11/23 16:40:49 flameeyes Exp $
+
+ 23 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ xine-lib-1.1.15-r1.ebuild:
+ Depend on an older version of imagemagick since otherwise it will fail to
+ build, this is known as upstream (xine) bug #177, but it hasn't been fixed
+ yet.
18 Oct 2008; Alexis Ballier <aballier@gentoo.org>
-files/xine-lib-1.1.8-dxr3.patch, -xine-lib-1.1.8.ebuild:
diff --git a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
index cce3619c3ce6..fc114623be77 100644
--- a/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.10 2008/10/06 22:03:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild,v 1.11 2008/11/23 16:40:49 flameeyes Exp $
EAPI=1
@@ -55,7 +55,7 @@ RDEPEND="X? ( x11-libs/libXext
vcd? ( media-video/vcdimager )
a52? ( >=media-libs/a52dec-0.7.4-r5 )
mad? ( media-libs/libmad )
- imagemagick? ( media-gfx/imagemagick )
+ imagemagick? ( <media-gfx/imagemagick-6.4.5.7 )
dts? ( media-libs/libdca )
aac? ( >=media-libs/faad2-2.6.1 )
>=media-video/ffmpeg-0.4.9_p20070129