diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /libxine/libxine-1.0.0-beta12/uclibc.patch | |
parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'libxine/libxine-1.0.0-beta12/uclibc.patch')
-rw-r--r-- | libxine/libxine-1.0.0-beta12/uclibc.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/libxine/libxine-1.0.0-beta12/uclibc.patch b/libxine/libxine-1.0.0-beta12/uclibc.patch index e69de29bb2..787e46a081 100644 --- a/libxine/libxine-1.0.0-beta12/uclibc.patch +++ b/libxine/libxine-1.0.0-beta12/uclibc.patch @@ -0,0 +1,55 @@ + +# +# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- xine-lib/configure.ac~uclibc 2003-09-28 16:42:13.000000000 +0200 ++++ xine-lib/configure.ac 2003-09-28 16:42:13.000000000 +0200 +@@ -190,7 +190,7 @@ + *) + AC_CHECK_LIB(pthread, pthread_create, + [THREAD_LIBS="-lpthread"], +- [AC_MSG_ERROR(pthread needed)]) ++ [AC_MSG_WARN(pthread needed)]) + ;; + esac + AC_SUBST(THREAD_LIBS) +--- xine-lib/src/xine-engine/osd.c~uclibc 2003-04-27 17:57:54.000000000 +0200 ++++ xine-lib/src/xine-engine/osd.c 2003-09-28 16:42:13.000000000 +0200 +@@ -34,10 +34,6 @@ + #include <dirent.h> + #include <errno.h> + +-#ifndef _MSC_VER +-#include <iconv.h> +-#endif /* _MSC_VER */ +- + #ifdef HAVE_LANGINFO_CODESET + #include <langinfo.h> + #endif +@@ -98,6 +94,8 @@ + }; + #endif + ++#define _MSC_VER ++ + /* + * open a new osd object. this will allocated an empty (all zero) drawing + * area where graphic primitives may be used. +@@ -1220,3 +1218,6 @@ + + return this; + } ++ ++#undef _MSC_VER ++ +--- xine-lib/src/video_out/video_out_fb.c~uclibc 2003-03-19 16:29:27.000000000 +0100 ++++ xine-lib/src/video_out/video_out_fb.c 2003-09-28 17:16:05.000000000 +0200 +@@ -71,7 +71,6 @@ + #include <netinet/in.h> + + #include <linux/fb.h> +-#include <linux/kd.h> + #include <linux/vt.h> + + #include "xine_internal.h" |