summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-03-22 11:31:22 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-03-22 11:31:22 +0000
commit9de04b6ca17f2863c8db1d85fd551f767dab935f (patch)
treed34a4c1d979f2315ac3047baedb0d4343f131fe1 /profiles
parentFix build if qt-test is not installed and add missing dep on qt-test, fixes b... (diff)
downloadgentoo-2-9de04b6ca17f2863c8db1d85fd551f767dab935f.tar.gz
gentoo-2-9de04b6ca17f2863c8db1d85fd551f767dab935f.tar.bz2
gentoo-2-9de04b6ca17f2863c8db1d85fd551f767dab935f.zip
Introduce fftools USE_EXPAND per -dev discussion for ffmpeg extra tools.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/make.defaults6
-rw-r--r--profiles/desc/fftools.desc15
3 files changed, 23 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 7c9786d5ff5b..8ccc7f3ee48e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6341 2012/03/22 10:38:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6342 2012/03/22 11:31:22 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!
+ 22 Mar 2012; Alexis Ballier <aballier@gentoo.org> +desc/fftools.desc,
+ base/make.defaults:
+ Introduce fftools USE_EXPAND per -dev discussion for ffmpeg extra tools.
+
22 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Lastrite www-client/galeon wrt #333895 and #403415
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index d6cd04bc940d..57e9dc8abf28 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.72 2011/11/17 01:14:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.73 2012/03/22 11:31:22 aballier Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
diff --git a/profiles/desc/fftools.desc b/profiles/desc/fftools.desc
new file mode 100644
index 000000000000..fd4911d3ec72
--- /dev/null
+++ b/profiles/desc/fftools.desc
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/fftools.desc,v 1.1 2012/03/22 11:31:22 aballier Exp $
+
+# This file contains descriptions of FFTOOLS USE-EXPANDED variables.
+# Keep it sorted.
+
+aviocat - cat's an URL to another one, useful for dumping streams.
+cws2fws - converts cws files (Macromedia Flash, compressed) to fws ones (Macromedia Flash, uncompressed).
+ffeval - A simple expression evalutor.
+graph2dot - A tool to convert a libavfilter graph to a dot file.
+ismindex - A tool for creating smooth streaming manifests.
+pktdumper - Dumps packets as demuxed by libavformat.
+qt-faststart - Rearranges a Quicktime file to facilitate network streaming.
+trasher - Writes burts of random data into a file. Great for testing error robustness/resilience/concealment.