Commit Graph

482 Commits

Author SHA1 Message Date
Domen Kožar
4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Peter Simons
0377be182c cinelerra: fix download url 2014-12-04 15:57:16 +01:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
AndersonTorres
8d248638bb MPV: update to 0.7.0
Now quvi support was dropped by upstream, and MPV uses Youtube-dl directly.
Another minor change is the update of Waf internal builder.
2014-11-27 00:27:53 -02:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Jonathan Rudenberg
f5e8b86e29 makemkv: Update 1.8.14 -> 1.9.0 2014-11-22 16:24:39 -05:00
Thomas Tuegel
66ebc65cd3 phonon-backend-vlc: add Qt 5 support 2014-11-20 11:11:12 -06:00
Cillian de Róiste
aa3ba007c1 mpv: update from 0.6.1 to 0.6.2 2014-11-18 21:52:47 +01:00
aszlig
fdd9d132ca
mpv: Remove waf script from buildInputs.
Since b23dbb1a5dffbfa3abb47fcd0f1579ac2e6f29fc, if buildInputs contains
a plain file it is used as a setup hook. The waf script which is used
here in mpv however isn't a setup hook and also shouldn't be included in
buildInputs as it was kind of a no-op before already.

Failed build log:

https://headcounter.org/hydra/build/582548/nixlog/1/raw

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-15 16:47:44 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Vladimír Čunát
0ff8281b12 aegisub: do not force libiconv, use auto link flags
This fixes build after #4419.
It seems to start fine without the flags, CC maint. @AndersonTorres.
2014-11-03 12:58:54 +01:00
William A. Kennington III
a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
lethalman
fae9e793b4 Merge pull request #4789 from edwtjo/xbmc-wrapper-desktop-passthroughs
xbmc: passthrough desktop and icon files
2014-11-03 00:20:46 +01:00
cillianderoiste
9d5c8a78a2 Merge pull request #4792 from titanous/titanous-maintainer
Add titanous as a maintainer to libcec and xbmc
2014-11-02 22:07:38 +01:00
Edward Tjörnhammar
8481d34cf1 Merge pull request #4790 from edwtjo/xbmc-svtplay-4.0.9
xbmcPlugins.svtplay: 4.0.8 -> 4.0.9
2014-11-02 22:00:12 +01:00
Jonathan Rudenberg
7b218ead96 Add titanous as a maintainer to libcec and xbmc 2014-11-02 15:58:11 -05:00
Edward Tjörnhammar
4a9dc44c38 xbmcPlugins.svtplay: 4.0.8 -> 4.0.9 2014-11-02 21:36:22 +01:00
Edward Tjörnhammar
78175840f0 xbmc: passthrough desktop and icon files 2014-11-02 21:30:54 +01:00
Jonathan Rudenberg
e169f3365d mythtv: 0.24.2 -> 0.27.4 2014-11-02 15:15:03 -05:00
Jonathan Rudenberg
f6a734e9e0 Add libcec support to xbmc 2014-10-28 17:45:08 -04:00
Mateusz Kowalczyk
03ee662161 mkvtoolnix: update from 7.2.0 to 7.3.0 2014-10-27 00:54:13 +00:00
Jonathan Rudenberg
8cc11f4255 makemkv: update to 1.8.14 2014-10-25 20:14:05 -04:00
AndersonTorres
76f6e8625f MPV: update to 0.6.1 2014-10-25 16:33:01 -02:00
Markus Kohlhase
bbcefd9cc6 added mediathek application 2014-10-25 16:24:29 +02:00
Damien Cassou
5ab448d944 Add byzanz 2014-10-23 10:42:56 +02:00
Edward Tjörnhammar
24dce998b4 xbmcPlugins.svtplay: 4.0.6 -> 4.0.8 2014-10-18 22:09:03 +02:00
aszlig
c1f55dcd35
miro: Add support for video/audio library sharing.
This is done using the Avahi/Bonjour compatibility library.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-14 19:46:59 +02:00
Edward Tjörnhammar
9701d58e28 xbmcPlugins.genesis: added package
Closes #4482
2014-10-12 12:35:09 +01:00
Vincent Laporte
8280d6522e smtube: new package
SMTube allows to search, play and download Youtube videos.

Homepage: http://smplayer.sourceforge.net/smtube.php
2014-10-11 10:56:00 +01:00
Vincent Laporte
826572a9e3 smplayer: update from 14.3.0 to 14.9.0 2014-10-11 10:45:45 +01:00
Cillian de Róiste
13664348f5 kde4_next.kdenlive: update from 0.9.8 to 0.9.10 2014-10-08 19:52:29 +02:00
Rickard Nilsson
1ccb2f76b5 Merge pull request #4078 from edwtjo/libretro-cores-addendum
XBMC RetroArch integration and some cores
2014-10-02 20:50:49 +02:00
Edward Tjörnhammar
37a83771e6 xmbcPlugins: svtplay added 2014-10-02 20:09:18 +02:00
Edward Tjörnhammar
9d4e344b46 xbmc: enable plugins to be picked up from the store. 2014-10-02 20:09:18 +02:00
Domen Kožar
6ac16b3660 cmplayer: fix build 2014-10-02 10:23:08 +02:00
Cillian de Róiste
258e75304e simplescreenrecorder: update from 0.3.0 to 0.3.1 2014-09-30 20:39:47 +02:00
AndersonTorres
9a6e559b9d mpv: update to 0.5.4
Also, a small update on internal let-waf expression

Closes #4306
2014-09-28 22:46:49 +01:00
muflax
9da620a723 mplayer2: fix typo in configure
Closes #4287
2014-09-27 08:21:31 +01:00
muflax
5861898fc2 add jpeg support to mplayer and mplayer2
Closes #4288
2014-09-27 08:20:30 +01:00
Mateusz Kowalczyk
58fc36a179 mkvtoolnix: update from 7.1.0 to 7.2.0 2014-09-26 08:33:40 +01:00
AndersonTorres
a41d73e75f Aegisub: updating to 3.2.1 2014-09-24 22:06:44 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
William A. Kennington III
f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
Mateusz Kowalczyk
c7bbc288b5 Merge branch 'cmplayer' of https://github.com/abbradar/nixpkgs
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 23:00:41 +01:00
Nikolay Amiantov
e4ce9e98e3 cmplayer: store patch with expression 2014-09-20 02:27:57 +04:00
Nikolay Amiantov
e81589e2c1 cmplayer: add package 2014-09-19 03:52:11 +04:00
Domen Kožar
771e2d8d09 add xvidcap to the channel for linux 2014-09-17 13:35:59 +02:00