Merge branch 'master' into core-updates Conflicts: gnu/packages/image.scm
gnu: youtube-dl: Update to 2014.09.06. * gnu/packages/video.scm (youtube-dl): Update to 2014.09.06.
Merge branch 'master' into core-updates
gnu: ffmpeg: Update to 2.3.3. * gnu/packages/video.scm (ffmpeg): Update to version 2.3.3.
Merge branch 'master' into core-updates
gnu: ffmpeg: Update to 2.3.1. * gnu/packages/video.scm (ffmpeg): Update to 2.3.1.
gnu: ffmpeg and vlc: Rely on runtime cpu detection. * gnu/packages/video.scm (ffmpeg): Pass "--enable-runtime-cpudetect" to configure. Do not disable use of processor features that can be detected at runtime. (vlc): Rely on runtime cpu detection. Do not disable use of processor features that can be detected at runtime.
gnu: mplayer: Enable runtime cpu detection. * gnu/packages/video.scm (mplayer): Pass --enable-runtime-cpudetection to configure on supported platforms, as well as a suitable --target.
Merge branch 'master' into core-updates
gnu: ffmpeg: Remove --disable-vis. * gnu/packages/video.scm (ffmpeg): Remove --disable-vis.
gnu: ffmpeg: Update to 2.3. * gnu/packages/video.scm (ffmpeg): Update to version 2.3. Signed-off-by: Jason Self <j@jxself.org> Signed-off-by: Ludovic Courtès <ludo@gnu.org>
gnu: Add youtube-dl. * gnu/packages/video.scm (youtube-dl): New variable.
gnu: Consolidate libjpeg, libpng, and libtiff into one module. * gnu/packages/image.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add image.scm and remove libjpeg.scm, libpng.scm, and libtiff.scm. * gnu/packages/libjpeg.scm, gnu/packages/libpng.scm, gnu/packages/libtiff.scm: Delete files. * gnu/packages/emacs.scm gnu/packages/games.scm, gnu/packages/gd.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm, gnu/packages/gimp.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnustep.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm, gnu/packages/gtk.scm, gnu/packages/imagemagick.scm, gnu/packages/inkscape.scm, gnu/packages/netpbm.scm, gnu/packages/pdf.scm, gnu/packages/plotutils.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm, gnu/packages/scheme.scm, gnu/packages/sdl.scm, gnu/packages/slim.scm, gnu/packages/tcl.scm, gnu/packages/texlive.scm, gnu/packages/video.scm, gnu/packages/xiph.scm, gnu/packages/xorg.scm: Use (gnu packages image) module.
gnu: Enable libvpx support in ffmpeg. * gnu/packages/video.scm (ffmpeg): Add libvpx input.
gnu: Add libvpx. * gnu/packages/video.scm (libvpx): New variable.
Merge branch 'master' into core-updates
gnu: mplayer: Add mpg123 as an input. * gnu/packages/video.scm (mplayer)[inputs]: Add mpg123.
gnu: Add mplayer. * gnu/packages/video.scm (mplayer): New variable.
gnu: Add vlc. * gnu/packages/video.scm (vlc): New variable.
gnu: ffmpeg: Upgrade to 2.2.1. * gnu/packages/video.scm (ffmpeg): Upgrade to 2.2.1.