mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity
50557 commits 234 branches 124 tags 7.1 GiB
Commit graph

449 commits

Author SHA1 Message Date
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
Eelco Dolstra c1719a5835 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-05 17:57:45 -04:00
Mathijs Kwik e3ae9289e0 MPlayer: upgrade to 1.1 
- big cleanup of optional dependency handling
I hope I didn't miss any cases.

- XVID
xvid support seams broken, both built-in as external.
I didn't notice any issues playing xvid video's though, as ffmpeg's
default mpeg4 decoder handles xvid-encoded files just fine.
It seems the only users affected by this are users who still encode
xvid with mencoder (instead of plain ffmpeg). If this really is an
issue to anyone, please let me know, so I can look into it some more,
or retain an older mplayer version next to this one.
 2012-10-04 10:40:52 +02:00
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
 2012-09-26 14:51:51 -04:00
Yury G. Kudryashov db81ec4242 bangarang-2.1 2012-08-31 12:09:38 +04:00
Yury G. Kudryashov 834884ae7b Explicitly pass SDO 2012-08-31 12:09:11 +04:00
Lluís Batlle i Rossell 184ea61eb6 vlc: updating to 2.0.3 
I hadd problems with how 2.0.1 disabled and reenabled DPMS on xorg. Let's see
if anything improves with 2.0.3.
 2012-07-28 22:47:15 +02:00
Florian Friesdorf 471a9615a2 fix mpich2 and mplayer 2012-07-24 14:17:45 +02:00
Shea Levy 1a0baad6b2 Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh 2012-07-15 03:32:50 -04:00
Lluís Batlle i Rossell 8a764b7891 xine-ui: update to 0.99.7 2012-07-02 23:04:12 +02:00
Mathijs Kwik 42ea23675e ogmtools: new package 2012-06-28 11:41:58 +02:00
Mathijs Kwik b40092010c mkvtoolnix: upgraded to 5.6.0 
svn path=/nixpkgs/trunk/; revision=34465
 2012-06-11 17:40:55 +00:00
Cillian de Roiste da4c1e38fd Removed patch, no longer necessary 
svn path=/nixpkgs/trunk/; revision=34363
 2012-06-05 17:50:22 +00:00
Cillian de Roiste 1067f51f92 Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency 
svn path=/nixpkgs/trunk/; revision=34362
 2012-06-05 16:52:11 +00:00
Mathijs Kwik aac9492dde mplayer: enabled speex support 
I enabled it by default, as ffmpeg/libav/vlc/xine all have speex enabled by
default too, so it's probably on most systems already

svn path=/nixpkgs/trunk/; revision=34024
 2012-05-09 10:01:35 +00:00
Lluís Batlle i Rossell 97abdd38a5 Adding the Allied Technologies libdc1394 variant and the cc1394 viewer. 
svn path=/nixpkgs/trunk/; revision=34013
 2012-05-08 09:50:58 +00:00
Lluís Batlle i Rossell 9b2efc0a33 Adding support in VLC for 1394 cameras. 
svn path=/nixpkgs/trunk/; revision=34012
 2012-05-08 09:49:38 +00:00
Lluís Batlle i Rossell 593eeb54d0 Fixing a typo, semicolon, in the coriander expression. 
svn path=/nixpkgs/trunk/; revision=33980
 2012-05-03 12:07:45 +00:00
Lluís Batlle i Rossell 6209407d7a Adding the license meta for two packages I added today. 
svn path=/nixpkgs/trunk/; revision=33977
 2012-05-03 09:41:11 +00:00
Lluís Batlle i Rossell f9526cd7f1 Adding coriander. I don't know how to make its gconf thing work, so it shows a 
warning at gui start.


svn path=/nixpkgs/trunk/; revision=33976
 2012-05-03 09:38:36 +00:00
Karn Kallio 2dbe2887ed Fix build of dvdauthor; also advance version to 0.7.0 
svn path=/nixpkgs/trunk/; revision=33873
 2012-04-22 00:25:20 +00:00
Lluís Batlle i Rossell e7b964ba33 Updating gnash. I'm not sure it builds... it takes a lot of time to build; at 
least it does not fail very early.


svn path=/nixpkgs/trunk/; revision=33635
 2012-04-05 22:34:11 +00:00
Mathijs Kwik a6238bce68 avidemux: upgraded to 2.5.6 
- added support for vp8 (libvpx)
- added support for xvid
- added support for libva output

svn path=/nixpkgs/trunk/; revision=33447
 2012-03-28 08:40:41 +00:00
Cillian de Roiste 9810e6110f Upgrading to 2.0.1, bugfix for smb error. Thanks to Kirill Elagin 
svn path=/nixpkgs/trunk/; revision=33398
 2012-03-24 19:52:46 +00:00
Yury G. Kudryashov 707bf75144 mythth-0.24.2 
New dependencies:
* Qt4
* Pulseaudio (optional but I've hardcoded it)
* fftw (single precision)

svn path=/nixpkgs/trunk/; revision=33180
 2012-03-16 22:26:26 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov a38ba26fbe cinelerra: drop esound support 
I'm going to remove esound from nixpkgs in a few minutes.

svn path=/nixpkgs/trunk/; revision=32981
 2012-03-11 14:07:19 +00:00
Yury G. Kudryashov eb81f33244 Remove zapping, zvbi and rte 
Feel free to revert&fix compile if you need these packages.

svn path=/nixpkgs/trunk/; revision=32966
 2012-03-09 20:16:02 +00:00
Joachim Schiele 92c04c80c7 tvtime is now on nixos, thanks to the patches taken from the portage team! 
svn path=/nixpkgs/trunk/; revision=32962
 2012-03-09 18:21:10 +00:00
Lluís Batlle i Rossell 749df87304 Removing a patch not needed anymore, for vlc. 
svn path=/nixpkgs/trunk/; revision=32856
 2012-03-07 20:36:42 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Yury G. Kudryashov 3652c61aed svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32522
 2012-02-23 20:35:33 +00:00
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00
Peter Simons e91b090577 upgraded vlc to 2.0 - with bluray support 
svn path=/nixpkgs/trunk/; revision=32487
 2012-02-22 20:29:33 +00:00
Eelco Dolstra 8dc12887e1 * Fix building VLC with zlib 1.2.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32385
 2012-02-18 17:23:17 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +00:00
Yury G. Kudryashov 070874c5f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32321
 2012-02-16 11:23:36 +00:00
Eelco Dolstra 848f583ba3 * VLC: build with xcb-util-keysyms instead of xcb-util, otherwise the 
keyboard doesn't work properly.  (xcb-util-keysyms was split from
  xcb-util.)

svn path=/nixpkgs/trunk/; revision=32300
 2012-02-15 15:42:59 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31987
 2012-02-02 20:36:11 +00:00
Cillian de Roiste 467722ad1a 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. 
svn path=/nixpkgs/trunk/; revision=31913
 2012-01-29 13:39:30 +00:00
Yury G. Kudryashov 71c28d0e33 Use meta.platforms 
svn path=/nixpkgs/trunk/; revision=31909
 2012-01-28 14:39:56 +00:00
Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +00:00
Yury G. Kudryashov 2ced89b7f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31846
 2012-01-26 08:45:19 +00:00
Yury G. Kudryashov eb59b98c26 vlc-1.1.13 
svn path=/nixpkgs/trunk/; revision=31843
 2012-01-26 08:36:18 +00:00
Karn Kallio 47ae4a01bd kdenlive builds for kde48 release candidate (and kde47). 
svn path=/nixpkgs/trunk/; revision=31802
 2012-01-24 04:50:55 +00:00
Peter Simons 9b740035a4 mplayer: renamed the expression from "mplayer-r${version}" to "mplayer-${version}" 
The additional 'r' after the hyphen prevented nix-env from recognizing the SVN
revision number as a version'ish kind of thing; thus nix-env would never update
an installed mplayer in any user profile.

In other words, to get this particular update, you must remove the old
expression by running

    nix-env -e mplayer-r33472

..., and then install the new one:

nix-env -i mplayer

svn path=/nixpkgs/trunk/; revision=31785
 2012-01-21 21:25:45 +00:00
Peter Simons c9d11ba56a mplayer: update mplayer and ffmpeg to current HEAD versions 
svn path=/nixpkgs/trunk/; revision=31784
 2012-01-21 21:25:41 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov 7d018a5bc0 xine-ui: use libpng-1.2 
svn path=/nixpkgs/branches/libpng15/; revision=31455
 2012-01-09 12:48:45 +00:00
Yury G. Kudryashov f4a079a76c Upgrade xine-lib and xine-ui 
svn path=/nixpkgs/trunk/; revision=31451
 2012-01-09 10:25:56 +00:00
Cillian de Roiste d9d74208b5 Adding dvswitch: a digital video mixer intended for interactive live mixing of several incoming DV video streams, typically used for recording conferences 
svn path=/nixpkgs/trunk/; revision=31446
 2012-01-08 23:27:45 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix 
svn path=/nixpkgs/trunk/; revision=31406
 2012-01-07 17:06:49 +00:00
Piotr Pietraszkiewicz 1bd85e4159 added libdvbpsi and added it to the dependency list of vlc so that vlc can play DVB 
svn path=/nixpkgs/trunk/; revision=30789
 2011-12-06 23:09:19 +00:00
Piotr Pietraszkiewicz 32163fa1ff added dvb-apps 
svn path=/nixpkgs/trunk/; revision=30788
 2011-12-06 23:01:22 +00:00
Shea Levy 3de62cd12a Add quvi 
Patch submitted by mornfall

svn path=/nixpkgs/trunk/; revision=30720
 2011-12-03 22:21:00 +00:00
Evgeny Egorochkin 6d51717fcf Bangarang: fix deps to get it to compile against kde 4.7 
svn path=/nixpkgs/trunk/; revision=30353
 2011-11-09 13:01:51 +00:00
Michael Raskin 6947317d3c Fix xine-ui build - curl dropped curl/types.h 
svn path=/nixpkgs/trunk/; revision=30318
 2011-11-08 11:18:24 +00:00
Cillian de Roiste d99e939015 Upgrading Kdenlive to 0.8 
svn path=/nixpkgs/trunk/; revision=28715
 2011-08-20 23:26:59 +00:00
David Guibert 065c0213cf gnome-mplayer, gnome-mediamplayer updated to 1.0.4 
svn path=/nixpkgs/trunk/; revision=28445
 2011-08-09 20:39:43 +00:00
Eelco Dolstra 0cb6cfb7a1 * Update vlc to 1.1.11. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28104
 2011-08-01 09:23:10 +00:00
Eelco Dolstra 1352c90c8a * MPlayer: don't build the OSS backend. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27829
 2011-07-18 16:08:15 +00:00
Eelco Dolstra c7669210d1 * Whitespace. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27757
 2011-07-13 12:31:43 +00:00
Sander van der Burg 703f1b23fb Ensure that the shared ffmpeg is used, instead of the one included in the kino source tarball 
svn path=/nixpkgs/trunk/; revision=27559
 2011-06-29 19:22:02 +00:00
Sander van der Burg 11210cf06f Updated kino to version 1.3.4 (and did some code standard fixes) 
svn path=/nixpkgs/trunk/; revision=27558
 2011-06-29 16:21:02 +00:00
Florian Friesdorf 453be2fc62 cinelerra-git: let pkgconfig handle freetype and its -I flags 
svn path=/nixpkgs/trunk/; revision=27529
 2011-06-22 22:23:57 +00:00
Florian Friesdorf 35f8c3d150 cinelerra-git: file, libuuid instead of e2fsprogs, and libXext 
svn path=/nixpkgs/trunk/; revision=27527
 2011-06-22 22:23:50 +00:00
Florian Friesdorf 200101c7b0 cinelerra-git: switched to fetchgit 
svn path=/nixpkgs/trunk/; revision=27526
 2011-06-22 22:23:45 +00:00
Cillian de Roiste 21dccfccc3 Updating the sha256, why is this changing? 
svn path=/nixpkgs/trunk/; revision=27288
 2011-05-21 07:31:07 +00:00
Michael Raskin d913275398 Update/fix MPlayer 
svn path=/nixpkgs/trunk/; revision=27280
 2011-05-20 08:06:02 +00:00
Lluís Batlle i Rossell 6fa4ceded6 Updating vlc 
svn path=/nixpkgs/trunk/; revision=26963
 2011-04-25 10:53:07 +00:00
Lluís Batlle i Rossell 7bfeee2318 MPlayer does not depend on a *built* ffmpeg. 
svn path=/nixpkgs/trunk/; revision=26944
 2011-04-23 23:04:22 +00:00
Lluís Batlle i Rossell b2e493a858 Updating MPlayer to the snapshot of today. 
I unpack ffmpeg.src where mplayer wants, taking 'ffmpeg' in the function arguments. Maybe it is not
very nice.

I've not checked if the rest of dependencies are needed either.

And someone should store the snapshot somewhere more permanent.


svn path=/nixpkgs/trunk/; revision=26939
 2011-04-23 21:06:39 +00:00
Lluís Batlle i Rossell be47ac0d25 Building vlc with libva support. 
svn path=/nixpkgs/trunk/; revision=26855
 2011-04-16 11:31:36 +00:00
Evgeny Egorochkin 94e19387f3 Bangarang: version bump 
svn path=/nixpkgs/trunk/; revision=26529
 2011-03-26 18:18:49 +00:00
Karn Kallio acf13a9859 Get kdenlive to compile with qt47. 
svn path=/nixpkgs/trunk/; revision=26518
 2011-03-25 22:40:55 +00:00
Ludovic Courtès 37e69af39e GNU Gnash 0.8.9. 
svn path=/nixpkgs/trunk/; revision=26498
 2011-03-24 22:25:03 +00:00
David Guibert ed85acac61 fix mkvtoolnix description and homepage 
svn path=/nixpkgs/trunk/; revision=25926
 2011-02-12 20:22:55 +00:00
David Guibert 87418d034b mkvtoolnix: 4.4.0 
svn path=/nixpkgs/trunk/; revision=25925
 2011-02-12 20:18:53 +00:00
Yury G. Kudryashov f909b550dd vlc-1.1.5, much more dependencies 
svn path=/nixpkgs/trunk/; revision=25872
 2011-02-09 21:11:30 +00:00
Eelco Dolstra 90f485f268 * MPlayer updated to the latest SVN snapshot. 
* MPlayer: add VDPAU support.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25297
 2010-12-27 18:48:16 +00:00
Eelco Dolstra 4837b70d27 * Restore MPlayer's default font. This got lost somewhere. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25260
 2010-12-23 17:07:07 +00:00
Lluís Batlle i Rossell 22253677b3 Merging from trunk. The previous merge took the firefox 3.6 in a bad state. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
 2010-12-19 20:12:10 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Evgeny Egorochkin 4d715b2e53 kmplayer: version bump 
svn path=/nixpkgs/trunk/; revision=24901
 2010-11-28 10:04:41 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Lluís Batlle i Rossell 00d1d949d7 Updating kdenlive (and mlt as a requirement) 
svn path=/nixpkgs/trunk/; revision=24567
 2010-11-02 13:23:59 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Michael Raskin e82053ac94 Fix XawTV build 
svn path=/nixpkgs/trunk/; revision=24267
 2010-10-13 15:48:37 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Yury G. Kudryashov 673e66e3a3 Move most kde-extragear apps to top-level 
svn path=/nixpkgs/trunk/; revision=24092
 2010-10-05 17:44:33 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Lluís Batlle i Rossell 812420fab6 Adding lxdvdrip (it builds, but I still don't know how to make it work) 
svn path=/nixpkgs/trunk/; revision=23858
 2010-09-18 16:29:07 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
 2010-09-17 19:10:21 +00:00
Eelco Dolstra b63de97e4c * Updated gecko-mediaplayer and gnome-mplayer. 
svn path=/nixpkgs/trunk/; revision=23737
 2010-09-11 17:16:42 +00:00
Lluís Batlle i Rossell a88f348d5b Make mplayer build on the loongson2f 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23578
 2010-09-01 08:36:09 +00:00
Lluís Batlle i Rossell cca1cae042 Updating from trunk. I had to do some changes to make it fit. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
 2010-08-29 11:09:23 +00:00
Ludovic Courtès 8d6af9d471 GNU Gnash 0.8.8. 
svn path=/nixpkgs/trunk/; revision=23365
 2010-08-23 14:52:48 +00:00
Yury G. Kudryashov 62ddc0e6df Use tarball snapshot 
svn:externals cause problems with fetchsvn.

svn path=/nixpkgs/trunk/; revision=23292
 2010-08-20 21:36:11 +00:00
Yury G. Kudryashov 879baa7c58 MPlayer: various updates 
1. Add pulseaudio and xsreensaver support
2. Use default arguments instead of custom args in all-packages.nix.
3. Remove ? null. callPackage passes all these args anyway.
4. Add binary codecs for non-i686 platforms. Have no video to test.
5. Use fetchsvn instead of gentoo-made snapshot.

svn path=/nixpkgs/trunk/; revision=23285
 2010-08-20 20:09:22 +00:00
Lluís Batlle i Rossell 51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking 
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
 2010-08-11 20:14:25 +00:00
Eelco Dolstra f1598a8941 * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22798
 2010-07-28 18:01:17 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +00:00
Lluís Batlle i Rossell 41fc0fba17 Adding libupnp to vlc (I hope this will enable some DLNA things) 
svn path=/nixpkgs/trunk/; revision=22602
 2010-07-14 15:02:34 +00:00
Evgeny Egorochkin 9ffa12eb19 Added Bangarang media player 
svn path=/nixpkgs/trunk/; revision=22423
 2010-06-26 18:29:42 +00:00
Lluís Batlle i Rossell 9885a6a4da I did not enable well the -fPIC for lua in my last commit. 2nd attempt, for vlc to build fine. 
Making vlc build finally (disabling dbus in it)

svn path=/nixpkgs/trunk/; revision=22415
 2010-06-25 18:34:35 +00:00
Lluís Batlle i Rossell 924177da84 New VLC, ffmpeg, x264 and libvpx all-in-one-rebuild. VP8 support. 
svn path=/nixpkgs/trunk/; revision=22410
 2010-06-24 22:55:25 +00:00
Lluís Batlle i Rossell f7bd2a829e Adding yasm and lame support to mplayer 
svn path=/nixpkgs/trunk/; revision=21972
 2010-05-25 18:39:29 +00:00
Eelco Dolstra 5f9542583f * MPlayer updated (from David Brown). 
svn path=/nixpkgs/trunk/; revision=21829
 2010-05-18 08:48:43 +00:00
Lluís Batlle i Rossell b3870f0148 Adding xvid, to ffmpeg and mplayer. 
svn path=/nixpkgs/trunk/; revision=21469
 2010-04-30 21:47:09 +00:00
Lluís Batlle i Rossell 7b6ce0f9df Updating x264, and adding x264 support to mplayer and ffmpeg. 
svn path=/nixpkgs/trunk/; revision=21451
 2010-04-30 08:33:47 +00:00
Armijn Hemel de5c9fd9bc update to 1.0.6 
svn path=/nixpkgs/trunk/; revision=21328
 2010-04-26 20:06:00 +00:00
Eelco Dolstra cd56e341de * Consolidate MPlayer trunk.nix and default.nix into one. 
* Removed the font because MPlayer doesn't use it anymore (it uses
  fontconfig).
* Removed rp9codecs because the Real codecs are included in the
  "essential" codecs package.
* Moved win32codecs into the MPlayer Nix expression.

svn path=/nixpkgs/trunk/; revision=21070
 2010-04-14 12:13:01 +00:00
Armijn Hemel 0cf1045be4 update to 1.0.5, add libvorbis, libtheora, speex support 
svn path=/nixpkgs/trunk/; revision=21068
 2010-04-14 10:52:20 +00:00
Lluís Batlle i Rossell 1d71fc8923 Updating avidemux 
svn path=/nixpkgs/trunk/; revision=20670
 2010-03-16 21:52:36 +00:00
Marc Weber 65ef5d1328 mplayer-trunk update 
svn path=/nixpkgs/trunk/; revision=20604
 2010-03-13 06:07:46 +00:00
Armijn Hemel ec3285843f update to 1.0.4 
svn path=/nixpkgs/trunk/; revision=19123
 2009-12-25 19:22:25 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using 
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
 2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild 
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
 2009-12-10 22:19:52 +00:00
Lluís Batlle i Rossell 6f2e018c7a Enabling plugins in avidemux. 
Adding an assertion, for stdenv having glibc. avidemux wants pthreads.

svn path=/nixpkgs/trunk/; revision=18593
 2009-11-24 14:01:48 +00:00
Lluís Batlle i Rossell d634b32abf Adding avidemux. 
svn path=/nixpkgs/trunk/; revision=18584
 2009-11-24 08:27:18 +00:00
Michael Raskin 183e6593be One more program needs libXi explicitly passed.. 
svn path=/nixpkgs/trunk/; revision=18181
 2009-11-06 05:14:41 +00:00
Lluís Batlle i Rossell 954a8d0cdc Adding amr support in mplayer. That should be enabled by the user, because those libraries are not redistributable. 
I don't know if the 'unfree' in the amr libraries will stop mplayer being built without its support. We would have to write the all-packages MPlayer expression different, in this case.

svn path=/nixpkgs/trunk/; revision=17635
 2009-10-04 21:31:34 +00:00
Ludovic Courtès f8836a2e41 GNU Gnash 0.8.6. 
svn path=/nixpkgs/trunk/; revision=17421
 2009-09-25 15:24:31 +00:00
Marc Weber 0ba0fefa95 mplayer-trunk: build with jackaudio support 
svn path=/nixpkgs/trunk/; revision=17329
 2009-09-21 10:09:24 +00:00
Eelco Dolstra 5cd8ae7289 svn path=/nixpkgs/trunk/; revision=17300 2009-09-20 14:10:16 +00:00
Marc Weber 09920037c0 adding mplayer trunk cause the stable source distribution is said to be 
outdated

svn path=/nixpkgs/trunk/; revision=17030
 2009-09-10 16:58:02 +00:00
Eelco Dolstra 4d7e5187d8 * xine-lib: updated to 1.1.16.3. 
* xine-lib: dropped the dependency on SDL, which is not really
  necessary.  (And it caused Phonon/KDE to depend on SDL.)

svn path=/nixpkgs/trunk/; revision=16680
 2009-08-11 20:47:33 +00:00
Eelco Dolstra 998412adf6 * Added gecko-mediaplayer, a browser plugin that uses gnome-mplayer to 
play video.  Seems to be more stable than mplayerplug-in.

svn path=/nixpkgs/trunk/; revision=16379
 2009-07-15 20:34:08 +00:00
Lluís Batlle i Rossell 5d72346338 Adding pkgconfig to MPlayer, as now it uses it for finding some libs as theora. 
svn path=/nixpkgs/trunk/; revision=15629
 2009-05-17 20:34:12 +00:00
Ludovic Courtès f9f56062c1 Gnash: Remove pointless configure flag. 
svn path=/nixpkgs/trunk/; revision=15557
 2009-05-11 22:51:54 +00:00
Lluís Batlle i Rossell 1804d2bf98 Adding a patch I forgot needed for the xvidcap expression 
svn path=/nixpkgs/trunk/; revision=15479
 2009-05-06 21:03:57 +00:00
Lluís Batlle i Rossell a5ebd913f3 Updating xvidcap. 
svn path=/nixpkgs/trunk/; revision=15432
 2009-05-03 13:24:31 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Eelco Dolstra f762b50991 * Another sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
 2009-04-23 11:59:43 +00:00
Eelco Dolstra cee387e845 * Move the composition of Haskell packages out of all-packages.nix 
into haskell-packages.nix, which depends on an instance of GHC.
  This allows a consistent set of packages to be built with the same
  GHC.  For instance,

  $ nix-build -A haskellPackages_ghc683.xmonad

  builds xmonad and all its dependencies with GHC 6.8.3, while

  $ nix-build -A haskellPackages_ghc6102.xmonad

  does the same with GHC 6.10.2.  This is the same technique used with
  kernelPackages.  It also means that we don't need things like
  "cabal682" and "cabal683" anymore.

* The setup hook is now in a separate wrapper package so that we don't
  have to recompile all of GHC every time we want to make a small
  change.

* cinelerra: this package appears to have an accidental dependency on
  the "X11" Haskell package.

svn path=/nixpkgs/trunk/; revision=15125
 2009-04-18 12:47:11 +00:00
Eelco Dolstra a4c304ef84 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
 2009-04-15 13:25:01 +00:00
Lluís Batlle i Rossell b8969ff4ae Making mplayer compile with mesa, so it gets 'gl' output. 
svn path=/nixpkgs/trunk/; revision=15041
 2009-04-14 21:01:16 +00:00
Eelco Dolstra fd03290fc0 * Simplified the pthread_cancel fix a bit: you just need to use -lgcc_s. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15017
 2009-04-13 17:07:20 +00:00
Eelco Dolstra 977e608a38 * xine-ui: put $gcc/lib in the RPATH, because otherwise it will barf 
(on exit) with "libgcc_s.so.1 must be installed for pthread_cancel
  to work".

svn path=/nixpkgs/branches/stdenv-updates/; revision=14980
 2009-04-09 15:27:48 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
 2009-04-09 12:19:57 +00:00
Eelco Dolstra f6e7c5b326 * vlc 0.9.9. 
svn path=/nixpkgs/trunk/; revision=14872
 2009-04-03 20:25:23 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
 2009-03-16 12:45:27 +00:00
Eelco Dolstra 8ac53703f0 * vlc: use faad. 
svn path=/nixpkgs/trunk/; revision=14502
 2009-03-10 23:28:06 +00:00
Eelco Dolstra 1485c905f7 * ffmpeg: build with faad2 support. However, vlc still won't play 
mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

svn path=/nixpkgs/trunk/; revision=14501
 2009-03-10 22:45:27 +00:00
Eelco Dolstra 44ac9e249c * MPlayer: updated to the SVN version. 
* VLC: updated to 0.9.8a.  It now uses Qt for the GUI, which looks a
  lot better than the wxWidgets one.
* libdvdread, libdvdnav: updated to 4.1.3.
* ffmpeg: updated to 0.5 (a new release!).  Got rid of the SVN
  version, which shouldn't be necessary anymore.

svn path=/nixpkgs/trunk/; revision=14500
 2009-03-10 21:03:51 +00:00
Ludovic Courtès f301e8423b GNU Gnash 0.8.5. 
svn path=/nixpkgs/trunk/; revision=14415
 2009-03-06 14:24:27 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines. 
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
 2009-03-03 13:27:40 +00:00
Eelco Dolstra ffe07e1507 * MPlayer: disabled ivtv since it doesn't build. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14104
 2009-02-17 16:10:19 +00:00
Marc Weber 91f9300897 added dvdauthor 
svn path=/nixpkgs/trunk/; revision=13766
 2009-01-14 16:23:06 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead 
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
 2008-12-20 01:20:35 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=13299
 2008-11-14 16:57:19 +00:00
Ludovic Courtès 9ec27e7dfd Gnash: Use gst-ffmpeg and set the right `GST_PLUGIN_PATH'. 
This makes viewing YouTube videos work out-of-the-box!

svn path=/nixpkgs/trunk/; revision=13256
 2008-11-12 08:37:39 +00:00
Eelco Dolstra 94a773eed3 * Disable make check for now, still investigating... 
svn path=/nixpkgs/trunk/; revision=13101
 2008-10-21 23:00:31 +00:00
Ludovic Courtès 448452a734 Gnash: Run the test suite. 
svn path=/nixpkgs/trunk/; revision=13073
 2008-10-15 08:43:50 +00:00
Marc Weber 1669c048a2 added meta tag to xvidcap 
svn path=/nixpkgs/trunk/; revision=13071
 2008-10-14 15:26:25 +00:00
Marc Weber 5a4a28e437 added cinelerra (video editing application) 
svn path=/nixpkgs/trunk/; revision=13068
 2008-10-14 14:01:50 +00:00
Ludovic Courtès 064d1af52b GNU Gnash 0.8.4. 
svn path=/nixpkgs/trunk/; revision=13059
 2008-10-14 08:26:00 +00:00
Ludovic Courtès 834144b5d3 GNU Gnash: Depend on Libtool. 
This (1) allows Gnash to be linked against the available `libltdl' rather
than its own, and (2) it prevents `libtld.h' to be installed (which was the
case when Gnash's own libltdl was used), thereby avoiding a collision with
Libtool.

svn path=/nixpkgs/trunk/; revision=12292
 2008-07-06 21:46:33 +00:00
Eelco Dolstra 9affba6463 * mythtv: build with Xv/X11/XvMV support. However, for some strange 
Qt-related reason it currently needs libXmu in $LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=12191
 2008-06-25 22:01:33 +00:00
Eelco Dolstra 677be83122 * Fixes for a52dec and mpeg2dec to make vlc build on x86_64-linux. 
* Fixes to make par2cmdline and exult build on gcc 4.x, since gcc
  3.4.x doesn't seem to work on x86_64-linux (NIXPKGS-91).
* Disabled pidgin on x86_64-linux because it needs a dynamic libperl
  which we don't have right now.
* Disabled wine on x86_64-linux because we still lack -m32 support.

svn path=/nixpkgs/trunk/; revision=12187
 2008-06-25 15:01:04 +00:00
Ludovic Courtès a667b3289a Gnash: Use the GNU mirror, honor $TMPDIR. 
svn path=/nixpkgs/trunk/; revision=12182
 2008-06-25 08:50:39 +00:00
Eelco Dolstra 9d48cb846b * MythTV 0.21. 
svn path=/nixpkgs/trunk/; revision=12177
 2008-06-23 09:01:04 +00:00
Eelco Dolstra faba06ce54 * firefox-wrapper: plugins no longer have to declare additional 
LD_LIBRARY_PATH elements, since they can use patchelf --rpath if
  necessary.
* Flashplayer / JRE: do just that.
* JRE: libstdcpp5 no longer seems to be necessary for the plugin.

svn path=/nixpkgs/trunk/; revision=12094
 2008-06-14 21:42:07 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
 2008-06-13 11:46:39 +00:00
Michael Raskin 4bc2a91eed Gnash 0.8.3 
svn path=/nixpkgs/trunk/; revision=12070
 2008-06-13 04:54:22 +00:00