Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates ...

Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix

2013-06-13 17:12:43 +04:00

..

avidemux

avidemux: upgraded to 2.5.6

2012-03-28 08:40:41 +00:00

avxsynth

Adding avxsynth.

2013-04-10 15:12:37 +02:00

bangarang

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

cc1394

Adding the Allied Technologies libdc1394 variant and the cc1394 viewer.

2012-05-08 09:50:58 +00:00

cinelerra

cinelerra: drop esound support

2012-03-11 14:07:19 +00:00

coriander

Fixing a typo, semicolon, in the coriander expression.

2012-05-03 12:07:45 +00:00

dvb-apps

added dvb-apps

2011-12-06 23:01:22 +00:00

dvdauthor

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

dvswitch

Patching the prefix, since it is hardcoded. The application seems to work correctly now, although it does crash with my current gtk theme (oxygen) when adding a stream. Using the gnome gtk-icon-theme does work, but this is probably just a bug in the oxygen gtk theme and should be fixed there.

2012-01-29 13:39:30 +00:00

gnash

ReRevert Merge x-updates into master

2013-05-29 23:25:02 +02:00

gnome-mplayer

gnome-mplayer, gnome-mediamplayer updated to 1.0.4

2011-08-09 20:39:43 +00:00

gpac

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

kdenlive

kdenlive+mlt: enabling some subcomponents, parallel builds

2013-06-05 00:30:44 +02:00

key-mon

Add key-mon

2012-11-11 18:13:04 +01:00

kino

Ensure that the shared ffmpeg is used, instead of the one included in the kino source tarball

2011-06-29 19:22:02 +00:00

kmplayer

Merging from trunk. The previous merge took the firefox 3.6 in a bad state.

2010-12-19 20:12:10 +00:00

lxdvdrip

* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

2012-01-18 20:16:00 +00:00

makemkv

missing semicolon, found after push..

2013-03-01 01:26:19 -08:00

mkvtoolnix

mkvtoolnix: upgrade to 6.2.0

2013-04-30 09:27:02 +02:00

mplayer

mplayer(2): Add support and library for bs2b.

2013-05-25 19:01:43 +02:00

mplayer2

mplayer(2): Add support and library for bs2b.

2013-05-25 19:01:43 +02:00

mythtv

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

ogmtools

ogmtools: new package

2012-06-28 11:41:58 +02:00

omxplayer

Adding omxplayer, for the raspberrypi.

2013-03-29 21:54:29 +01:00

quvi

Add quvi

2011-12-03 22:21:00 +00:00

tvtime

Remove a bunch of unreferenced files

2012-11-29 13:43:37 +01:00

vlc

flac: update, enable tests

2013-06-11 15:48:42 +02:00

xawtv

Fix XawTV build

2010-10-13 15:48:37 +00:00

xbmc

xbmc: 12.1 -> 12.2

2013-05-26 20:53:20 +02:00

xine-ui

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

xvidcap

Adding a patch I forgot needed for the xvidcap expression

2009-05-06 21:03:57 +00:00