Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/libwebsockets.scm

gnu: ffmpeg: Upgrade to 2.1.4

* gnu/packages/video.scm (ffmpeg): Upgrade to 2.1.4.

Merge branch 'master' into core-updates

gnu: ffmpeg: Update to 2.1.3.

* gnu/packages/video.scm (ffmpeg): Update to 2.1.3.

gnu: ffmpeg: Add input opus.

* gnu/packages/video.scm (ffmpeg): Add input opus.

gnu: Rename (gnu packages oggvorbis) to (gnu packages xiph).

* gnu/packages/oggvorbis.scm: Rename this ...
* gnu/packages/xiph.scm: ... to this. Adjust module name accordingly.
* gnu-system.am (GNU_SYSTEM_MODULES): Update.
* gnu/packages/{gnunet.scm, libcanberra.scm, mp3.scm, pulseaudio.scm, sdl.scm,
    video.scm}: Use new module name.

gnu: ffmpeg: Modify runpath of binaries to include output library path.

* gnu/packages/video.scm (ffmpeg): Patch binaries to add output library path
    to runpath.

gnu: Move numerous "inputs" which should be "native-inputs".

* gnu/packages/avahi.scm, gnu/packages/cdrom.scm, gnu/packages/cryptsetup.scm,
  gnu/packages/curl.scm, gnu/packages/emacs.scm, gnu/packages/fontutils.scm,
  gnu/packages/gdb.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
  gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
  gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphviz.scm,
  gnu/packages/groff.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm,
  gnu/packages/gv.scm, gnu/packages/imagemagick.scm, gnu/packages/irssi.scm,
  gnu/packages/kde.scm, gnu/packages/libcanberra.scm, gnu/packages/libtiff.scm,
  gnu/packages/linux.scm, gnu/packages/lvm.scm, gnu/packages/mp3.scm,
  gnu/packages/netpbm.scm, gnu/packages/parted.scm, gnu/packages/pdf.scm,
  gnu/packages/pulseaudio.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm,
  gnu/packages/ratpoison.scm, gnu/packages/rdf.scm, gnu/packages/slim.scm,
  gnu/packages/texlive.scm, gnu/packages/version-control.scm,
  gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
  gnu/packages/xml.scm, gnu/packages/xnee.scm, gnu/packages/xorg.scm,
  gnu/packages/zip.scm:  Move some build-time dependencies from `inputs' to
  `native-inputs'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

gnu: ffmpeg: Check via "make fate".

* gnu/packages/patches/ffmpeg-check.patch: Drop patch.
* gnu-system.am (dist_patch_DATA): Unregister patch.
* gnu/packages/video.scm (ffmpeg): Drop patch and use "fate" as test target
    as recommended at http://trac.ffmpeg.org/ticket/3177#comment:11 .
* gnu/packages/video.scm

gnu: ffmpeg: Enable tests.

* gnu/packages/video.scm (ffmpeg): Add upstream patch and re-enable tests.
* gnu/packages/patches/ffmpeg-check.patch: New file.
* gnu-system.am (dist_patch_DATA): Register patch.

gnu: ffmpeg: Disable tests.

* gnu/packages/video.scm (ffmpeg): Disable tests, see
    https://trac.ffmpeg.org/ticket/3177 .

gnu: ffmpeg: Update to 2.1.1.

* gnu/packages/video.scm (ffmpeg): Update to 2.1.1.

Merge branch 'master' into core-updates

Conflicts:
	guix/packages.scm

gnu: ffmpeg: Fix typo in configure flags.

* gnu/packages/video.scm (ffmpeg): Add "d" in "3d" in configure flags.

gnu: Add ffmpeg.

* gnu/packages/video.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add module.