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
commit0c8b45cbd29ea7d675da8dacb0f59b6778612ff8 (patch)
tree7375cd8f315dc87e81fae5a6b7a6a0e49b016d5b /media-libs
parentFix broken .desktop file (bug #245822) (diff)
downloadhistorical-0c8b45cbd29ea7d675da8dacb0f59b6778612ff8.tar.gz
historical-0c8b45cbd29ea7d675da8dacb0f59b6778612ff8.tar.bz2
historical-0c8b45cbd29ea7d675da8dacb0f59b6778612ff8.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.
Package-Manager: portage-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/Manifest10
-rw-r--r--media-libs/xine-lib/xine-lib-1.1.15-r1.ebuild4
3 files changed, 14 insertions, 8 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/Manifest b/media-libs/xine-lib/Manifest
index 6d3e865533f0..dc0bb65774e2 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,13 +5,13 @@ AUX xine-lib-1.1.15-buffer_h_ansi.patch 556 RMD160 d6607e3319a1fe0d6f88a40dd775d
AUX xine-lib-1.1.15-ffmpeg.patch 1346 RMD160 a15b850afa2169a4f2cffc551eda067b5290e1b0 SHA1 de8d2d3f755ed87bb9650749ba339974f57a7538 SHA256 6bd74e3646a7bed6bbb8449de25995006d7a011b3e3abdfbf8791334a00b8d85
AUX xine-lib-1.1.15-libmpeg2-vis.patch 405 RMD160 896298250884a9e3a1b168fe7140835a7112bc53 SHA1 3a3212a629c630e52327f25b3df3c5ecef5b5bbb SHA256 90af2c9a50db6dc358df59c9ab3e4aaed4bc8a8686f2b512e1dffa97b64825fe
DIST xine-lib-1.1.15.tar.bz2 7478750 RMD160 5c64dd51c05a6e17cb6dfcbb8a9009ba8571c75f SHA1 bcb567ea2a11c5f26b2384d5400b8466ea9048c6 SHA256 07ddf2a9f521417dd2f097534a52ddd9d2883679932f965ae7e7b0125d3c9dcc
-EBUILD xine-lib-1.1.15-r1.ebuild 5698 RMD160 1bb9cb8f121751304fffe644b766d4921b587462 SHA1 cf3133b20769e670b6dae4d4b8b98d7fe999ee3f SHA256 94a8cc0d0359667cccfd2cd5e233bcd8d6cdbe12886c52447a75dc2f15def4e3
-MISC ChangeLog 65379 RMD160 9f4907e08a8c17b6a232f85a31f57f5b01ada2c4 SHA1 0100effed4ecc7fc3e20d3cb71e038f8f53c098d SHA256 cf545aecda56e63e887d50a1616687d4ab421b19fe983530c2ca3628019425d6
+EBUILD xine-lib-1.1.15-r1.ebuild 5708 RMD160 73c2e3080da4983e74f5017e5343cd844f924f02 SHA1 191152e2ec37cfb3bc969e1872dbb88190f0811a SHA256 675ad196a2d7b95be77e99cbc4ec9a75d491943ba1d40ceceaa32010a7aae2e0
+MISC ChangeLog 65626 RMD160 093f68839f3dda617cc6e0c99515843e0e79a964 SHA1 2589bff78b5ccad906bc9fd2d1143c053cca2ea0 SHA256 ffafe9dac37c7f39b4152ea6356e6085b8b525be739af0014fdf7b67742f2d1b
MISC metadata.xml 2914 RMD160 bed4bab81a32b49e4923ddfcc02e8338a45ef7ef SHA1 fe3faf7dba7f929241acfe5eaa17b2f66bfb2722 SHA256 efe3b879c59c9971e1ffcd732c2bdbd8f60f2b173fde675a371202ceeb96b0fe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkj6CgAACgkQvFcC4BYPU0pHSQCfapIgXf/s5WDvLLFo8tTjsUMK
-zlsAnR2ujgeJ+gtFBTDB+m/0EhJATmoK
-=KINN
+iEYEARECAAYFAkkph5gACgkQAiZjviIA2XiNRQCgxSBWjZ1oW8LeZwFCftFHFx8Z
+/WoAnjxniZN9TCBMGABZyDO5XXdMR96b
+=jQsV
-----END PGP SIGNATURE-----
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