Author: urkud
Date: Mon Jan 9 10:30:13 2012
New Revision: 31452
URL: https://nixos.org/websvn/nix/?rev=31452&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/development/libraries/lirc/
- copied from r31451, nixpkgs/trunk/pkgs/development/libraries/lirc/
nixpkgs/branches/libpng15/pkgs/development/libraries/vcdimager/
- copied from r31451, nixpkgs/trunk/pkgs/development/libraries/vcdimager/
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/video/xine-ui/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/xine-lib/default.nix
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/libpng15/pkgs/applications/video/xine-ui/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/video/xine-ui/default.nix
Mon Jan 9 10:25:56 2012 (r31451)
+++ nixpkgs/branches/libpng15/pkgs/applications/video/xine-ui/default.nix
Mon Jan 9 10:30:13 2012 (r31452)
@@ -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/;
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/xine-lib/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/xine-lib/default.nix
Mon Jan 9 10:25:56 2012 (r31451)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/xine-lib/default.nix
Mon Jan 9 10:30:13 2012 (r31452)
@@ -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";
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Mon Jan 9
10:25:56 2012 (r31451)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Mon Jan 9
10:30:13 2012 (r31452)
@@ -4210,6 +4210,8 @@
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 @@
vamp = callPackage ../development/libraries/audio/vamp { };
+ vcdimager = callPackage ../development/libraries/vcdimager { };
+
vigra = callPackage ../development/libraries/vigra { };
vmime = callPackage ../development/libraries/vmime { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
