JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xine-lib: now compiles with 2.6.23 headers

Browse Source 
svn path=/nixpkgs/trunk/; revision=10328
This commit is contained in:
Yury G. Kudryashov 2008-01-28 19:37:36 +00:00
parent 1e072c634d
commit 68cf3dddcc
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/xine-lib/default.nix
View File

@ -27,4 +27,5 @@ assert alsaSupport -> alsaLib != null;
libXv = if xvideoSupport then libXv else null;
libdvdcss = if encryptedDVDSupport then libdvdcss else null;
propagatedBuildInputs = [zlib];
patches = [ ./xine-lib-linux-headers-2.6.23.patch ];
}) // {inherit xineramaSupport libXinerama;}

22
pkgs/development/libraries/xine-lib/xine-lib-linux-headers-2.6.23.patch Normal file
View File

@ -0,0 +1,22 @@
# HG changeset patch
# User Ken Moffat <zarniwhoop@users.sourceforge.net>
# Date 1193435051 -3600
# Node ID 8a369a0d5ff104cc115bbe76c6b4f3e281d1ef25
# Parent 05fde4048642d1a7edb19ea623acd760064718bc
Linux-2.6.23 header change breaks build
>
> /* Special codes used when specifying changer slots. */
> #define CDSL_NONE (INT_MAX-1)
> #define CDSL_CURRENT INT_MAX
--- a/src/input/vcd/libcdio/_cdio_linux.c Tue Oct 23 23:45:58 2007 +0100
+++ b/src/input/vcd/libcdio/_cdio_linux.c Fri Oct 26 22:44:11 2007 +0100
@@ -59,6 +59,7 @@ static const char _rcsid[] = "$Id: _cdio
#include <unistd.h>
#include <fcntl.h>
#include <mntent.h>
+#include <limits.h>
#include <linux/cdrom.h>
#include <scsi/scsi.h>