b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Upgrade xine-lib and xine-ui

Browse source 
svn path=/nixpkgs/trunk/; revision=31451
This commit is contained in:
Yury G. Kudryashov 2012-01-09 10:25:56 +00:00
parent ff5134f8b0
commit f4a079a76c
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/video/xine-ui/default.nix
View file

@ -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/;

21
pkgs/development/libraries/xine-lib/default.nix
View file

@ -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";