diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-10-26 12:02:50 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-10-26 12:02:50 +0000 |
| commit | a97f6094504e534a37080ad19069155e039f2cc5 (patch) | |
| tree | 489fc0dcf5e6882af34a7c9b53a738926e06d8b9 /profiles | |
| parent | Bump, closes #290496 (diff) | |
| download | historical-a97f6094504e534a37080ad19069155e039f2cc5.tar.gz historical-a97f6094504e534a37080ad19069155e039f2cc5.tar.bz2 historical-a97f6094504e534a37080ad19069155e039f2cc5.zip | |
mask new ffmpeg snapshot with x264
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index b838e7737a03..1b02e0eebb0d 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3468 2009/10/26 09:05:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3469 2009/10/26 12:02:50 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! + 26 Oct 2009; Alexis Ballier <aballier@gentoo.org> package.mask: + mask new ffmpeg snapshot with x264 + 26 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> profiles.desc: Change selinux profiles from stable to dev because of missing stable toolchain (gcc-4, bug 290485), and parent files with wrong ordering (see diff --git a/profiles/package.mask b/profiles/package.mask index 956d73e683c0..4b20dfc288f0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10678 2009/10/26 00:28:21 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10679 2009/10/26 12:02:50 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 @@ -222,6 +222,7 @@ sys-kernel/sh-sources # New x264 snapshot. Masked for testing. >=media-libs/x264-0.0.20091001 >=media-video/x264-encoder-0.0.20091001 +>=media-video/ffmpeg-0.5_p20373 # Doug Goldstein <cardoe@gentoo.org> (21 Oct 2009) # Work in progress |