mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Code Issues Wiki Activity
27257 commits 203 branches 125 tags 5.6 GiB
Commit graph

317 commits

Author SHA1 Message Date
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