Vladimír Čunát
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Vladimír Čunát
341aadaba1
kdenlive+mlt: enabling some subcomponents, parallel builds
2013-06-05 00:30:44 +02:00
Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Domen Kozar
afe180f74c
xbmc: 12.1 -> 12.2
2013-05-26 20:53:20 +02:00
aszlig
b08d6a39f8
mplayer(2): Add support and library for bs2b.
...
This also adds a new package "libbs2b", which is needed in order to support
Bauer stereophonic-to-binaural DSP as an audio filter.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-25 19:01:43 +02:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Lluís Batlle i Rossell
ce7c7dece5
kdenlive: update to 0.9.6
2013-05-07 12:19:38 +02:00
Vladimír Čunát
8fc5fb6ecc
Merge branch 'master' into x-updates
2013-05-01 08:14:15 +02:00
Mathijs Kwik
2f036a21d7
mkvtoolnix: upgrade to 6.2.0
2013-04-30 09:27:02 +02:00
Vladimír Čunát
5fce03c561
gnash: fix build via using pangox_compat
2013-04-18 11:28:03 +02:00
Mathijs Kwik
ca392fb8a9
vlc: upgrade to 2.0.6
2013-04-12 11:40:33 +02:00
Lluís Batlle i Rossell
d8f98d1a85
Adding avxsynth.
...
To add it, I also add ffms and log4cpp.
2013-04-10 15:12:37 +02:00
Mathijs Kwik
fd76305a9b
vlc: enable support for the opus codec
2013-04-08 08:38:10 +02:00
Lluís Batlle i Rossell
48f534bce9
mplayer2: add reference to libXxf86vm
...
Otherwise, playing h264 with vdpau complains about not able to sync to vsync.
2013-04-05 10:45:03 +02:00
Lluís Batlle i Rossell
d0d4e66652
ffmpeg: update to 1.2 (and patching mplayer2)
...
Simple patch required by mplayer2 to build with ffmpeg 1.2.
2013-04-04 23:07:23 +02:00
Domen Kozar
16672fc8b1
xbmc: add pulse support, lame, avahi, libdvdcss
2013-04-01 17:13:00 +02:00
Lluís Batlle i Rossell
a76a9f783e
Adding omxplayer, for the raspberrypi.
2013-03-29 21:54:29 +01:00
Domen Kozar
65057975c8
xbmc: bump to 12.1
2013-03-28 17:21:20 +01:00
Domen Kozar
acf4697a5f
upgrade xbmc to 12.0
2013-03-12 01:35:16 +01:00
Domen Kozar
65a4f741fd
Set platform and maintainer for xbmc pkg
2013-03-11 18:12:46 +01:00
Shea Levy
e13c058fd2
Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs
...
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.
I've tested that it builds, nothing more.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:26:53 -05:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Mathijs Kwik
45aea0bf52
mkvtoolnix: upgrade to 6.1.0
2013-03-04 22:40:22 +01:00
Jack Cummings
58a9875789
missing semicolon, found after push..
2013-03-01 01:26:19 -08:00
Sergey Mironov
bd49c22ea1
mplayer: install desktop icon when X11 is enabled
2013-03-01 00:20:52 +04:00
Jack Cummings
ae35f74dbe
Add makemkv descriptions
2013-02-24 02:17:24 -08:00
Jack Cummings
dbc343c49a
makemkv-1.8.0
2013-02-23 19:37:16 -08:00
Domen Kozar
6506f9b070
add nasm to xbmc dependencies
2013-02-16 23:23:15 +01:00
Eelco Dolstra
a25b27a7f8
buildNativeInputs -> nativeBuildInputs
2013-02-15 13:38:07 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Lluís Batlle i Rossell
6ee6cd5ec9
Updates: kdenlive-0.9.4 mlt-0.8.8
...
Upstream kdenlive suggests mlt-0.8.8.
2013-02-14 20:06:54 +01:00
Lluís Batlle i Rossell
511f3b7a61
Adding mplayer2, a mplayer fork.
...
It can play files very well with "vdpau". It has a reworked
vdpau pipeline compared to mplayer1. Mplayer1 fails to play well in
my computer.
2013-01-31 00:26:30 +01:00
Eelco Dolstra
ecee1be7f1
RealPlayer: Remove
...
This package hasn't built in ages, is unfree, and is not needed
anymore.
2013-01-28 16:31:23 +01:00
Rickard Nilsson
0e8f9adb07
xbmc: Add libvdpau to LD_LIBRARY_PATH, so xbmc can find it at runtime
2013-01-21 19:05:08 +01:00
Eelco Dolstra
5bb548d2e4
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-01-17 14:19:14 +01:00
Eelco Dolstra
bb6db816fe
mplayer: Disable use of unfree binary codecs by default
2013-01-14 23:08:27 +01:00
Eelco Dolstra
f59881fc30
mplayer: Change directory name / attribute name from MPlayer to mplayer
2013-01-14 14:38:24 +01:00
Vladimír Čunát
479b58d706
Update vlc (minor bugfix).
2013-01-14 12:21:22 +01:00
Jan Malakhovski
4b041ea0b7
xbmc: add version 11
2013-01-05 23:33:50 +01:00
Lluís Batlle i Rossell
b58780c43d
Merge remote-tracking branch 'eelco/master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/gcc/4.7/default.nix
Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Mathijs Kwik
6776756882
mkvtoolnix: upgrade to 5.9.0
2012-12-13 14:00:28 +01:00
Mathijs Kwik
d4d4528833
new package: GPAC
2012-12-01 12:23:23 +01:00
Mathijs Kwik
4c8d63d549
mkvtoolnix: upgrade to 5.8.0
2012-12-01 12:23:23 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Cillian de Róiste
27f3a41754
Add key-mon
...
a utility to show live keyboard and mouse status for teaching and screencasts
2012-11-11 18:13:04 +01:00
Mathijs Kwik
977337716a
dvdauthor: upgrade to 0.7.1
2012-11-08 10:41:22 +01:00
Michael Raskin
6c48c3c230
Add libpng dependency to MPlayer - screenshots now work
2012-11-04 21:58:13 +04:00
Eduard Carreras
76d8f6b7be
VLC: update to v2.0.4
2012-10-19 18:57:19 +02:00