summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2015-02-10 05:51:23 +0000
committerPatrick Lauer <patrick@gentoo.org>2015-02-10 05:51:23 +0000
commit36ebb4b91ba3b49529f811efe6cb4fb28587630f (patch)
tree0f945e5a2c95653ce12821ebef124f1dfb1cc6df /profiles
parentAdd ssl-fetch to DEPEND (diff)
downloadgentoo-2-36ebb4b91ba3b49529f811efe6cb4fb28587630f.tar.gz
gentoo-2-36ebb4b91ba3b49529f811efe6cb4fb28587630f.tar.bz2
gentoo-2-36ebb4b91ba3b49529f811efe6cb4fb28587630f.zip
Re-mask media-plugins/gst-plugins-libav until ffmpeg catches up
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask7
2 files changed, 11 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 184e73e6611d..d9303ee32ad9 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9769 2015/02/10 02:50:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9770 2015/02/10 05:51:23 patrick Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
@@ -8,6 +8,10 @@
10 Feb 2015; Patrick Lauer <patrick@gentoo.org> base/package.use.mask,
package.mask:
+ Re-mask media-plugins/gst-plugins-libav until ffmpeg catches up
+
+ 10 Feb 2015; Patrick Lauer <patrick@gentoo.org> base/package.use.mask,
+ package.mask:
Remove libav masks after discussion with lu_zero
09 Feb 2015; Eray Aslan <eras@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 3afead73ad83..5c9c91e3c2a8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16340 2015/02/10 02:50:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16341 2015/02/10 05:51:23 patrick Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,11 @@
#--- END OF EXAMPLES ---
+# Patrick Lauer <patrick@gentoo.org (10 Feb 2015)
+# Depends on versions of ffmpeg that are still missing keywords
+# (Original libav mask reasons are fixed)
+>=media-plugins/gst-plugins-libav-1.4
+
# Manuel Rüger <mrueg@gentoo.org> (10 Feb 2015)
# Breaks build for cups-filters-1.0.61
# See bug #539492