- syncing patches to trunk
This commit is contained in:
Stephan Raue 2009-11-16 04:28:21 +01:00
parent 7fcb7a234f
commit c22e37dbc7

View File

@ -1,10 +1,10 @@
diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
--- xbmc-24229/configure.in 2009-11-03 12:18:12.098521374 +0100
+++ xbmc-24229.patch/configure.in 2009-11-03 12:37:53.688395337 +0100
@@ -350,6 +350,12 @@
AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
diff -Naur xbmc-24572/configure.in xbmc-24572.patch/configure.in
--- xbmc-24572/configure.in 2009-11-13 20:37:01.756638545 +0100
+++ xbmc-24572.patch/configure.in 2009-11-13 20:41:14.259621759 +0100
@@ -352,6 +352,12 @@
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([pthread], [pthread_yield],
+ AC_DEFINE([HAVE_PTHREAD_YIELD], [1],
+ [Define to 1 if you have the 'pthread_yield' function]))
@ -14,9 +14,9 @@ diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
PKG_CHECK_MODULES([MAD], [mad],
[INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
AC_MSG_ERROR($missing_library))
diff -Naur xbmc-24229/xbmc/FileSystem/FileCurl.cpp xbmc-24229.patch/xbmc/FileSystem/FileCurl.cpp
--- xbmc-24229/xbmc/FileSystem/FileCurl.cpp 2009-11-03 10:49:58.898396757 +0100
+++ xbmc-24229.patch/xbmc/FileSystem/FileCurl.cpp 2009-11-03 12:35:23.238521816 +0100
diff -Naur xbmc-24572/xbmc/FileSystem/FileCurl.cpp xbmc-24572.patch/xbmc/FileSystem/FileCurl.cpp
--- xbmc-24572/xbmc/FileSystem/FileCurl.cpp 2009-11-13 18:19:50.000000000 +0100
+++ xbmc-24572.patch/xbmc/FileSystem/FileCurl.cpp 2009-11-13 20:38:20.330748551 +0100
@@ -19,6 +19,8 @@
*
*/
@ -26,7 +26,7 @@ diff -Naur xbmc-24229/xbmc/FileSystem/FileCurl.cpp xbmc-24229.patch/xbmc/FileSys
#include "FileCurl.h"
#include "Util.h"
#include "URL.h"
@@ -1178,10 +1180,10 @@
@@ -1179,10 +1181,10 @@
// happens especially on ftp during initial connection
#ifndef _LINUX
SwitchToThread();