summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/MPlayer/default.nix67
-rw-r--r--pkgs/applications/video/MPlayer/rp9codecs/default.nix15
-rw-r--r--pkgs/applications/video/MPlayer/trunk.nix79
-rw-r--r--pkgs/applications/video/MPlayer/win32codecs/default.nix19
-rw-r--r--pkgs/applications/video/avidemux/default.nix6
-rw-r--r--pkgs/applications/video/vlc/default.nix10
6 files changed, 38 insertions, 158 deletions
diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 0c1e9548c8d..6d2de592f42 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -1,10 +1,11 @@
 { alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false
 , xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true
-, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib
+, stdenv, fetchurl, x11, freetype, fontconfig, zlib
 , alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
 , libXinerama ? null, libXrandr ? null, libdvdnav ? null
 , cdparanoia ? null, cddaSupport ? true
 , amrnb ? null, amrwb ? null, amrSupport ? false
+, jackaudioSupport ? false, jackaudio ? null
 , mesa, pkgconfig, unzip
 }:
 
@@ -16,78 +17,68 @@ assert xineramaSupport -> libXinerama != null;
 assert randrSupport -> libXrandr != null;
 assert dvdnavSupport -> libdvdnav != null;
 assert cddaSupport -> cdparanoia != null;
+assert jackaudioSupport -> jackaudio != null;
 assert amrSupport -> (amrnb != null && amrwb != null);
 
 let
 
-  win32codecs = (import ./win32codecs) {
-    inherit stdenv fetchurl;
-  };
+  codecs = stdenv.mkDerivation {
+    name = "MPlayer-codecs-essential-20071007";
+  
+    src = fetchurl {
+      url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2;
+      sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
+    };
 
-  rp9codecs = (import ./rp9codecs) {
-    inherit stdenv fetchurl;
+    installPhase = ''
+      mkdir $out
+      cp -prv * $out
+    '';
+  
+    meta = {
+      license = "unfree";
+    };
   };
 
-  srcAmr = fetchurl {
-    url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26073-530.zip;
-    sha256 = "1qyla52jjymhcnbidhwc6a1vm4v1wl27mj4ygp3cpn33swcmkgd0";
-  };
-
-  srcAmrFloat = fetchurl {
-    url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26104-540.zip;
-    sha256 = "1d337h3051w7azipsq7nzf4d25csia2snq3qlhw2sj7282ab042z";
-  };
-
-  srcAmrWBFloat = fetchurl {
-    url = http://www.3gpp.org/ftp/Specs/latest/Rel-5/26_series/26204-540.zip;
-    sha256 = "1mb7g3fy5faz26jjbibxvlbb5b81vwmdsldl3kl8hzg14vcrv1q9";
-  };
-
-in
+in  
 
 stdenv.mkDerivation {
-  name = "MPlayer-1.0rc2-r28450";
+  name = "MPlayer-1.0-pre-rc4-20100213";
 
-  # 1.0_rc2 is outdated according to website - use trunk instead
   src = fetchurl {
-    url = mirror://gentoo/distfiles/mplayer-1.0_rc2_p28450.tar.bz2;
-    sha256 = "0cbils58mq20nablywgjfpfx2pzjgnhin23sb8k1s5h2rxgvi3vf";
+    url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100213.tbz2;
+    sha256 = "1c5w49vqavs9pnc5av89v502wfa5g7hfn65ffhpx25ddi1irzh2r";
   };
 
   buildInputs =
-    [x11 libXv freetype zlib mesa pkgconfig]
+    [ x11 libXv freetype zlib mesa pkgconfig ]
     ++ stdenv.lib.optional alsaSupport alsa
     ++ stdenv.lib.optional xvSupport libXv
     ++ stdenv.lib.optional theoraSupport libtheora
     ++ stdenv.lib.optional cacaSupport libcaca
     ++ stdenv.lib.optional xineramaSupport libXinerama
     ++ stdenv.lib.optional randrSupport libXrandr
-    ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread]
+    ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
     ++ stdenv.lib.optional cddaSupport cdparanoia
-    ++ stdenv.lib.optionals amrSupport [amrnb amrwb];
+    ++ stdenv.lib.optional jackaudioSupport jackaudio
+    ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ];
 
   configureFlags = ''
     ${if cacaSupport then "--enable-caca" else "--disable-caca"}
     ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
-    --win32codecsdir=${win32codecs}
-    --realcodecsdir=${rp9codecs}
+    --codecsdir=${codecs}
     --enable-runtime-cpudetection
-    --enable-x11 --with-extraincdir=${libX11}/include
+    --enable-x11
     --disable-xanim
     --disable-ivtv
   '';
 
   NIX_LDFLAGS = "-lX11 -lXext";
 
-  # Provide a reasonable standard font.  Maybe we should symlink here.
-  postInstall = ''
-    ensureDir $out/share/mplayer
-    cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
-  '';
-
   meta = {
     description = "A movie player that supports many video formats";
     homepage = "http://mplayerhq.hu";
     license = "GPL";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/applications/video/MPlayer/rp9codecs/default.nix b/pkgs/applications/video/MPlayer/rp9codecs/default.nix
deleted file mode 100644
index 4456fc031a7..00000000000
--- a/pkgs/applications/video/MPlayer/rp9codecs/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "MPlayer-rp9codecs-20050115";
-  
-  src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/rp9codecs-20050115.tar.bz2;
-    sha256 = "353c22e2c992a1c730bdd5fade66a94e1a058e38063d2ce064a6510b70c39677";
-  };
-
-  installPhase = ''
-    mkdir $out
-    cp -prv * $out
-  '';
-}
diff --git a/pkgs/applications/video/MPlayer/trunk.nix b/pkgs/applications/video/MPlayer/trunk.nix
deleted file mode 100644
index 19da6d91b7c..00000000000
--- a/pkgs/applications/video/MPlayer/trunk.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-# the hompepage even recommends using trunk
-{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false
-, xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true
-, stdenv, fetchurl, x11, freetype, freefont_ttf, zlib
-, alsa ? null, libX11, libXv ? null, libtheora ? null, libcaca ? null
-, libXinerama ? null, libXrandr ? null, libdvdnav ? null, jackaudio ? null
-, cdparanoia ? null, cddaSupport ? true, jackaudioSupport ? true
-, mesa, pkgconfig
-, sourceFromHead
-}:
-
-assert alsaSupport -> alsa != null;
-assert xvSupport -> libXv != null;
-assert theoraSupport -> libtheora != null;
-assert cacaSupport -> libcaca != null;
-assert xineramaSupport -> libXinerama != null;
-assert randrSupport -> libXrandr != null;
-assert dvdnavSupport -> libdvdnav != null;
-assert cddaSupport -> cdparanoia != null;
-assert jackaudioSupport -> jackaudio != null;
-
-let
-
-  win32codecs = (import ./win32codecs) {
-    inherit stdenv fetchurl;
-  };
-
-  rp9codecs = (import ./rp9codecs) {
-    inherit stdenv fetchurl;
-  };
-
-in
-
-stdenv.mkDerivation {
-
-  name = "mplayer-trunk";
-
-  # REGION AUTO UPDATE:     { name="MPlayer"; type = "svn"; url="svn://svn.mplayerhq.hu/mplayer/trunk"; }
-  src= sourceFromHead "MPlayer-29990.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/MPlayer-29990.tar.gz"; sha256 = "8d9ac59e7cc3e2bc9ca46281ac2c268d460e041aceac056b600205c8c5235169"; });
-  # END
-
-  buildInputs =
-    [x11 libXv freetype zlib mesa pkgconfig]
-    ++ stdenv.lib.optional alsaSupport alsa
-    ++ stdenv.lib.optional xvSupport libXv
-    ++ stdenv.lib.optional theoraSupport libtheora
-    ++ stdenv.lib.optional cacaSupport libcaca
-    ++ stdenv.lib.optional xineramaSupport libXinerama
-    ++ stdenv.lib.optional randrSupport libXrandr
-    ++ stdenv.lib.optionals dvdnavSupport [libdvdnav libdvdnav.libdvdread]
-    ++ stdenv.lib.optional cddaSupport cdparanoia
-    ++ stdenv.lib.optional jackaudioSupport jackaudio;
-
-  configureFlags = ''
-    ${if cacaSupport then "--enable-caca" else "--disable-caca"}
-    ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""}
-    --win32codecsdir=${win32codecs}
-    --realcodecsdir=${rp9codecs}
-    --enable-runtime-cpudetection
-    --enable-x11
-    --disable-xanim
-    --disable-ivtv
-  '';
-
-  NIX_LDFLAGS = "-lX11 -lXext";
-
-  # Provide a reasonable standard font.  Maybe we should symlink here.
-  postInstall = ''
-    ensureDir $out/share/mplayer
-    cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
-  '';
-
-  meta = {
-    description = "A movie player that supports many video formats";
-    homepage = "http://mplayerhq.hu";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
deleted file mode 100644
index 569b6780374..00000000000
--- a/pkgs/applications/video/MPlayer/win32codecs/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "MPlayer-codecs-essential-20071007";
-  
-  src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2;
-    sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
-  };
-
-  installPhase = ''
-    mkdir $out
-    cp -prv * $out
-  '';
-  
-  meta = {
-    license = "unfree";
-  };
-}
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 8ff345d5ea9..4aaf2ef9cc1 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -5,11 +5,11 @@ alsaLib, lame, faac, faad2, libvorbis }:
 assert stdenv ? glibc;
 
 stdenv.mkDerivation {
-  name = "avidemux-2.5.1";
+  name = "avidemux-2.5.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/avidemux/avidemux_2.5.1.tar.gz;
-    sha256 = "14jwrblbli7bswx4i7b85l0s1msx8rxrqb908df3z8jxm6w4cm9g";
+    url = mirror://sourceforge/avidemux/avidemux_2.5.2.tar.gz;
+    sha256 = "1apq5s79ik562xmhyvg6nvkmk2bhm5fcjwsrwrpxwipn6swkfpk8";
   };
   
   buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index d46c52b31be..b84ef841efc 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,22 +1,24 @@
 { stdenv, fetchurl, perl, xlibs, libdvdnav
 , zlib, a52dec, libmad, faad2, ffmpeg, alsa
 , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
+, libvorbis, libtheora, speex
 }:
 
 stdenv.mkDerivation {
-  name = "vlc-1.0.4";
+  name = "vlc-1.0.5";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/1.0.4/vlc-1.0.4.tar.bz2;
-    sha256 = "15lqirz99dcghqdqsqlgb8fa2xs45a7r32zxhlzk5930rnh0pzyv";
+    url = http://download.videolan.org/pub/videolan/vlc/1.0.5/vlc-1.0.5.tar.bz2;
+    sha256 = "1kbd43y6sy6lg1xgl1j4mid6rdx6sszkm8c14hwqrfvgjd69kwgp";
   };
 
   buildInputs = [
     perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
     alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
+    libvorbis libtheora speex
   ];
 
-  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad";
+  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad --enable-theora --enable-vorbis --enable-speex";
 
   preBuild = ''
     substituteInPlace modules/misc/freetype.c --replace \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-20 13:04:23 +0000