svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31452

pkgs/applications/video/xine-ui/default.nix

@@ -1,26 +1,29 @@
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl}:
+{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl
+, lirc, xz, shared_mime_info }:
 
-stdenv.mkDerivation {
-  name = "xine-ui-0.99.5";
+stdenv.mkDerivation rec {
+  name = "xine-ui-0.99.6";
   
   src = fetchurl {
-    url = mirror://sourceforge/xine/xine-ui-0.99.5.tar.gz;
-    sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k";
+    url = "mirror://sourceforge/xine/${name}.tar.xz";
+    sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf";
   };
   
+  buildNativeInputs = [ xz pkgconfig shared_mime_info ];
+
   buildInputs =
-    [ pkgconfig xineLib libpng readline ncurses curl
+    [ xineLib libpng readline ncurses curl lirc
       xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
-      xlibs.libXinerama xlibs.libXi
+      xlibs.libXinerama xlibs.libXi xlibs.libXft
     ];
 
-  preBuild = ''
-    sed -e '/curl.types.h/d' -i *.c *.h */*.c */*.h */*/*.c */*/*.h
-  '';
+  patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
 
   configureFlags = "--with-readline=${readline}";
   
-  NIX_LDFLAGS = "-lXext -lgcc_s";
+  LIRC_CFLAGS="-I${lirc}/include";
+  LIRC_LIBS="-L ${lirc}/lib -llirc_client";
+#NIX_LDFLAGS = "-lXext -lgcc_s";
 
   meta = { 
     homepage = http://www.xine-project.org/;

pkgs/development/libraries/lirc/default.nix

@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, alsaLib }:
+
+stdenv.mkDerivation rec {
+  name = "lirc-0.9.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/lirc/${name}.tar.bz2";
+    sha256 = "1zx4mcnjwzz6jsi6ln7a3dkgx05nvg1pxxvmjqvd966ldapay8v3";
+  };
+
+  buildInputs = [ alsaLib ];
+
+  configureFlags = "--with-driver=none --enable-sandboxed";
+}

pkgs/development/libraries/vcdimager/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libcdio, libxml2, popt }:
+
+stdenv.mkDerivation {
+  name = "vcdimager-0.7.24";
+
+  src = fetchurl {
+    url = mirror://gnu/vcdimager/vcdimager-0.7.24.tar.gz;
+    sha256 = "1526jxynslg07i50v3c3afhc8swbd4si8y6s8m3h1wrz6mkplp87";
+  };
+
+  buildNativeInputs = [ pkgconfig ];
+
+  buildInputs = [ libxml2 popt ];
+
+  propagatedBuildInputs = [ libcdio ];
+
+  meta = {
+    homepage = http://www.gnu.org/software/vcdimager/;
+    description = "GNU VCDImager is a full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs.";
+    platforms = stdenv.lib.platforms.gnu; # random choice
+  };
+}

pkgs/development/libraries/xine-lib/default.nix

@@ -1,29 +1,30 @@
 { stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib
 , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
-, flac, libcaca, pulseaudio, libmng
+, flac, libcaca, pulseaudio, libmng, libcdio, libv4l, vcdimager
+, libmpcdec
 }:
 
 stdenv.mkDerivation rec {
-  name = "xine-lib-1.1.19";
+  name = "xine-lib-1.2.0";
   
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.bz2";
-    sha256 = "0x47kmsaxx1bv8w2cacvzls3sjw9y4vk82rd94km1m1s6k2wcxv2";
+    sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c";
   };
 
-  patches =
-    [ (fetchurl {
-        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
-        sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
-      })
-    ];
+#  patches =
+#    [ (fetchurl {
+#        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1";
+#        sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b";
+#      })
+#    ];
   
   buildNativeInputs = [ pkgconfig perl ];
 
   buildInputs = [
     xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
     alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac
-    libcaca pulseaudio libmng
+    libcaca pulseaudio libmng libcdio libv4l vcdimager libmpcdec
   ];
 
   NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss";

pkgs/top-level/all-packages.nix

@@ -4210,6 +4210,8 @@ let
 
   lightning = callPackage ../development/libraries/lightning { };
 
+  lirc = callPackage ../development/libraries/lirc { };
+
   liquidwar = builderDefsPackage ../games/liquidwar {
     inherit (xlibs) xproto libX11 libXrender;
     inherit gmp mesa libjpeg libpng
@@ -4640,6 +4642,8 @@ let
 
   vamp = callPackage ../development/libraries/audio/vamp { };
 
+  vcdimager = callPackage ../development/libraries/vcdimager { };
+
   vigra = callPackage ../development/libraries/vigra { };
 
   vmime = callPackage ../development/libraries/vmime { };