Commit Graph

63 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Marc Weber
65ef5d1328 mplayer-trunk update
svn path=/nixpkgs/trunk/; revision=20604
2010-03-13 06:07:46 +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
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
Marc Weber
0ba0fefa95 mplayer-trunk: build with jackaudio support
svn path=/nixpkgs/trunk/; revision=17329
2009-09-21 10:09:24 +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
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
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
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
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12: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
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
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
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
003a6d10b5 Added CDDA support to MPlayer
svn path=/nixpkgs/trunk/; revision=10978
2008-03-06 09:34:36 +00:00
Eelco Dolstra
441e3e19d6 * MPlayer 1.0rc2.
svn path=/nixpkgs/trunk/; revision=9535
2007-10-26 19:47:35 +00:00
Marc Weber
8942d938de flite added and added mplayer derivation with esound and new configuration style support (still a mess but works)
svn path=/nixpkgs/trunk/; revision=9326
2007-09-17 23:24:58 +00:00
Eelco Dolstra
a6338f1f34 * Security fix.
svn path=/nixpkgs/trunk/; revision=7665
2007-01-14 18:25:26 +00:00
Eelco Dolstra
cf8fad5c83 * MPlayer 1.0rc1.
* Added freefont-ttf (use to provide a default OSD font for MPlayer).

svn path=/nixpkgs/trunk/; revision=7241
2006-12-05 22:28:45 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +00:00
Eelco Dolstra
791b680a9f * Revive the aspect ratio patches (for screens rotated through Xrandr).
svn path=/nixpkgs/trunk/; revision=5672
2006-07-10 17:14:16 +00:00
Eelco Dolstra
03dca65e08 * MPlayer updated to 1.0pre8.
svn path=/nixpkgs/trunk/; revision=5498
2006-06-23 12:00:06 +00:00
Eelco Dolstra
cce11c4f1f * Added gtk-gnutella.
* Added a patch to MPlayer to fix the aspect ratio on screens rotated
  with Xrandr.
* Disable toolbus for now because it requires a non-existant package
  (tcltk).

svn path=/nixpkgs/trunk/; revision=5171
2006-04-18 18:46:36 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra
9b6e112573 * Enable Xinerama support in MPlayer.
svn path=/nixpkgs/trunk/; revision=4163
2005-10-29 19:07:27 +00:00
Eelco Dolstra
c0506b8029 * Added libcaca.
* Libcaca support in MPlayer.
* Hopefully fix X11 detection in MPlayer.

svn path=/nixpkgs/trunk/; revision=3684
2005-08-24 15:02:30 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00