Skip to content

Commit

Permalink
Merge branch 'master' into pvr-ppa
Browse files Browse the repository at this point in the history
  • Loading branch information
@opdenkamp
opdenkamp committed Dec 12, 2011
2 parents 2e00d86 + bb7088b commit bf93a02
Show file tree
Hide file tree
Showing 241 changed files with 7,586 additions and 5,454 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pbxproj -crlf -diff
65 changes: 37 additions & 28 deletions XBMC-ATV2.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,7 @@
F5AE41131341751E0004BD79 /* XBMCOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41061341751E0004BD79 /* XBMCOperations.cpp */; };
F5AE453B134D2E720004BD79 /* JSONServiceDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE4539134D2E720004BD79 /* JSONServiceDescription.cpp */; };
F5B13E0113344F310045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13E0013344F310045076D /* DarwinUtils.mm */; };
F5BD033A148D4923001B5583 /* CryptThreading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BD0338148D4923001B5583 /* CryptThreading.cpp */; };
F5CEE72C13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CEE72B13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp */; };
F5E6209F13E9081400D5F2CD /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E6209D13E9081400D5F2CD /* InfoBool.cpp */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -3096,6 +3097,8 @@
F5AE453A134D2E720004BD79 /* JSONServiceDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONServiceDescription.h; sourceTree = "<group>"; };
F5B13DFF13344F2A0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
F5B13E0013344F310045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
F5BD0338148D4923001B5583 /* CryptThreading.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptThreading.cpp; sourceTree = "<group>"; };
F5BD0339148D4923001B5583 /* CryptThreading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptThreading.h; sourceTree = "<group>"; };
F5CEE72B13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDOverlayCodecTX3G.cpp; sourceTree = "<group>"; };
F5CEE72D13D3F9B300225F72 /* DVDOverlayCodecTX3G.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDOverlayCodecTX3G.h; sourceTree = "<group>"; };
F5E6209D13E9081400D5F2CD /* InfoBool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InfoBool.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5548,6 +5551,10 @@
F56C772A131EC154000AD0F6 /* CharsetConverter.h */,
F56C772B131EC154000AD0F6 /* CPUInfo.cpp */,
F56C772C131EC154000AD0F6 /* CPUInfo.h */,
F56C7716131EC154000AD0F6 /* Crc32.cpp */,
F56C7717131EC154000AD0F6 /* Crc32.h */,
F5BD0338148D4923001B5583 /* CryptThreading.cpp */,
F5BD0339148D4923001B5583 /* CryptThreading.h */,
F56C772D131EC154000AD0F6 /* DownloadQueue.cpp */,
F56C772E131EC154000AD0F6 /* DownloadQueue.h */,
F56C772F131EC154000AD0F6 /* DownloadQueueManager.cpp */,
Expand Down Expand Up @@ -6320,7 +6327,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n#SYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\nfi";
shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\n\n# rsync command for skins. jpg, png exclusion is handled during sync\n# if a Textures.xbt file is found \nSKINSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude skin.touched --exclude screensaver.rsxs* --exclude visualization.*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/darwin/runtime\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/addons/visualization.glspectrum\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/visualization.waveform\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\nSYNCSKIN_A=${SKINSYNC}\nif [ -f \"$SRCROOT/addons/skin.confluence/media/Textures.xbt\" ]; then\nSYNCSKIN_A=\"${SKINSYNC} --exclude *.png --exclude *.jpg\"\nfi\n${SYNCSKIN_A} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\nfi";
showEnvVarsInLog = 0;
};
F589B48D128A697C00D8079E /* copy frameworks */ = {
Expand Down Expand Up @@ -7274,36 +7281,38 @@
DF7E680013ED4E25003ED690 /* DVDInputStreamPVRManager.cpp in Sources */,
DF7E680113ED4E25003ED690 /* DVDInputStreamStack.cpp in Sources */,
DF7E680413ED4E42003ED690 /* DVDDemuxPVRClient.cpp in Sources */,
DF7E681613ED5152003ED690 /* TimeSmoother.cpp in Sources */,
DF7E683B13ED52B7003ED690 /* PVRDirectory.cpp in Sources */,
DF7E683C13ED52B7003ED690 /* PVRFile.cpp in Sources */,
DF34885513FD73810026A711 /* InertialScrollingHandler.cpp in Sources */,
DFB8A87C14154B810075EAE6 /* AirPlayServer.cpp in Sources */,
DFB8A8A214154C8C0075EAE6 /* HttpParser.cpp in Sources */,
DFB8A8A514154CA70075EAE6 /* GUIAction.cpp in Sources */,
DF07AFAD144CBD0A00947926 /* PeripheralBusUSB.cpp in Sources */,
DF07AFAE144CBD0A00947926 /* PeripheralBus.cpp in Sources */,
DF07AFB2144CBD0A00947926 /* Peripheral.cpp in Sources */,
DF07AFB3144CBD0A00947926 /* PeripheralBluetooth.cpp in Sources */,
DF07AFB4144CBD0A00947926 /* PeripheralCecAdapter.cpp in Sources */,
DF07AFB5144CBD0A00947926 /* PeripheralDisk.cpp in Sources */,
DF07AFB6144CBD0A00947926 /* PeripheralHID.cpp in Sources */,
DF07AFB7144CBD0A00947926 /* PeripheralNIC.cpp in Sources */,
DF07AFB8144CBD0A00947926 /* PeripheralNyxboard.cpp in Sources */,
DF07AFB9144CBD0A00947926 /* PeripheralTuner.cpp in Sources */,
DF07AFBA144CBD0A00947926 /* GUIDialogPeripheralManager.cpp in Sources */,
DF07AFBB144CBD0A00947926 /* GUIDialogPeripheralSettings.cpp in Sources */,
DF07AFBE144CBD0A00947926 /* Peripherals.cpp in Sources */,
DF07AFC1144CBD4600947926 /* AirTunesServer.cpp in Sources */,
DF07AFCC144CBD6500947926 /* AFPDirectory.cpp in Sources */,
DF07AFCD144CBD6500947926 /* FileAFP.cpp in Sources */,
DF07AFCE144CBD6500947926 /* FilePipe.cpp in Sources */,
DF07AFCF144CBD6500947926 /* FileUPnP.cpp in Sources */,
DF07AFD0144CBD6500947926 /* PipesManager.cpp in Sources */,
DF07AFD5144CBD9F00947926 /* JpegIO.cpp in Sources */,
DF07AFD8144CBDB700947926 /* SkinVariable.cpp in Sources */,
DF07AFDB144CBDC600947926 /* pyrendercapture.cpp in Sources */,
DF07AFDE144CBDDA00947926 /* ApplicationOperations.cpp in Sources */,
DFAB04C113F8385F00B70BFB /* InertialScrollingHandler.cpp in Sources */,
DF34890913FD96390026A711 /* GUIAction.cpp in Sources */,
DFA6BE8713FED2A10048CC11 /* AirPlayServer.cpp in Sources */,
DFA6BE8A13FED2B40048CC11 /* HttpParser.cpp in Sources */,
18968DE814155E1D005BA742 /* ApplicationOperations.cpp in Sources */,
DFCFC53D1413F7F70004D0BF /* AFPDirectory.cpp in Sources */,
DFCFC53E1413F7F70004D0BF /* FileAFP.cpp in Sources */,
32D6D47C1423A9D8003641AC /* JpegIO.cpp in Sources */,
DF44852F140064F40069344B /* BXAcodec.cpp in Sources */,
DF4485341400651B0069344B /* FilePipe.cpp in Sources */,
DF4485351400651B0069344B /* PipesManager.cpp in Sources */,
DF4485381400654A0069344B /* AirTunesServer.cpp in Sources */,
DF98D9A81434F4B400A6EBE1 /* SkinVariable.cpp in Sources */,
F5E1131D14357B6500175026 /* PeripheralBusUSB.cpp in Sources */,
F5E1131E14357B6500175026 /* PeripheralBus.cpp in Sources */,
F5E1131F14357B6500175026 /* Peripheral.cpp in Sources */,
F5E1132014357B6500175026 /* PeripheralBluetooth.cpp in Sources */,
F5E1132114357B6500175026 /* PeripheralCecAdapter.cpp in Sources */,
F5E1132214357B6500175026 /* PeripheralDisk.cpp in Sources */,
F5E1132314357B6500175026 /* PeripheralHID.cpp in Sources */,
F5E1132414357B6500175026 /* PeripheralNIC.cpp in Sources */,
F5E1132514357B6500175026 /* PeripheralNyxboard.cpp in Sources */,
F5E1132614357B6500175026 /* PeripheralTuner.cpp in Sources */,
F5E1132714357B6500175026 /* GUIDialogPeripheralManager.cpp in Sources */,
F5E1132814357B6500175026 /* GUIDialogPeripheralSettings.cpp in Sources */,
F5E1132914357B6500175026 /* Peripherals.cpp in Sources */,
F5E113AD1435882400175026 /* pyrendercapture.cpp in Sources */,
DF673A251443769300A5A509 /* FileUPnP.cpp in Sources */,
F5BD033A148D4923001B5583 /* CryptThreading.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading

0 comments on commit bf93a02

Please sign in to comment.