Commit graph

240 commits

Author SHA1 Message Date
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
Eelco Dolstra 09ab596e0f * Remove calls to fail().
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
2008-04-23 07:34:20 +00:00
Nicolas Pierron 4485ebdea6 Add real players codecs for MPlayer. (can now play *.rmvb files)
svn path=/nixpkgs/trunk/; revision=11552
2008-04-10 22:12:14 +00:00
Michael Raskin 1275775baf Reverted unneeded setting of NIX_LDFLAGS.
svn path=/nixpkgs/trunk/; revision=11112
2008-03-14 06:44:01 +00:00
Michael Raskin 8ec59864b2 Unfortunately needed here on NixOS...
svn path=/nixpkgs/trunk/; revision=11054
2008-03-11 12:37:22 +00:00
Ludovic Courtès d35b3240fd Gnash: Add libXext' to the RPATH' of `gtk-gnash'.
svn path=/nixpkgs/trunk/; revision=11036
2008-03-10 15:05:32 +00:00
Ludovic Courtès 00e0e9ac37 Gnash: Install Mozilla plug-in.
svn path=/nixpkgs/trunk/; revision=11034
2008-03-10 13:24:11 +00:00
Ludovic Courtès 7c7639a888 GNU Gnash 0.8.2, Agg 2.5.
svn path=/nixpkgs/trunk/; revision=11030
2008-03-10 09:48:17 +00:00
Michael Raskin 003a6d10b5 Added CDDA support to MPlayer
svn path=/nixpkgs/trunk/; revision=10978
2008-03-06 09:34:36 +00:00
Yury G. Kudryashov 5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00