Attachment #189121 for bug #258082

View | Details | Raw Unified | Return to bug 258082 | Differences between

and this patch

Lines 340-345 Link Here

(-)boxee-0.9.11.5591-src/configure.in (+1 lines)
340	[tools/XBMCTex/Makefile]	340	[tools/XBMCTex/Makefile]
341	[xbmc/cores/dvdplayer/Codecs/Makefile]	341	[xbmc/cores/dvdplayer/Codecs/Makefile]
342	[xbmc/lib/cximage-6.0/Makefile]	342	[xbmc/lib/cximage-6.0/Makefile]
		343	[xbmc/lib/cximage-6.0/Makefile.include]
343	[xbmc/cores/paplayer/MACDll/Makefile]	344	[xbmc/cores/paplayer/MACDll/Makefile]
344	[xbmc/cores/paplayer/MIDCodec/Makefile]	345	[xbmc/cores/paplayer/MIDCodec/Makefile]
345	[xbmc/cores/paplayer/AACCodec/Makefile]	346	[xbmc/cores/paplayer/AACCodec/Makefile]

Lines 285-291 Link Here

(-)boxee-0.9.11.5591-src/Makefile.in (-1 / +1 lines)
285	$(wildcard $(OBJSXBMC)) :\| compile	285	$(wildcard $(OBJSXBMC)) :\| compile
286		286
287	LIBS += xbmc/lib/libBoxee/libBoxee.a xbmc/lib/libBoxee/libtxpath.a -lcurl	287	LIBS += xbmc/lib/libBoxee/libBoxee.a xbmc/lib/libBoxee/libtxpath.a -lcurl
288	LIBS += xbmc/lib/libsmb/libtalloc-i486-linux.a xbmc/lib/libsmb/libtdb-i486-linux.a xbmc/lib/libsmb/libsmbsharemodes-i486-linux.a xbmc/lib/libsmb/libwbclient-i486-linux.a	288	LIBS += xbmc/lib/libsmb/libtalloc-@ARCH@.a xbmc/lib/libsmb/libtdb-@ARCH@.a xbmc/lib/libsmb/libsmbsharemodes-@ARCH@.a xbmc/lib/libsmb/libwbclient-@ARCH@.a
289		289
290	Boxee: $(wildcard $(OBJSXBMC)) $(LIBS) \| compile	290	Boxee: $(wildcard $(OBJSXBMC)) $(LIBS) \| compile
291	g++ $(DEBUG_FLAGS) -o Boxee $(OBJSXBMC) $(LIBS) -rdynamic	291	g++ $(DEBUG_FLAGS) -o Boxee $(OBJSXBMC) $(LIBS) -rdynamic

Lines 29-35 Link Here

(-)boxee-0.9.11.5591-src/system/rtorrent.rc.linux (-1 / +1 lines)
29	# deleted.	29	# deleted.
30	schedule = watch_directory,5,5,load_start=~/.boxee/torrent/*.torrent	30	schedule = watch_directory,5,5,load_start=~/.boxee/torrent/*.torrent
31		31
32	on_finished = move_complete,"execute=/bin/mv,-n,$d.get_base_path=,~/.boxee/downloads/ ;d.set_directory=~/.boxee/downloads/"	32	on_finished = move_complete,"execute=/bin/mv,-u,$d.get_base_path=,~/.boxee/downloads/ ;d.set_directory=~/.boxee/downloads/"
33		33
34	# Close torrents when diskspace is low.	34	# Close torrents when diskspace is low.
35	schedule = low_diskspace,5,60,close_low_diskspace=100M	35	schedule = low_diskspace,5,60,close_low_diskspace=100M

Line 0 Link Here

(-)boxee-0.9.11.5591-src/tools/Linux/boxee.desktop (+10 lines)
	1	[Desktop Entry]
	2	Encoding=UTF-8
	3	Name=Boxee
	4	Comment=Boxee social media center
	5	Exec=/opt/bin/boxee
	6	Icon=boxee.png
	7	Terminal=false
	8	Type=Application
	9	Categories=Application;AudioVideo;Player;
	10	StartupNotify=true

Lines 1-6 Link Here

(-)boxee-0.9.11.5591-src/xbmc/app/Makefile (-2 / +3 lines)
1	INCLUDES=-I. -I../ -I../linux -I../../guilib -I../cores -I../utils	1	INCLUDES=-I. -I../ -I../linux -I../../guilib -I../cores -I../utils -I../lib -I../lib/libBoxee
2		2
3	SRCS=App_Python_Wrapper.cpp XAPP_App.cpp XAPP_Button.cpp XAPP_Control.cpp XAPP_Image.cpp XAPP_Label.cpp XAPP_List.cpp XAPP_ListItem.cpp XAPP_LocalConfig.cpp XAPP_MC.cpp XAPP_Player.cpp XAPP_PlayList.cpp XAPP_ServerConfig.cpp XAPP_ToggleButton.cpp XAPP_Window.cpp	3	SRCS=App_Python_Wrapper.cpp XAPP_App.cpp XAPP_Button.cpp XAPP_Control.cpp XAPP_Image.cpp XAPP_Label.cpp XAPP_List.cpp XAPP_ListItem.cpp XAPP_LocalConfig.cpp XAPP_MC.cpp XAPP_Player.cpp XAPP_PlayList.cpp XAPP_ToggleButton.cpp XAPP_Window.cpp
		4	SRCS+= XAPP_Edit.cpp
4		5
5	include ../../Makefile.include	6	include ../../Makefile.include
6	-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))	7	-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Lines 404-410 Link Here

(-)boxee-0.9.11.5591-src/xbmc/FileSystem/FileCurl.cpp (-2 / +2 lines)
404	if( m_ftpport.length() > 0 )	404	if( m_ftpport.length() > 0 )
405	g_curlInterface.easy_setopt(h, CURLOPT_FTPPORT, m_ftpport.c_str());	405	g_curlInterface.easy_setopt(h, CURLOPT_FTPPORT, m_ftpport.c_str());
406	else	406	else
407	g_curlInterface.easy_setopt(h, CURLOPT_FTPPORT, NULL);	407	g_curlInterface.easy_setopt(h, CURLOPT_FTPPORT, (void*)NULL);
408		408
409	// allow curl to not use the ip address in the returned pasv response	409	// allow curl to not use the ip address in the returned pasv response
410	if( m_ftppasvip )	410	if( m_ftppasvip )
Lines 804-810 Link Here
804	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_NOBODY, 0);	804	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_NOBODY, 0);
805	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEFUNCTION, (void*)dummy_callback);	805	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEFUNCTION, (void*)dummy_callback);
806	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FOLLOWLOCATION, 1);	806	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_FOLLOWLOCATION, 1);
807	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEDATA, NULL); /* will cause write failure*/	807	g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_WRITEDATA, (void)NULL); / will cause write failure*/
808		808
809	char err[4096];	809	char err[4096];
810	memset(err,0,4096);	810	memset(err,0,4096);




ARCH=@ARCH@
CFLAGS+=-O2

ifeq ($(ARCH), x86_64-linux)
    CFLAGS+=-fPIC
    CXXFLAGS+=$(CFLAGS)
endif

ifeq ($(ARCH), osx)
   CFLAGS+= -fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/opt/local/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DXBMC -DNO_LCMS -DNO_JPEG
   CXXFLAGS+= $(CFLAGS)
endif


Lines 2-7 Link Here

(-)boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/tiff/Makefile (+4 lines)
2		2
3	OBJS=fax3sm_winnt.o tif_aux.o tif_close.o tif_codec.o tif_compress.o tif_dir.o tif_dirinfo.o tif_dirread.o tif_dirwrite.o tif_dumpmode.o tif_error.o tif_fax3.o tif_flush.o tif_getimage.o tif_jpeg.o tif_luv.o tif_lzw.o tif_next.o tif_ojpeg.o tif_open.o tif_packbits.o tif_pixarlog.o tif_predict.o tif_print.o tif_read.o tif_strip.o tif_swab.o tif_thunder.o tif_tile.o tif_version.o tif_warning.o tif_write.o tif_zip.o	3	OBJS=fax3sm_winnt.o tif_aux.o tif_close.o tif_codec.o tif_compress.o tif_dir.o tif_dirinfo.o tif_dirread.o tif_dirwrite.o tif_dumpmode.o tif_error.o tif_fax3.o tif_flush.o tif_getimage.o tif_jpeg.o tif_luv.o tif_lzw.o tif_next.o tif_ojpeg.o tif_open.o tif_packbits.o tif_pixarlog.o tif_predict.o tif_print.o tif_read.o tif_strip.o tif_swab.o tif_thunder.o tif_tile.o tif_version.o tif_warning.o tif_write.o tif_zip.o
4		4
		5	ifeq ($(ARCH), x86_64-linux)
		6	CFLAGS+= -fPIC
		7	endif
		8
5	%o : %c	9	%o : %c
6	$(CC) $(CFLAGS) -c -o $@ $<	10	$(CC) $(CFLAGS) -c -o $@ $<
7		11

Lines 1-5 Link Here

(-)boxee-0.9.11.5591-src/xbmc/lib/libPython/Makefile (+1 lines)
1	INCLUDES=-I. -I../../ -I../../linux -I../../../guilib -I../../utils -I.	1	INCLUDES=-I. -I../../ -I../../linux -I../../../guilib -I../../utils -I.
2	SRCS=XBPython.cpp XBPythonDll.cpp XBPyThread.cpp XBPythonDllFuncs.S	2	SRCS=XBPython.cpp XBPythonDll.cpp XBPyThread.cpp XBPythonDllFuncs.S
		3	SRCS+= XBPyPersistentThread.cpp
3		4
4	LIB=python.a	5	LIB=python.a
5		6

Lines 36-41 Link Here

(-)boxee-0.9.11.5591-src/xbmc/lib/libPython/Python/Modules/readline.c (-1 / +3 lines)
36	#ifdef HAVE_RL_COMPLETION_MATCHES	36	#ifdef HAVE_RL_COMPLETION_MATCHES
37	#define completion_matches(x, y) \	37	#define completion_matches(x, y) \
38	rl_completion_matches((x), ((rl_compentry_func_t *)(y)))	38	rl_completion_matches((x), ((rl_compentry_func_t *)(y)))
		39	#else
		40	extern char *completion_matches(char , rl_compentry_func_t *);
39	#endif	41	#endif
40		42
41		43
Lines 634-640 Link Here
634	/* C function to call the Python completer. */	636	/* C function to call the Python completer. */
635		637
636	static char *	638	static char *
637	on_completion(char *text, int state)	639	on_completion(const char *text, int state)
638	{	640	{
639	char *result = NULL;	641	char *result = NULL;
640	if (completer != NULL) {	642	if (completer != NULL) {

Lines 215-220 Link Here

(-)boxee-0.9.11.5591-src/xbmc/Makefile (+1 lines)
215	SRCS += ItemLoader.cpp GUIWindowBoxeeBrowse.cpp GUIWindowBoxeeMain.cpp GUIDialogBoxeeMainMenu.cpp GUIDialogBoxeeOptionsMenu.cpp GUIDialogBoxeeMediaAction.cpp GUIWindowBoxeeMediaInfo.cpp	215	SRCS += ItemLoader.cpp GUIWindowBoxeeBrowse.cpp GUIWindowBoxeeMain.cpp GUIDialogBoxeeMainMenu.cpp GUIDialogBoxeeOptionsMenu.cpp GUIDialogBoxeeMediaAction.cpp GUIWindowBoxeeMediaInfo.cpp
216	SRCS += GUIWindowBoxeeMediaSources.cpp GUIWindowBoxeeMediaSourceInfo.cpp GUIWindowBoxeeMediaSourceList.cpp GUIWindowBoxeeMediaSourceAddFolder.cpp GUIWindowBoxeeMediaSourceAddShare.cpp BoxeeMediaSourceList.cpp	216	SRCS += GUIWindowBoxeeMediaSources.cpp GUIWindowBoxeeMediaSourceInfo.cpp GUIWindowBoxeeMediaSourceList.cpp GUIWindowBoxeeMediaSourceAddFolder.cpp GUIWindowBoxeeMediaSourceAddShare.cpp BoxeeMediaSourceList.cpp
217	SRCS += GUIDialogBoxeeAppCtx.cpp GUIDialogBoxeePictureCtx.cpp GUIDialogBoxeeLoggingIn.cpp GUIDialogBoxeeCredits.cpp BrowseWindowConfiguration.cpp BrowseWindowFilter.cpp BoxeeItemsHistory.cpp GUIDialogBoxeeManualResolve.cpp GUIWindowBoxeeApplicationSettings.cpp UpdateSourceFile.cpp AppDescriptor.cpp AppManager.cpp GUIWindowApp.cpp AppRegistry.cpp GUIBoxeeViewState.cpp GUIBoxeeViewStateFactory.cpp BoxeeViewDatabase.cpp GUIDialogBoxeeLibraryStatus.cpp AppRepository.cpp AppRepositories.cpp	217	SRCS += GUIDialogBoxeeAppCtx.cpp GUIDialogBoxeePictureCtx.cpp GUIDialogBoxeeLoggingIn.cpp GUIDialogBoxeeCredits.cpp BrowseWindowConfiguration.cpp BrowseWindowFilter.cpp BoxeeItemsHistory.cpp GUIDialogBoxeeManualResolve.cpp GUIWindowBoxeeApplicationSettings.cpp UpdateSourceFile.cpp AppDescriptor.cpp AppManager.cpp GUIWindowApp.cpp AppRegistry.cpp GUIBoxeeViewState.cpp GUIBoxeeViewStateFactory.cpp BoxeeViewDatabase.cpp GUIDialogBoxeeLibraryStatus.cpp AppRepository.cpp AppRepositories.cpp
		218	SRCS += BoxeeAuthenticator.cpp
218		219
219		220
220	LIB=xbmc.a	221	LIB=xbmc.a

Lines 44-50 Link Here

(-)boxee-0.9.11.5591-src/xbmc/utils/md5.h (-1 / +5 lines)
44	#include "StdString.h"	44	#include "StdString.h"
45		45
46	/* typedef a 32 bit type */	46	/* typedef a 32 bit type */
47	typedef unsigned long int UINT4;	47	#ifdef _WIN32PC
		48	typedef __int32 UINT4;
		49	#else
		50	typedef uint32_t UINT4;
		51	#endif
48		52
49	/* Data structure for MD5 (Message Digest) computation */	53	/* Data structure for MD5 (Message Digest) computation */
50	typedef struct {	54	typedef struct {

Return to bug 258082

Line 0 Link Here

(-)boxee-0.9.11.5591-src/xbmc/lib/cximage-6.0/Makefile.include.in (+13 lines)
	1	ARCH=@ARCH@
	2	CFLAGS+=-O2
	3
	4	ifeq ($(ARCH), x86_64-linux)
	5	CFLAGS+=-fPIC
	6	CXXFLAGS+=$(CFLAGS)
	7	endif
	8
	9	ifeq ($(ARCH), osx)
	10	CFLAGS+= -fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/opt/local/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DXBMC -DNO_LCMS -DNO_JPEG
	11	CXXFLAGS+= $(CFLAGS)
	12	endif
	13