Commit graph

39 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Eelco Dolstra
90f7601e2e * MPlayer 1.0pre7.
svn path=/nixpkgs/trunk/; revision=2980
2005-05-02 20:04:07 +00:00
Eelco Dolstra
419f172ddb * Added Ogg Theora support to MPlayer.
svn path=/nixpkgs/trunk/; revision=2245
2005-02-16 16:18:43 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
267a904c26 * MPlayer updated to 1.0pre6.
svn path=/nixpkgs/trunk/; revision=2138
2005-01-31 19:39:42 +00:00
Eelco Dolstra
d811b4c9d8 * Added libXv (XVideo).
* Zapping/VLC/MPlayer: use libXv.
* MPlayer: upgrade to 1.0pre4.
* Zapping: add libXext to the rpath.  I don't understand why this is
  necessary.  Zapping doesn't itself link against libXext, though some
  of its dependencies do.  (Maybe this is due to `--export-dynamic'?)

svn path=/nixpkgs/trunk/; revision=990
2004-05-01 18:17:56 +00:00
Eelco Dolstra
2b58d63ab6 * MPlayer had an undeclared dependency on zlib; found using the
improved purity enforcement in the gcc/ld-wrappers.

svn path=/nixpkgs/trunk/; revision=898
2004-04-01 18:06:09 +00:00
Eelco Dolstra
5a4de2c5de * Remove builder attributes.
* MPlayer: pass stdenv to w32codecs.

svn path=/nixpkgs/trunk/; revision=882
2004-03-30 15:15:19 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing
broke.

svn path=/nixpkgs/trunk/; revision=870
2004-03-29 10:25:25 +00:00
Eelco Dolstra
f1279496e5 * Upgrade to 1.0pre3.
svn path=/nixpkgs/trunk/; revision=582
2003-12-14 20:36:29 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Renamed from pkgs/applications/video/MPlayer/default.fix (Browse further)