Merge branch 'master' into pvr-ppa

opdenkamp · Apr 7, 2011 · e686e63 · e686e63
2 parents 28a2544 + 9bf1e06
commit e686e63
Show file tree

Hide file tree

Showing 1,215 changed files with 20,777 additions and 758,694 deletions.
diff --git a/.gitignore b/.gitignore
@@ -148,6 +148,9 @@ autom4te.cache
 /lib/addons/library.xbmc.pvr/project/VS2010Express/Release
 /lib/addons/library.xbmc.pvr/project/VS2010Express/Debug
 
+# /lib/cmyth/
+lib/cmyth/Makefile
+
 # /lib/cpluff/
 /lib/cpluff/ABOUT-NLS
 /lib/cpluff/aclocal.m4
@@ -364,6 +367,7 @@ autom4te.cache
 /system/libssh2.dll
 /system/libssl32.dll
 /system/hdhomerun.dll
+/system/ssh.dll
 
 # /system/cdrip
 /system/cdrip/lame_enc.dll
@@ -384,6 +388,7 @@ autom4te.cache
 /system/players/dvdplayer/swscale-0.6.1.dll
 /system/players/dvdplayer/libbluray.dll
 /system/players/dvdplayer/libmpeg2-0.dll
+/system/players/dvdplayer/libmad.dll
 
 # /system/players/paplayer
 /system/players/paplayer/wavpack.dll
@@ -394,7 +399,9 @@ autom4te.cache
 /system/players/paplayer/NoseFart.dll
 /system/players/paplayer/libsidplay2.dll
 /system/players/paplayer/adpcm.dll
-/system/players/dvdplayer/libmad.dll
+/system/players/paplayer/timidity.dll
+/system/players/paplayer/libFLAC.dll
+/system/players/paplayer/xbmc_asap.dll
 
 # /system/players/dsplayer
 /system/players/dsplayer/libsubs.dll
@@ -1086,11 +1093,6 @@ autom4te.cache
 
 /lib/libUPnP/Makefile
 
-# /lib/libXBMS
-/lib/libXBMS/Makefile
-/lib/libXBMS/libXBMS/Debug
-/lib/libXBMS/libXBMS/Release
-
 # /lib/libXDAAP
 /lib/libXDAAP/Makefile
 /lib/libXDAAP/libXDAAP_win32/Debug

diff --git a/Makefile.in b/Makefile.in
@@ -47,8 +47,6 @@ BIN_DIRS=	\
 	xbmc/storage \
 	xbmc/storage/linux \
 	xbmc/storage/osx \
-	lib/cmyth/libcmyth \
-	lib/cmyth/librefmem \
 	lib/libhts \
 	xbmc/interfaces \
 	xbmc/interfaces/http-api \
@@ -58,7 +56,6 @@ BIN_DIRS=	\
 	lib/libRTV \
 	xbmc/network/libscrobbler \
 	lib/libUPnP \
-	lib/libXBMS \
 	lib/libXDAAP \
 	xbmc/dbwrappers \
 	lib/UnrarXLib \
@@ -125,14 +122,10 @@ PAPCODEC_DIRS+= \
 	lib/asap
 endif
 
-ifeq ($(findstring osx,@ARCH@),osx)
-PAPCODEC_DIRS+= \
-	lib/libflac
-endif
-
 LIB_DIRS=\
 	lib/cximage-6.0 \
 	lib/libexif \
+	lib/cmyth \
 	lib/libhdhomerun \
 	lib/libid3tag \
 	lib/libapetag \
@@ -164,7 +157,6 @@ endif
 PVR_DIRS=\
 	xbmc/pvrclients/MediaPortal \
 	xbmc/pvrclients/mythtv \
-	xbmc/pvrclients/vdr-streamdev \
 	xbmc/pvrclients/vdr-vnsi \
 	xbmc/pvrclients/tvheadend
 
@@ -343,10 +335,6 @@ xbmc/dialogs/dialogs.a: force
 	$(MAKE) -C xbmc/dialogs
 xbmc/windows/windows.a: force
 	$(MAKE) -C xbmc/windows
-lib/cmyth/libcmyth/libcmyth.a: force
-	$(MAKE) -C lib/cmyth/libcmyth
-lib/cmyth/librefmem/librefmem.a: force
-	$(MAKE) -C lib/cmyth/librefmem
 lib/libhts/libhts.a: force
 	$(MAKE) -C lib/libhts
 xbmc/interfaces/interfaces.a: force
@@ -357,13 +345,11 @@ xbmc/interfaces/python/xbmcmodule/xbmcmodule.a: force
 	$(MAKE) -C xbmc/interfaces/python/xbmcmodule
 xbmc/network/libscrobbler/scrobbler.a: force
 	$(MAKE) -C xbmc/network/libscrobbler
-lib/libRTV/librtv-@ARCH@.a: force
+lib/libRTV/librtv.a: force
 	$(MAKE) -C lib/libRTV
-lib/libUPnP/libupnp-@ARCH@.a: force
+lib/libUPnP/libupnp.a: force
 	$(MAKE) -C lib/libUPnP
-lib/libXBMS/libxbms-@ARCH@.a: force
-	$(MAKE) -C lib/libXBMS
-lib/libXDAAP/libxdaap-@ARCH@.a: force
+lib/libXDAAP/libxdaap.a: force
 	$(MAKE) -C lib/libXDAAP
 lib/jsoncpp/src/lib_json/libjsoncpp.a: force
 	$(MAKE) -C lib/jsoncpp/src/lib_json
@@ -375,7 +361,7 @@ xbmc/dbwrappers/dbwrappers.a: force
 	$(MAKE) -C xbmc/dbwrappers
 lib/UnrarXLib/UnrarXLib.a: force
 	$(MAKE) -C lib/UnrarXLib
-lib/libsquish/libsquish-@ARCH@.a: force
+lib/libsquish/libsquish.a: force
 	$(MAKE) -C lib/libsquish
 xbmc/linux/linux.a: force
 	$(MAKE) -C xbmc/linux
@@ -455,7 +441,6 @@ endif
 pvrclients: exports
 	$(MAKE) -C xbmc/pvrclients/MediaPortal
 	$(MAKE) -C xbmc/pvrclients/mythtv
-	$(MAKE) -C xbmc/pvrclients/vdr-streamdev
 	$(MAKE) -C xbmc/pvrclients/vdr-vnsi
 	$(MAKE) -C xbmc/pvrclients/tvheadend
 screensavers: exports
@@ -484,15 +469,15 @@ else
 endif
 libexif: dllloader
 	$(MAKE) -C lib/libexif
+cmyth: dllloader
+	$(MAKE) -C lib/cmyth
 libhdhomerun: dllloader
 	$(MAKE) -C lib/libhdhomerun
 libid3tag: dllloader
 	$(MAKE) -C lib/libid3tag
 papcodecs: dllloader dvdpcodecs
+	test -d system/players/paplayer || mkdir system/players/paplayer
 	$(MAKE) -C lib/xbadpcm
-ifeq ($(findstring osx,@ARCH@), osx)
-	$(MAKE) -C lib/libflac
-endif
 	$(MAKE) -C lib/vgmstream
 	$(MAKE) -C lib/timidity
 	$(MAKE) -C lib/nosefart 
@@ -512,21 +497,15 @@ imagelib: dllloader
 	$(MAKE) -C lib/cximage-6.0
 
 codecs: papcodecs dvdpcodecs
-libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so
+libs: cmyth libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so
 externals: libaddon codecs libs python pvrclients visualizations screensavers
 
 xcode_depends: \
 	codecs libs python pvrclients visualizations screensavers eventclients skins \
-	lib/libsquish/libsquish-@ARCH@.a \
+	lib/libsquish/libsquish.a \
 	lib/libapetag/.libs/libapetag.a \
-	lib/cmyth/libcmyth/libcmyth.a \
-	lib/cmyth/librefmem/librefmem.a \
-	lib/libXBMS/libxbms-@ARCH@.a \
-	lib/libRTV/librtv-@ARCH@.a \
-	lib/libXDAAP/libxdaap-@ARCH@.a \
-	xbmc/interfaces/interfaces.a \
-	xbmc/interfaces/http-api/http-api.a \
-	xbmc/interfaces/json-rpc/json-rpc.a \
+	lib/libRTV/librtv.a \
+	lib/libXDAAP/libxdaap.a \
 	lib/jsoncpp/src/lib_json/libjsoncpp.a
 
 # platform independend objects
@@ -579,16 +558,16 @@ OBJSXBMC=	\
 	xbmc/windows/windows.a \
 	xbmc/interfaces/python/xbmcmodule/xbmcmodule.a \
 	xbmc/network/libscrobbler/scrobbler.a \
-	lib/libRTV/librtv-@ARCH@.a \
-	lib/libUPnP/libupnp-@ARCH@.a \
-	lib/libXDAAP/libxdaap-@ARCH@.a \
+	lib/libRTV/librtv.a \
+	lib/libUPnP/libupnp.a \
+	lib/libXDAAP/libxdaap.a \
 	xbmc/interfaces/interfaces.a \
 	xbmc/cdrip/cdrip.a \
 	xbmc/interfaces/json-rpc/json-rpc.a \
 	lib/jsoncpp/src/lib_json/libjsoncpp.a \
 	xbmc/interfaces/http-api/http-api.a \
 	xbmc/dbwrappers/dbwrappers.a \
-	lib/libsquish/libsquish-@ARCH@.a \
+	lib/libsquish/libsquish.a \
 	lib/libapetag/.libs/libapetag.a \
 	lib/xbmc-dll-symbols/dll-symbols.a \
         xbmc/rendering/rendering.a \
@@ -606,7 +585,6 @@ endif
 
 ifeq (@HAVE_XBMC_NONFREE@,1)
 OBJSXBMC+= \
-	lib/libXBMS/libxbms-@ARCH@.a \
 	lib/UnrarXLib/UnrarXLib.a
 endif
 
@@ -638,8 +616,6 @@ endif
 endif
 
 DYNOBJSXBMC= \
-	lib/cmyth/libcmyth/libcmyth.a \
-	lib/cmyth/librefmem/librefmem.a \
 	xbmc/linux/linux.a \
 	xbmc/network/network.a \
 	xbmc/video/windows/videowindows.a \
@@ -681,7 +657,7 @@ else
 	$(MAKE) -C tools/XBMCTex/
 endif
 
-tools/TexturePacker/TexturePacker: xbmc/guilib/guilib.a lib/libsquish/libsquish-@ARCH@.a
+tools/TexturePacker/TexturePacker: xbmc/guilib/guilib.a lib/libsquish/libsquish.a
 	$(MAKE) -C tools/TexturePacker/
 
 

diff --git a/Makefile.include.in b/Makefile.include.in
@@ -57,56 +57,66 @@ ifeq ($(ARCH), powerpc-osx)
 	BUNDLE1_O=-lbundle1.o
 endif
 
+ifneq ($(V), 1)
+	SILENT_CPP=@echo "CPP     $@";
+	SILENT_CC =@echo "CC      $@";
+	SILENT_S  =@echo "S       $@";
+	SILENT_GCH=@echo "GCH     $@";
+	SILENT_MM =@echo "MM      $@";
+	SILENT_AR =@echo "AR      $@";
+endif
+
+
 .cpp.o:
 	@rm -f ${<:.cpp=.o}
-	$(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cpp=.o}
+	$(SILENT_CPP) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cpp=.o}
 	@cp $*.d $*.P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
 	  rm -f $*.d
 
 .cc.o:
 	@rm -f ${<:.cc=.o}
-	$(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cc=.o}
+	$(SILENT_CC) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cc=.o}
 	@cp $*.d $*.P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
 	  rm -f $*.d
 
 .c.o:
 	@rm -f ${<:.c=.o}
-	$(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
+	$(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
 	@cp $*.d $*.P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
 	  rm -f $*.d
 
 .C.o:
 	@rm -f ${<:.C=.o}
-	$(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.C=.o}
+	$(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.C=.o}
 	@cp $*.d $*.P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
 	  rm -f $*.d
 
 .S.o:
-	rm -f ${<:.S=.o}
-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.S=.o}
+	@rm -f ${<:.S=.o}
+	$(SILENT_CC) $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.S=.o}
 
 %.h.gch : %.h
-	$(CXX) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
+	$(SILENT_GCH) $(CXX) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
 
 .m.o:
 	@rm -f ${<:.m=.o}
-	$(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.m=.o}
+	$(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.m=.o}
 	@cp $*.d $*.P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
 	  rm -f $*.d
 
 .mm.o:
 	@rm -f ${<:.mm=.o}
-	$(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.mm=.o}
+	$(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.mm=.o}
 	@cp $*.d $*.P; \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
 	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
@@ -121,7 +131,7 @@ OBJS+=$(filter %.o,$(SRCS:.m=.o))
 .PHONY : lib pch clean distclean distclean_evil
 
 $(LIB): $(OBJS)
-	$(AR) $(ARFLAGS) $(LIB) $(OBJS)
+	$(SILENT_AR) $(AR) $(ARFLAGS) $(LIB) $(OBJS)
 
 pch: $(PCH:.h=.h.gch)
 	for d in $(DIRS); do (cd "$$d"; $(MAKE) pch ); done