summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-02-11 13:48:35 +0000
committerAlexis Ballier <aballier@gentoo.org>2015-02-11 13:48:35 +0000
commit8efbe37d6ae82c2f5453ea9c021d624d60aa62e0 (patch)
tree345a50674eb964eb3d04e8045748007d45d8439c /profiles
parentunmask latest gst-libav (diff)
downloadgentoo-2-8efbe37d6ae82c2f5453ea9c021d624d60aa62e0.tar.gz
gentoo-2-8efbe37d6ae82c2f5453ea9c021d624d60aa62e0.tar.bz2
gentoo-2-8efbe37d6ae82c2f5453ea9c021d624d60aa62e0.zip
unmask latest ffmpeg
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b2cf8f60869b..96aaa2fbde7d 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9779 2015/02/11 13:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9780 2015/02/11 13:48:35 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!
11 Feb 2015; Alexis Ballier <aballier@gentoo.org> package.mask:
+ unmask latest ffmpeg
+
+ 11 Feb 2015; Alexis Ballier <aballier@gentoo.org> package.mask:
unmask latest gst-libav
11 Feb 2015; Pacho Ramos <pacho@gentoo.org> arch/arm/package.use.mask,
diff --git a/profiles/package.mask b/profiles/package.mask
index fc5cef27708c..d76922038028 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16347 2015/02/11 13:46:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16348 2015/02/11 13:48:35 aballier 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
@@ -344,10 +344,6 @@ app-admin/hwreport
# FAIL:07:02:35 (00:00:00) db_verify_preop: expected 0, got 1
=sys-libs/db-6.1*
-# Alexis Ballier <aballier@gentoo.org> (4 Aug 2014)
-# <vlc-2.2 will not work with this ffmpeg version; others to be investigated.
->=media-video/ffmpeg-2.3
-
# Yixun Lan <dlan@gentoo.org> (17 Jul 2014)
# Masked for proper testing. (Major updates in the code).
=net-misc/tinc-1.1_pre*