Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into pvr-ppa

Conflicts:
	xbmc/pvr/PVRManager.cpp
  • Loading branch information...
commit 28a25441553c68b9c3e301d869089b6bfc2d7650 2 parents 1f2654c + 087dede
@opdenkamp authored
Showing with 17,627 additions and 7,081 deletions.
  1. +1 −35 Makefile.in
  2. +93 −0 README.ios
  3. +1 −1  README.linux
  4. +1 −1  README.ubuntu
  5. +6,969 −0 XBMC-ATV2.xcodeproj/project.pbxproj
  6. +6,988 −0 XBMC-IOS.xcodeproj/project.pbxproj
  7. +63 −83 XBMC.xcodeproj/project.pbxproj
  8. +3 −3 addons/library.xbmc.addon/libXBMC_addon.h
  9. +51 −51 addons/library.xbmc.gui/libXBMC_gui.h
  10. +8 −3 addons/library.xbmc.pvr/libXBMC_pvr.h
  11. +7 −0 addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml
  12. +1 −1  addons/pvr.hts/resources/settings.xml
  13. +1 −0  addons/screensaver.xbmc.builtin.slideshow/resources/language/Finnish/strings.xml
  14. +1 −1  addons/skin.confluence/720p/DialogKeyboard.xml
  15. +4 −3 addons/skin.confluence/720p/MyVideoNav.xml
  16. +1 −1  addons/skin.confluence/720p/SettingsSystemInfo.xml
  17. +0 −1  addons/skin.confluence/720p/ViewsFileMode.xml
  18. +8 −2 addons/skin.confluence/language/Finnish/strings.xml
  19. +1 −3 bootstrap
  20. +126 −144 configure.in
  21. +3 −0  language/English/strings.xml
  22. +1 −1  language/Finnish/langinfo.xml
  23. +270 −110 language/Finnish/strings.xml
  24. +7 −5 language/Polish/strings.xml
  25. +11 −5 lib/DllAvCore.h
  26. +79 −79 lib/addons/library.xbmc.gui/libXBMC_gui.cpp
  27. +8 −0 lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
  28. +20 −1 lib/cmyth/libcmyth/connection.c
  29. +0 −32 lib/darwin/libSDL-OSX/SDL_SetWidthHeight.diff
  30. +0 −40 lib/darwin/libSDL-OSX/buildSDL-osx.sh
  31. BIN  lib/darwin/libSDL-OSX/libSDL-powerpc-osx.a
  32. BIN  lib/darwin/libSDL-OSX/libSDL-x86-osx.a
  33. BIN  lib/darwin/libSDL-OSX/libSDL_mixer-powerpc-osx.a
  34. BIN  lib/darwin/libSDL-OSX/libSDL_mixer-x86-osx.a
  35. +0 −37 lib/darwin/libcurl-OSX/build-libcurl-osx.sh
  36. +0 −1,936 lib/darwin/libcurl-OSX/include/curl/curl.h
  37. +0 −192 lib/darwin/libcurl-OSX/include/curl/curlbuild.h
  38. +0 −249 lib/darwin/libcurl-OSX/include/curl/curlrules.h
  39. +0 −70 lib/darwin/libcurl-OSX/include/curl/curlver.h
  40. +0 −103 lib/darwin/libcurl-OSX/include/curl/easy.h
  41. +0 −82 lib/darwin/libcurl-OSX/include/curl/mprintf.h
  42. +0 −346 lib/darwin/libcurl-OSX/include/curl/multi.h
  43. +0 −34 lib/darwin/libcurl-OSX/include/curl/stdcheaders.h
  44. +0 −551 lib/darwin/libcurl-OSX/include/curl/typecheck-gcc.h
  45. +0 −1  lib/darwin/libcurl-OSX/include/curl/types.h
  46. +1 −1  lib/libRTV/GuideParser.cpp
  47. +4 −0 lib/libXBMS/ccincludes.h
  48. +5 −0 lib/libXDAAP/httpClient.c
  49. +1 −1  lib/libXDAAP/thread.h
  50. +0 −31 lib/libass/xbmc/Makefile.in
  51. +1 −1  lib/libdvd/libdvdread/src/dvd_reader.c
  52. +4 −0 lib/libflac/flac-1.2.1/src/libFLAC/fixed.c
  53. +8 −0 lib/libhts/net_posix.c
  54. +1 −1  lib/nosefart/NoseFartDLL.cpp
  55. +1 −1  lib/stsound/StSoundLibrary/XBMCYM.cpp
  56. +2 −2 lib/stsound/StSoundLibrary/YmTypes.h
  57. +4 −4 project/VS2010Express/XBMC.vcxproj
  58. +8 −8 project/VS2010Express/XBMC.vcxproj.filters
  59. +0 −420 project/VS2010Express/guilib.vcxproj
  60. +0 −621 project/VS2010Express/guilib.vcxproj.filters
  61. +23 −18 project/Win32BuildSetup/BuildSetup.bat
  62. +1 −1  project/Win32BuildSetup/XBMC for Windows.nsi
  63. +2 −4 project/Win32BuildSetup/extract_git_rev.bat
  64. +1 −1  project/Win32BuildSetup/readme.txt
  65. +80 −43 system/keymaps/joystick.AppleRemote.xml
  66. +1 −0  system/keymaps/keyboard.xml
  67. BIN  system/libcurl-powerpc-osx.so
  68. BIN  system/libcurl-x86-osx.so
  69. +14 −0 tools/buildbot/gitrev-posix
  70. +3 −0  tools/buildbot/osx-depends-check
  71. +3 −3 tools/osx/ios-depends/Makefile
  72. +1 −0  tools/osx/ios-depends/autoconf/Makefile
  73. +1 −0  tools/osx/ios-depends/automake/Makefile
  74. +22 −18 tools/osx/ios-depends/boost/Makefile
  75. +0 −330 tools/osx/ios-depends/boost/boost.sh
  76. +5 −0 tools/osx/ios-depends/boost/user-config.jam-ios-4.2_armv7.in
  77. +3 −3 tools/osx/ios-depends/config.mk
  78. +1 −0  tools/osx/ios-depends/dpkg/Makefile
  79. +12 −0 tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch
  80. +1 −0  tools/osx/ios-depends/gettext/Makefile
  81. +52 −0 tools/osx/ios-depends/libass/Makefile
  82. +54 −0 tools/osx/ios-depends/libbluray/Makefile
  83. +55 −0 tools/osx/ios-depends/libflac/Makefile
  84. +54 −0 tools/osx/ios-depends/libmicrohttpd/Makefile
  85. +53 −0 tools/osx/ios-depends/libmodplug/Makefile
  86. +14 −5 tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch
  87. +1 −7 tools/osx/ios-depends/librtmp/Makefile
  88. +0 −36 tools/osx/ios-depends/openssl/01-build-armv7.patch
  89. +6 −3 tools/osx/ios-depends/openssl/Makefile
  90. +1 −0  tools/osx/ios-depends/pkg-config/Makefile
  91. +2 −1  tools/osx/ios-depends/tar/Makefile
  92. +3 −2 tools/osx/osx-depends/Makefile
  93. +1 −4 tools/osx/osx-depends/afpfs-ng/Makefile
  94. +2 −1  tools/osx/osx-depends/autoconf/Makefile
  95. +2 −1  tools/osx/osx-depends/automake/Makefile
  96. +4 −8 tools/osx/osx-depends/boost/Makefile
  97. +6 −5 tools/osx/osx-depends/config.mk
  98. +1 −4 tools/osx/osx-depends/curl/Makefile
  99. +1 −0  tools/osx/osx-depends/dpkg/Makefile
  100. +0 −3  tools/osx/osx-depends/expat/Makefile
  101. +0 −3  tools/osx/osx-depends/faad2/Makefile
  102. +0 −3  tools/osx/osx-depends/fontconfig/Makefile
  103. +0 −3  tools/osx/osx-depends/freetype2/Makefile
  104. +0 −3  tools/osx/osx-depends/fribidi/Makefile
  105. +1 −5 tools/osx/osx-depends/gettext/Makefile
  106. +0 −3  tools/osx/osx-depends/jpeg/Makefile
  107. +0 −2  tools/osx/osx-depends/libGLEW/Makefile
  108. +52 −0 tools/osx/osx-depends/libass/Makefile
  109. +54 −0 tools/osx/osx-depends/libbluray/Makefile
  110. +1 −5 tools/osx/osx-depends/libcdio/Makefile
  111. +55 −0 tools/osx/osx-depends/libflac/Makefile
  112. +1 −5 tools/osx/osx-depends/libgcrypt/Makefile
  113. +1 −4 tools/osx/osx-depends/libgpg-error/Makefile
  114. +0 −3  tools/osx/osx-depends/liblzo/Makefile
  115. +0 −2  tools/osx/osx-depends/liblzo2/Makefile
  116. +0 −3  tools/osx/osx-depends/libmad/Makefile
  117. +54 −0 tools/osx/osx-depends/libmicrohttpd/Makefile
  118. +53 −0 tools/osx/osx-depends/libmodplug/Makefile
  119. +0 −3  tools/osx/osx-depends/libmpeg2/Makefile
  120. +0 −3  tools/osx/osx-depends/libogg/Makefile
  121. +0 −3  tools/osx/osx-depends/libpng/Makefile
  122. +14 −5 tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch
  123. +2 −7 tools/osx/osx-depends/librtmp/Makefile
  124. +0 −3  tools/osx/osx-depends/libsamplerate/Makefile
  125. +0 −3  tools/osx/osx-depends/libsdl/Makefile
  126. +0 −3  tools/osx/osx-depends/libsdl_image/Makefile
  127. +0 −3  tools/osx/osx-depends/libsdl_mixer/Makefile
  128. +1 −4 tools/osx/osx-depends/libssh2/Makefile
  129. +53 −0 tools/osx/osx-depends/libtool/Makefile
  130. +0 −3  tools/osx/osx-depends/libvorbis/Makefile
  131. +0 −3  tools/osx/osx-depends/libwavpack/Makefile
  132. +1 −17 tools/osx/osx-depends/mysqlclient/Makefile
  133. +1 −3 tools/osx/osx-depends/openssl/Makefile
  134. +0 −3  tools/osx/osx-depends/pcre/Makefile
  135. +6 −1 tools/osx/osx-depends/python26/Makefile
  136. +1 −4 tools/osx/osx-depends/readline/Makefile
  137. +2 −53 tools/osx/osx-depends/samba/Makefile
  138. +1 −3 tools/osx/osx-depends/sqlite3/Makefile
  139. +1 −0  tools/osx/osx-depends/tar/Makefile
  140. +0 −3  tools/osx/osx-depends/tiff/Makefile
  141. +48 −46 tools/osx/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
  142. +36 −35 tools/osx/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
  143. +52 −31 xbmc/Application.cpp
  144. +9 −1 xbmc/Application.h
  145. +8 −0 xbmc/ApplicationMessenger.cpp
  146. +8 −16 xbmc/DllPaths_generated.h.in
  147. +0 −14 xbmc/FileItem.cpp
  148. +3 −5 xbmc/GUIInfoManager.cpp
  149. +3 −1 xbmc/GUIViewState.cpp
  150. +25 −39 xbmc/Util.cpp
  151. +1 −1  xbmc/Util.h
  152. +37 −7 xbmc/addons/Addon.cpp
  153. +19 −4 xbmc/addons/Addon.h
  154. +67 −27 xbmc/addons/AddonDatabase.cpp
  155. +3 −4 xbmc/addons/AddonDatabase.h
  156. +1 −1  xbmc/addons/AddonHelpers_GUI.cpp
  157. +16 −23 xbmc/addons/AddonHelpers_PVR.cpp
  158. +1 −0  xbmc/addons/AddonHelpers_PVR.h
  159. +2 −0  xbmc/addons/AddonHelpers_local.h
  160. +144 −51 xbmc/addons/AddonInstaller.cpp
  161. +42 −2 xbmc/addons/AddonInstaller.h
  162. +7 −39 xbmc/addons/AddonManager.cpp
  163. +0 −5 xbmc/addons/AddonManager.h
  164. +1 −1  xbmc/addons/GUIDialogAddonInfo.cpp
  165. +1 −1  xbmc/addons/GUIWindowAddonBrowser.cpp
  166. +5 −3 xbmc/addons/IAddon.h
  167. +21 −15 xbmc/addons/Repository.cpp
  168. +5 −3 xbmc/addons/Repository.h
  169. +4 −1 xbmc/addons/Scraper.cpp
  170. +1 −1  xbmc/addons/ScreenSaver.cpp
  171. +37 −28 xbmc/cores/AudioRenderers/IOSAudioRenderer.cpp
  172. +4 −0 xbmc/cores/AudioRenderers/IOSAudioRenderer.h
  173. +25 −16 xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
  174. +3 −2 xbmc/cores/DllLoader/exports/wrapper.c
  175. +2 −2 xbmc/cores/DllLoader/exports/wrapper_mach_alias
  176. +8 −1 xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
  177. +534 −247 xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
  178. +24 −8 xbmc/cores/VideoRenderers/LinuxRendererGLES.h
  179. +2 −1  xbmc/cores/VideoRenderers/Makefile.in
  180. +11 −16 xbmc/cores/VideoRenderers/OverlayRendererDX.cpp
  181. +19 −20 xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
  182. +1 −0  xbmc/cores/VideoRenderers/RenderFlags.h
  183. +9 −0 xbmc/cores/VideoRenderers/RenderManager.h
  184. +12 −4 xbmc/cores/VideoRenderers/yuv2rgb.neon.S
  185. +28 −0 xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
  186. +23 −1 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
  187. +8 −1 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
  188. +1 −1  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp
  189. +12 −3 xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
  190. +5 −5 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp
  191. +1 −1  xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp
  192. +1 −1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
  193. +10 −1 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
  194. +1 −1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h
  195. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
  196. +1 −1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h
  197. +1 −1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
  198. +13 −13 xbmc/cores/dvdplayer/DVDPlayer.cpp
  199. +9 −1 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
  200. +2 −2 xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
  201. +1 −1  xbmc/cores/paplayer/ASAPCodec.cpp
  202. +6 −0 xbmc/cores/paplayer/CDDAcodec.cpp
  203. +1 −0  xbmc/dbwrappers/mysqldataset.cpp
  204. +1 −1  xbmc/dialogs/GUIDialogKeyboard.cpp
  205. +2 −6 xbmc/epg/Epg.cpp
  206. +1 −1  xbmc/epg/Epg.h
  207. +20 −3 xbmc/epg/EpgContainer.cpp
  208. +1 −0  xbmc/epg/EpgContainer.h
  209. +2 −2 xbmc/epg/EpgDatabase.cpp
  210. +32 −0 xbmc/epg/EpgInfoTag.cpp
  211. +3 −0  xbmc/epg/EpgInfoTag.h
  212. +15 −6 xbmc/filesystem/AddonsDirectory.cpp
  213. +1 −1  xbmc/filesystem/FileCurl.cpp
  214. +19 −6 xbmc/filesystem/FileSmb.cpp
  215. +1 −1  xbmc/filesystem/FileSmb.h
  216. +4 −12 xbmc/filesystem/MusicDatabaseDirectory.cpp
  217. +19 −9 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
  218. +17 −9 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h
  219. +12 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp
  220. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.h
  221. +12 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.cpp
  222. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.h
  223. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.cpp
  224. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.h
  225. +12 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.cpp
  226. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.h
  227. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.cpp
  228. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.h
  229. +12 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.cpp
  230. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.h
  231. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.cpp
  232. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.h
  233. +10 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.cpp
  234. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.h
  235. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.cpp
  236. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.h
  237. +12 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
  238. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.h
  239. +10 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGenre.cpp
  240. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGenre.h
  241. +40 −39 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
  242. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h
  243. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.cpp
  244. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.h
  245. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.cpp
  246. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.h
  247. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.cpp
  248. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.h
  249. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.cpp
  250. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.h
  251. +20 −12 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
  252. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h
  253. +7 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYear.cpp
  254. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYear.h
  255. +12 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp
  256. +3 −2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h
  257. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp
  258. +1 −1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h
  259. +2 −0  xbmc/filesystem/MusicSearchDirectory.cpp
  260. +16 −13 xbmc/filesystem/PVRFile.cpp
  261. +1 −0  xbmc/filesystem/SmartPlaylistDirectory.cpp
  262. +2 −0  xbmc/filesystem/SpecialProtocol.cpp
  263. +5 −13 xbmc/filesystem/VideoDatabaseDirectory.cpp
  264. +19 −9 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp
  265. +17 −9 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
  266. +10 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeActor.cpp
  267. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeActor.h
  268. +10 −4 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeCountry.cpp
  269. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeCountry.h
  270. +10 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeDirector.cpp
  271. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeDirector.h
  272. +1 −1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
  273. +1 −1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h
  274. +10 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGenre.cpp
  275. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGenre.h
  276. +35 −38 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
  277. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h
  278. +10 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.cpp
  279. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.h
  280. +25 −27 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
  281. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h
  282. +23 −14 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
  283. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h
  284. +2 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp
  285. +2 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h
  286. +2 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp
  287. +2 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h
  288. +2 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp
  289. +2 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h
  290. +1 −1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp
  291. +1 −1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.h
  292. +17 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
  293. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h
  294. +10 −4 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSets.cpp
  295. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSets.h
  296. +10 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeStudio.cpp
  297. +3 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeStudio.h
  298. +1 −1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp
  299. +1 −1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h
  300. +1 −1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp
Sorry, we could not display the entire diff because too many files (494) changed.
View
36 Makefile.in
@@ -111,10 +111,6 @@ DVDPCODECS_DIRS= \
lib \
lib/libdvd \
-ifneq (@USE_EXTERNAL_LIBASS@,1)
-DVDPCODECS_DIRS+=lib/libass/xbmc
-endif
-
PAPCODECS_DIRS= \
lib/xbadpcm \
lib/nosefart \
@@ -142,12 +138,8 @@ LIB_DIRS=\
lib/libapetag \
xbmc/interfaces/python/linux \
lib/cpluff \
- lib/libmodplug \
lib/xbmc-dll-symbols \
lib/jsoncpp/src/lib_json
-ifeq ($(findstring osx,@ARCH@), osx)
-LIB_DIRS+=lib/libmicrohttpd
-endif
SS_DIRS=\
xbmc/screensavers/rsxs-0.9/xbmc
@@ -437,22 +429,8 @@ ifeq ($(findstring osx,@ARCH@), osx)
else
cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
endif
-lib/libmodplug/src/.libs/libmodplug.a: force
- $(MAKE) -C lib/libmodplug
-system/players/paplayer/libmodplug-@ARCH@.so: lib/libmodplug/src/.libs/libmodplug.a
-ifeq (@ARCH@, powerpc-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lbundle1.o -o $@ $<
-endif
-ifeq (@ARCH@, x86-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -o $@ $<
-endif
-ifeq (@ARCH@, arm-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $<
-endif
lib/xbmc-dll-symbols/dll-symbols.a: force
$(MAKE) -C lib/xbmc-dll-symbols
-lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a: force
- $(MAKE) -C lib/libmicrohttpd
exports:
$(MAKE) xbmc/cores/DllLoader/exports/exports.a
@@ -496,9 +474,6 @@ python: dllloader
dvdpcodecs: dllloader
$(MAKE) -C lib
$(MAKE) -C lib/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- $(MAKE) -C lib/libass/xbmc
-endif
eventclients:
ifeq ($(findstring osx,@ARCH@), osx)
ifneq ($(findstring arm,@ARCH@), arm)
@@ -537,11 +512,7 @@ imagelib: dllloader
$(MAKE) -C lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-ifeq ($(findstring osx,@ARCH@), osx)
-libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so system/players/paplayer/libmodplug-@ARCH@.so
-else
libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so
-endif
externals: libaddon codecs libs python pvrclients visualizations screensavers
xcode_depends: \
@@ -556,8 +527,7 @@ xcode_depends: \
xbmc/interfaces/interfaces.a \
xbmc/interfaces/http-api/http-api.a \
xbmc/interfaces/json-rpc/json-rpc.a \
- lib/jsoncpp/src/lib_json/libjsoncpp.a \
- lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a
+ lib/jsoncpp/src/lib_json/libjsoncpp.a
# platform independend objects
OBJSXBMC= \
@@ -640,18 +610,14 @@ OBJSXBMC+= \
lib/UnrarXLib/UnrarXLib.a
endif
-ifneq ($(findstring arm,@ARCH@), arm)
-# Can't include libhts for arm due to GPLv3
OBJSXBMC+= \
lib/libhts/libhts.a
-endif
# platform dependend objects
ifeq ($(findstring osx,@ARCH@), osx)
OBJSXBMC += \
xbmc/osx/osx.a \
xbmc/windowing/osx/windowing_osx.a \
- lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a \
xbmc/threads/darwin/threads_darwin.a \
xbmc/powermanagement/osx/powermanagement.a \
xbmc/network/osx/network.a \
View
93 README.ios
@@ -0,0 +1,93 @@
+TOC
+1. Introduction
+2. Getting the source code
+3. Install required libs
+ 3.1. Install Xcode
+ 3.2. Install Cross libs and runtime environment
+4. How to compile and run
+ 4.1 Using XCode
+ 4.2 Using Command line
+5. Gesture Handling on iPad/iPhone/iPod touch
+
+-----------------------------------------------------------------------------
+1. Introduction
+-----------------------------------------------------------------------------
+
+This is a platform port of XBMC for the Apple iOS operating system.
+The current build system is Xcode 3.2.5 and iOS SDK 4.2
+There are two ways to build XBMC for Mac.
+
+1) command-line or
+2) Xcode.
+
+Generally, Xcode is the easiest as it presents the build system in a GUI environment.
+The command-line build is still under development.
+
+XBMC for Mac is composed of a main binary with numerous dynamic libraries and
+codecs that support a multitude of music and video formats.
+
+NOTE TO NEW OS X USERS: All lines that are prefixed with the '$' character are
+commands that need to be typed into a Terminal window. Note that the '$'
+character itself should NOT be typed as part of the command.
+
+
+-----------------------------------------------------------------------------
+2. Getting the source code
+-----------------------------------------------------------------------------
+
+ $ cd $HOME
+ $ git clone git://github.com/xbmc/xbmc.git xbmc
+
+-----------------------------------------------------------------------------
+3.0 Install Xcode
+-----------------------------------------------------------------------------
+Install latest Xcode. You can download it from Apple's site after registration at
+(http://developer.apple.com/tools/download).
+The preferred version is Xcode 3.2.5 and iOS SDK 4.2.
+
+-----------------------------------------------------------------------------
+3.1 Install Cross libs and runtime environment
+-----------------------------------------------------------------------------
+
+ $ cd $HOME/XBMC
+ $ sudo mkdir -p /usr/local/bin; sudo cp tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/
+ $ make -C tools/osx/ios-depends
+
+-----------------------------------------------------------------------------
+4. How to compile
+-----------------------------------------------------------------------------
+Both Xcode and Terminal compilation require that build environment be setup
+from the step 3.1.
+
+ $ cd $HOME/XBMC
+ $ make -C tools/osx/ios-depends/xbmc
+ $ make clean
+ $ make xcode_depends
+
+-----------------------------------------------------------------------------
+4.1 Using Xcode
+-----------------------------------------------------------------------------
+Start XCode and open the XBMC project (XBMC-IOS.xcodeproj or XBMC-ATV2.xcodeproj)
+located in $HOME/XBMC.
+
+There are two relevant build targets : Release and Debug. Compile always for device
+end not simulator.
+
+-----------------------------------------------------------------------------
+4.2 Using Terminal (command-line)
+-----------------------------------------------------------------------------
+
+ $ cd $HOME/XBMC
+ $ xcodebuild -project XBMC-IOS.xcodeproj -target XBMC -configuration Release build ONLY_ACTIVE_ARCH=YES ARCHS=armv7 VALID_ARCHS=armv7 IPHONEOS_DEPLOYMENT_TARGET=4.1 SDKROOT=iphoneos4.2
+
+or
+
+ $ xcodebuild -project XBMC-ATV2.xcodeproj -target XBMC -configuration Release build ONLY_ACTIVE_ARCH=YES ARCHS=armv7 VALID_ARCHS=armv7 IPHONEOS_DEPLOYMENT_TARGET=4.1 SDKROOT=iphoneos4.2
+
+
+5. Gesture Handling on iPad/iPhone/iPod touch
+
+ Double Tap : Right Mouse Click
+ Swipe Left : Backspace
+ Swipe Right : Tab
+
View
2  README.linux
@@ -44,7 +44,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libfreetype6-dev, libfontconfig-dev, libbz2-dev, libfribidi-dev,
libsqlite3-dev, libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev,
libpcre3-dev, liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev,
- libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev, libxtst-dev,
+ libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev,
libxmu-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev,
libdbus-1-dev, libhal-storage-dev, libhal-dev, libpulse-dev,
libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,
View
2  README.ubuntu
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
+ # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
View
6,969 XBMC-ATV2.xcodeproj/project.pbxproj
6,969 additions, 0 deletions not shown
View
6,988 XBMC-IOS.xcodeproj/project.pbxproj
6,988 additions, 0 deletions not shown
View
146 XBMC.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 45;
objects = {
/* Begin PBXAggregateTarget section */
@@ -1208,16 +1208,10 @@
F56C8D47131F5E85000AD0F6 /* libmad.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2E131F5E84000AD0F6 /* libmad.dylib */; };
F56C8D49131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */; };
F56C8D4A131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */; };
- F56C8D4B131F5E85000AD0F6 /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
- F56C8D4C131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
- F56C8D4D131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */; };
- F56C8D4E131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
F56C8D4F131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */; };
F56C8D50131F5E85000AD0F6 /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D37131F5E85000AD0F6 /* libcdio.dylib */; };
F56C8D51131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */; };
- F56C8D52131F5E85000AD0F6 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D39131F5E85000AD0F6 /* libcurl.dylib */; };
F56C8D53131F5E85000AD0F6 /* libsmbclient.dylib.0 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */; };
- F56C8D54131F5E85000AD0F6 /* libtalloc.dylib.2 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */; };
F56C8D55131F5E85000AD0F6 /* libfreetype.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */; };
F56C8D56131F5E85000AD0F6 /* libfontconfig.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */; };
F56C8D57131F5E85000AD0F6 /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */; };
@@ -1231,21 +1225,17 @@
F56C8D5F131F5E85000AD0F6 /* libmad.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2E131F5E84000AD0F6 /* libmad.dylib */; };
F56C8D61131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */; };
F56C8D62131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */; };
- F56C8D63131F5E85000AD0F6 /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
- F56C8D64131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
- F56C8D65131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */; };
- F56C8D66131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
F56C8D67131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */; };
F56C8D68131F5E85000AD0F6 /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D37131F5E85000AD0F6 /* libcdio.dylib */; };
F56C8D69131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */; };
- F56C8D6A131F5E85000AD0F6 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D39131F5E85000AD0F6 /* libcurl.dylib */; };
F56C8D6B131F5E86000AD0F6 /* libsmbclient.dylib.0 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */; };
- F56C8D6C131F5E86000AD0F6 /* libtalloc.dylib.2 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */; };
F56C8D6D131F5E86000AD0F6 /* libfreetype.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */; };
F56C8D6E131F5E86000AD0F6 /* libfontconfig.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */; };
F56C8D6F131F5E86000AD0F6 /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */; };
F56C8D70131F5E86000AD0F6 /* libpython2.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D40131F5E85000AD0F6 /* libpython2.6.dylib */; };
F56C8D71131F5E86000AD0F6 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D41131F5E85000AD0F6 /* libsqlite3.dylib */; };
+ F57A1D1E1329B15300498CC7 /* AutoPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F57A1D1D1329B15300498CC7 /* AutoPool.mm */; };
+ F57A1D1F1329B15300498CC7 /* AutoPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F57A1D1D1329B15300498CC7 /* AutoPool.mm */; };
F57A1E3A132AAB0E00498CC7 /* libSDL.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57A1E39132AAB0E00498CC7 /* libSDL.dylib */; };
F57A1E3B132AAB0E00498CC7 /* libSDL.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57A1E39132AAB0E00498CC7 /* libSDL.dylib */; };
F57A1E3D132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57A1E3C132AAB1A00498CC7 /* libSDL_mixer.dylib */; };
@@ -1848,8 +1838,6 @@
F5A7A6F81128934D0059D6AA /* http-api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A7A6F61128934C0059D6AA /* http-api.a */; };
F5A7A702112893E50059D6AA /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */; };
F5A7A703112893E50059D6AA /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */; };
- F5A7A8131128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */; };
- F5A7A8141128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */; };
F5A7A85B112908F00059D6AA /* WebServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A859112908F00059D6AA /* WebServer.cpp */; };
F5A7A85C112908F00059D6AA /* WebServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A859112908F00059D6AA /* WebServer.cpp */; };
F5A7B376113AFB5F0059D6AA /* FileSFTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */; };
@@ -1865,6 +1853,18 @@
F5AACA970FB3E2B800DBB77C /* GUIDialogSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AACA950FB3E2B800DBB77C /* GUIDialogSlider.cpp */; };
F5AACA980FB3E2B800DBB77C /* GUIDialogSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AACA950FB3E2B800DBB77C /* GUIDialogSlider.cpp */; };
F5AD1EA80F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AD1EA70F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp */; };
+ F5B13868133081390045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
+ F5B138691330813A0045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
+ F5B13AD1133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
+ F5B13AD2133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
+ F5B13C8D1334056B0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13C8C1334056B0045076D /* DarwinUtils.mm */; };
+ F5B13C8E1334056B0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13C8C1334056B0045076D /* DarwinUtils.mm */; };
+ F5B5CBB5133865FA007A4B4C /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
+ F5B5CBB6133865FB007A4B4C /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
+ F5B5CBB91338661B007A4B4C /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
+ F5B5CBBA1338661C007A4B4C /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
+ F5B5CBD61338680F007A4B4C /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
+ F5B5CBD713386811007A4B4C /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
F5BDB80C120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
F5BDB80D120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
F5BDB81A1202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB8191202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp */; };
@@ -2471,8 +2471,8 @@
7C779E51104A58F900F444C4 /* GUIWindowTestPatternGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowTestPatternGL.h; sourceTree = "<group>"; };
7C7B2B2E1134F36400713D6D /* mysqldataset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mysqldataset.cpp; sourceTree = "<group>"; };
7C7B2B2F1134F36400713D6D /* mysqldataset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mysqldataset.h; sourceTree = "<group>"; };
- 7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = xbmc/FileSystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; };
- 7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = xbmc/FileSystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; };
+ 7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = xbmc/filesystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; };
+ 7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = xbmc/filesystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; };
7C8A14541154CB2600E5FCFA /* TextureCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureCache.cpp; sourceTree = "<group>"; };
7C8A14551154CB2600E5FCFA /* TextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureCache.h; sourceTree = "<group>"; };
7C8A187A115B2A8200E5FCFA /* TextureDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureDatabase.cpp; sourceTree = "<group>"; };
@@ -2708,11 +2708,6 @@
E38E148E0D25F9F900618676 /* EncoderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderWav.cpp; sourceTree = "<group>"; };
E38E148F0D25F9F900618676 /* EncoderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderWav.h; sourceTree = "<group>"; };
E38E14910D25F9F900618676 /* lame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lame.h; sourceTree = "<group>"; };
- E38E14950D25F9F900618676 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; };
- E38E14960D25F9F900618676 /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = "<group>"; };
- E38E14970D25F9F900618676 /* os_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os_types.h; sourceTree = "<group>"; };
- E38E14980D25F9F900618676 /* vorbisenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisenc.h; sourceTree = "<group>"; };
- E38E14990D25F9F900618676 /* vorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisfile.h; sourceTree = "<group>"; };
E38E149E0D25F9F900618676 /* coff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coff.cpp; sourceTree = "<group>"; };
E38E149F0D25F9F900618676 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coff.h; sourceTree = "<group>"; };
E38E14A00D25F9F900618676 /* coffldr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coffldr.h; sourceTree = "<group>"; };
@@ -3780,8 +3775,8 @@
F51CEF870F5C64A5004F4602 /* DVDInputStreamHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDInputStreamHTSP.h; path = xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h; sourceTree = SOURCE_ROOT; };
F51CF2CE0F6055A4004F4602 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
F51CF2CF0F6055A4004F4602 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; };
- F52910120EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirectoryNodeMusicVideoAlbum.h; path = xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.h; sourceTree = SOURCE_ROOT; };
- F52910130EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryNodeMusicVideoAlbum.cpp; path = xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.cpp; sourceTree = SOURCE_ROOT; };
+ F52910120EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirectoryNodeMusicVideoAlbum.h; path = xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.h; sourceTree = SOURCE_ROOT; };
+ F52910130EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryNodeMusicVideoAlbum.cpp; path = xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.cpp; sourceTree = SOURCE_ROOT; };
F52B063911869862004B1D66 /* Skin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Skin.h; sourceTree = "<group>"; };
F52B063A11869862004B1D66 /* Skin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Skin.cpp; sourceTree = "<group>"; };
F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDVideoCodecVDA.cpp; path = xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp; sourceTree = SOURCE_ROOT; };
@@ -3844,20 +3839,18 @@
F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libwavpack.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libwavpack.dylib"; sourceTree = "<absolute>"; };
F56C8D32131F5E84000AD0F6 /* libogg.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libogg.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libogg.dylib"; sourceTree = "<absolute>"; };
F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbis.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libvorbis.dylib"; sourceTree = "<absolute>"; };
- F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libvorbisfile.dylib"; sourceTree = "<absolute>"; };
F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisenc.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libvorbisenc.dylib"; sourceTree = "<absolute>"; };
F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfribidi.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libfribidi.dylib"; sourceTree = "<absolute>"; };
F56C8D37131F5E85000AD0F6 /* libcdio.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcdio.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libcdio.dylib"; sourceTree = "<absolute>"; };
F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsamplerate.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libsamplerate.dylib"; sourceTree = "<absolute>"; };
- F56C8D39131F5E85000AD0F6 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libcurl.dylib"; sourceTree = "<absolute>"; };
F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsmbclient.dylib.0; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libsmbclient.dylib.0"; sourceTree = "<absolute>"; };
- F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtalloc.dylib.2; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libtalloc.dylib.2"; sourceTree = "<absolute>"; };
- F56C8D3C131F5E85000AD0F6 /* libtdb.dylib.1 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; fileEncoding = 4; name = libtdb.dylib.1; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libtdb.dylib.1"; sourceTree = "<absolute>"; };
F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfreetype.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libfreetype.dylib"; sourceTree = "<absolute>"; };
F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfontconfig.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libfontconfig.dylib"; sourceTree = "<absolute>"; };
F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmysqlclient.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/mysql/libmysqlclient.dylib"; sourceTree = "<absolute>"; };
F56C8D40131F5E85000AD0F6 /* libpython2.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpython2.6.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libpython2.6.dylib"; sourceTree = "<absolute>"; };
F56C8D41131F5E85000AD0F6 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libsqlite3.dylib"; sourceTree = "<absolute>"; };
+ F57A1D1C1329B15300498CC7 /* AutoPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoPool.h; sourceTree = "<group>"; };
+ F57A1D1D1329B15300498CC7 /* AutoPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoPool.mm; sourceTree = "<group>"; };
F57A1E39132AAB0E00498CC7 /* libSDL.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSDL.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libSDL.dylib"; sourceTree = "<absolute>"; };
F57A1E3C132AAB1A00498CC7 /* libSDL_mixer.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSDL_mixer.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libSDL_mixer.dylib"; sourceTree = "<absolute>"; };
F57B6F7E1071B8B500079ACB /* JobManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JobManager.cpp; sourceTree = "<group>"; };
@@ -3904,7 +3897,6 @@
F5A7A6F61128934C0059D6AA /* http-api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "http-api.a"; path = "xbmc/interfaces/http-api/http-api.a"; sourceTree = "<group>"; };
F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnnouncementManager.cpp; sourceTree = "<group>"; };
F5A7A701112893E50059D6AA /* AnnouncementManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnouncementManager.h; sourceTree = "<group>"; };
- F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmicrohttpd.a; path = lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a; sourceTree = "<group>"; };
F5A7A859112908F00059D6AA /* WebServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebServer.cpp; sourceTree = "<group>"; };
F5A7A85A112908F00059D6AA /* WebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebServer.h; sourceTree = "<group>"; };
F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSFTP.cpp; sourceTree = "<group>"; };
@@ -3922,6 +3914,10 @@
F5ACB5370FC3DF3D00AAA056 /* eprintf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eprintf.cpp; sourceTree = "<group>"; };
F5AD1EA60F488A1A0065EB5D /* GUIWindowKaraokeLyrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowKaraokeLyrics.h; sourceTree = "<group>"; };
F5AD1EA70F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowKaraokeLyrics.cpp; sourceTree = "<group>"; };
+ F5B138641330811D0045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
+ F5B13AD0133319310045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libass.dylib"; sourceTree = "<absolute>"; };
+ F5B13C8B1334056B0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
+ F5B13C8C1334056B0045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
F5B413131065900C0035D105 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
F5BDB80A120202F400F0B710 /* DVDSubtitleTagSami.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDSubtitleTagSami.h; sourceTree = "<group>"; };
F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDSubtitleTagSami.cpp; sourceTree = "<group>"; };
@@ -4029,7 +4025,6 @@
F5A7A6F1112893330059D6AA /* libjsoncpp.a in Frameworks */,
F5A7A6F4112893440059D6AA /* json-rpc.a in Frameworks */,
F5A7A6F71128934C0059D6AA /* http-api.a in Frameworks */,
- F5A7A8131128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */,
F56C8CE2131F5DAF000AD0F6 /* libc.dylib in Frameworks */,
F56C8CE7131F5DC6000AD0F6 /* libz.dylib in Frameworks */,
F56C8CEA131F5DCC000AD0F6 /* libm.dylib in Frameworks */,
@@ -4045,16 +4040,10 @@
F56C8D47131F5E85000AD0F6 /* libmad.dylib in Frameworks */,
F56C8D49131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */,
F56C8D4A131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */,
- F56C8D4B131F5E85000AD0F6 /* libogg.dylib in Frameworks */,
- F56C8D4C131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */,
- F56C8D4D131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */,
- F56C8D4E131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */,
F56C8D4F131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */,
F56C8D50131F5E85000AD0F6 /* libcdio.dylib in Frameworks */,
F56C8D51131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */,
- F56C8D52131F5E85000AD0F6 /* libcurl.dylib in Frameworks */,
F56C8D53131F5E85000AD0F6 /* libsmbclient.dylib.0 in Frameworks */,
- F56C8D54131F5E85000AD0F6 /* libtalloc.dylib.2 in Frameworks */,
F56C8D55131F5E85000AD0F6 /* libfreetype.dylib in Frameworks */,
F56C8D56131F5E85000AD0F6 /* libfontconfig.dylib in Frameworks */,
F56C8D57131F5E85000AD0F6 /* libmysqlclient.dylib in Frameworks */,
@@ -4062,6 +4051,11 @@
F56C8D59131F5E85000AD0F6 /* libsqlite3.dylib in Frameworks */,
F57A1E3A132AAB0E00498CC7 /* libSDL.dylib in Frameworks */,
F57A1E3D132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
+ F5B13868133081390045076D /* libmicrohttpd.dylib in Frameworks */,
+ F5B13AD1133319310045076D /* libass.dylib in Frameworks */,
+ F5B5CBB5133865FA007A4B4C /* libogg.dylib in Frameworks */,
+ F5B5CBB91338661B007A4B4C /* libvorbis.dylib in Frameworks */,
+ F5B5CBD61338680F007A4B4C /* libvorbisenc.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4095,7 +4089,6 @@
F5A7A6F2112893330059D6AA /* libjsoncpp.a in Frameworks */,
F5A7A6F5112893440059D6AA /* json-rpc.a in Frameworks */,
F5A7A6F81128934D0059D6AA /* http-api.a in Frameworks */,
- F5A7A8141128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */,
F56C8CE3131F5DAF000AD0F6 /* libc.dylib in Frameworks */,
F56C8CE8131F5DC6000AD0F6 /* libz.dylib in Frameworks */,
F56C8CEB131F5DCC000AD0F6 /* libm.dylib in Frameworks */,
@@ -4111,16 +4104,10 @@
F56C8D5F131F5E85000AD0F6 /* libmad.dylib in Frameworks */,
F56C8D61131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */,
F56C8D62131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */,
- F56C8D63131F5E85000AD0F6 /* libogg.dylib in Frameworks */,
- F56C8D64131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */,
- F56C8D65131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */,
- F56C8D66131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */,
F56C8D67131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */,
F56C8D68131F5E85000AD0F6 /* libcdio.dylib in Frameworks */,
F56C8D69131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */,
- F56C8D6A131F5E85000AD0F6 /* libcurl.dylib in Frameworks */,
F56C8D6B131F5E86000AD0F6 /* libsmbclient.dylib.0 in Frameworks */,
- F56C8D6C131F5E86000AD0F6 /* libtalloc.dylib.2 in Frameworks */,
F56C8D6D131F5E86000AD0F6 /* libfreetype.dylib in Frameworks */,
F56C8D6E131F5E86000AD0F6 /* libfontconfig.dylib in Frameworks */,
F56C8D6F131F5E86000AD0F6 /* libmysqlclient.dylib in Frameworks */,
@@ -4128,6 +4115,11 @@
F56C8D71131F5E86000AD0F6 /* libsqlite3.dylib in Frameworks */,
F57A1E3B132AAB0E00498CC7 /* libSDL.dylib in Frameworks */,
F57A1E3E132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
+ F5B138691330813A0045076D /* libmicrohttpd.dylib in Frameworks */,
+ F5B13AD2133319310045076D /* libass.dylib in Frameworks */,
+ F5B5CBB6133865FB007A4B4C /* libogg.dylib in Frameworks */,
+ F5B5CBBA1338661C007A4B4C /* libvorbis.dylib in Frameworks */,
+ F5B5CBD713386811007A4B4C /* libvorbisenc.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5275,6 +5267,8 @@
E37D5CB40D3023BB0081D327 /* osx */ = {
isa = PBXGroup;
children = (
+ F57A1D1C1329B15300498CC7 /* AutoPool.h */,
+ F57A1D1D1329B15300498CC7 /* AutoPool.mm */,
6E2FACD20E26E92800DF79EA /* Info.plist */,
F5EA04280F72EB88005C2EC5 /* SDLMain.mm */,
F5EA04E80F72F9CA005C2EC5 /* SDLMain.h */,
@@ -5282,6 +5276,8 @@
83A72B930FBC8DFF00171871 /* CoreAudio.h */,
F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */,
F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */,
+ F5B13C8B1334056B0045076D /* DarwinUtils.h */,
+ F5B13C8C1334056B0045076D /* DarwinUtils.mm */,
E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */,
E306D12D0DDF7B590052C2AD /* XBMCHelper.h */,
F51CEEEE0F5C5D20004F4602 /* OSXGNUReplacements.c */,
@@ -5422,7 +5418,6 @@
E38E148E0D25F9F900618676 /* EncoderWav.cpp */,
E38E148F0D25F9F900618676 /* EncoderWav.h */,
E38E14900D25F9F900618676 /* lame */,
- E38E14940D25F9F900618676 /* oggvorbis */,
);
path = cdrip;
sourceTree = "<group>";
@@ -5435,18 +5430,6 @@
path = lame;
sourceTree = "<group>";
};
- E38E14940D25F9F900618676 /* oggvorbis */ = {
- isa = PBXGroup;
- children = (
- E38E14950D25F9F900618676 /* codec.h */,
- E38E14960D25F9F900618676 /* ogg.h */,
- E38E14970D25F9F900618676 /* os_types.h */,
- E38E14980D25F9F900618676 /* vorbisenc.h */,
- E38E14990D25F9F900618676 /* vorbisfile.h */,
- );
- path = oggvorbis;
- sourceTree = "<group>";
- };
E38E149A0D25F9F900618676 /* cores */ = {
isa = PBXGroup;
children = (
@@ -7224,20 +7207,17 @@
F56C8D2B131F5E84000AD0F6 /* libpcre.dylib */,
F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */,
F56C8D2D131F5E84000AD0F6 /* libcrypto.dylib */,
+ F5B13AD0133319310045076D /* libass.dylib */,
F56C8D2E131F5E84000AD0F6 /* libmad.dylib */,
F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */,
F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */,
F56C8D32131F5E84000AD0F6 /* libogg.dylib */,
F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */,
- F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */,
F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */,
F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */,
F56C8D37131F5E85000AD0F6 /* libcdio.dylib */,
F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */,
- F56C8D39131F5E85000AD0F6 /* libcurl.dylib */,
F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */,
- F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */,
- F56C8D3C131F5E85000AD0F6 /* libtdb.dylib.1 */,
F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */,
F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */,
F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */,
@@ -7246,6 +7226,7 @@
E38E24250D26317D00618676 /* libGLEW.dylib */,
F57A1E39132AAB0E00498CC7 /* libSDL.dylib */,
F57A1E3C132AAB1A00498CC7 /* libSDL_mixer.dylib */,
+ F5B138641330811D0045076D /* libmicrohttpd.dylib */,
);
name = "External Libs";
sourceTree = "<group>";
@@ -7259,7 +7240,6 @@
F5A7A6F61128934C0059D6AA /* http-api.a */,
F5A7A6F3112893440059D6AA /* json-rpc.a */,
F5A7A6F0112893330059D6AA /* libjsoncpp.a */,
- F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */,
F5A1C86A0F6B048000A96ABD /* x86 */,
F5A1C8690F6B047D00A96ABD /* ppc */,
);
@@ -7471,7 +7451,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB924B08733DCA0010E9CD /* Build configuration list for PBXProject "XBMC" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -7506,7 +7486,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#set -x\n\nEXTERNAL_LIBS=/Users/Shared/xbmc-depends/osx-10.4_i386\n\nTARGET_NAME=$PRODUCT_NAME\nTARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME/Contents\n\nTARGET_BINARY=$TARGET_CONTENTS/MacOS/XBMC\nTARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks\nDYLIB_NAMEPATH=@executable_path/../Frameworks\nXBMC_HOME=$TARGET_CONTENTS/Resources/XBMC\n\nmkdir -p \"$TARGET_CONTENTS/MacOS\"\nmkdir -p \"$TARGET_CONTENTS/Resources\"\nmkdir -p \"$TARGET_CONTENTS/Frameworks\"\n\ncp -f \"$TARGET_BUILD_DIR/XBMC\" \"$TARGET_BINARY\"\ncp -f \"$SRCROOT/media/xbmc.icns\" \"$TARGET_CONTENTS/Resources/\"\ncp -f \"$SRCROOT/xbmc/osx/Info.plist\" \"$TARGET_CONTENTS/\"\n\n# start clean so we don't keep old dylibs\nrm -rf \"$TARGET_CONTENTS/Frameworks/*\"\n\n# rsync command for packaging external python\nmkdir -p \"$TARGET_CONTENTS\"/Frameworks/usr/lib\nPYTHONSYNC=\"rsync -av --exclude .DS_Store --exclude *.a --exclude test --exclude tests\"\n${PYTHONSYNC} \"$EXTERNAL_LIBS/lib/python2.6\" \"$TARGET_FRAMEWORKS/usr/lib/\"\nrm -rf \"$TARGET_FRAMEWORKS/usr/lib/python2.6/config\"\n\n# Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_BINARY\"\nfor a in $(otool -L \"$TARGET_BINARY\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do \n\techo \"Processing $a\"\n\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_BINARY\"\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the *.so dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_FRAMEWORKS/usr/lib for so files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_FRAMEWORKS\"/usr/lib -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the *osx.so dylib dependencies and rename their locations to inside the Framework\necho \"Checking $XBMC_HOME/system for so files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$XBMC_HOME\"/system -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the addon/*.so dylib dependencies and rename their locations to inside the Framework\necho \"Checking $XBMC_HOME/addon for so files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$XBMC_HOME\"/addons -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the addon/*.xbs dylib dependencies and rename their locations to inside the Framework\necho \"Checking $XBMC_HOME/addon for xbs files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$XBMC_HOME\"/addons -name \"*.xbs\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_FRAMEWORKS for dylib files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_FRAMEWORKS/\"*dylib* ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_FRAMEWORKS/$(basename $b)\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n";
+ shellScript = "#set -x\n\nfunction check_dyloaded_depends\n{\n b=$(find \"$EXTERNAL_LIBS\" -name $1 -print)\n if [ -f \"$b\" ]; then\n #echo \"Processing $b\"\n if [ ! -f \"$TARGET_FRAMEWORKS/$(basename $b)\" ]; then\n echo \" Packaging $b\"\n cp -f \"$b\" \"$TARGET_FRAMEWORKS/\"\n chmod u+w \"$TARGET_FRAMEWORKS/$(basename $b)\"\n fi\n for a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n if [ -f \"$a\" ]; then\n if [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n echo \" Packaging $a\"\n cp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n chmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n install_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_FRAMEWORKS/$(basename $b)\"\n fi\n fi\n done \n fi\n}\n\nfunction check_xbmc_dylib_depends\n{\n REWIND=\"1\"\n while [ $REWIND = \"1\" ]\n do\n let REWIND=\"0\"\n for b in $(find \"$1\" -name \"$2\" -print) ; do\n #echo \"Processing $b\"\n for a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n #echo \" Packaging $a\"\n if [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n echo \" Packaging $a\"\n cp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n chmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n let REWIND=\"1\"\n fi\n install_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n done\n done\n done\n}\n\nEXTERNAL_LIBS=/Users/Shared/xbmc-depends/osx-10.4_i386\n\nTARGET_NAME=$PRODUCT_NAME\nTARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME/Contents\n\nTARGET_BINARY=$TARGET_CONTENTS/MacOS/XBMC\nTARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks\nDYLIB_NAMEPATH=@executable_path/../Frameworks\nXBMC_HOME=$TARGET_CONTENTS/Resources/XBMC\n\nmkdir -p \"$TARGET_CONTENTS/MacOS\"\nmkdir -p \"$TARGET_CONTENTS/Resources\"\n# start clean so we don't keep old dylibs\nrm -rf \"$TARGET_CONTENTS/Frameworks\"\nmkdir -p \"$TARGET_CONTENTS/Frameworks\"\n\necho \"Package $TARGET_BUILD_DIR/XBMC\"\ncp -f \"$TARGET_BUILD_DIR/XBMC\" \"$TARGET_BINARY\"\ncp -f \"$SRCROOT/media/xbmc.icns\" \"$TARGET_CONTENTS/Resources/\"\ncp -f \"$SRCROOT/xbmc/osx/Info.plist\" \"$TARGET_CONTENTS/\"\n\n# Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_BINARY dylib dependencies\"\nfor a in $(otool -L \"$TARGET_BINARY\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do \n\techo \" Packaging $a\"\n\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_BINARY\"\ndone\n\necho \"Package $EXTERNAL_LIBS/lib/python2.6\"\nmkdir -p \"$TARGET_CONTENTS/Frameworks/lib\"\nPYTHONSYNC=\"rsync -aq --exclude .DS_Store --exclude *.a --exclude *.exe --exclude test --exclude tests\"\n${PYTHONSYNC} \"$EXTERNAL_LIBS/lib/python2.6\" \"$TARGET_FRAMEWORKS/lib/\"\nrm -rf \"$TARGET_FRAMEWORKS/lib/python2.6/config\"\n\necho \"Checking $TARGET_FRAMEWORKS/lib/python2.6 *.so for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$TARGET_FRAMEWORKS\"/lib/python2.6 \"*.so\"\n\necho \"Checking $XBMC_HOME/system *.so for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$XBMC_HOME\"/system \"*.so\"\n\necho \"Checking $XBMC_HOME/addons *.so for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$XBMC_HOME\"/addons \"*.so\"\n\necho \"Checking $XBMC_HOME/addons *.xbs for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$XBMC_HOME\"/addons \"*.xbs\"\n\necho \"Checking xbmc/DllPaths_generated.h for dylib dependencies\"\nfor a in $(grep .dylib \"$SRCROOT\"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\\\"//g) ; do\n check_dyloaded_depends $a\ndone\n\necho \"Checking $TARGET_FRAMEWORKS for missing dylib dependencies\"\nREWIND=\"1\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_FRAMEWORKS/\"*dylib* ; do\n\t\t#echo \" Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\t#echo \"Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Packaging $a\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_FRAMEWORKS/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n";
};
81B8FC150E7D927A00354E2E /* update version info */ = {
isa = PBXShellScriptBuildPhase;
@@ -7534,7 +7514,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\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 -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.zlib --exclude *.a\"\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 -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/osx\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
+ shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\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 -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.zlib --exclude *.a\"\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 -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
};
F5A1CBDF0F6B0B4700A96ABD /* copy frameworks */ = {
isa = PBXShellScriptBuildPhase;
@@ -7577,7 +7557,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\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 -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.zlib --exclude *.a\"\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 -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/osx\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
+ shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\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 *arm-osx.* --exclude *.zlib --exclude *.a\"\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\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -8502,6 +8482,8 @@
C8F3728B132A53E700E903AE /* PVRFile.cpp in Sources */,
C8F3728E132A541300E903AE /* DVDInputStreamPVRManager.cpp in Sources */,
C8F37293132A54F300E903AE /* Observer.cpp in Sources */,
+ F57A1D1E1329B15300498CC7 /* AutoPool.mm in Sources */,
+ F5B13C8D1334056B0045076D /* DarwinUtils.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9369,6 +9351,8 @@
7C4705AF12EF584C00369E51 /* AddonInstaller.cpp in Sources */,
18C1D22E13033F6A00CFFE59 /* GLUtils.cpp in Sources */,
7C84A59F12FA3C1600CD1714 /* SourcesDirectory.cpp in Sources */,
+ F57A1D1F1329B15300498CC7 /* AutoPool.mm in Sources */,
+ F5B13C8E1334056B0045076D /* DarwinUtils.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9440,22 +9424,18 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
+ "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
+ "\"$(SRCROOT)\"",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11 = "\"$(SRCROOT)/lib/darwin/libSDL-OSX\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12 = "\"$XBMC_DEPENDS/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13 = "\"$XBMC_DEPENDS/lib/mysql\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14 = "\"$(SRCROOT)/xbmc/interfaces/http-api\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15 = "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/lib/libRTV\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/lib/libXBMS\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libXDAAP\"";
@@ -9531,22 +9511,18 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
+ "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
+ "\"$(SRCROOT)\"",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11 = "\"$(SRCROOT)/lib/darwin/libSDL-OSX\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12 = "\"$XBMC_DEPENDS/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13 = "\"$XBMC_DEPENDS/lib/mysql\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14 = "\"$(SRCROOT)/xbmc/interfaces/http-api\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15 = "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/lib/libRTV\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/lib/libXBMS\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libXDAAP\"";
@@ -9580,7 +9556,7 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.4;
USER_HEADER_SEARCH_PATHS = .;
VALID_ARCHS = "ppc i386";
};
@@ -9598,7 +9574,7 @@
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.4;
PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.4;
USER_HEADER_SEARCH_PATHS = .;
VALID_ARCHS = "ppc i386";
};
@@ -9675,9 +9651,7 @@
lib/cmyth/librefmem,
lib/libapetag/.libs,
lib/libsquish,
- "lib/darwin/libSDL-OSX",
lib/jsoncpp/src/lib_json,
- lib/libmicrohttpd/src/daemon/.libs,
"xbmc/interfaces/http-api",
"xbmc/interfaces/json-rpc",
/opt/local/lib,
@@ -9687,11 +9661,15 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
+ "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
+ "\"$(SRCROOT)\"",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
"-headerpad_max_install_names",
@@ -9755,9 +9733,7 @@
lib/cmyth/librefmem,
lib/libapetag/.libs,
lib/libsquish,
- "lib/darwin/libSDL-OSX",
lib/jsoncpp/src/lib_json,
- lib/libmicrohttpd/src/daemon/.libs,
"xbmc/interfaces/http-api",
"xbmc/interfaces/json-rpc",
/opt/local/lib,
@@ -9767,11 +9743,15 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
+ "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
+ "\"$(SRCROOT)\"",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
LINK_WITH_STANDARD_LIBRARIES = YES;
OTHER_LDFLAGS = (
"-headerpad_max_install_names",
View
6 addons/library.xbmc.addon/libXBMC_addon.h
@@ -63,16 +63,16 @@ typedef enum queue_msg {
QUEUE_ERROR
} queue_msg_t;
-class cHelper_libXBMC_addon
+class CHelper_libXBMC_addon
{
public:
- cHelper_libXBMC_addon()
+ CHelper_libXBMC_addon()
{
m_libXBMC_addon = NULL;
m_Handle = NULL;
}
- ~cHelper_libXBMC_addon()
+ ~CHelper_libXBMC_addon()
{
if (m_libXBMC_addon)
{
View
102 addons/library.xbmc.gui/libXBMC_gui.h
@@ -53,22 +53,22 @@ typedef void* GUIHANDLE;
#define ADDON_ACTION_PREVIOUS_MENU 10
#define ADDON_ACTION_CLOSE_DIALOG 51
-class cGUIWindow;
-class cGUISpinControl;
-class cGUIRadioButton;
-class cGUIProgressControl;
-class cListItem;
+class CAddonGUIWindow;
+class CAddonGUISpinControl;
+class CAddonGUIRadioButton;
+class CAddonGUIProgressControl;
+class CAddonListItem;
-class cHelper_libXBMC_gui
+class CHelper_libXBMC_gui
{
public:
- cHelper_libXBMC_gui()
+ CHelper_libXBMC_gui()
{
m_libXBMC_gui = NULL;
m_Handle = NULL;
}
- ~cHelper_libXBMC_gui()
+ ~CHelper_libXBMC_gui()
{
if (m_libXBMC_gui)
{
@@ -120,43 +120,43 @@ class cHelper_libXBMC_gui
dlsym(m_libXBMC_gui, "GUI_get_video_resolution");
if (GetVideoResolution == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Window_create = (cGUIWindow* (*)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog))
+ Window_create = (CAddonGUIWindow* (*)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog))
dlsym(m_libXBMC_gui, "GUI_Window_create");
if (Window_create == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Window_destroy = (void (*)(cGUIWindow* p))
+ Window_destroy = (void (*)(CAddonGUIWindow* p))
dlsym(m_libXBMC_gui, "GUI_Window_destroy");
if (Window_destroy == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Control_getSpin = (cGUISpinControl* (*)(cGUIWindow *window, int controlId))
+ Control_getSpin = (CAddonGUISpinControl* (*)(CAddonGUIWindow *window, int controlId))
dlsym(m_libXBMC_gui, "GUI_control_get_spin");
if (Control_getSpin == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Control_releaseSpin = (void (*)(cGUISpinControl* p))
+ Control_releaseSpin = (void (*)(CAddonGUISpinControl* p))
dlsym(m_libXBMC_gui, "GUI_control_release_spin");
if (Control_releaseSpin == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Control_getRadioButton = (cGUIRadioButton* (*)(cGUIWindow *window, int controlId))
+ Control_getRadioButton = (CAddonGUIRadioButton* (*)(CAddonGUIWindow *window, int controlId))
dlsym(m_libXBMC_gui, "GUI_control_get_radiobutton");
if (Control_getRadioButton == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Control_releaseRadioButton = (void (*)(cGUIRadioButton* p))
+ Control_releaseRadioButton = (void (*)(CAddonGUIRadioButton* p))
dlsym(m_libXBMC_gui, "GUI_control_release_radiobutton");
if (Control_releaseRadioButton == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Control_getProgress = (cGUIProgressControl* (*)(cGUIWindow *window, int controlId))
+ Control_getProgress = (CAddonGUIProgressControl* (*)(CAddonGUIWindow *window, int controlId))
dlsym(m_libXBMC_gui, "GUI_control_get_progress");
if (Control_getProgress == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- Control_releaseProgress = (void (*)(cGUIProgressControl* p))
+ Control_releaseProgress = (void (*)(CAddonGUIProgressControl* p))
dlsym(m_libXBMC_gui, "GUI_control_release_progress");
if (Control_releaseProgress == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- ListItem_create = (cListItem* (*)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path))
+ ListItem_create = (CAddonListItem* (*)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path))
dlsym(m_libXBMC_gui, "GUI_ListItem_create");
if (ListItem_create == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
- ListItem_destroy = (void (*)(cListItem* p))
+ ListItem_destroy = (void (*)(CAddonListItem* p))
dlsym(m_libXBMC_gui, "GUI_ListItem_destroy");
if (ListItem_destroy == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
@@ -169,16 +169,16 @@ class cHelper_libXBMC_gui
int (*GetScreenHeight)();
int (*GetScreenWidth)();
int (*GetVideoResolution)();
- cGUIWindow* (*Window_create)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
- void (*Window_destroy)(cGUIWindow* p);
- cGUISpinControl* (*Control_getSpin)(cGUIWindow *window, int controlId);
- void (*Control_releaseSpin)(cGUISpinControl* p);
- cGUIRadioButton* (*Control_getRadioButton)(cGUIWindow *window, int controlId);
- void (*Control_releaseRadioButton)(cGUIRadioButton* p);
- cGUIProgressControl* (*Control_getProgress)(cGUIWindow *window, int controlId);
- void (*Control_releaseProgress)(cGUIProgressControl* p);
- cListItem* (*ListItem_create)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
- void (*ListItem_destroy)(cListItem* p);
+ CAddonGUIWindow* (*Window_create)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
+ void (*Window_destroy)(CAddonGUIWindow* p);
+ CAddonGUISpinControl* (*Control_getSpin)(CAddonGUIWindow *window, int controlId);
+ void (*Control_releaseSpin)(CAddonGUISpinControl* p);
+ CAddonGUIRadioButton* (*Control_getRadioButton)(CAddonGUIWindow *window, int controlId);
+ void (*Control_releaseRadioButton)(CAddonGUIRadioButton* p);
+ CAddonGUIProgressControl* (*Control_getProgress)(CAddonGUIWindow *window, int controlId);
+ void (*Control_releaseProgress)(CAddonGUIProgressControl* p);
+ CAddonListItem* (*ListItem_create)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
+ void (*ListItem_destroy)(CAddonListItem* p);
protected:
int (*GUI_register_me)(void *HANDLE);
@@ -193,11 +193,11 @@ class cHelper_libXBMC_gui
};
};
-class cGUISpinControl
+class CAddonGUISpinControl
{
public:
- cGUISpinControl(cGUIWindow *window, int controlId);
- virtual ~cGUISpinControl(void) {}
+ CAddonGUISpinControl(CAddonGUIWindow *window, int controlId);
+ virtual ~CAddonGUISpinControl(void) {}
virtual void SetVisible(bool yesNo);
virtual void SetText(const char *label);
@@ -207,16 +207,16 @@ class cGUISpinControl
virtual void SetValue(int iValue);
private:
- cGUIWindow *m_Window;
+ CAddonGUIWindow *m_Window;
int m_ControlId;
GUIHANDLE m_SpinHandle;
};
-class cGUIRadioButton
+class CAddonGUIRadioButton
{
public:
- cGUIRadioButton(cGUIWindow *window, int controlId);
- ~cGUIRadioButton() {}
+ CAddonGUIRadioButton(CAddonGUIWindow *window, int controlId);
+ ~CAddonGUIRadioButton() {}
virtual void SetVisible(bool yesNo);
virtual void SetText(const char *label);
@@ -224,16 +224,16 @@ class cGUIRadioButton
virtual bool IsSelected();
private:
- cGUIWindow *m_Window;
+ CAddonGUIWindow *m_Window;
int m_ControlId;
GUIHANDLE m_ButtonHandle;
};
-class cGUIProgressControl
+class CAddonGUIProgressControl
{
public:
- cGUIProgressControl(cGUIWindow *window, int controlId);
- virtual ~cGUIProgressControl(void) {}
+ CAddonGUIProgressControl(CAddonGUIWindow *window, int controlId);
+ virtual ~CAddonGUIProgressControl(void) {}
virtual void SetPercentage(float fPercent);
virtual float GetPercentage() const;
@@ -242,18 +242,18 @@ class cGUIProgressControl
virtual std::string GetDescription() const;
private:
- cGUIWindow *m_Window;
+ CAddonGUIWindow *m_Window;
int m_ControlId;
GUIHANDLE m_ProgressHandle;
};
-class cListItem
+class CAddonListItem
{
-friend class cGUIWindow;
+friend class CAddonGUIWindow;
public:
- cListItem(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
- virtual ~cListItem(void) {}
+ CAddonListItem(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
+ virtual ~CAddonListItem(void) {}
virtual const char *GetLabel();
virtual void SetLabel(const char *label);
@@ -272,15 +272,15 @@ friend class cGUIWindow;
GUIHANDLE m_ListItemHandle;
};
-class cGUIWindow
+class CAddonGUIWindow
{
-friend class cGUISpinControl;
-friend class cGUIRadioButton;
-friend class cGUIProgressControl;
+friend class CAddonGUISpinControl;
+friend class CAddonGUIRadioButton;
+friend class CAddonGUIProgressControl;
public:
- cGUIWindow(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
- ~cGUIWindow();
+ CAddonGUIWindow(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
+ ~CAddonGUIWindow();
virtual bool Show();
virtual void Close();
@@ -301,7 +301,7 @@ friend class cGUIProgressControl;
virtual void ClearList();
virtual GUIHANDLE AddStringItem(const char *name, int itemPosition = -1);
virtual void AddItem(GUIHANDLE item, int itemPosition = -1);
- virtual void AddItem(cListItem *item, int itemPosition = -1);
+ virtual void AddItem(CAddonListItem *item, int itemPosition = -1);
virtual void RemoveItem(int itemPosition);
virtual GUIHANDLE GetListItem(int listPos);
virtual void SetCurrentListPosition(int listPos);
View
11 addons/library.xbmc.pvr/libXBMC_pvr.h
@@ -54,16 +54,16 @@
#define DVD_TIME_BASE 1000000
#define DVD_NOPTS_VALUE (-1LL<<52) // should be possible to represent in both double and __int64
-class cHelper_libXBMC_pvr
+class CHelper_libXBMC_pvr
{
public:
- cHelper_libXBMC_pvr()
+ CHelper_libXBMC_pvr()
{
m_libXBMC_pvr = NULL;
m_Handle = NULL;
}
- ~cHelper_libXBMC_pvr()
+ ~CHelper_libXBMC_pvr()
{
if (m_libXBMC_pvr)
{
@@ -127,6 +127,10 @@ class cHelper_libXBMC_pvr
dlsym(m_libXBMC_pvr, "PVR_trigger_recording_update");
if (TriggerRecordingUpdate == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+ TriggerChannelUpdate = (void (*)())
+ dlsym(m_libXBMC_pvr, "PVR_trigger_channel_update");
+ if (TriggerChannelUpdate == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
+
#ifdef USE_DEMUX
FreeDemuxPacket = (void (*)(DemuxPacket* pPacket))
dlsym(m_libXBMC_pvr, "PVR_free_demux_packet");
@@ -148,6 +152,7 @@ class cHelper_libXBMC_pvr
void (*Recording)(const char *Name, const char *FileName, bool On);
void (*TriggerTimerUpdate)();
void (*TriggerRecordingUpdate)();
+ void (*TriggerChannelUpdate)();
#ifdef USE_DEMUX
void (*FreeDemuxPacket)(DemuxPacket* pPacket);
DemuxPacket* (*AllocateDemuxPacket)(int iDataSize);
View
7 addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+ <string id="30000">Fanitaide käytössä</string>
+ <string id="30001">Käytä trailereita HD-Trailers.net -sivustolta</string>
+ <string id="30002">Kieli</string>
+ <string id="30003">Hae luokitus IMDb:stä</string>
+</strings>
View
2  addons/pvr.hts/resources/settings.xml
@@ -5,6 +5,6 @@
<setting id="htsp_port" type="integer" label="30002" default="9982" />
<setting id="user" type="text" label="30003" default="" />
<setting id="pass" type="text" label="30004" option="hidden" default="" />
- <setting id="skip_I_frame" type="bool" label="30005" default="true" />
+ <setting id="skip_I_frame_count" type="enum" label="30005" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="0" />
<setting id="epg_offset_correction" type="enum" label="30006" values="-12|-11|-10|-9|-8|-7|-6|-5|-4|-3|-2|-1|0|1|2|3|4|5|6|7|8|9|10|11|12" default="12" />
</settings>
View
1  addons/screensaver.xbmc.builtin.slideshow/resources/language/Finnish/strings.xml
@@ -5,4 +5,5 @@
<string id="30002">Videoiden fanitaide</string>
<string id="30003">Musiikin fanitaide</string>
<string id="30004">Kuvakansio</string>
+ <string id="30005">Himmennystaso</string>
</strings>
View
2  addons/skin.confluence/720p/DialogKeyboard.xml
@@ -1,5 +1,5 @@
<window id="103">
- <defaultcontrol always="true">65</defaultcontrol>
+ <defaultcontrol always="true">300</defaultcontrol>
<include>dialogeffect</include>
<coordinates>
<system>2</system>
View
7 addons/skin.confluence/720p/MyVideoNav.xml
@@ -14,7 +14,7 @@
<height>720</height>
<texture border="20">black-back.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(50) | Control.IsVisible(500) | Control.IsVisible(505)</visible>
+ <visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(500) | Control.IsVisible(505)</visible>
</control>
<control type="image">
<posx>0</posx>
@@ -23,7 +23,7 @@
<height>128</height>
<texture>floor.png</texture>
<include>VisibleFadeEffect</include>
- <visible>Control.IsVisible(50) | Control.IsVisible(500) | Control.IsVisible(505) | Control.IsVisible(508)</visible>
+ <visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(500) | Control.IsVisible(505) | Control.IsVisible(508)</visible>
</control>
<control type="group">
<include>VisibleFadeEffect</include>
@@ -385,7 +385,7 @@
<control type="group">
<posx>470</posx>
<posy>0</posy>
- <visible>Container.Content(Episodes)</visible>
+ <visible>Container.Content(Episodes) + !IsEmpty(ListItem.Season)</visible>
<include>VisibleFadeEffect</include>
<animation effect="slide" end="-710,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
<animation effect="slide" start="-710,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
@@ -406,6 +406,7 @@
<posx>240</posx>
<posy>0</posy>
<visible>Container.Content(Seasons) | Container.Content(Episodes)</visible>
+ <visible>!IsEmpty(ListItem.TVShowTitle)</visible>
<include>VisibleFadeEffect</include>
<animation effect="slide" end="-600,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
<animation effect="slide" start="-600,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
View
2  addons/skin.confluence/720p/SettingsSystemInfo.xml
@@ -281,7 +281,7 @@
<description>XBMC XBE BUILD Version</description>
<posx>750</posx>
<posy>400</posy>
- <width>700</width>
+ <width>730</width>
<label>144</label>
<align>right</align>
<textcolor>blue</textcolor>
View
1  addons/skin.confluence/720p/ViewsFileMode.xml
@@ -180,7 +180,6 @@
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
<preloaditems>2</preloaditems>
- <visible>![Window.IsVisible(VideoLibrary) + Container.Content(TVShows)]</visible>
<itemlayout height="275" width="270">
<control type="image">
<posx>1</posx>
View
10 addons/skin.confluence/language/Finnish/strings.xml
@@ -59,7 +59,7 @@
<string id="31104">Toista esittelyt ikkunassa [COLOR=grey3](Videotiedot-ikkuna)[/COLOR]</string>
<string id="31105"></string>
<string id="31106">Yleiset asetukset</string>
- <string id="31107"></string>
+ <string id="31107">Piilota tiedostojen nimistä luetut merkinnät [COLOR=grey3](Blu-ray, HD-DVD)[/COLOR]</string>
<string id="31108">Piilota päävalikon painikkeet</string>
<string id="31109">Päävalikon taustakuvat</string>
<string id="31110">Muokkaa taustakuvaa päävalikon painikkeelle</string>
@@ -71,7 +71,7 @@
<string id="31116"></string>
<string id="31117">Näytä viimeksi lisätyt videot</string>
<string id="31118">Päävalikon alivalikko</string>
- <string id="31119"></string>
+ <string id="31119">Piilota taustan fanitaide</string>
<string id="31120">PAINIKKEEN TEKSTI</string>
<string id="31121"></string>
<string id="31122">Sääsivu</string>
@@ -84,6 +84,12 @@
<string id="31128">Sanoitukset</string>
<string id="31129"></string>
<string id="31130"></string>
+ <string id="31131"></string>
+ <string id="31132">Sanoitukset-lisäosa</string>
+ <string id="31133">Tekstitykset-lisäosa</string>
+ <string id="31134">Päävalikon Videot-alivalikko</string>
+ <string id="31135">Päävalikon Musiikki-alivalikko</string>
+ <string id="31136">Päävalikon Kuvat-alivalikko</string>
<string id="31140">Musiikki-OSD</string>
<string id="31141">Video-OSD</string>
View
4 bootstrap
@@ -4,9 +4,7 @@ set -e
autoreconf -vif
autoreconf -vif lib/cpluff
-# we must autoreconf libass as we don't know till later if it's used.
-[ -d lib/libass ] && autoreconf -vif lib/libass
-# order matters with libbdnav and friends
+# order matters with libdvd and friends
[ -d lib/libdvd/libdvdcss ] && \
autoreconf -vif lib/libdvd/libdvdcss
autoreconf -vif lib/libdvd/libdvdread
View
270 configure.in
@@ -82,9 +82,10 @@ crystalhd_not_found="== Could not find libcrystalhd. CrystalHD support disabled.
crystalhd_disabled="== CrystalHD support manually disabled. =="
vdadecoder_enabled="== VDADecoder support enabled. =="
vdadecoder_disabled="== VDADecoder support manually disabled. =="
+vtbdecoder_enabled="== VTBDecoder support enabled. =="
+vtbdecoder_disabled="== VTBDecoder support manually disabled. =="
openmax_disabled="== OpenMax support manually disabled. =="
openmax_not_found="== Could not find libnvomx. OpenMax support disabled. =="
-libass_using_internal="== External Libass not found, using internal. =="
ssh_not_found="== Could not find libssh. SSH FTP VFS support disabled. =="
librtmp_not_found="== Could not find libRTMP. RTMP support disabled. =="
librtmp_disabled="== RTMP support disabled. =="
@@ -162,6 +163,12 @@ AC_ARG_ENABLE([vdadecoder],
[use_vdadecoder=$enableval],
[use_vdadecoder=auto])
+AC_ARG_ENABLE([vtbdecoder],
+ [AS_HELP_STRING([--enable-vtbdecoder],
+ [enable VTBDecoder decoding (default is auto)])],
+ [use_vtbdecoder=$enableval],
+ [use_vtbdecoder=auto])
+
AC_ARG_ENABLE([openmax],
[AS_HELP_STRING([--enable-openmax],
[enable OpenMax decoding (default is yes)])],
@@ -302,7 +309,6 @@ AC_ARG_ENABLE([external-python],
[use_external_python=$enableval],
[use_external_python=$use_external_libraries])
-use_external_libass="yes"
### End of external library options
if test "x$host_vendor" != "xapple"; then
@@ -331,7 +337,19 @@ case $host in
x86_64-*-linux-gnu*)
ARCH="x86_64-linux"
;;
+ arm-apple-darwin*)
+ use_joystick=no
+ use_vdadecoder=no
+ use_vtbdecoder=yes
+ ARCH="arm-osx"
+ SYSROOT="-miphoneos-version-min=4.1 -isysroot $SDKROOT"
+ ARCHTYPE=$HOSTTYPE
+ AC_SUBST([ARCHTYPE])
+ AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
+ ;;
i386-apple-darwin*)
+ use_joystick=no
+ use_vtbdecoder=no
ARCH="x86-osx"
export MACOSX_DEPLOYMENT_TARGET=10.4
SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
@@ -387,6 +405,7 @@ fi
CFLAGS="$CFLAGS $DEBUG_FLAGS"
CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS"
+
if test "$use_optimizations" = "yes"; then
final_message="$final_message\n Optimization:\tYes"
CXXFLAGS="$CXXFLAGS -O2"
@@ -400,22 +419,26 @@ fi
if test "$host_vendor" = "apple" ; then
# standard xbmc paths
INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/xbmc/osx"
- LIBS="$LIBS -framework IOKit"
- LIBS="$LIBS -framework Cocoa"
- LIBS="$LIBS -framework OpenGL"
- LIBS="$LIBS -framework AppKit"
- LIBS="$LIBS -framework Carbon"
- LIBS="$LIBS -framework CoreAudio"
- LIBS="$LIBS -framework QuickTime"
- LIBS="$LIBS -framework AudioUnit"
- LIBS="$LIBS -framework Foundation"
- LIBS="$LIBS -framework CoreServices"
- LIBS="$LIBS -framework CoreVideo"
- LIBS="$LIBS -framework CoreAudio"
- LIBS="$LIBS -framework AudioToolbox"
- LIBS="$LIBS -framework CoreFoundation"
- LIBS="$LIBS -framework DiskArbitration"
- LIBS="$LIBS -framework ApplicationServices"
+ if expr "X$host_cpu" : 'Xarm.*' > /dev/null; then
+ use_arch=arm
+ else
+ LIBS="$LIBS -framework IOKit"
+ LIBS="$LIBS -framework Cocoa"
+ LIBS="$LIBS -framework OpenGL"
+ LIBS="$LIBS -framework AppKit"
+ LIBS="$LIBS -framework Carbon"
+ LIBS="$LIBS -framework CoreAudio"
+ LIBS="$LIBS -framework QuickTime"
+ LIBS="$LIBS -framework AudioUnit"
+ LIBS="$LIBS -framework Foundation"
+ LIBS="$LIBS -framework CoreServices"
+ LIBS="$LIBS -framework CoreVideo"
+ LIBS="$LIBS -framework CoreAudio"
+ LIBS="$LIBS -framework AudioToolbox"
+ LIBS="$LIBS -framework CoreFoundation"
+ LIBS="$LIBS -framework DiskArbitration"
+ LIBS="$LIBS -framework ApplicationServices"
+ fi
elif expr "X$host_cpu" : 'Xarm.*' > /dev/null; then
use_arch=arm
CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
@@ -483,12 +506,22 @@ AC_LANG_POP([C++])
# Checks for platforms libraries.
if test "$use_gles" = "yes"; then
# GLES overwrites GL if both set to yes.
- AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([GLESv2], [main],, AC_MSG_ERROR($missing_library))
+ if test "$host_vendor" = "apple" ; then
+ AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
+ AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
+ AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
+ else
+ AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
+ fi
else
if test "$use_gl" = "yes"; then
if test "$host_vendor" = "apple" ; then
- # linking to OpenGL.framework instead of libGL, libGLU
+ # linking to OpenGL.framework instead of libGL, libGLU so AC_CHECK_LIB will fail
+ AC_DEFINE([HAVE_LIBGL],[1],["Define to 1 if you have the `GL' library (-lGL)."])
+ AC_MSG_RESULT(== WARNING: OpenGL support is assumed.)
+ AC_DEFINE([HAVE_LIBGLU],[1],["Define to 1 if you have the `GLU' library (-lGLU)."])
+ AC_MSG_RESULT(== WARNING: OpenGLU support is assumed.)
AC_CHECK_LIB([GLEW],[main],, AC_MSG_ERROR($missing_library))
else
AC_CHECK_LIB([GL], [main],, AC_MSG_ERROR($missing_library))
@@ -502,15 +535,24 @@ else
fi
# platform common libraries
+AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
+if test $MYSQL_CONFIG = "yes"; then
+ INCLUDES="$INCLUDES `mysql_config --include`"
+ LIBS="$LIBS `mysql_config --libs`"
+else
+ AC_MSG_ERROR($missing_program)
+fi
+AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([mad.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([jpeglib.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([samplerate.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([ogg/ogg.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([vorbis/vorbisenc.h],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([ass], [ass_set_message_cb],,use_external_libass="no")
+AC_CHECK_LIB([ass], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
+AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
@@ -519,7 +561,10 @@ AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
+AC_CHECK_LIB([modplug], [main],, AC_MSG_ERROR($missing_library))
+AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([MAD], [mad],
[INCLUDES="$INCLUDES $MAD_CFLAGS"; LIBS="$LIBS $MAD_LIBS"],
AC_MSG_ERROR($missing_library))
@@ -558,9 +603,12 @@ PKG_CHECK_MODULES([OGG], [ogg],
PKG_CHECK_MODULES([VORBIS], [vorbis],
[INCLUDES="$INCLUDES $VORBIS_CFLAGS"; LIBS="$LIBS $VORBIS_LIBS"],
AC_MSG_ERROR($missing_library))
-PKG_CHECK_MODULES([VORBISENC], [vorbisenc],
+PKG_CHECK_MODULES([VORBISENC], [vorbisenc],
[INCLUDES="$INCLUDES $VORBISENC_CFLAGS"; LIBS="$LIBS $VORBISENC_LIBS"],
AC_MSG_ERROR($missing_library))
+PKG_CHECK_MODULES([CURL], [libcurl],
+ [INCLUDES="$INCLUDES $CURL_CFLAGS"],
+ AC_MSG_ERROR($missing_library))
# check for libbluray
AS_CASE([x$use_libbluray],
@@ -574,9 +622,7 @@ AS_CASE([x$use_libbluray],
AS_CASE([x$use_libbluray],
[xyes],[
INCLUDES="$INCLUDES $LIBBLURAY_CFLAGS";
- if test "$host_vendor" != "apple"; then
- XB_FIND_SONAME([BLURAY], [bluray], [use_libbluray])
- fi;
+ XB_FIND_SONAME([BLURAY], [bluray], [use_libbluray])
AC_DEFINE([HAVE_LIBBLURAY], 1, [System has libbluray library])
AC_SUBST([HAVE_LIBBLURAY], 1)
],[
@@ -587,18 +633,7 @@ AS_CASE([x$use_libbluray],
# platform dependent libraries
if test "$host_vendor" = "apple" ; then
- AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
- if test $MYSQL_CONFIG = "yes"; then
- INCLUDES="$INCLUDES `mysql_config --include`"
- LIBS="$LIBS `mysql_config --libs`"
- else
- AC_MSG_ERROR($missing_program)
- fi
AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([faad], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([VORBISFILE], [vorbisfile],
[INCLUDES="$INCLUDES $VORBISFILE_CFLAGS"; LIBS="$LIBS $VORBISFILE_LIBS"],
AC_MSG_ERROR($missing_library))
@@ -607,24 +642,11 @@ if test "$host_vendor" = "apple" ; then
AC_CHECK_LIB([SDL], [main],, AC_MSG_ERROR($missing_library))
fi
else
- AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
- if test $MYSQL_CONFIG = "yes"; then
- INCLUDES="$INCLUDES `mysql_config --include`"
- LIBS="$LIBS `mysql_config --libs`"
- else
- AC_MSG_ERROR($missing_program)
- fi
- # don't combine with mysqlclient check in apple section above, Linux needs
- # paths from mysql_config
- AC_CHECK_LIB([modplug], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([mysqlclient],[main],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
- AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([rt], [clock_gettime],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([SDL_image], [main],, AC_MSG_ERROR($missing_library))
@@ -637,18 +659,12 @@ else
PKG_CHECK_MODULES([XT], [xt],
[INCLUDES="$INCLUDES $XT_CFLAGS"; LIBS="$LIBS $XT_LIBS"],
AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([XTST], [xtst],
- [INCLUDES="$INCLUDES $XTST_CFLAGS"; LIBS="$LIBS $XTST_LIBS"],
- AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XEXT], [xext],
[INCLUDES="$INCLUDES $XEXT_CFLAGS"; LIBS="$LIBS $XEXT_LIBS"],
AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XMU], [xmu],
[INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
AC_MSG_ERROR($missing_library))
- PKG_CHECK_MODULES([CURL], [libcurl],
- [INCLUDES="$INCLUDES $CURL_CFLAGS"],
- AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([DBUS], [dbus-1],
[INCLUDES="$INCLUDES $DBUS_CFLAGS"; LIBS="$LIBS $DBUS_LIBS"],
AC_MSG_ERROR($missing_library))
@@ -665,24 +681,18 @@ fi
if test "$host_vendor" != "apple"; then
XB_FIND_SONAME([FLAC], [FLAC])
- XB_FIND_SONAME([MODPLUG], [modplug])
fi
-XB_FIND_SONAME([CURL], [curl])
XB_FIND_SONAME([MAD], [mad])
XB_FIND_SONAME([OGG], [ogg])
+XB_FIND_SONAME([CURL], [curl])
XB_FIND_SONAME([VORBIS], [vorbis])
XB_FIND_SONAME([VORBISENC], [vorbisenc])
XB_FIND_SONAME([VORBISFILE], [vorbisfile])
+XB_FIND_SONAME([MODPLUG], [modplug])
# WebServer
-if test "$host_vendor" != "apple" ; then
- if test "$use_webserver" = "yes"; then
- AC_CHECK_LIB([microhttpd], [main],, AC_MSG_ERROR($missing_library))
- fi
-else
- if test "$use_webserver" = "yes"; then
- AC_DEFINE([HAVE_LIBMICROHTTPD], [1],)
- fi
+if test "$use_webserver" = "yes"; then
+ AC_CHECK_LIB([microhttpd], [main],, AC_MSG_ERROR($missing_library))
fi
# Optical
@@ -791,7 +801,7 @@ if test "$use_librtmp" != "no"; then
use_librtmp="no"
fi
])
- if test "$use_librtmp" != "no" && test "$host_vendor" != "apple"; then
+ if test "$use_librtmp" != "no"; then
XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp])
fi
if test "$use_librtmp" != "no"; then
@@ -829,8 +839,8 @@ if test "$use_external_ffmpeg" = "yes"; then
[AC_CHECK_HEADERS([ffmpeg/avcodec.h ffmpeg/avformat.h ffmpeg/avutil.h postproc/postprocess.h ffmpeg/swscale.h],,
[AC_MSG_ERROR($missing_headers)])])
- # libavcore is optional
- AC_CHECK_HEADERS([libavcore/avcore.h libavcore/samplefmt.h])
+ # optional
+ AC_CHECK_HEADERS([libavcore/avcore.h libavcore/samplefmt.h libavutil/samplefmt.h])
# old FFmpeg have this in libavcodec/opt.h instead:
AC_CHECK_HEADERS([libavutil/opt.h])
@@ -1010,7 +1020,24 @@ if test "x$use_vdadecoder" != "xno"; then
fi
else
AC_MSG_NOTICE($vdadecoder_disabled)
- USE_VDA=0
+fi
+
+# VTBDecoder
+if test "x$use_vtbdecoder" != "xno"; then
+ if test "$host_vendor" = "apple" ; then
+ HAVE_VIDEOTOOLBOXDECODER=1
+ AC_DEFINE([HAVE_VIDEOTOOLBOXDECODER], [1], [Define to 1 if you have the 'VTBDecoder' library.])
+ AC_MSG_NOTICE($vtbdecoder_enabled)
+ else
+ if test "x$use_vtbdecoder" = "xyes"; then
+ AC_MSG_ERROR([VTB Decoder not supported on this platform])
+ else
+ use_vtbdecoder="no"
+ AC_MSG_NOTICE($vtbdecoder_disabled)
+ fi
+ fi
+else
+ AC_MSG_NOTICE($vtbdecoder_disabled)
fi
# OpenMax
@@ -1041,9 +1068,11 @@ if test "$host_vendor" != "apple" ; then
fi
fi
-AC_CHECK_PROG(HAVE_CMAKE,cmake,"yes","no",)
-if test "$HAVE_CMAKE" = "no" ; then
- AC_MSG_ERROR($missing_program)
+if test "$use_arch" != "arm" ; then
+ AC_CHECK_PROG(HAVE_CMAKE,cmake,"yes","no",)
+ if test "$HAVE_CMAKE" = "no" ; then
+ AC_MSG_ERROR($missing_program)
+ fi
fi
AC_CHECK_PROG(HAVE_GPERF,gperf,"yes","no",)
@@ -1061,7 +1090,7 @@ if test "$HAVE_ZIP" = "no" ; then
AC_MSG_ERROR($missing_program)
fi
-if test "$ARCH" = "i486-linux"; then
+if test "$ARCH" = "i486-linux" || test "$ARCH" = "x86-freebsd"; then
AC_CHECK_PROG(HAVE_NASM,nasm,"yes","no",)
if test "$HAVE_NASM" = "no" ; then
AC_MSG_ERROR($missing_program)
@@ -1154,6 +1183,12 @@ else
final_message="$final_message\n VDADecoder:\tNo"
fi
+if test "x$use_vtbdecoder" != "xno"; then
+ final_message="$final_message\n VTBDecoder:\tYes"
+else
+ final_message="$final_message\n VTBDecoder:\tNo"
+fi
+
if test "$use_openmax" != "no"; then
final_message="$final_message\n OpenMax:\tYes"
else
@@ -1246,7 +1281,7 @@ else
fi
if test "$HAVE_GIT" = "yes"; then
- GIT_REV=$(git rev-parse --short HEAD)
+ GIT_REV=$(git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | awk '{gsub("-", "");print $2"-"$1}')
fi
if test "$GIT_REV" = ""; then
GIT_REV="Unknown"
@@ -1382,16 +1417,6 @@ if test "$host_vendor" = "apple"; then
lib/libflac/Makefile"
fi
-if test "$use_external_libass" = "no"; then
- OUTPUT_FILES="$OUTPUT_FILES \
- lib/libass/xbmc/Makefile"
- USE_EXTERNAL_LIBASS=0