summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-04-24 12:33:02 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-04-24 12:33:02 +0000
commit959b1e29ad5247972cf337c57cba14e0d3d25704 (patch)
tree059635dfff39cac12dcd6238de9b6eaf2aef0b33 /media-video/mplayer
parentremove old (diff)
downloadhistorical-959b1e29ad5247972cf337c57cba14e0d3d25704.tar.gz
historical-959b1e29ad5247972cf337c57cba14e0d3d25704.tar.bz2
historical-959b1e29ad5247972cf337c57cba14e0d3d25704.zip
use system libass, require freetype 2.2.1 at least
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/Manifest10
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild9
3 files changed, 14 insertions, 10 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ab4788049a7f..a80e5f1cda29 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.723 2010/04/24 12:18:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.724 2010/04/24 12:33:02 aballier Exp $
+
+ 24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
+ use system libass, require freetype 2.2.1 at least
24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
fix opencore-amr automagic dep
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 7cf5a4e86a40..ecfe49074cd7 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -15,13 +15,13 @@ DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484
DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8
-EBUILD mplayer-9999.ebuild 19812 RMD160 1aa9e9363154df8e40a0b7baf9828829dd9d59f8 SHA1 6c2ce988035a74d9237ff2137ab32f0ae5ccf758 SHA256 50ea6a59b59cb965a27871c0834d681c3c655badc48a5727e5baf48f35e99792
-MISC ChangeLog 127854 RMD160 2f195009eff1c7fb52787dc9e631e968bcad5bfc SHA1 513fa1b455e0cd6071412eefcb628911f63a71c3 SHA256 8f2d376713e08c96c776ad2ddf7fa42d622cdcf28e6b06dd1f738c517ec81daf
+EBUILD mplayer-9999.ebuild 19850 RMD160 aedbc1e12a1e1f33c4b92a24e8027b633884d2f1 SHA1 34496b846fce2b19c0b2eb4b9066199891885eff SHA256 c5aa9360c987ea5c40cdde20a01a2b475f30ddd87207751a7bfa54aa9d2761f0
+MISC ChangeLog 127981 RMD160 d91ab0b70a6721f3573df915192f7a849db01386 SHA1 3e5e71df3deb135775ca0738bc14a5639405d8ff SHA256 79544f748c3f1f0bd1b0a486af30b0e41e5e4c48098d6ebf9e3bbf5a19127c44
MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkvS4akACgkQvFcC4BYPU0qmNACfU3ulIBuRpQnOb3KxNu6ezdFz
-cNUAoJbC1jbYhOnfbJf9fp2loqamg9Xg
-=5AwM
+iEYEARECAAYFAkvS5QQACgkQvFcC4BYPU0oaDwCfT5alWn+jgaDZ9dysHbIgH8W4
+OKQAn0jrXAz2EqFwpjg6+lZ2szzfmbXD
+=Obox
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 8aceeb0c204a..5ea04ab229ef 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.38 2010/04/24 12:18:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.39 2010/04/24 12:33:02 aballier Exp $
EAPI="2"
@@ -52,7 +52,7 @@ HOMEPAGE="http://www.mplayerhq.hu/"
FONT_RDEPS="
virtual/ttf-fonts
media-libs/fontconfig
- media-libs/freetype:2
+ >=media-libs/freetype-2.2.1:2
"
X_RDEPS="
x11-libs/libXext
@@ -70,7 +70,7 @@ RDEPEND+="
)
X? (
${X_RDEPS}
- ass? ( ${FONT_RDEPS} )
+ ass? ( ${FONT_RDEPS} media-libs/libass )
dga? ( x11-libs/libXxf86dga )
ggi? (
media-libs/libggi
@@ -288,7 +288,8 @@ src_configure() {
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- use ass || myconf+=" --disable-ass --disable-ass-internal"
+ use ass || myconf+=" --disable-ass"
+ myconf+=" --disable-ass-internal"
use bidi || myconf+=" --disable-fribidi"
use encode || myconf+=" --disable-mencoder"
use ipv6 || myconf+=" --disable-inet6"