summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-10-19 08:55:46 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-10-19 08:55:46 +0000
commit7d16602a9eb223f1b1451373ab715a4088c78c8a (patch)
tree5fe4a81c90cc656fe8de9ebca09d9806e08f9fbc /profiles
parentDisabling GTK+ isn't supported by upstream Makefile.am wrt #287729. (diff)
downloadgentoo-2-7d16602a9eb223f1b1451373ab715a4088c78c8a.tar.gz
gentoo-2-7d16602a9eb223f1b1451373ab715a4088c78c8a.tar.bz2
gentoo-2-7d16602a9eb223f1b1451373ab715a4088c78c8a.zip
Unmask x264 and mask gst-plugins-x264.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask11
2 files changed, 9 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 0889bf65ae5b..065098993cd2 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.3412 2009/10/18 23:49:52 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3413 2009/10/19 08:55:45 ssuominen 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!
+ 19 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Unmask x264 and mask gst-plugins-x264.
+
18 Oct 2009; Christian Faulhammer <fauli@gentoo.org> package.mask:
Claws Mail has been bumped, so remove mask for plugins
diff --git a/profiles/package.mask b/profiles/package.mask
index 33c538f87832..34c8c1a85e2a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10614 2009/10/18 23:49:52 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10615 2009/10/19 08:55:46 ssuominen 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
@@ -31,6 +31,10 @@
#--- END OF EXAMPLES ---
+# Samuli Suominen <ssuominen@gentoo.org> (19 Oct 2009)
+# No new x264 support.
+media-plugins/gst-plugins-x264
+
# Samuli Suominen <ssuominen@gentoo.org> (18 Oct 2009)
# Fails to build with KDE4 installed wrt bug #279485.
# Masked for removal in 30 days.
@@ -375,11 +379,6 @@ dev-python/rhpxl
# on amd64 with gcc-4.4. See bug #280925
=sci-physics/root-5.24.00
-# Alexis Ballier <aballier@gentoo.org> (23 Sep 2009)
-# API changes
->=media-libs/x264-0.0.20090923
->=media-video/x264-encoder-0.0.20090923
-
# Tomáš Chvátal <scarabeus@gentoo.org> (22 Sep 2009)
# Removal in 30 days. We should keep only freeglut around.
media-libs/vgui