summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-03-09 12:36:26 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-03-09 12:36:26 +0000
commitf4561a35469b570831ede6145584ff9b55e763b2 (patch)
treef2cc7484503b67ea83786179445661a74dcf2008 /profiles
parentBump connection to 0.2.0 (diff)
downloadgentoo-2-f4561a35469b570831ede6145584ff9b55e763b2.tar.gz
gentoo-2-f4561a35469b570831ede6145584ff9b55e763b2.tar.bz2
gentoo-2-f4561a35469b570831ede6145584ff9b55e763b2.zip
unmask vaapi on multilib ffmpeg
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/base/package.use.mask4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 552218a7271c..64ffe58e89fd 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8681 2014/03/09 12:30:48 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8682 2014/03/09 12:36:25 aballier 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
# here. If in doubt put a record here!
+ 09 Mar 2014; Alexis Ballier <aballier@gentoo.org> base/package.use.mask:
+ unmask vaapi on multilib ffmpeg
+
09 Mar 2014; Tom Wijsman <TomWij@gentoo.org> package.mask:
Mask mate-base/mate-file-manager, mate-extra/mate-calc,
mate-extra/mate-character-map, mate-extra/mate-power-manager,
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 867c00e9923a..006ecf9afa5e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.547 2014/03/07 00:35:27 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.548 2014/03/09 12:36:26 aballier Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
@@ -127,7 +127,7 @@ app-editors/gvim luajit racket
# Alexis Ballier <aballier@gentoo.org> (11 Aug 2013)
# Multilib migrated version for binary compatibility.
# Those useflags have deps that are not migrated yet.
-=media-video/ffmpeg-0.10* libass frei0r gnutls rtmp vaapi sdl openssl
+=media-video/ffmpeg-0.10* libass frei0r gnutls rtmp sdl openssl
# Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013)
# Doesn't work on most profiles. Easier to mask here and