Commit Graph

167 Commits

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