Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Mar 2011 11:34:36 GMT
From:      Mickael Maillot <mickael.maillot@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/155466: multimedia/xbmc: Update to 10.1
Message-ID:  <201103111134.p2BBYafL027088@red.freebsd.org>
Resent-Message-ID: <201103111140.p2BBeBgP057405@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         155466
>Category:       ports
>Synopsis:       multimedia/xbmc: Update to 10.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 11 11:40:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Mickael Maillot
>Release:        
>Organization:
>Environment:
>Description:
update XBMC to 10.1
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urdN -x .svn -x todo.txt xbmc.orig/Makefile xbmc/Makefile
--- xbmc.orig/Makefile	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/Makefile	2011-03-11 12:30:42.000000000 +0100
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xbmc
-PORTVERSION=	10.0
-PORTREVISION=	5
+PORTVERSION=	10.1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
 
diff -urdN -x .svn -x todo.txt xbmc.orig/distinfo xbmc/distinfo
--- xbmc.orig/distinfo	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/distinfo	2011-03-11 11:35:11.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (xbmc-10.0.tar.gz) = 06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a
-SIZE (xbmc-10.0.tar.gz) = 130239951
+SHA256 (xbmc-10.1.tar.gz) = 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
+SIZE (xbmc-10.1.tar.gz) = 130187822
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-Makefile.in xbmc/files/patch-Makefile.in
--- xbmc.orig/files/patch-Makefile.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-Makefile.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2010-12-17 07:17:41.000000000 +0100
-+++ Makefile.in	2011-02-23 22:22:13.000000000 +0100
+--- ./Makefile.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./Makefile.in	2011-03-11 08:27:38.000000000 +0100
 @@ -71,7 +71,6 @@
  	xbmc/cores/paplayer/timidity \
  	xbmc/cores/paplayer/SIDCodec \
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-Makefile.include.in xbmc/files/patch-Makefile.include.in
--- xbmc.orig/files/patch-Makefile.include.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-Makefile.include.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./Makefile.include.in.orig	2010-07-12 00:23:28.000000000 +0200
-+++ ./Makefile.include.in	2010-12-01 12:17:34.287118766 +0100
+--- ./Makefile.include.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./Makefile.include.in	2011-03-11 08:27:38.000000000 +0100
 @@ -1,7 +1,7 @@
  AR=ar
  ARFLAGS=crus
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-configure.in xbmc/files/patch-configure.in
--- xbmc.orig/files/patch-configure.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-configure.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- configure.in.orig	2010-12-17 07:17:41.000000000 +0100
-+++ configure.in	2011-03-08 15:10:52.000000000 +0100
+--- ./configure.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./configure.in	2011-03-11 08:27:38.000000000 +0100
 @@ -19,10 +19,10 @@
  [
    if [[ "$host_vendor" != "apple" ]]; then
@@ -153,7 +153,7 @@
    test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
    test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
    test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
-@@ -1211,6 +1262,12 @@
+@@ -1210,6 +1261,12 @@
    final_message="$final_message\n  Bluray:\tNo"
  fi
  
@@ -166,7 +166,7 @@
  if test "$use_mid" = "yes"; then
    final_message="$final_message\n  MID Support:\tYes"
    SDL_DEFINES="$SDL_DEFINES -DMID"
-@@ -1418,7 +1475,6 @@
+@@ -1410,7 +1467,6 @@
      xbmc/cores/paplayer/NSFCodec/Makefile \
      xbmc/cores/paplayer/SIDCodec/Makefile \
      xbmc/cores/paplayer/vgmstream/Makefile \
@@ -174,7 +174,7 @@
      xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
      xbmc/cores/playercorefactory/Makefile \
      xbmc/karaoke/Makefile \
-@@ -1491,6 +1547,7 @@
+@@ -1483,6 +1539,7 @@
  AC_SUBST(USE_EXTERNAL_LIBMPEG2)
  AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
  AC_SUBST(USE_EXTERNAL_PYTHON)
@@ -182,7 +182,7 @@
  AC_SUBST(USE_PYTHON2_6)
  AC_SUBST(USE_PYTHON2_5)
  AC_SUBST(USE_PYTHON2_4)
-@@ -1735,7 +1792,7 @@
+@@ -1727,7 +1784,7 @@
        --enable-static \
        --disable-shared \
        --cc="$CC" &&
@@ -191,7 +191,7 @@
      mkdir -p `pwd`/../includes/dvdread
      cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
    else
-@@ -1749,8 +1806,9 @@
+@@ -1741,8 +1798,9 @@
        --disable-shared \
        --disable-strip \
        --disable-opts \
@@ -202,7 +202,7 @@
      mkdir -p `pwd`/../includes/dvdread
      cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
    fi
-@@ -1766,6 +1824,17 @@
+@@ -1758,6 +1816,17 @@
        --enable-static \
        --disable-shared \
        --cc="$CC"
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-guilib__StdString.h xbmc/files/patch-guilib__StdString.h
--- xbmc.orig/files/patch-guilib__StdString.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-guilib__StdString.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- guilib/StdString.h.orig	2009-09-25 16:12:41.000000000 +0200
-+++ guilib/StdString.h	2010-12-13 21:19:16.000000000 +0100
+--- ./guilib/StdString.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./guilib/StdString.h	2011-03-11 08:27:38.000000000 +0100
 @@ -2,6 +2,7 @@
  #include <string>
  #include <stdint.h>
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-guilib__TextureBundleXPR.cpp xbmc/files/patch-guilib__TextureBundleXPR.cpp
--- xbmc.orig/files/patch-guilib__TextureBundleXPR.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-guilib__TextureBundleXPR.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./guilib/TextureBundleXPR.cpp.orig	2010-05-13 09:06:42.000000000 +0200
-+++ ./guilib/TextureBundleXPR.cpp	2010-12-01 12:17:34.307278095 +0100
+--- ./guilib/TextureBundleXPR.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./guilib/TextureBundleXPR.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -285,7 +285,7 @@
      GlobalMemoryStatus(&stat);
      CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %lu bytes, have %lu bytes)", name.c_str(),
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-guilib__XBTFReader.cpp xbmc/files/patch-guilib__XBTFReader.cpp
--- xbmc.orig/files/patch-guilib__XBTFReader.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-guilib__XBTFReader.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./guilib/XBTFReader.cpp.orig	2010-02-14 19:20:07.000000000 +0100
-+++ ./guilib/XBTFReader.cpp	2010-12-01 12:17:34.289131542 +0100
+--- ./guilib/XBTFReader.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./guilib/XBTFReader.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -187,7 +187,7 @@
    {
      return false;
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-guilib__common__LIRC.cpp xbmc/files/patch-guilib__common__LIRC.cpp
--- xbmc.orig/files/patch-guilib__common__LIRC.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-guilib__common__LIRC.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- guilib/common/LIRC.cpp.orig	2011-03-07 14:16:12.000000000 +0100
-+++ guilib/common/LIRC.cpp	2011-03-07 14:11:31.000000000 +0100
+--- ./guilib/common/LIRC.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./guilib/common/LIRC.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -19,11 +19,14 @@
  *
  */
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-guilib__system.h xbmc/files/patch-guilib__system.h
--- xbmc.orig/files/patch-guilib__system.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-guilib__system.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,6 +1,6 @@
---- ./guilib/system.h.orig	2010-11-09 20:05:35.000000000 +0100
-+++ ./guilib/system.h	2010-12-01 12:17:34.292155875 +0100
-@@ -66,7 +66,9 @@
+--- ./guilib/system.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./guilib/system.h	2011-03-11 08:27:38.000000000 +0100
+@@ -65,7 +65,9 @@
  #define HAS_FILESYSTEM_SAP
  #define HAS_FILESYSTEM_VTP
  #define HAS_FILESYSTEM_HTSP
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-lib__cpluff__libcpluff__ploader.c xbmc/files/patch-lib__cpluff__libcpluff__ploader.c
--- xbmc.orig/files/patch-lib__cpluff__libcpluff__ploader.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-lib__cpluff__libcpluff__ploader.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./lib/cpluff/libcpluff/ploader.c.orig	2010-07-09 17:51:15.000000000 +0200
-+++ ./lib/cpluff/libcpluff/ploader.c	2010-12-01 12:17:34.288126970 +0100
+--- ./lib/cpluff/libcpluff/ploader.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./lib/cpluff/libcpluff/ploader.c	2011-03-11 08:27:38.000000000 +0100
 @@ -161,15 +161,15 @@
  		cpi_warnf(plcontext->context,
  			N_("Suspicious plug-in descriptor content in %s, line %d, column %d (%s)."),
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-tools__Linux__xbmc.sh.in xbmc/files/patch-tools__Linux__xbmc.sh.in
--- xbmc.orig/files/patch-tools__Linux__xbmc.sh.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-tools__Linux__xbmc.sh.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./tools/Linux/xbmc.sh.in.orig	2010-10-28 21:09:04.000000000 +0200
-+++ ./tools/Linux/xbmc.sh.in	2010-12-01 12:17:34.286115032 +0100
+--- ./tools/Linux/xbmc.sh.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./tools/Linux/xbmc.sh.in	2011-03-11 08:27:38.000000000 +0100
 @@ -23,6 +23,8 @@
  exec_prefix="@exec_prefix@"
  datarootdir="@datarootdir@"
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-tools__TexturePacker__XBMCTex.cpp xbmc/files/patch-tools__TexturePacker__XBMCTex.cpp
--- xbmc.orig/files/patch-tools__TexturePacker__XBMCTex.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-tools__TexturePacker__XBMCTex.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./tools/TexturePacker/XBMCTex.cpp.orig	2010-10-17 19:04:21.000000000 +0200
-+++ ./tools/TexturePacker/XBMCTex.cpp	2010-12-01 12:17:34.285107108 +0100
+--- ./tools/TexturePacker/XBMCTex.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./tools/TexturePacker/XBMCTex.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -40,7 +40,11 @@
  #endif
  
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__Application.cpp xbmc/files/patch-xbmc__Application.cpp
--- xbmc.orig/files/patch-xbmc__Application.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__Application.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,15 +1,15 @@
---- ./xbmc/Application.cpp.orig	2010-10-31 14:58:11.000000000 +0100
-+++ ./xbmc/Application.cpp	2010-12-01 12:17:34.231763652 +0100
-@@ -494,6 +494,8 @@
+--- ./xbmc/Application.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/Application.cpp	2011-03-11 08:27:38.000000000 +0100
+@@ -495,6 +495,8 @@
    CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
  #if defined(__APPLE__)
-   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X (%s). Built on %s (SVN:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);
+   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
 +#elif defined(__FreeBSD__)
-+  CLog::Log(LOGNOTICE, "Starting XBMC, Platform: FreeBSD (%s). Built on %s (SVN:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);
++  CLog::Log(LOGNOTICE, "Starting XBMC, Platform: FreeBSD (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
  #elif defined(_LINUX)
-   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Linux (%s, %s). Built on %s (SVN:%s)", g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);
+   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Linux (%s, %s). Built on %s (Git:%s)", g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
  #elif defined(_WIN32)
-@@ -777,6 +779,11 @@
+@@ -785,6 +787,11 @@
        }
      }
    }
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__DetectDVDType.cpp xbmc/files/patch-xbmc__DetectDVDType.cpp
--- xbmc.orig/files/patch-xbmc__DetectDVDType.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__DetectDVDType.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/DetectDVDType.cpp.orig	2010-10-11 17:15:33.000000000 +0200
-+++ ./xbmc/DetectDVDType.cpp	2010-12-01 12:17:34.238812978 +0100
+--- ./xbmc/DetectDVDType.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/DetectDVDType.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -34,7 +34,7 @@
  #include <sys/types.h>
  #include <sys/ioctl.h>
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__FileSystem__CacheStrategy.cpp xbmc/files/patch-xbmc__FileSystem__CacheStrategy.cpp
--- xbmc.orig/files/patch-xbmc__FileSystem__CacheStrategy.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__FileSystem__CacheStrategy.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/FileSystem/CacheStrategy.cpp.orig	2010-10-10 15:01:06.000000000 +0200
-+++ ./xbmc/FileSystem/CacheStrategy.cpp	2010-12-01 12:17:34.234788543 +0100
+--- ./xbmc/FileSystem/CacheStrategy.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/FileSystem/CacheStrategy.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -93,7 +93,8 @@
  
    if(m_hCacheFileWrite == INVALID_HANDLE_VALUE)
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__FileSystem__DllLibCurl.cpp xbmc/files/patch-xbmc__FileSystem__DllLibCurl.cpp
--- xbmc.orig/files/patch-xbmc__FileSystem__DllLibCurl.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__FileSystem__DllLibCurl.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/FileSystem/DllLibCurl.cpp.orig	2010-08-25 00:38:59.000000000 +0200
-+++ ./xbmc/FileSystem/DllLibCurl.cpp	2010-12-01 12:17:34.236800761 +0100
+--- ./xbmc/FileSystem/DllLibCurl.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/FileSystem/DllLibCurl.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -84,6 +84,12 @@
  
  void DllLibCurlGlobal::CheckIdle()
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__FileSystem__SAPDirectory.cpp xbmc/files/patch-xbmc__FileSystem__SAPDirectory.cpp
--- xbmc.orig/files/patch-xbmc__FileSystem__SAPDirectory.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__FileSystem__SAPDirectory.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,7 +1,5 @@
-Index: xbmc/FileSystem/SAPDirectory.cpp
-===================================================================
---- xbmc/FileSystem/SAPDirectory.cpp	(revision 35575)
-+++ xbmc/FileSystem/SAPDirectory.cpp	(working copy)
+--- ./xbmc/FileSystem/SAPDirectory.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/FileSystem/SAPDirectory.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -30,6 +30,9 @@
  #ifdef __APPLE__
  #include "OSXGNUReplacements.h" // strnlen
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__GUILargeTextureManager.cpp xbmc/files/patch-xbmc__GUILargeTextureManager.cpp
--- xbmc.orig/files/patch-xbmc__GUILargeTextureManager.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__GUILargeTextureManager.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/GUILargeTextureManager.cpp.orig	2010-10-08 04:41:58.000000000 +0200
-+++ ./xbmc/GUILargeTextureManager.cpp	2010-12-01 12:17:34.238812978 +0100
+--- ./xbmc/GUILargeTextureManager.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/GUILargeTextureManager.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -68,7 +68,8 @@
        m_texture = NULL;
      }
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp xbmc/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp
--- xbmc.orig/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/MusicInfoTagLoaderWMA.cpp.orig	2009-10-12 11:16:56.000000000 +0200
-+++ ./xbmc/MusicInfoTagLoaderWMA.cpp	2010-12-01 12:17:34.239816992 +0100
+--- ./xbmc/MusicInfoTagLoaderWMA.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/MusicInfoTagLoaderWMA.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -538,7 +538,7 @@
                                  "Unable to create album art for %s "
                                  "(extension=%s, size=%u)",
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__ProgramDatabase.cpp xbmc/files/patch-xbmc__ProgramDatabase.cpp
--- xbmc.orig/files/patch-xbmc__ProgramDatabase.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__ProgramDatabase.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/ProgramDatabase.cpp.orig	2010-07-12 22:53:38.000000000 +0200
-+++ ./xbmc/ProgramDatabase.cpp	2010-12-01 12:17:34.231763652 +0100
+--- ./xbmc/ProgramDatabase.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/ProgramDatabase.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -63,7 +63,7 @@
    catch (...)
    {
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__Util.cpp xbmc/files/patch-xbmc__Util.cpp
--- xbmc.orig/files/patch-xbmc__Util.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__Util.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/Util.cpp.orig	2010-12-17 07:17:41.000000000 +0100
-+++ xbmc/Util.cpp	2010-12-27 20:40:24.000000000 +0100
+--- ./xbmc/Util.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/Util.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -27,6 +27,11 @@
  #include <mach-o/dyld.h>
  #endif
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__VideoDatabase.cpp xbmc/files/patch-xbmc__VideoDatabase.cpp
--- xbmc.orig/files/patch-xbmc__VideoDatabase.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__VideoDatabase.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/VideoDatabase.cpp.orig	2010-11-09 22:55:18.000000000 +0100
-+++ ./xbmc/VideoDatabase.cpp	2010-12-01 12:17:34.199531299 +0100
+--- ./xbmc/VideoDatabase.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/VideoDatabase.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -4423,7 +4423,7 @@
      }
  
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__ViewDatabase.cpp xbmc/files/patch-xbmc__ViewDatabase.cpp
--- xbmc.orig/files/patch-xbmc__ViewDatabase.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__ViewDatabase.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/ViewDatabase.cpp.orig	2010-07-03 13:07:36.000000000 +0200
-+++ ./xbmc/ViewDatabase.cpp	2010-12-01 12:17:34.233780060 +0100
+--- ./xbmc/ViewDatabase.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/ViewDatabase.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -62,7 +62,7 @@
    catch (...)
    {
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__addons__Addon.cpp xbmc/files/patch-xbmc__addons__Addon.cpp
--- xbmc.orig/files/patch-xbmc__addons__Addon.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__addons__Addon.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,7 +1,5 @@
-Index: xbmc/addons/Addon.cpp
-===================================================================
---- xbmc/addons/Addon.cpp	(revision 35575)
-+++ xbmc/addons/Addon.cpp	(working copy)
+--- ./xbmc/addons/Addon.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/addons/Addon.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -29,6 +29,9 @@
  #ifdef __APPLE__
  #include "../osx/OSXGNUReplacements.h"
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp xbmc/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp
--- xbmc.orig/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,6 +1,6 @@
---- ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp.orig	2010-10-25 16:43:36.000000000 +0200
-+++ ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp	2010-12-01 12:17:34.212621188 +0100
-@@ -439,7 +439,7 @@
+--- ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp	2011-03-11 08:27:38.000000000 +0100
+@@ -440,7 +440,7 @@
  {
    if (!m_bIsAllocated) return 0;
  
@@ -9,7 +9,7 @@
    if (nSpace == 0)
    {
      snd_pcm_state_t state = snd_pcm_state(m_pPlayHandle);
-@@ -451,7 +451,8 @@
+@@ -452,7 +452,8 @@
    }
    if (nSpace < 0)
    {
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp
--- xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig	2010-10-04 01:33:13.000000000 +0200
-+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2010-12-01 12:17:34.209596576 +0100
+--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -30,6 +30,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h
--- xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig	2010-05-28 21:31:42.000000000 +0200
-+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h	2010-12-01 12:17:34.210600869 +0100
+--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h	2011-03-11 08:27:38.000000000 +0100
 @@ -35,9 +35,15 @@
  
  typedef void ( *PFV)(void);
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp xbmc/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp
--- xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/cores/DllLoader/exports/exports_python_linux.cpp.orig	2010-12-17 07:17:41.000000000 +0100
-+++ xbmc/cores/DllLoader/exports/exports_python_linux.cpp	2010-12-27 20:00:59.000000000 +0100
+--- ./xbmc/cores/DllLoader/exports/exports_python_linux.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/DllLoader/exports/exports_python_linux.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -34,7 +34,7 @@
  #endif
  #include "../DllLoaderContainer.h"
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h xbmc/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h
--- xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h.orig	2010-06-01 16:33:45.000000000 +0200
-+++ ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h	2010-12-01 12:17:34.211609073 +0100
+--- ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h	2011-03-11 08:27:38.000000000 +0100
 @@ -29,7 +29,7 @@
  
  class CMutex;
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__wrapper.c xbmc/files/patch-xbmc__cores__DllLoader__exports__wrapper.c
--- xbmc.orig/files/patch-xbmc__cores__DllLoader__exports__wrapper.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__DllLoader__exports__wrapper.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/DllLoader/exports/wrapper.c.orig	2010-05-28 21:31:42.000000000 +0200
-+++ ./xbmc/cores/DllLoader/exports/wrapper.c	2010-12-01 12:17:34.206576434 +0100
+--- ./xbmc/cores/DllLoader/exports/wrapper.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/DllLoader/exports/wrapper.c	2011-03-11 08:27:38.000000000 +0100
 @@ -37,7 +37,7 @@
  #include <dirent.h>
  #endif
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp xbmc/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp
--- xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/dvdplayer/DVDAudio.cpp.orig	2010-05-05 11:33:40.000000000 +0200
-+++ ./xbmc/cores/dvdplayer/DVDAudio.cpp	2010-12-01 12:17:34.200531401 +0100
+--- ./xbmc/cores/dvdplayer/DVDAudio.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/dvdplayer/DVDAudio.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -235,13 +235,14 @@
  
    if(silence > 0 && m_iBufferSize > 0)
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp
--- xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp.orig	2010-12-17 07:17:41.000000000 +0100
-+++ xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp	2010-12-28 13:26:49.000000000 +0100
+--- ./xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -647,7 +647,7 @@
  
  void CVDPAU::InitVDPAUProcs()
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp xbmc/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp
--- xbmc.orig/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/dvdplayer/DVDPlayer.cpp.orig	2010-10-27 19:02:14.000000000 +0200
-+++ ./xbmc/cores/dvdplayer/DVDPlayer.cpp	2010-12-01 12:17:34.204563658 +0100
+--- ./xbmc/cores/dvdplayer/DVDPlayer.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/dvdplayer/DVDPlayer.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -2868,7 +2868,7 @@
            m_dvd.state = DVDSTATE_STILL;
            CLog::Log(LOGDEBUG,
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__paplayer__Makefile.in xbmc/files/patch-xbmc__cores__paplayer__Makefile.in
--- xbmc.orig/files/patch-xbmc__cores__paplayer__Makefile.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__paplayer__Makefile.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/cores/paplayer/Makefile.in.orig	2011-02-23 22:23:24.000000000 +0100
-+++ xbmc/cores/paplayer/Makefile.in	2011-02-23 22:24:24.000000000 +0100
+--- ./xbmc/cores/paplayer/Makefile.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/paplayer/Makefile.in	2011-03-11 08:27:38.000000000 +0100
 @@ -20,7 +20,6 @@
  endif
  
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp xbmc/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp
--- xbmc.orig/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp.orig	2010-10-04 19:49:31.000000000 +0200
-+++ ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp	2010-12-01 12:17:34.222702947 +0100
+--- ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -19,7 +19,7 @@
   *
   */
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__paplayer__PAPlayer.cpp xbmc/files/patch-xbmc__cores__paplayer__PAPlayer.cpp
--- xbmc.orig/files/patch-xbmc__cores__paplayer__PAPlayer.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__paplayer__PAPlayer.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,6 +1,6 @@
---- ./xbmc/cores/paplayer/PAPlayer.cpp.orig	2010-09-30 12:17:21.000000000 +0200
-+++ ./xbmc/cores/paplayer/PAPlayer.cpp	2010-12-01 12:17:34.224719076 +0100
-@@ -341,7 +341,8 @@
+--- ./xbmc/cores/paplayer/PAPlayer.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/paplayer/PAPlayer.cpp	2011-03-11 08:27:38.000000000 +0100
+@@ -339,7 +339,8 @@
  
    if(silence > 0 && m_bufferPos[stream] > 0)
    {
@@ -10,7 +10,7 @@
      memset(m_pcmBuffer[stream] + m_bufferPos[stream], 0, silence);
      m_bufferPos[stream] += silence;
    }
-@@ -896,7 +897,7 @@
+@@ -894,7 +895,7 @@
    {
      DWORD time = CTimeUtils::GetTimeMS();
      m_timeOffset = m_decoder[m_currentDecoder].Seek(m_SeekTime);
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in xbmc/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in
--- xbmc.orig/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/paplayer/SIDCodec/Makefile.in.orig	2010-06-11 19:53:24.000000000 +0200
-+++ ./xbmc/cores/paplayer/SIDCodec/Makefile.in	2010-12-01 12:17:34.223710592 +0100
+--- ./xbmc/cores/paplayer/SIDCodec/Makefile.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/paplayer/SIDCodec/Makefile.in	2011-03-11 08:27:38.000000000 +0100
 @@ -1,7 +1,7 @@
  ARCH=@ARCH@
  
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__paplayer__WAVcodec.cpp xbmc/files/patch-xbmc__cores__paplayer__WAVcodec.cpp
--- xbmc.orig/files/patch-xbmc__cores__paplayer__WAVcodec.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__paplayer__WAVcodec.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/paplayer/WAVcodec.cpp.orig	2010-06-03 06:23:58.000000000 +0200
-+++ ./xbmc/cores/paplayer/WAVcodec.cpp	2010-12-01 12:17:34.221698375 +0100
+--- ./xbmc/cores/paplayer/WAVcodec.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/paplayer/WAVcodec.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -137,7 +137,7 @@
              return false;
            }
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp
--- xbmc.orig/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp.orig	2010-10-04 19:46:47.000000000 +0200
-+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp	2010-12-01 12:17:34.217661928 +0100
+--- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -25,7 +25,7 @@
  #include <stdio.h>
  #include <stdint.h>
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h
--- xbmc.orig/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h.orig	2008-07-15 20:34:24.000000000 +0200
-+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h	2010-12-01 12:17:34.219682526 +0100
+--- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h	2011-03-11 08:27:38.000000000 +0100
 @@ -39,20 +39,20 @@
  // Platform specific stuff
  //-----------------------------------------------------------
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c xbmc/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c
--- xbmc.orig/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/cximage-6.0/raw/dcr.c.orig	2009-05-16 12:01:35.000000000 +0200
-+++ ./xbmc/lib/cximage-6.0/raw/dcr.c	2010-12-01 12:17:34.252898220 +0100
+--- ./xbmc/lib/cximage-6.0/raw/dcr.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/cximage-6.0/raw/dcr.c	2011-03-11 08:27:38.000000000 +0100
 @@ -144,8 +144,12 @@
  
  		//!!! set return point for error handling
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h xbmc/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h
--- xbmc.orig/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/cximage-6.0/raw/libdcr.h.orig	2009-05-21 08:01:34.000000000 +0200
-+++ ./xbmc/lib/cximage-6.0/raw/libdcr.h	2010-12-01 12:17:34.248861773 +0100
+--- ./xbmc/lib/cximage-6.0/raw/libdcr.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/cximage-6.0/raw/libdcr.h	2011-03-11 08:27:38.000000000 +0100
 @@ -41,7 +41,7 @@
  #include <setjmp.h>
  #include <sys/types.h>
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libPython__XBPython.cpp xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp
--- xbmc.orig/files/patch-xbmc__lib__libPython__XBPython.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/lib/libPython/XBPython.cpp.orig	2010-12-17 07:17:41.000000000 +0100
-+++ xbmc/lib/libPython/XBPython.cpp	2011-03-07 15:00:17.000000000 +0100
+--- ./xbmc/lib/libPython/XBPython.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libPython/XBPython.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -24,7 +24,9 @@
    #include "config.h"
  #endif
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libPython__linux__Makefile.in xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in
--- xbmc.orig/files/patch-xbmc__lib__libPython__linux__Makefile.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/lib/libPython/linux/Makefile.in.orig	2010-12-17 07:17:41.000000000 +0100
-+++ xbmc/lib/libPython/linux/Makefile.in	2011-03-07 14:55:55.000000000 +0100
+--- ./xbmc/lib/libPython/linux/Makefile.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libPython/linux/Makefile.in	2011-03-11 08:27:38.000000000 +0100
 @@ -2,10 +2,13 @@
  CC=@CC@
  CFLAGS=@CFLAGS@
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libPython__linux__wrapper_python.c xbmc/files/patch-xbmc__lib__libPython__linux__wrapper_python.c
--- xbmc.orig/files/patch-xbmc__lib__libPython__linux__wrapper_python.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libPython__linux__wrapper_python.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libPython/linux/wrapper_python.c.orig	2010-07-17 23:26:42.000000000 +0200
-+++ ./xbmc/lib/libPython/linux/wrapper_python.c	2010-12-01 12:17:34.245845263 +0100
+--- ./xbmc/lib/libPython/linux/wrapper_python.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libPython/linux/wrapper_python.c	2011-03-11 08:27:38.000000000 +0100
 @@ -40,7 +40,7 @@
  int xbp_mkdir(const char *dirname);
  int xbp_open(const char *filename, int oflag, int pmode);
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libRTV__GuideParser.cpp xbmc/files/patch-xbmc__lib__libRTV__GuideParser.cpp
--- xbmc.orig/files/patch-xbmc__lib__libRTV__GuideParser.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libRTV__GuideParser.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libRTV/GuideParser.cpp.orig	2010-02-12 00:47:51.000000000 +0100
-+++ ./xbmc/lib/libRTV/GuideParser.cpp	2010-12-01 12:17:34.245845263 +0100
+--- ./xbmc/lib/libRTV/GuideParser.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libRTV/GuideParser.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -130,7 +130,7 @@
  #include <winbase.h>
  #endif
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libXBMS__ccincludes.h xbmc/files/patch-xbmc__lib__libXBMS__ccincludes.h
--- xbmc.orig/files/patch-xbmc__lib__libXBMS__ccincludes.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libXBMS__ccincludes.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libXBMS/ccincludes.h.orig	2010-04-18 23:05:41.000000000 +0200
-+++ ./xbmc/lib/libXBMS/ccincludes.h	2010-12-01 12:17:34.244845160 +0100
+--- ./xbmc/lib/libXBMS/ccincludes.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libXBMS/ccincludes.h	2011-03-11 08:27:38.000000000 +0100
 @@ -58,6 +58,10 @@
  #define snprintf _snprintf
  #endif /* _XBOX */
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libXDAAP__httpClient.c xbmc/files/patch-xbmc__lib__libXDAAP__httpClient.c
--- xbmc.orig/files/patch-xbmc__lib__libXDAAP__httpClient.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libXDAAP__httpClient.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libXDAAP/httpClient.c.orig	2009-03-28 03:32:24.000000000 +0100
-+++ ./xbmc/lib/libXDAAP/httpClient.c	2010-12-01 12:17:34.243841426 +0100
+--- ./xbmc/lib/libXDAAP/httpClient.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libXDAAP/httpClient.c	2011-03-11 08:27:38.000000000 +0100
 @@ -61,6 +61,11 @@
  #include <netinet/in.h>
  #endif
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libXDAAP__ioloop.c xbmc/files/patch-xbmc__lib__libXDAAP__ioloop.c
--- xbmc.orig/files/patch-xbmc__lib__libXDAAP__ioloop.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libXDAAP__ioloop.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libXDAAP/ioloop.c.orig	2008-08-10 17:07:47.000000000 +0200
-+++ ./xbmc/lib/libXDAAP/ioloop.c	2010-12-01 12:17:34.240824916 +0100
+--- ./xbmc/lib/libXDAAP/ioloop.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libXDAAP/ioloop.c	2011-03-11 08:27:38.000000000 +0100
 @@ -122,9 +122,9 @@
  
  void fd_event_reset(fd_event *event)
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libXDAAP__thread.h xbmc/files/patch-xbmc__lib__libXDAAP__thread.h
--- xbmc.orig/files/patch-xbmc__lib__libXDAAP__thread.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libXDAAP__thread.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libXDAAP/thread.h.orig	2008-12-04 22:22:25.000000000 +0100
-+++ ./xbmc/lib/libXDAAP/thread.h	2010-12-01 12:17:34.243841426 +0100
+--- ./xbmc/lib/libXDAAP/thread.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libXDAAP/thread.h	2011-03-11 08:27:38.000000000 +0100
 @@ -37,7 +37,7 @@
  #define ts_mutex      pthread_mutex_t
  #define ts_condition  pthread_cond_t
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libXDAAP__threadpool.c xbmc/files/patch-xbmc__lib__libXDAAP__threadpool.c
--- xbmc.orig/files/patch-xbmc__lib__libXDAAP__threadpool.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libXDAAP__threadpool.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libXDAAP/threadpool.c.orig	2008-07-19 14:45:00.000000000 +0200
-+++ ./xbmc/lib/libXDAAP/threadpool.c	2010-12-01 12:17:34.241828930 +0100
+--- ./xbmc/lib/libXDAAP/threadpool.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libXDAAP/threadpool.c	2011-03-11 08:27:38.000000000 +0100
 @@ -279,10 +279,10 @@
  void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
                                   void *arg1, void *arg2)
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__lib__libhts__net_posix.c xbmc/files/patch-xbmc__lib__libhts__net_posix.c
--- xbmc.orig/files/patch-xbmc__lib__libhts__net_posix.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__lib__libhts__net_posix.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/lib/libhts/net_posix.c.orig	2010-02-15 06:06:37.000000000 +0100
-+++ ./xbmc/lib/libhts/net_posix.c	2010-12-01 12:17:34.312321908 +0100
+--- ./xbmc/lib/libhts/net_posix.c.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/lib/libhts/net_posix.c	2011-03-11 08:27:38.000000000 +0100
 @@ -17,12 +17,14 @@
   */
  
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__FreeBSDGNUReplacements.c xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c
--- xbmc.orig/files/patch-xbmc__linux__FreeBSDGNUReplacements.c	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- /dev/null	2010-12-16 16:44:10.000000000 +0100
-+++ xbmc/linux/FreeBSDGNUReplacements.c	2010-12-16 16:45:22.613185593 +0100
+--- ./xbmc/linux/FreeBSDGNUReplacements.c.orig	2011-03-11 08:27:38.000000000 +0100
++++ ./xbmc/linux/FreeBSDGNUReplacements.c	2011-03-11 08:27:38.000000000 +0100
 @@ -0,0 +1,252 @@
 +
 +#include "FreeBSDGNUReplacements.h"
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__FreeBSDGNUReplacements.h xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h
--- xbmc.orig/files/patch-xbmc__linux__FreeBSDGNUReplacements.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- /dev/null	2010-12-16 17:00:01.000000000 +0100
-+++ xbmc/linux/FreeBSDGNUReplacements.h	2010-12-16 16:54:02.098300652 +0100
+--- ./xbmc/linux/FreeBSDGNUReplacements.h.orig	2011-03-11 08:27:38.000000000 +0100
++++ ./xbmc/linux/FreeBSDGNUReplacements.h	2011-03-11 08:27:38.000000000 +0100
 @@ -0,0 +1,25 @@
 +#ifndef __FREEBSDGNUREPLACEMENTS_H__
 +#define __FREEBSDGNUREPLACEMENTS_H__
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__LinuxTimezone.cpp xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp
--- xbmc.orig/files/patch-xbmc__linux__LinuxTimezone.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/linux/LinuxTimezone.cpp	(revision 35637)
-+++ xbmc/linux/LinuxTimezone.cpp	(working copy)
+--- ./xbmc/linux/LinuxTimezone.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/LinuxTimezone.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -27,6 +27,12 @@
  #include "OSXGNUReplacements.h"
  #endif
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__Makefile.in xbmc/files/patch-xbmc__linux__Makefile.in
--- xbmc.orig/files/patch-xbmc__linux__Makefile.in	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__Makefile.in	2011-03-11 11:35:11.000000000 +0100
@@ -1,7 +1,5 @@
-Index: xbmc/linux/Makefile.in
-===================================================================
---- xbmc/linux/Makefile.in	(revision 35575)
-+++ xbmc/linux/Makefile.in	(working copy)
+--- ./xbmc/linux/Makefile.in.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/Makefile.in	2011-03-11 08:27:38.000000000 +0100
 @@ -9,6 +9,10 @@
  
  SRCS=ConvUtils.cpp XEventUtils.cpp XFileUtils.cpp XHandle.cpp XSyncUtils.cpp XTimeUtils.cpp XMemUtils.cpp XThreadUtils.cpp NetworkLinux.cpp LinuxResourceCounter.cpp LinuxTimezone.cpp XRandR.cpp XCriticalSection.cpp XLCDproc.cpp HALManager.cpp HALPowerSyscall.cpp ConsoleDeviceKitPowerSyscall.cpp DBusUtil.cpp DBusMessage.cpp ZeroconfAvahi.cpp ZeroconfBrowserAvahi.cpp HALProvider.cpp PosixMountProvider.cpp DeviceKitDisksProvider.cpp UDisksProvider.cpp ConsoleUPowerSyscall.cpp
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__NetworkLinux.cpp xbmc/files/patch-xbmc__linux__NetworkLinux.cpp
--- xbmc.orig/files/patch-xbmc__linux__NetworkLinux.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__NetworkLinux.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/linux/NetworkLinux.cpp.orig	2010-03-06 18:18:26.000000000 +0100
-+++ ./xbmc/linux/NetworkLinux.cpp	2010-12-01 12:17:34.260943458 +0100
+--- ./xbmc/linux/NetworkLinux.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/NetworkLinux.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -23,14 +23,14 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
@@ -157,7 +157,7 @@
  #else
     FILE* fp = fopen("/proc/net/dev", "r");
     if (!fp)
-@@ -327,7 +406,7 @@
+@@ -321,7 +400,7 @@
  std::vector<CStdString> CNetworkLinux::GetNameServers(void)
  {
     std::vector<CStdString> result;
@@ -166,7 +166,7 @@
     res_init();
  
     for (int i = 0; i < _res.nscount; i ++)
-@@ -363,7 +442,7 @@
+@@ -357,7 +436,7 @@
     if (!IsWireless())
        return result;
  
@@ -175,7 +175,7 @@
     // Query the wireless extentsions version number. It will help us when we
     // parse the resulting events
     struct iwreq iwr;
-@@ -549,7 +628,7 @@
+@@ -543,7 +622,7 @@
     encryptionMode = ENC_NONE;
     assignment = NETWORK_DISABLED;
  
@@ -184,7 +184,7 @@
     FILE* fp = fopen("/etc/network/interfaces", "r");
     if (!fp)
     {
-@@ -625,7 +704,7 @@
+@@ -619,7 +698,7 @@
  
  void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode)
  {
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__PlatformDefs.h xbmc/files/patch-xbmc__linux__PlatformDefs.h
--- xbmc.orig/files/patch-xbmc__linux__PlatformDefs.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__PlatformDefs.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/linux/PlatformDefs.h.orig	2010-06-09 07:05:59.000000000 +0200
-+++ ./xbmc/linux/PlatformDefs.h	2010-12-01 12:17:34.264972083 +0100
+--- ./xbmc/linux/PlatformDefs.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/PlatformDefs.h	2011-03-11 08:27:38.000000000 +0100
 @@ -37,11 +37,15 @@
  #include <unistd.h>
  #include <pthread.h>
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__PosixMountProvider.cpp xbmc/files/patch-xbmc__linux__PosixMountProvider.cpp
--- xbmc.orig/files/patch-xbmc__linux__PosixMountProvider.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__PosixMountProvider.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/linux/PosixMountProvider.cpp.orig	2010-01-09 00:47:11.000000000 +0100
-+++ ./xbmc/linux/PosixMountProvider.cpp	2010-12-01 12:17:34.257919126 +0100
+--- ./xbmc/linux/PosixMountProvider.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/PosixMountProvider.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -98,6 +98,8 @@
  
  #ifdef __APPLE__
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__XFileUtils.cpp xbmc/files/patch-xbmc__linux__XFileUtils.cpp
--- xbmc.orig/files/patch-xbmc__linux__XFileUtils.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__XFileUtils.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/linux/XFileUtils.cpp.orig	2010-08-21 12:04:13.000000000 +0200
-+++ ./xbmc/linux/XFileUtils.cpp	2010-12-01 12:17:34.259935534 +0100
+--- ./xbmc/linux/XFileUtils.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/XFileUtils.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -29,7 +29,7 @@
  #include "XHandle.h"
  #include <sys/types.h>
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__XRandR.cpp xbmc/files/patch-xbmc__linux__XRandR.cpp
--- xbmc.orig/files/patch-xbmc__linux__XRandR.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__XRandR.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/linux/XRandR.cpp.orig	2010-10-10 20:44:23.000000000 +0200
-+++ ./xbmc/linux/XRandR.cpp	2010-12-01 12:17:34.256914833 +0100
+--- ./xbmc/linux/XRandR.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/XRandR.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -29,6 +29,11 @@
  #include "tinyXML/tinyxml.h"
  #include "../xbmc/utils/log.h"
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__linux__XSyncUtils.cpp xbmc/files/patch-xbmc__linux__XSyncUtils.cpp
--- xbmc.orig/files/patch-xbmc__linux__XSyncUtils.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__linux__XSyncUtils.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/linux/XSyncUtils.cpp.orig	2010-06-25 13:02:35.000000000 +0200
-+++ ./xbmc/linux/XSyncUtils.cpp	2010-12-01 12:17:34.263963880 +0100
+--- ./xbmc/linux/XSyncUtils.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/linux/XSyncUtils.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -105,7 +105,7 @@
    return bOk;
  }
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h xbmc/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h
--- xbmc.orig/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h.orig	2007-10-08 19:37:14.000000000 +0200
-+++ ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h	2010-12-01 12:17:34.237808685 +0100
+--- ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h	2011-03-11 08:27:38.000000000 +0100
 @@ -101,7 +101,9 @@
  # else
     /* With this compiler, trust the _Bool type if the compiler has it.  */
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__utils__IoSupport.cpp xbmc/files/patch-xbmc__utils__IoSupport.cpp
--- xbmc.orig/files/patch-xbmc__utils__IoSupport.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__utils__IoSupport.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- xbmc/utils/IoSupport.cpp.orig	2010-07-11 22:11:12.000000000 +0200
-+++ xbmc/utils/IoSupport.cpp	2010-12-13 21:20:19.000000000 +0100
+--- ./xbmc/utils/IoSupport.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/utils/IoSupport.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -31,7 +31,7 @@
  #include "WIN32Util.h"
  #include "CharsetConverter.h"
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__utils__Semaphore.cpp xbmc/files/patch-xbmc__utils__Semaphore.cpp
--- xbmc.orig/files/patch-xbmc__utils__Semaphore.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__utils__Semaphore.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/utils/Semaphore.cpp.orig	2010-01-22 20:37:53.000000000 +0100
-+++ ./xbmc/utils/Semaphore.cpp	2010-12-01 12:17:34.283090420 +0100
+--- ./xbmc/utils/Semaphore.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/utils/Semaphore.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -21,7 +21,7 @@
   */
  
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__utils__Stopwatch.cpp xbmc/files/patch-xbmc__utils__Stopwatch.cpp
--- xbmc.orig/files/patch-xbmc__utils__Stopwatch.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__utils__Stopwatch.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/utils/Stopwatch.cpp.orig	2010-06-25 23:43:57.000000000 +0200
-+++ ./xbmc/utils/Stopwatch.cpp	2010-12-01 12:17:34.282082217 +0100
+--- ./xbmc/utils/Stopwatch.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/utils/Stopwatch.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -20,7 +20,7 @@
   */
  
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__utils__SystemInfo.cpp xbmc/files/patch-xbmc__utils__SystemInfo.cpp
--- xbmc.orig/files/patch-xbmc__utils__SystemInfo.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__utils__SystemInfo.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/utils/SystemInfo.cpp.orig	2010-06-16 03:13:48.000000000 +0200
-+++ ./xbmc/utils/SystemInfo.cpp	2010-12-01 12:17:34.279062075 +0100
+--- ./xbmc/utils/SystemInfo.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/utils/SystemInfo.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -607,7 +607,7 @@
    return strRet;
  }
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__utils__SystemInfo.h xbmc/files/patch-xbmc__utils__SystemInfo.h
--- xbmc.orig/files/patch-xbmc__utils__SystemInfo.h	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__utils__SystemInfo.h	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/utils/SystemInfo.h.orig	2010-06-01 17:19:39.000000000 +0200
-+++ ./xbmc/utils/SystemInfo.h	2010-12-01 12:17:34.284098904 +0100
+--- ./xbmc/utils/SystemInfo.h.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/utils/SystemInfo.h	2011-03-11 08:27:38.000000000 +0100
 @@ -87,7 +87,7 @@
    bool GetHDDInfo(CStdString& strHDDModel, CStdString& strHDDSerial,CStdString& strHDDFirmware,CStdString& strHDDpw,CStdString& strHDDLockState);
    bool GetRefurbInfo(CStdString& rfi_FirstBootTime, CStdString& rfi_PowerCycleCount);
diff -urdN -x .svn -x todo.txt xbmc.orig/files/patch-xbmc__utils__Thread.cpp xbmc/files/patch-xbmc__utils__Thread.cpp
--- xbmc.orig/files/patch-xbmc__utils__Thread.cpp	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/files/patch-xbmc__utils__Thread.cpp	2011-03-11 11:35:11.000000000 +0100
@@ -1,5 +1,5 @@
---- ./xbmc/utils/Thread.cpp.orig	2010-05-28 02:51:41.000000000 +0200
-+++ ./xbmc/utils/Thread.cpp	2010-12-01 12:17:34.281078203 +0100
+--- ./xbmc/utils/Thread.cpp.orig	2011-03-05 04:33:37.000000000 +0100
++++ ./xbmc/utils/Thread.cpp	2011-03-11 08:27:38.000000000 +0100
 @@ -37,7 +37,7 @@
  #include "GraphicContext.h"
  #include "utils/TimeUtils.h"
diff -urdN -x .svn -x todo.txt xbmc.orig/pkg-plist xbmc/pkg-plist
--- xbmc.orig/pkg-plist	2011-03-11 12:28:23.000000000 +0100
+++ xbmc/pkg-plist	2011-03-11 11:35:11.000000000 +0100
@@ -167,6 +167,7 @@
 %%DATADIR%%/addons/script.recentlyadded/LICENSE.txt
 %%DATADIR%%/addons/script.recentlyadded/RecentlyAdded.py
 %%DATADIR%%/addons/script.recentlyadded/addon.xml
+%%DATADIR%%/addons/script.recentlyadded/changelog.txt
 %%DATADIR%%/addons/script.rss.editor/LICENSE.txt
 %%DATADIR%%/addons/script.rss.editor/addon.xml
 %%DATADIR%%/addons/script.rss.editor/default.py


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103111134.p2BBYafL027088>