Attachment #113856 for bug #155466

Lines 6-13 Link Here

(-)xbmc/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= xbmc	8	PORTNAME= xbmc
9	PORTVERSION= 10.0	9	PORTVERSION= 10.1
10	PORTREVISION= 5	10	PORTREVISION= 0
11	CATEGORIES= multimedia	11	CATEGORIES= multimedia
12	MASTER_SITES= http://mirrors.xbmc.org/releases/source/	12	MASTER_SITES= http://mirrors.xbmc.org/releases/source/
13		13

Lines 1-2 Link Here

(-)xbmc/distinfo (-2 / +2 lines)
1	SHA256 (xbmc-10.0.tar.gz) = 06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a	1	SHA256 (xbmc-10.1.tar.gz) = 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
2	SIZE (xbmc-10.0.tar.gz) = 130239951	2	SIZE (xbmc-10.1.tar.gz) = 130187822

Lines 1-5 Link Here

(-)xbmc/files/patch-Makefile.in (-2 / +2 lines)
1	--- Makefile.in.orig 2010-12-17 07:17:41.000000000 +0100	1	--- ./Makefile.in.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ Makefile.in 2011-02-23 22:22:13.000000000 +0100	2	+++ ./Makefile.in 2011-03-11 08:27:38.000000000 +0100
3	@@ -71,7 +71,6 @@	3	@@ -71,7 +71,6 @@
4	xbmc/cores/paplayer/timidity \	4	xbmc/cores/paplayer/timidity \
5	xbmc/cores/paplayer/SIDCodec \	5	xbmc/cores/paplayer/SIDCodec \

Lines 1-5 Link Here

(-)xbmc/files/patch-Makefile.include.in (-2 / +2 lines)
1	--- ./Makefile.include.in.orig 2010-07-12 00:23:28.000000000 +0200	1	--- ./Makefile.include.in.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./Makefile.include.in 2010-12-01 12:17:34.287118766 +0100	2	+++ ./Makefile.include.in 2011-03-11 08:27:38.000000000 +0100
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	AR=ar	4	AR=ar
5	ARFLAGS=crus	5	ARFLAGS=crus




--- ./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

   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])
@@ -1210,6 +1261,12 @@
   final_message="$final_message\n  Bluray:\tNo"
 fi
 

 if test "$use_mid" = "yes"; then
   final_message="$final_message\n  MID Support:\tYes"
   SDL_DEFINES="$SDL_DEFINES -DMID"
@@ -1410,7 +1467,6 @@
     xbmc/cores/paplayer/NSFCodec/Makefile \
     xbmc/cores/paplayer/SIDCodec/Makefile \
     xbmc/cores/paplayer/vgmstream/Makefile \

     xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
     xbmc/cores/playercorefactory/Makefile \
     xbmc/karaoke/Makefile \
@@ -1483,6 +1539,7 @@
 AC_SUBST(USE_EXTERNAL_LIBMPEG2)
 AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
 AC_SUBST(USE_EXTERNAL_PYTHON)

 AC_SUBST(USE_PYTHON2_6)
 AC_SUBST(USE_PYTHON2_5)
 AC_SUBST(USE_PYTHON2_4)
@@ -1727,7 +1784,7 @@
       --enable-static \
       --disable-shared \
       --cc="$CC" &&

     mkdir -p `pwd`/../includes/dvdread
     cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
   else
@@ -1741,8 +1798,9 @@
       --disable-shared \
       --disable-strip \
       --disable-opts \

     mkdir -p `pwd`/../includes/dvdread
     cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
   fi
@@ -1758,6 +1816,17 @@
       --enable-static \
       --disable-shared \
       --cc="$CC"

Lines 1-5 Link Here

(-)xbmc/files/patch-guilib__StdString.h (-2 / +2 lines)
1	--- guilib/StdString.h.orig 2009-09-25 16:12:41.000000000 +0200	1	--- ./guilib/StdString.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ guilib/StdString.h 2010-12-13 21:19:16.000000000 +0100	2	+++ ./guilib/StdString.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -2,6 +2,7 @@	3	@@ -2,6 +2,7 @@
4	#include <string>	4	#include <string>
5	#include <stdint.h>	5	#include <stdint.h>

Lines 1-5 Link Here

(-)xbmc/files/patch-guilib__TextureBundleXPR.cpp (-2 / +2 lines)
1	--- ./guilib/TextureBundleXPR.cpp.orig 2010-05-13 09:06:42.000000000 +0200	1	--- ./guilib/TextureBundleXPR.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./guilib/TextureBundleXPR.cpp 2010-12-01 12:17:34.307278095 +0100	2	+++ ./guilib/TextureBundleXPR.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -285,7 +285,7 @@	3	@@ -285,7 +285,7 @@
4	GlobalMemoryStatus(&stat);	4	GlobalMemoryStatus(&stat);
5	CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %lu bytes, have %lu bytes)", name.c_str(),	5	CLog::Log(LOGERROR, "Out of memory loading texture: %s (need %lu bytes, have %lu bytes)", name.c_str(),

Lines 1-5 Link Here

(-)xbmc/files/patch-guilib__XBTFReader.cpp (-2 / +2 lines)
1	--- ./guilib/XBTFReader.cpp.orig 2010-02-14 19:20:07.000000000 +0100	1	--- ./guilib/XBTFReader.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./guilib/XBTFReader.cpp 2010-12-01 12:17:34.289131542 +0100	2	+++ ./guilib/XBTFReader.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -187,7 +187,7 @@	3	@@ -187,7 +187,7 @@
4	{	4	{
5	return false;	5	return false;

Lines 1-5 Link Here

(-)xbmc/files/patch-guilib__common__LIRC.cpp (-2 / +2 lines)
1	--- guilib/common/LIRC.cpp.orig 2011-03-07 14:16:12.000000000 +0100	1	--- ./guilib/common/LIRC.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ guilib/common/LIRC.cpp 2011-03-07 14:11:31.000000000 +0100	2	+++ ./guilib/common/LIRC.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -19,11 +19,14 @@	3	@@ -19,11 +19,14 @@
4	*	4	*
5	*/	5	*/

Lines 1-6 Link Here

(-)xbmc/files/patch-guilib__system.h (-3 / +3 lines)
1	--- ./guilib/system.h.orig 2010-11-09 20:05:35.000000000 +0100	1	--- ./guilib/system.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./guilib/system.h 2010-12-01 12:17:34.292155875 +0100	2	+++ ./guilib/system.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -66,7 +66,9 @@	3	@@ -65,7 +65,9 @@
4	#define HAS_FILESYSTEM_SAP	4	#define HAS_FILESYSTEM_SAP
5	#define HAS_FILESYSTEM_VTP	5	#define HAS_FILESYSTEM_VTP
6	#define HAS_FILESYSTEM_HTSP	6	#define HAS_FILESYSTEM_HTSP

Lines 1-5 Link Here

(-)xbmc/files/patch-lib__cpluff__libcpluff__ploader.c (-2 / +2 lines)
1	--- ./lib/cpluff/libcpluff/ploader.c.orig 2010-07-09 17:51:15.000000000 +0200	1	--- ./lib/cpluff/libcpluff/ploader.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./lib/cpluff/libcpluff/ploader.c 2010-12-01 12:17:34.288126970 +0100	2	+++ ./lib/cpluff/libcpluff/ploader.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -161,15 +161,15 @@	3	@@ -161,15 +161,15 @@
4	cpi_warnf(plcontext->context,	4	cpi_warnf(plcontext->context,
5	N_("Suspicious plug-in descriptor content in %s, line %d, column %d (%s)."),	5	N_("Suspicious plug-in descriptor content in %s, line %d, column %d (%s)."),

Lines 1-5 Link Here

(-)xbmc/files/patch-tools__Linux__xbmc.sh.in (-2 / +2 lines)
1	--- ./tools/Linux/xbmc.sh.in.orig 2010-10-28 21:09:04.000000000 +0200	1	--- ./tools/Linux/xbmc.sh.in.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./tools/Linux/xbmc.sh.in 2010-12-01 12:17:34.286115032 +0100	2	+++ ./tools/Linux/xbmc.sh.in 2011-03-11 08:27:38.000000000 +0100
3	@@ -23,6 +23,8 @@	3	@@ -23,6 +23,8 @@
4	exec_prefix="@exec_prefix@"	4	exec_prefix="@exec_prefix@"
5	datarootdir="@datarootdir@"	5	datarootdir="@datarootdir@"

Lines 1-5 Link Here

(-)xbmc/files/patch-tools__TexturePacker__XBMCTex.cpp (-2 / +2 lines)
1	--- ./tools/TexturePacker/XBMCTex.cpp.orig 2010-10-17 19:04:21.000000000 +0200	1	--- ./tools/TexturePacker/XBMCTex.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./tools/TexturePacker/XBMCTex.cpp 2010-12-01 12:17:34.285107108 +0100	2	+++ ./tools/TexturePacker/XBMCTex.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -40,7 +40,11 @@	3	@@ -40,7 +40,11 @@
4	#endif	4	#endif
5		5




--- ./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 (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
+#elif defined(__FreeBSD__)
+  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 (Git:%s)", g_sysinfo.GetLinuxDistro().c_str(), g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
 #elif defined(_WIN32)
@@ -785,6 +787,11 @@
       }
     }
   }

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__DetectDVDType.cpp (-2 / +2 lines)
1	--- ./xbmc/DetectDVDType.cpp.orig 2010-10-11 17:15:33.000000000 +0200	1	--- ./xbmc/DetectDVDType.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/DetectDVDType.cpp 2010-12-01 12:17:34.238812978 +0100	2	+++ ./xbmc/DetectDVDType.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -34,7 +34,7 @@	3	@@ -34,7 +34,7 @@
4	#include <sys/types.h>	4	#include <sys/types.h>
5	#include <sys/ioctl.h>	5	#include <sys/ioctl.h>

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__FileSystem__CacheStrategy.cpp (-2 / +2 lines)
1	--- ./xbmc/FileSystem/CacheStrategy.cpp.orig 2010-10-10 15:01:06.000000000 +0200	1	--- ./xbmc/FileSystem/CacheStrategy.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/FileSystem/CacheStrategy.cpp 2010-12-01 12:17:34.234788543 +0100	2	+++ ./xbmc/FileSystem/CacheStrategy.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -93,7 +93,8 @@	3	@@ -93,7 +93,8 @@
4		4
5	if(m_hCacheFileWrite == INVALID_HANDLE_VALUE)	5	if(m_hCacheFileWrite == INVALID_HANDLE_VALUE)

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__FileSystem__DllLibCurl.cpp (-2 / +2 lines)
1	--- ./xbmc/FileSystem/DllLibCurl.cpp.orig 2010-08-25 00:38:59.000000000 +0200	1	--- ./xbmc/FileSystem/DllLibCurl.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/FileSystem/DllLibCurl.cpp 2010-12-01 12:17:34.236800761 +0100	2	+++ ./xbmc/FileSystem/DllLibCurl.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -84,6 +84,12 @@	3	@@ -84,6 +84,12 @@
4		4
5	void DllLibCurlGlobal::CheckIdle()	5	void DllLibCurlGlobal::CheckIdle()

Lines 1-7 Link Here

(-)xbmc/files/patch-xbmc__FileSystem__SAPDirectory.cpp (-4 / +2 lines)
1	Index: xbmc/FileSystem/SAPDirectory.cpp	1	--- ./xbmc/FileSystem/SAPDirectory.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	===================================================================	2	+++ ./xbmc/FileSystem/SAPDirectory.cpp 2011-03-11 08:27:38.000000000 +0100
3	--- xbmc/FileSystem/SAPDirectory.cpp (revision 35575)
4	+++ xbmc/FileSystem/SAPDirectory.cpp (working copy)
5	@@ -30,6 +30,9 @@	3	@@ -30,6 +30,9 @@
6	#ifdef __APPLE__	4	#ifdef __APPLE__
7	#include "OSXGNUReplacements.h" // strnlen	5	#include "OSXGNUReplacements.h" // strnlen

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__GUILargeTextureManager.cpp (-2 / +2 lines)
1	--- ./xbmc/GUILargeTextureManager.cpp.orig 2010-10-08 04:41:58.000000000 +0200	1	--- ./xbmc/GUILargeTextureManager.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/GUILargeTextureManager.cpp 2010-12-01 12:17:34.238812978 +0100	2	+++ ./xbmc/GUILargeTextureManager.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -68,7 +68,8 @@	3	@@ -68,7 +68,8 @@
4	m_texture = NULL;	4	m_texture = NULL;
5	}	5	}

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__MusicInfoTagLoaderWMA.cpp (-2 / +2 lines)
1	--- ./xbmc/MusicInfoTagLoaderWMA.cpp.orig 2009-10-12 11:16:56.000000000 +0200	1	--- ./xbmc/MusicInfoTagLoaderWMA.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/MusicInfoTagLoaderWMA.cpp 2010-12-01 12:17:34.239816992 +0100	2	+++ ./xbmc/MusicInfoTagLoaderWMA.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -538,7 +538,7 @@	3	@@ -538,7 +538,7 @@
4	"Unable to create album art for %s "	4	"Unable to create album art for %s "
5	"(extension=%s, size=%u)",	5	"(extension=%s, size=%u)",

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__ProgramDatabase.cpp (-2 / +2 lines)
1	--- ./xbmc/ProgramDatabase.cpp.orig 2010-07-12 22:53:38.000000000 +0200	1	--- ./xbmc/ProgramDatabase.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/ProgramDatabase.cpp 2010-12-01 12:17:34.231763652 +0100	2	+++ ./xbmc/ProgramDatabase.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -63,7 +63,7 @@	3	@@ -63,7 +63,7 @@
4	catch (...)	4	catch (...)
5	{	5	{

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__Util.cpp (-2 / +2 lines)
1	--- xbmc/Util.cpp.orig 2010-12-17 07:17:41.000000000 +0100	1	--- ./xbmc/Util.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/Util.cpp 2010-12-27 20:40:24.000000000 +0100	2	+++ ./xbmc/Util.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -27,6 +27,11 @@	3	@@ -27,6 +27,11 @@
4	#include <mach-o/dyld.h>	4	#include <mach-o/dyld.h>
5	#endif	5	#endif

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__VideoDatabase.cpp (-2 / +2 lines)
1	--- ./xbmc/VideoDatabase.cpp.orig 2010-11-09 22:55:18.000000000 +0100	1	--- ./xbmc/VideoDatabase.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/VideoDatabase.cpp 2010-12-01 12:17:34.199531299 +0100	2	+++ ./xbmc/VideoDatabase.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -4423,7 +4423,7 @@	3	@@ -4423,7 +4423,7 @@
4	}	4	}
5		5

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__ViewDatabase.cpp (-2 / +2 lines)
1	--- ./xbmc/ViewDatabase.cpp.orig 2010-07-03 13:07:36.000000000 +0200	1	--- ./xbmc/ViewDatabase.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/ViewDatabase.cpp 2010-12-01 12:17:34.233780060 +0100	2	+++ ./xbmc/ViewDatabase.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -62,7 +62,7 @@	3	@@ -62,7 +62,7 @@
4	catch (...)	4	catch (...)
5	{	5	{

Lines 1-7 Link Here

(-)xbmc/files/patch-xbmc__addons__Addon.cpp (-4 / +2 lines)
1	Index: xbmc/addons/Addon.cpp	1	--- ./xbmc/addons/Addon.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	===================================================================	2	+++ ./xbmc/addons/Addon.cpp 2011-03-11 08:27:38.000000000 +0100
3	--- xbmc/addons/Addon.cpp (revision 35575)
4	+++ xbmc/addons/Addon.cpp (working copy)
5	@@ -29,6 +29,9 @@	3	@@ -29,6 +29,9 @@
6	#ifdef __APPLE__	4	#ifdef __APPLE__
7	#include "../osx/OSXGNUReplacements.h"	5	#include "../osx/OSXGNUReplacements.h"

Lines 1-6 Link Here

(-)xbmc/files/patch-xbmc__cores__AudioRenderers__ALSADirectSound.cpp (-4 / +4 lines)
1	--- ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp.orig 2010-10-25 16:43:36.000000000 +0200	1	--- ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp 2010-12-01 12:17:34.212621188 +0100	2	+++ ./xbmc/cores/AudioRenderers/ALSADirectSound.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -439,7 +439,7 @@	3	@@ -440,7 +440,7 @@
4	{	4	{
5	if (!m_bIsAllocated) return 0;	5	if (!m_bIsAllocated) return 0;
6		6
Lines 9-15 Link Here
9	if (nSpace == 0)	9	if (nSpace == 0)
10	{	10	{
11	snd_pcm_state_t state = snd_pcm_state(m_pPlayHandle);	11	snd_pcm_state_t state = snd_pcm_state(m_pPlayHandle);
12	@@ -451,7 +451,8 @@	12	@@ -452,7 +452,8 @@
13	}	13	}
14	if (nSpace < 0)	14	if (nSpace < 0)
15	{	15	{

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.cpp (-2 / +2 lines)
1	--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig 2010-10-04 01:33:13.000000000 +0200	1	--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2010-12-01 12:17:34.209596576 +0100	2	+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -30,6 +30,7 @@	3	@@ -30,6 +30,7 @@
4	#include <sys/stat.h>	4	#include <sys/stat.h>
5	#include <sys/types.h>	5	#include <sys/types.h>

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__DllLoader__exports__emu_msvcrt.h (-2 / +2 lines)
1	--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig 2010-05-28 21:31:42.000000000 +0200	1	--- ./xbmc/cores/DllLoader/exports/emu_msvcrt.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h 2010-12-01 12:17:34.210600869 +0100	2	+++ ./xbmc/cores/DllLoader/exports/emu_msvcrt.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -35,9 +35,15 @@	3	@@ -35,9 +35,15 @@
4		4
5	typedef void ( *PFV)(void);	5	typedef void ( *PFV)(void);

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__DllLoader__exports__exports_python_linux.cpp (-2 / +2 lines)
1	--- xbmc/cores/DllLoader/exports/exports_python_linux.cpp.orig 2010-12-17 07:17:41.000000000 +0100	1	--- ./xbmc/cores/DllLoader/exports/exports_python_linux.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/cores/DllLoader/exports/exports_python_linux.cpp 2010-12-27 20:00:59.000000000 +0100	2	+++ ./xbmc/cores/DllLoader/exports/exports_python_linux.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -34,7 +34,7 @@	3	@@ -34,7 +34,7 @@
4	#endif	4	#endif
5	#include "../DllLoaderContainer.h"	5	#include "../DllLoaderContainer.h"

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__DllLoader__exports__util__EmuFileWrapper.h (-2 / +2 lines)
1	--- ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h.orig 2010-06-01 16:33:45.000000000 +0200	1	--- ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h 2010-12-01 12:17:34.211609073 +0100	2	+++ ./xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@
4		4
5	class CMutex;	5	class CMutex;

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__DllLoader__exports__wrapper.c (-2 / +2 lines)
1	--- ./xbmc/cores/DllLoader/exports/wrapper.c.orig 2010-05-28 21:31:42.000000000 +0200	1	--- ./xbmc/cores/DllLoader/exports/wrapper.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/DllLoader/exports/wrapper.c 2010-12-01 12:17:34.206576434 +0100	2	+++ ./xbmc/cores/DllLoader/exports/wrapper.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@
4	#include <dirent.h>	4	#include <dirent.h>
5	#endif	5	#endif

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__dvdplayer__DVDAudio.cpp (-2 / +2 lines)
1	--- ./xbmc/cores/dvdplayer/DVDAudio.cpp.orig 2010-05-05 11:33:40.000000000 +0200	1	--- ./xbmc/cores/dvdplayer/DVDAudio.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/dvdplayer/DVDAudio.cpp 2010-12-01 12:17:34.200531401 +0100	2	+++ ./xbmc/cores/dvdplayer/DVDAudio.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -235,13 +235,14 @@	3	@@ -235,13 +235,14 @@
4		4
5	if(silence > 0 && m_iBufferSize > 0)	5	if(silence > 0 && m_iBufferSize > 0)

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VDPAU.cpp (-2 / +2 lines)
1	--- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp.orig 2010-12-17 07:17:41.000000000 +0100	1	--- ./xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2010-12-28 13:26:49.000000000 +0100	2	+++ ./xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -647,7 +647,7 @@	3	@@ -647,7 +647,7 @@
4		4
5	void CVDPAU::InitVDPAUProcs()	5	void CVDPAU::InitVDPAUProcs()

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__dvdplayer__DVDPlayer.cpp (-2 / +2 lines)
1	--- ./xbmc/cores/dvdplayer/DVDPlayer.cpp.orig 2010-10-27 19:02:14.000000000 +0200	1	--- ./xbmc/cores/dvdplayer/DVDPlayer.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/dvdplayer/DVDPlayer.cpp 2010-12-01 12:17:34.204563658 +0100	2	+++ ./xbmc/cores/dvdplayer/DVDPlayer.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -2868,7 +2868,7 @@	3	@@ -2868,7 +2868,7 @@
4	m_dvd.state = DVDSTATE_STILL;	4	m_dvd.state = DVDSTATE_STILL;
5	CLog::Log(LOGDEBUG,	5	CLog::Log(LOGDEBUG,

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__paplayer__Makefile.in (-2 / +2 lines)
1	--- xbmc/cores/paplayer/Makefile.in.orig 2011-02-23 22:23:24.000000000 +0100	1	--- ./xbmc/cores/paplayer/Makefile.in.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/cores/paplayer/Makefile.in 2011-02-23 22:24:24.000000000 +0100	2	+++ ./xbmc/cores/paplayer/Makefile.in 2011-03-11 08:27:38.000000000 +0100
3	@@ -20,7 +20,6 @@	3	@@ -20,7 +20,6 @@
4	endif	4	endif
5		5

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__paplayer__NSFCodec__NoseFartDLL.cpp (-2 / +2 lines)
1	--- ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp.orig 2010-10-04 19:49:31.000000000 +0200	1	--- ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp 2010-12-01 12:17:34.222702947 +0100	2	+++ ./xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -19,7 +19,7 @@	3	@@ -19,7 +19,7 @@
4	*	4	*
5	*/	5	*/

Lines 1-6 Link Here

(-)xbmc/files/patch-xbmc__cores__paplayer__PAPlayer.cpp (-4 / +4 lines)
1	--- ./xbmc/cores/paplayer/PAPlayer.cpp.orig 2010-09-30 12:17:21.000000000 +0200	1	--- ./xbmc/cores/paplayer/PAPlayer.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/paplayer/PAPlayer.cpp 2010-12-01 12:17:34.224719076 +0100	2	+++ ./xbmc/cores/paplayer/PAPlayer.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -341,7 +341,8 @@	3	@@ -339,7 +339,8 @@
4		4
5	if(silence > 0 && m_bufferPos[stream] > 0)	5	if(silence > 0 && m_bufferPos[stream] > 0)
6	{	6	{
Lines 10-16 Link Here
10	memset(m_pcmBuffer[stream] + m_bufferPos[stream], 0, silence);	10	memset(m_pcmBuffer[stream] + m_bufferPos[stream], 0, silence);
11	m_bufferPos[stream] += silence;	11	m_bufferPos[stream] += silence;
12	}	12	}
13	@@ -896,7 +897,7 @@	13	@@ -894,7 +895,7 @@
14	{	14	{
15	DWORD time = CTimeUtils::GetTimeMS();	15	DWORD time = CTimeUtils::GetTimeMS();
16	m_timeOffset = m_decoder[m_currentDecoder].Seek(m_SeekTime);	16	m_timeOffset = m_decoder[m_currentDecoder].Seek(m_SeekTime);

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__paplayer__SIDCodec__Makefile.in (-2 / +2 lines)
1	--- ./xbmc/cores/paplayer/SIDCodec/Makefile.in.orig 2010-06-11 19:53:24.000000000 +0200	1	--- ./xbmc/cores/paplayer/SIDCodec/Makefile.in.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/paplayer/SIDCodec/Makefile.in 2010-12-01 12:17:34.223710592 +0100	2	+++ ./xbmc/cores/paplayer/SIDCodec/Makefile.in 2011-03-11 08:27:38.000000000 +0100
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	ARCH=@ARCH@	4	ARCH=@ARCH@
5		5

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__paplayer__WAVcodec.cpp (-2 / +2 lines)
1	--- ./xbmc/cores/paplayer/WAVcodec.cpp.orig 2010-06-03 06:23:58.000000000 +0200	1	--- ./xbmc/cores/paplayer/WAVcodec.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/paplayer/WAVcodec.cpp 2010-12-01 12:17:34.221698375 +0100	2	+++ ./xbmc/cores/paplayer/WAVcodec.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -137,7 +137,7 @@	3	@@ -137,7 +137,7 @@
4	return false;	4	return false;
5	}	5	}

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__XBMCYM.cpp (-2 / +2 lines)
1	--- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp.orig 2010-10-04 19:46:47.000000000 +0200	1	--- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp 2010-12-01 12:17:34.217661928 +0100	2	+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -25,7 +25,7 @@	3	@@ -25,7 +25,7 @@
4	#include <stdio.h>	4	#include <stdio.h>
5	#include <stdint.h>	5	#include <stdint.h>

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__cores__paplayer__YMCodec__StSoundLibrary__YmTypes.h (-2 / +2 lines)
1	--- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h.orig 2008-07-15 20:34:24.000000000 +0200	1	--- ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h 2010-12-01 12:17:34.219682526 +0100	2	+++ ./xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -39,20 +39,20 @@	3	@@ -39,20 +39,20 @@
4	// Platform specific stuff	4	// Platform specific stuff
5	//-----------------------------------------------------------	5	//-----------------------------------------------------------

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__cximage-6.0__raw__dcr.c (-2 / +2 lines)
1	--- ./xbmc/lib/cximage-6.0/raw/dcr.c.orig 2009-05-16 12:01:35.000000000 +0200	1	--- ./xbmc/lib/cximage-6.0/raw/dcr.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/cximage-6.0/raw/dcr.c 2010-12-01 12:17:34.252898220 +0100	2	+++ ./xbmc/lib/cximage-6.0/raw/dcr.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -144,8 +144,12 @@	3	@@ -144,8 +144,12 @@
4		4
5	//!!! set return point for error handling	5	//!!! set return point for error handling

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__cximage-6.0__raw__libdcr.h (-2 / +2 lines)
1	--- ./xbmc/lib/cximage-6.0/raw/libdcr.h.orig 2009-05-21 08:01:34.000000000 +0200	1	--- ./xbmc/lib/cximage-6.0/raw/libdcr.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/cximage-6.0/raw/libdcr.h 2010-12-01 12:17:34.248861773 +0100	2	+++ ./xbmc/lib/cximage-6.0/raw/libdcr.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -41,7 +41,7 @@	3	@@ -41,7 +41,7 @@
4	#include <setjmp.h>	4	#include <setjmp.h>
5	#include <sys/types.h>	5	#include <sys/types.h>

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp (-2 / +2 lines)
1	--- xbmc/lib/libPython/XBPython.cpp.orig 2010-12-17 07:17:41.000000000 +0100	1	--- ./xbmc/lib/libPython/XBPython.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/lib/libPython/XBPython.cpp 2011-03-07 15:00:17.000000000 +0100	2	+++ ./xbmc/lib/libPython/XBPython.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -24,7 +24,9 @@	3	@@ -24,7 +24,9 @@
4	#include "config.h"	4	#include "config.h"
5	#endif	5	#endif

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in (-2 / +2 lines)
1	--- xbmc/lib/libPython/linux/Makefile.in.orig 2010-12-17 07:17:41.000000000 +0100	1	--- ./xbmc/lib/libPython/linux/Makefile.in.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/lib/libPython/linux/Makefile.in 2011-03-07 14:55:55.000000000 +0100	2	+++ ./xbmc/lib/libPython/linux/Makefile.in 2011-03-11 08:27:38.000000000 +0100
3	@@ -2,10 +2,13 @@	3	@@ -2,10 +2,13 @@
4	CC=@CC@	4	CC=@CC@
5	CFLAGS=@CFLAGS@	5	CFLAGS=@CFLAGS@

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libPython__linux__wrapper_python.c (-2 / +2 lines)
1	--- ./xbmc/lib/libPython/linux/wrapper_python.c.orig 2010-07-17 23:26:42.000000000 +0200	1	--- ./xbmc/lib/libPython/linux/wrapper_python.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libPython/linux/wrapper_python.c 2010-12-01 12:17:34.245845263 +0100	2	+++ ./xbmc/lib/libPython/linux/wrapper_python.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -40,7 +40,7 @@	3	@@ -40,7 +40,7 @@
4	int xbp_mkdir(const char *dirname);	4	int xbp_mkdir(const char *dirname);
5	int xbp_open(const char *filename, int oflag, int pmode);	5	int xbp_open(const char *filename, int oflag, int pmode);

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libRTV__GuideParser.cpp (-2 / +2 lines)
1	--- ./xbmc/lib/libRTV/GuideParser.cpp.orig 2010-02-12 00:47:51.000000000 +0100	1	--- ./xbmc/lib/libRTV/GuideParser.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libRTV/GuideParser.cpp 2010-12-01 12:17:34.245845263 +0100	2	+++ ./xbmc/lib/libRTV/GuideParser.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -130,7 +130,7 @@	3	@@ -130,7 +130,7 @@
4	#include <winbase.h>	4	#include <winbase.h>
5	#endif	5	#endif

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libXBMS__ccincludes.h (-2 / +2 lines)
1	--- ./xbmc/lib/libXBMS/ccincludes.h.orig 2010-04-18 23:05:41.000000000 +0200	1	--- ./xbmc/lib/libXBMS/ccincludes.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libXBMS/ccincludes.h 2010-12-01 12:17:34.244845160 +0100	2	+++ ./xbmc/lib/libXBMS/ccincludes.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -58,6 +58,10 @@	3	@@ -58,6 +58,10 @@
4	#define snprintf _snprintf	4	#define snprintf _snprintf
5	#endif /* _XBOX */	5	#endif /* _XBOX */

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libXDAAP__httpClient.c (-2 / +2 lines)
1	--- ./xbmc/lib/libXDAAP/httpClient.c.orig 2009-03-28 03:32:24.000000000 +0100	1	--- ./xbmc/lib/libXDAAP/httpClient.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libXDAAP/httpClient.c 2010-12-01 12:17:34.243841426 +0100	2	+++ ./xbmc/lib/libXDAAP/httpClient.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -61,6 +61,11 @@	3	@@ -61,6 +61,11 @@
4	#include <netinet/in.h>	4	#include <netinet/in.h>
5	#endif	5	#endif

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libXDAAP__ioloop.c (-2 / +2 lines)
1	--- ./xbmc/lib/libXDAAP/ioloop.c.orig 2008-08-10 17:07:47.000000000 +0200	1	--- ./xbmc/lib/libXDAAP/ioloop.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libXDAAP/ioloop.c 2010-12-01 12:17:34.240824916 +0100	2	+++ ./xbmc/lib/libXDAAP/ioloop.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -122,9 +122,9 @@	3	@@ -122,9 +122,9 @@
4		4
5	void fd_event_reset(fd_event *event)	5	void fd_event_reset(fd_event *event)

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libXDAAP__thread.h (-2 / +2 lines)
1	--- ./xbmc/lib/libXDAAP/thread.h.orig 2008-12-04 22:22:25.000000000 +0100	1	--- ./xbmc/lib/libXDAAP/thread.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libXDAAP/thread.h 2010-12-01 12:17:34.243841426 +0100	2	+++ ./xbmc/lib/libXDAAP/thread.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@
4	#define ts_mutex pthread_mutex_t	4	#define ts_mutex pthread_mutex_t
5	#define ts_condition pthread_cond_t	5	#define ts_condition pthread_cond_t

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libXDAAP__threadpool.c (-2 / +2 lines)
1	--- ./xbmc/lib/libXDAAP/threadpool.c.orig 2008-07-19 14:45:00.000000000 +0200	1	--- ./xbmc/lib/libXDAAP/threadpool.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libXDAAP/threadpool.c 2010-12-01 12:17:34.241828930 +0100	2	+++ ./xbmc/lib/libXDAAP/threadpool.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -279,10 +279,10 @@	3	@@ -279,10 +279,10 @@
4	void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,	4	void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
5	void arg1, void arg2)	5	void arg1, void arg2)

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__lib__libhts__net_posix.c (-2 / +2 lines)
1	--- ./xbmc/lib/libhts/net_posix.c.orig 2010-02-15 06:06:37.000000000 +0100	1	--- ./xbmc/lib/libhts/net_posix.c.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/lib/libhts/net_posix.c 2010-12-01 12:17:34.312321908 +0100	2	+++ ./xbmc/lib/libhts/net_posix.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -17,12 +17,14 @@	3	@@ -17,12 +17,14 @@
4	*/	4	*/
5		5

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.c (-2 / +2 lines)
1	--- /dev/null 2010-12-16 16:44:10.000000000 +0100	1	--- ./xbmc/linux/FreeBSDGNUReplacements.c.orig 2011-03-11 08:27:38.000000000 +0100
2	+++ xbmc/linux/FreeBSDGNUReplacements.c 2010-12-16 16:45:22.613185593 +0100	2	+++ ./xbmc/linux/FreeBSDGNUReplacements.c 2011-03-11 08:27:38.000000000 +0100
3	@@ -0,0 +1,252 @@	3	@@ -0,0 +1,252 @@
4	+	4	+
5	+#include "FreeBSDGNUReplacements.h"	5	+#include "FreeBSDGNUReplacements.h"

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__FreeBSDGNUReplacements.h (-2 / +2 lines)
1	--- /dev/null 2010-12-16 17:00:01.000000000 +0100	1	--- ./xbmc/linux/FreeBSDGNUReplacements.h.orig 2011-03-11 08:27:38.000000000 +0100
2	+++ xbmc/linux/FreeBSDGNUReplacements.h 2010-12-16 16:54:02.098300652 +0100	2	+++ ./xbmc/linux/FreeBSDGNUReplacements.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -0,0 +1,25 @@	3	@@ -0,0 +1,25 @@
4	+#ifndef __FREEBSDGNUREPLACEMENTS_H__	4	+#ifndef __FREEBSDGNUREPLACEMENTS_H__
5	+#define __FREEBSDGNUREPLACEMENTS_H__	5	+#define __FREEBSDGNUREPLACEMENTS_H__

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__LinuxTimezone.cpp (-2 / +2 lines)
1	--- xbmc/linux/LinuxTimezone.cpp (revision 35637)	1	--- ./xbmc/linux/LinuxTimezone.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/linux/LinuxTimezone.cpp (working copy)	2	+++ ./xbmc/linux/LinuxTimezone.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -27,6 +27,12 @@	3	@@ -27,6 +27,12 @@
4	#include "OSXGNUReplacements.h"	4	#include "OSXGNUReplacements.h"
5	#endif	5	#endif

Lines 1-7 Link Here

(-)xbmc/files/patch-xbmc__linux__Makefile.in (-4 / +2 lines)
1	Index: xbmc/linux/Makefile.in	1	--- ./xbmc/linux/Makefile.in.orig 2011-03-05 04:33:37.000000000 +0100
2	===================================================================	2	+++ ./xbmc/linux/Makefile.in 2011-03-11 08:27:38.000000000 +0100
3	--- xbmc/linux/Makefile.in (revision 35575)
4	+++ xbmc/linux/Makefile.in (working copy)
5	@@ -9,6 +9,10 @@	3	@@ -9,6 +9,10 @@
6		4
7	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	5	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




--- ./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>

 #else
    FILE* fp = fopen("/proc/net/dev", "r");
    if (!fp)
@@ -321,7 +400,7 @@
 std::vector<CStdString> CNetworkLinux::GetNameServers(void)
 {
    std::vector<CStdString> result;

    res_init();
 
    for (int i = 0; i < _res.nscount; i ++)
@@ -357,7 +436,7 @@
    if (!IsWireless())
       return result;
 

    // Query the wireless extentsions version number. It will help us when we
    // parse the resulting events
    struct iwreq iwr;
@@ -543,7 +622,7 @@
    encryptionMode = ENC_NONE;
    assignment = NETWORK_DISABLED;
 

    FILE* fp = fopen("/etc/network/interfaces", "r");
    if (!fp)
    {
@@ -619,7 +698,7 @@
 
 void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode)
 {

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__PlatformDefs.h (-2 / +2 lines)
1	--- ./xbmc/linux/PlatformDefs.h.orig 2010-06-09 07:05:59.000000000 +0200	1	--- ./xbmc/linux/PlatformDefs.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/linux/PlatformDefs.h 2010-12-01 12:17:34.264972083 +0100	2	+++ ./xbmc/linux/PlatformDefs.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -37,11 +37,15 @@	3	@@ -37,11 +37,15 @@
4	#include <unistd.h>	4	#include <unistd.h>
5	#include <pthread.h>	5	#include <pthread.h>

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__PosixMountProvider.cpp (-2 / +2 lines)
1	--- ./xbmc/linux/PosixMountProvider.cpp.orig 2010-01-09 00:47:11.000000000 +0100	1	--- ./xbmc/linux/PosixMountProvider.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/linux/PosixMountProvider.cpp 2010-12-01 12:17:34.257919126 +0100	2	+++ ./xbmc/linux/PosixMountProvider.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -98,6 +98,8 @@	3	@@ -98,6 +98,8 @@
4		4
5	#ifdef __APPLE__	5	#ifdef __APPLE__

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__XFileUtils.cpp (-2 / +2 lines)
1	--- ./xbmc/linux/XFileUtils.cpp.orig 2010-08-21 12:04:13.000000000 +0200	1	--- ./xbmc/linux/XFileUtils.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/linux/XFileUtils.cpp 2010-12-01 12:17:34.259935534 +0100	2	+++ ./xbmc/linux/XFileUtils.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@
4	#include "XHandle.h"	4	#include "XHandle.h"
5	#include <sys/types.h>	5	#include <sys/types.h>

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__XRandR.cpp (-2 / +2 lines)
1	--- ./xbmc/linux/XRandR.cpp.orig 2010-10-10 20:44:23.000000000 +0200	1	--- ./xbmc/linux/XRandR.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/linux/XRandR.cpp 2010-12-01 12:17:34.256914833 +0100	2	+++ ./xbmc/linux/XRandR.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -29,6 +29,11 @@	3	@@ -29,6 +29,11 @@
4	#include "tinyXML/tinyxml.h"	4	#include "tinyXML/tinyxml.h"
5	#include "../xbmc/utils/log.h"	5	#include "../xbmc/utils/log.h"

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__XSyncUtils.cpp (-2 / +2 lines)
1	--- ./xbmc/linux/XSyncUtils.cpp.orig 2010-06-25 13:02:35.000000000 +0200	1	--- ./xbmc/linux/XSyncUtils.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/linux/XSyncUtils.cpp 2010-12-01 12:17:34.263963880 +0100	2	+++ ./xbmc/linux/XSyncUtils.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -105,7 +105,7 @@	3	@@ -105,7 +105,7 @@
4	return bOk;	4	return bOk;
5	}	5	}

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__screensavers__rsxs-0.9__lib__stdbool_.h (-2 / +2 lines)
1	--- ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h.orig 2007-10-08 19:37:14.000000000 +0200	1	--- ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h 2010-12-01 12:17:34.237808685 +0100	2	+++ ./xbmc/screensavers/rsxs-0.9/lib/stdbool_.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -101,7 +101,9 @@	3	@@ -101,7 +101,9 @@
4	# else	4	# else
5	/* With this compiler, trust the _Bool type if the compiler has it. */	5	/* With this compiler, trust the _Bool type if the compiler has it. */

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__utils__IoSupport.cpp (-2 / +2 lines)
1	--- xbmc/utils/IoSupport.cpp.orig 2010-07-11 22:11:12.000000000 +0200	1	--- ./xbmc/utils/IoSupport.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ xbmc/utils/IoSupport.cpp 2010-12-13 21:20:19.000000000 +0100	2	+++ ./xbmc/utils/IoSupport.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -31,7 +31,7 @@	3	@@ -31,7 +31,7 @@
4	#include "WIN32Util.h"	4	#include "WIN32Util.h"
5	#include "CharsetConverter.h"	5	#include "CharsetConverter.h"

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__utils__Semaphore.cpp (-2 / +2 lines)
1	--- ./xbmc/utils/Semaphore.cpp.orig 2010-01-22 20:37:53.000000000 +0100	1	--- ./xbmc/utils/Semaphore.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/utils/Semaphore.cpp 2010-12-01 12:17:34.283090420 +0100	2	+++ ./xbmc/utils/Semaphore.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -21,7 +21,7 @@	3	@@ -21,7 +21,7 @@
4	*/	4	*/
5		5

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__utils__Stopwatch.cpp (-2 / +2 lines)
1	--- ./xbmc/utils/Stopwatch.cpp.orig 2010-06-25 23:43:57.000000000 +0200	1	--- ./xbmc/utils/Stopwatch.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/utils/Stopwatch.cpp 2010-12-01 12:17:34.282082217 +0100	2	+++ ./xbmc/utils/Stopwatch.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -20,7 +20,7 @@	3	@@ -20,7 +20,7 @@
4	*/	4	*/
5		5

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__utils__SystemInfo.cpp (-2 / +2 lines)
1	--- ./xbmc/utils/SystemInfo.cpp.orig 2010-06-16 03:13:48.000000000 +0200	1	--- ./xbmc/utils/SystemInfo.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/utils/SystemInfo.cpp 2010-12-01 12:17:34.279062075 +0100	2	+++ ./xbmc/utils/SystemInfo.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -607,7 +607,7 @@	3	@@ -607,7 +607,7 @@
4	return strRet;	4	return strRet;
5	}	5	}

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__utils__SystemInfo.h (-2 / +2 lines)
1	--- ./xbmc/utils/SystemInfo.h.orig 2010-06-01 17:19:39.000000000 +0200	1	--- ./xbmc/utils/SystemInfo.h.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/utils/SystemInfo.h 2010-12-01 12:17:34.284098904 +0100	2	+++ ./xbmc/utils/SystemInfo.h 2011-03-11 08:27:38.000000000 +0100
3	@@ -87,7 +87,7 @@	3	@@ -87,7 +87,7 @@
4	bool GetHDDInfo(CStdString& strHDDModel, CStdString& strHDDSerial,CStdString& strHDDFirmware,CStdString& strHDDpw,CStdString& strHDDLockState);	4	bool GetHDDInfo(CStdString& strHDDModel, CStdString& strHDDSerial,CStdString& strHDDFirmware,CStdString& strHDDpw,CStdString& strHDDLockState);
5	bool GetRefurbInfo(CStdString& rfi_FirstBootTime, CStdString& rfi_PowerCycleCount);	5	bool GetRefurbInfo(CStdString& rfi_FirstBootTime, CStdString& rfi_PowerCycleCount);

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__utils__Thread.cpp (-2 / +2 lines)
1	--- ./xbmc/utils/Thread.cpp.orig 2010-05-28 02:51:41.000000000 +0200	1	--- ./xbmc/utils/Thread.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/utils/Thread.cpp 2010-12-01 12:17:34.281078203 +0100	2	+++ ./xbmc/utils/Thread.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@
4	#include "GraphicContext.h"	4	#include "GraphicContext.h"
5	#include "utils/TimeUtils.h"	5	#include "utils/TimeUtils.h"

Lines 167-172 Link Here

(-)xbmc/pkg-plist (+1 lines)
167	%%DATADIR%%/addons/script.recentlyadded/LICENSE.txt	167	%%DATADIR%%/addons/script.recentlyadded/LICENSE.txt
168	%%DATADIR%%/addons/script.recentlyadded/RecentlyAdded.py	168	%%DATADIR%%/addons/script.recentlyadded/RecentlyAdded.py
169	%%DATADIR%%/addons/script.recentlyadded/addon.xml	169	%%DATADIR%%/addons/script.recentlyadded/addon.xml
		170	%%DATADIR%%/addons/script.recentlyadded/changelog.txt
170	%%DATADIR%%/addons/script.rss.editor/LICENSE.txt	171	%%DATADIR%%/addons/script.rss.editor/LICENSE.txt
171	%%DATADIR%%/addons/script.rss.editor/addon.xml	172	%%DATADIR%%/addons/script.rss.editor/addon.xml
172	%%DATADIR%%/addons/script.rss.editor/default.py	173	%%DATADIR%%/addons/script.rss.editor/default.py

Return to bug 155466

Lines 1-5 Link Here

(-)xbmc/files/patch-configure.in (-8 / +8 lines)
1	--- configure.in.orig 2010-12-17 07:17:41.000000000 +0100	1	--- ./configure.in.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ configure.in 2011-03-08 15:10:52.000000000 +0100	2	+++ ./configure.in 2011-03-11 08:27:38.000000000 +0100
3	@@ -19,10 +19,10 @@	3	@@ -19,10 +19,10 @@
4	[	4	[
5	if [[ "$host_vendor" != "apple" ]]; then	5	if [[ "$host_vendor" != "apple" ]]; then
Lines 153-159 Link Here
153	test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])	153	test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
154	test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])	154	test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
155	test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])	155	test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
156	@@ -1211,6 +1262,12 @@	156	@@ -1210,6 +1261,12 @@
157	final_message="$final_message\n Bluray:\tNo"	157	final_message="$final_message\n Bluray:\tNo"
158	fi	158	fi
159		159
Lines 166-172 Link Here
166	if test "$use_mid" = "yes"; then	166	if test "$use_mid" = "yes"; then
167	final_message="$final_message\n MID Support:\tYes"	167	final_message="$final_message\n MID Support:\tYes"
168	SDL_DEFINES="$SDL_DEFINES -DMID"	168	SDL_DEFINES="$SDL_DEFINES -DMID"
169	@@ -1418,7 +1475,6 @@	169	@@ -1410,7 +1467,6 @@
170	xbmc/cores/paplayer/NSFCodec/Makefile \	170	xbmc/cores/paplayer/NSFCodec/Makefile \
171	xbmc/cores/paplayer/SIDCodec/Makefile \	171	xbmc/cores/paplayer/SIDCodec/Makefile \
172	xbmc/cores/paplayer/vgmstream/Makefile \	172	xbmc/cores/paplayer/vgmstream/Makefile \
Lines 174-180 Link Here
174	xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \	174	xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
175	xbmc/cores/playercorefactory/Makefile \	175	xbmc/cores/playercorefactory/Makefile \
176	xbmc/karaoke/Makefile \	176	xbmc/karaoke/Makefile \
177	@@ -1491,6 +1547,7 @@	177	@@ -1483,6 +1539,7 @@
178	AC_SUBST(USE_EXTERNAL_LIBMPEG2)	178	AC_SUBST(USE_EXTERNAL_LIBMPEG2)
179	AC_SUBST(USE_EXTERNAL_LIBWAVPACK)	179	AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
180	AC_SUBST(USE_EXTERNAL_PYTHON)	180	AC_SUBST(USE_EXTERNAL_PYTHON)
Lines 182-188 Link Here
182	AC_SUBST(USE_PYTHON2_6)	182	AC_SUBST(USE_PYTHON2_6)
183	AC_SUBST(USE_PYTHON2_5)	183	AC_SUBST(USE_PYTHON2_5)
184	AC_SUBST(USE_PYTHON2_4)	184	AC_SUBST(USE_PYTHON2_4)
185	@@ -1735,7 +1792,7 @@	185	@@ -1727,7 +1784,7 @@
186	--enable-static \	186	--enable-static \
187	--disable-shared \	187	--disable-shared \
188	--cc="$CC" &&	188	--cc="$CC" &&
Lines 191-197 Link Here
191	mkdir -p `pwd`/../includes/dvdread	191	mkdir -p `pwd`/../includes/dvdread
192	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread	192	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
193	else	193	else
194	@@ -1749,8 +1806,9 @@	194	@@ -1741,8 +1798,9 @@
195	--disable-shared \	195	--disable-shared \
196	--disable-strip \	196	--disable-strip \
197	--disable-opts \	197	--disable-opts \
Lines 202-208 Link Here
202	mkdir -p `pwd`/../includes/dvdread	202	mkdir -p `pwd`/../includes/dvdread
203	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread	203	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
204	fi	204	fi
205	@@ -1766,6 +1824,17 @@	205	@@ -1758,6 +1816,17 @@
206	--enable-static \	206	--enable-static \
207	--disable-shared \	207	--disable-shared \
208	--cc="$CC"	208	--cc="$CC"

Lines 1-15 Link Here

(-)xbmc/files/patch-xbmc__Application.cpp (-7 / +7 lines)
1	--- ./xbmc/Application.cpp.orig 2010-10-31 14:58:11.000000000 +0100	1	--- ./xbmc/Application.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/Application.cpp 2010-12-01 12:17:34.231763652 +0100	2	+++ ./xbmc/Application.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -494,6 +494,8 @@	3	@@ -495,6 +495,8 @@
4	CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");	4	CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
5	#if defined(__APPLE__)	5	#if defined(__APPLE__)
6	CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X (%s). Built on %s (SVN:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);	6	CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
7	+#elif defined(__FreeBSD__)	7	+#elif defined(__FreeBSD__)
8	+ CLog::Log(LOGNOTICE, "Starting XBMC, Platform: FreeBSD (%s). Built on %s (SVN:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, SVN_REV);	8	+ CLog::Log(LOGNOTICE, "Starting XBMC, Platform: FreeBSD (%s). Built on %s (Git:%s)", g_sysinfo.GetUnameVersion().c_str(), __DATE__, GIT_REV);
9	#elif defined(_LINUX)	9	#elif defined(_LINUX)
10	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);	10	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);
11	#elif defined(_WIN32)	11	#elif defined(_WIN32)
12	@@ -777,6 +779,11 @@	12	@@ -785,6 +787,11 @@
13	}	13	}
14	}	14	}
15	}	15	}

Lines 1-5 Link Here

(-)xbmc/files/patch-xbmc__linux__NetworkLinux.cpp (-6 / +6 lines)
1	--- ./xbmc/linux/NetworkLinux.cpp.orig 2010-03-06 18:18:26.000000000 +0100	1	--- ./xbmc/linux/NetworkLinux.cpp.orig 2011-03-05 04:33:37.000000000 +0100
2	+++ ./xbmc/linux/NetworkLinux.cpp 2010-12-01 12:17:34.260943458 +0100	2	+++ ./xbmc/linux/NetworkLinux.cpp 2011-03-11 08:27:38.000000000 +0100
3	@@ -23,14 +23,14 @@	3	@@ -23,14 +23,14 @@
4	#include <sys/socket.h>	4	#include <sys/socket.h>
5	#include <netinet/in.h>	5	#include <netinet/in.h>
Lines 157-163 Link Here
157	#else	157	#else
158	FILE* fp = fopen("/proc/net/dev", "r");	158	FILE* fp = fopen("/proc/net/dev", "r");
159	if (!fp)	159	if (!fp)
160	@@ -327,7 +406,7 @@	160	@@ -321,7 +400,7 @@
161	std::vector<CStdString> CNetworkLinux::GetNameServers(void)	161	std::vector<CStdString> CNetworkLinux::GetNameServers(void)
162	{	162	{
163	std::vector<CStdString> result;	163	std::vector<CStdString> result;
Lines 166-172 Link Here
166	res_init();	166	res_init();
167		167
168	for (int i = 0; i < _res.nscount; i ++)	168	for (int i = 0; i < _res.nscount; i ++)
169	@@ -363,7 +442,7 @@	169	@@ -357,7 +436,7 @@
170	if (!IsWireless())	170	if (!IsWireless())
171	return result;	171	return result;
172		172
Lines 175-181 Link Here
175	// Query the wireless extentsions version number. It will help us when we	175	// Query the wireless extentsions version number. It will help us when we
176	// parse the resulting events	176	// parse the resulting events
177	struct iwreq iwr;	177	struct iwreq iwr;
178	@@ -549,7 +628,7 @@	178	@@ -543,7 +622,7 @@
179	encryptionMode = ENC_NONE;	179	encryptionMode = ENC_NONE;
180	assignment = NETWORK_DISABLED;	180	assignment = NETWORK_DISABLED;
181		181
Lines 184-190 Link Here
184	FILE* fp = fopen("/etc/network/interfaces", "r");	184	FILE* fp = fopen("/etc/network/interfaces", "r");
185	if (!fp)	185	if (!fp)
186	{	186	{
187	@@ -625,7 +704,7 @@	187	@@ -619,7 +698,7 @@
188		188
189	void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode)	189	void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode)
190	{	190	{