MPlayer-1.0pre4 build error if inlucing fbdev support

[mikkelerup@…]

When compiling MPlayer-1.0pre4 on a system with a 2.6.7 kernel and using 2.6 headers I got the following error:

In file included from vo_fbdev.c:21: ../osdep/kerneltwosix.h:4:31: linux/thread_info.h: No such file or directory In file included from /usr/include/linux/list.h:1,

from ../osdep/kerneltwosix.h:5, from vo_fbdev.c:21:

/usr/include/linux/err_kernel_only.h:1:2: #error Kernel only header included in userspace make[1]: * [vo_fbdev.o] Error 1

However removing the offending #includes from kerneltwosix.h fixed the problem:

--- main/osdep/kerneltwosix.h.orig 2004-04-16 13:10:24.000000000 +0000 +++ main/osdep/kerneltwosix.h 2004-04-16 13:10:36.000000000 +0000 @@ -1,9 +1,3 @@

#include <linux/version.h>

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) -#define KERNEL -#include <linux/thread_info.h> -#include <linux/list.h> -#undef KERNEL -#endif

Mikkel

[Randy McMurchy]

Added kernel_2.6 patch to MPlayer build instructions.

[Reimar.Doeffinger@…]

osdep/kerneltwosix.h isn't used anymore in pre6, so this patch should not be needed anymore with it.

[bdubbs@…]

Milestone old deleted