Mercurial > mplayer.hg
changeset 11765:e0b096f0e640
linux 2.6 patch by "ismail 'cartman' d«Ónmez" <ismail.donmez@boun.edu.tr>
no idea whether this really works :)
| author | attila |
|---|---|
| date | Sat, 10 Jan 2004 09:48:15 +0000 |
| parents | 129caea8bebc |
| children | a80ae8896d6a |
| files | libvo/Makefile libvo/vo_fbdev.c libvo/vo_fbdev2.c libvo/vo_mga.c osdep/kerneltwosix.h |
| diffstat | 5 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/Makefile Sat Jan 10 09:10:52 2004 +0000 +++ b/libvo/Makefile Sat Jan 10 09:48:15 2004 +0000 @@ -10,7 +10,7 @@ SRCS += vosub_vidix.c endif -CFLAGS = $(OPTFLAGS) -I. -I.. $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall +CFLAGS = $(OPTFLAGS) -I. -I.. -I../osdep $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall .SUFFIXES: .c .o
--- a/libvo/vo_fbdev.c Sat Jan 10 09:10:52 2004 +0000 +++ b/libvo/vo_fbdev.c Sat Jan 10 09:48:15 2004 +0000 @@ -18,6 +18,7 @@ #include <sys/mman.h> #include <sys/ioctl.h> #include <sys/kd.h> +#include "kerneltwosix.h" #include <linux/fb.h> #include "config.h"
--- a/libvo/vo_fbdev2.c Sat Jan 10 09:10:52 2004 +0000 +++ b/libvo/vo_fbdev2.c Sat Jan 10 09:48:15 2004 +0000 @@ -13,6 +13,7 @@ #include <sys/mman.h> #include <sys/ioctl.h> +#include "kerneltwosix.h" #include <linux/fb.h> #include "config.h"
--- a/libvo/vo_mga.c Sat Jan 10 09:10:52 2004 +0000 +++ b/libvo/vo_mga.c Sat Jan 10 09:48:15 2004 +0000 @@ -14,6 +14,7 @@ #include <unistd.h> #include <fcntl.h> #include <sys/mman.h> +#include "kerneltwosix.h" #include <linux/fb.h> #include "drivers/mga_vid.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/osdep/kerneltwosix.h Sat Jan 10 09:48:15 2004 +0000 @@ -0,0 +1,9 @@ +#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 + +