diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-28 19:37:36 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-28 19:37:36 +0000 |
| commit | 68cf3dddcc3a8551d4091e9dceea902e4c5fcd25 (patch) | |
| tree | 604c9ae9e54a867c6672b032ecb23b9e7d123b4f /pkgs/development/libraries/xine-lib | |
| parent | 1e072c634d8137108ff4fc35aaca18bdd094d62e (diff) | |
| download | nixpkgs-68cf3dddcc3a8551d4091e9dceea902e4c5fcd25.tar nixpkgs-68cf3dddcc3a8551d4091e9dceea902e4c5fcd25.tar.gz nixpkgs-68cf3dddcc3a8551d4091e9dceea902e4c5fcd25.tar.bz2 nixpkgs-68cf3dddcc3a8551d4091e9dceea902e4c5fcd25.tar.lz nixpkgs-68cf3dddcc3a8551d4091e9dceea902e4c5fcd25.tar.xz nixpkgs-68cf3dddcc3a8551d4091e9dceea902e4c5fcd25.tar.zst nixpkgs-68cf3dddcc3a8551d4091e9dceea902e4c5fcd25.zip | |
xine-lib: now compiles with 2.6.23 headers
svn path=/nixpkgs/trunk/; revision=10328
Diffstat (limited to 'pkgs/development/libraries/xine-lib')
| -rw-r--r-- | pkgs/development/libraries/xine-lib/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/xine-lib/xine-lib-linux-headers-2.6.23.patch | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 738b21741b5..51592f61b1a 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -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;} diff --git a/pkgs/development/libraries/xine-lib/xine-lib-linux-headers-2.6.23.patch b/pkgs/development/libraries/xine-lib/xine-lib-linux-headers-2.6.23.patch new file mode 100644 index 00000000000..cd3d766ea8f --- /dev/null +++ b/pkgs/development/libraries/xine-lib/xine-lib-linux-headers-2.6.23.patch @@ -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> + |