[cmake] Use FFMPEG from prebuilt dependencies on OSX

FernetMenta · Jan 17, 2016 · 39e4138 · 39e4138
1 parent 896ab7e
commit 39e4138
Show file tree

Hide file tree

Showing 34 changed files with 151 additions and 34 deletions.
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
@@ -26,7 +26,9 @@ option(ENABLE_NFS         "Enable NFS support?" ON)
 option(ENABLE_AIRTUNES    "Enable AirTunes support?" ON)
 option(ENABLE_CEC         "Enable CEC support?" ON)
 if(UNIX)
-  option(ENABLE_INTERNAL_FFMPEG "Enable internal ffmpeg?" ON)
+  if(NOT APPLE)
+    option(ENABLE_INTERNAL_FFMPEG "Enable internal ffmpeg?" ON)
+  endif()
   option(FFMPEG_PATH        "Path to external ffmpeg?" "")
   option(ENABLE_INTERNAL_CROSSGUID "Enable internal crossguid?" ON)
   option(ENABLE_ALSA        "Enable ALSA support?" ON)

diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake
@@ -72,7 +72,8 @@ else()
                   libavutil>=54.20.100 libswscale>=3.1.101 libswresample>=1.1.100 libpostproc>=53.3.100)
   if(PKG_CONFIG_FOUND)
     pkg_check_modules (FFMPEG ${FFMPEG_PKGS})
-    set(FFMPEG_LIBRARIES "${FFMPEG_LDFLAGS}")
+    string(REGEX REPLACE "framework;" "framework " FFMPEG_LDFLAGS "${FFMPEG_LDFLAGS}")
+    set(FFMPEG_LIBRARIES ${FFMPEG_LDFLAGS})
   else()
     find_path(FFMPEG_INCLUDE_DIRS libavcodec/avcodec.h PATH_SUFFIXES ffmpeg)
     find_library(FFMPEG_LIBAVCODEC NAMES avcodec libavcodec PATH_SUFFIXES ffmpeg/libavcodec)

diff --git a/xbmc/CMakeLists.txt b/xbmc/CMakeLists.txt
@@ -34,4 +34,8 @@ set(SOURCES Application.cpp
             XBDateTime.cpp)
 
 core_add_library(xbmc)
-add_dependencies(xbmc libcpluff ffmpeg)
+add_dependencies(xbmc libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(xbmc ffmpeg)
+endif()
diff --git a/xbmc/addons/CMakeLists.txt b/xbmc/addons/CMakeLists.txt
@@ -33,4 +33,8 @@ set(SOURCES AddonCallbacksAddon.cpp
             Webinterface.cpp)
 
 core_add_library(addons)
-add_dependencies(addons libcpluff ffmpeg)
+add_dependencies(addons libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(addons ffmpeg)
+endif()
diff --git a/xbmc/cdrip/CMakeLists.txt b/xbmc/cdrip/CMakeLists.txt
@@ -4,4 +4,7 @@ set(SOURCES CDDARipJob.cpp
             EncoderFFmpeg.cpp)
 
 core_add_library(cdrip)
-add_dependencies(cdrip ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(cdrip ffmpeg)
+endif()
diff --git a/xbmc/cores/AudioEngine/CMakeLists.txt b/xbmc/cores/AudioEngine/CMakeLists.txt
@@ -66,4 +66,8 @@ endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 core_add_library(audioengine)
-add_dependencies(audioengine libcpluff ffmpeg)
+add_dependencies(audioengine libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(audioengine ffmpeg)
+endif()
diff --git a/xbmc/cores/CMakeLists.txt b/xbmc/cores/CMakeLists.txt
@@ -3,4 +3,6 @@ set(SOURCES DataCacheCore.cpp
 
 core_add_library(cores)
 
-add_dependencies(cores ffmpeg)
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(cores ffmpeg)
+endif()
diff --git a/xbmc/cores/VideoPlayer/CMakeLists.txt b/xbmc/cores/VideoPlayer/CMakeLists.txt
@@ -16,7 +16,11 @@ set(SOURCES DVDAudio.cpp
             Edl.cpp)
 
 core_add_library(VideoPlayer)
-add_dependencies(VideoPlayer libcpluff ffmpeg)
+add_dependencies(VideoPlayer libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(VideoPlayer ffmpeg)
+endif()
 
 if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_dependencies(VideoPlayer dvdnav)

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Audio/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDCodecs/Audio/CMakeLists.txt
@@ -2,4 +2,7 @@ set(SOURCES DVDAudioCodecFFmpeg.cpp
             DVDAudioCodecPassthrough.cpp)
 
 core_add_library(dvdaudiocodecs)
-add_dependencies(dvdaudiocodecs ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(dvdaudiocodecs ffmpeg)
+endif()
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDCodecs/CMakeLists.txt
@@ -2,4 +2,7 @@ set(SOURCES DVDCodecUtils.cpp
             DVDFactoryCodec.cpp)
 
 core_add_library(dvdcodecs)
-add_dependencies(dvdcodecs ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(dvdcodecs ffmpeg)
+endif()
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/CMakeLists.txt
@@ -11,4 +11,7 @@ if(CORE_SYSTEM_NAME STREQUAL "windows")
 endif()
 
 core_add_library(dvdoverlaycodecs)
-add_dependencies(dvdoverlaycodecs ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(dvdoverlaycodecs ffmpeg)
+endif()
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDCodecs/Video/CMakeLists.txt
@@ -42,4 +42,7 @@ if(MMAL_FOUND)
 endif()
 
 core_add_library(dvdvideocodecs)
-add_dependencies(dvdvideocodecs ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(dvdvideocodecs ffmpeg)
+endif()
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt
@@ -10,7 +10,11 @@ set(SOURCES DVDDemuxBXA.cpp
             DVDFactoryDemuxer.cpp)
 
 core_add_library(dvddemuxers)
-add_dependencies(dvddemuxers libcpluff ffmpeg)
+add_dependencies(dvddemuxers libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(dvddemuxers ffmpeg)
+endif()
 
 if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_dependencies(dvddemuxers dvdnav)

diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDInputStreams/CMakeLists.txt
@@ -16,7 +16,11 @@ if(BLURAY_FOUND)
 endif()
 
 core_add_library(dvdinputstreams)
-add_dependencies(dvdinputstreams libcpluff ffmpeg)
+add_dependencies(dvdinputstreams libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(dvdinputstreams ffmpeg)
+endif()
 
 if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_dependencies(dvdinputstreams dvdnav)

diff --git a/xbmc/cores/VideoPlayer/DVDSubtitles/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDSubtitles/CMakeLists.txt
@@ -12,4 +12,7 @@ set(SOURCES DVDFactorySubtitle.cpp
             DVDSubtitleTagSami.cpp)
 
 core_add_library(dvdsubtitles)
-add_dependencies(dvdsubtitles ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(dvdsubtitles ffmpeg)
+endif()
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt b/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt
@@ -31,4 +31,7 @@ endif()
 
 
 core_add_library(videorenderers)
-add_dependencies(videorenderers ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(videorenderers ffmpeg)
+endif()
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt
@@ -25,4 +25,7 @@ if(MMAL_FOUND)
 endif()
 
 core_add_library(videorenderers_hwdec)
-add_dependencies(videorenderers_hwdec ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(videorenderers_hwdec ffmpeg)
+endif()
diff --git a/xbmc/cores/paplayer/CMakeLists.txt b/xbmc/cores/paplayer/CMakeLists.txt
@@ -4,4 +4,8 @@ set(SOURCES AudioDecoder.cpp
             VideoPlayerCodec.cpp)
 
 core_add_library(paplayer)
-add_dependencies(paplayer libcpluff ffmpeg)
+add_dependencies(paplayer libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(paplayer ffmpeg)
+endif()
diff --git a/xbmc/cores/playercorefactory/CMakeLists.txt b/xbmc/cores/playercorefactory/CMakeLists.txt
@@ -2,4 +2,7 @@ set(SOURCES PlayerCoreFactory.cpp
             PlayerSelectionRule.cpp)
 
 core_add_library(playercorefactory)
-add_dependencies(playercorefactory ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(playercorefactory ffmpeg)
+endif()
diff --git a/xbmc/filesystem/CMakeLists.txt b/xbmc/filesystem/CMakeLists.txt
@@ -109,4 +109,8 @@ include_directories(${CORE_SOURCE_DIR}/lib/libUPnP
 add_definitions(-DNPT_CONFIG_ENABLE_LOGGING)
 
 core_add_library(filesystem)
-add_dependencies(filesystem libcpluff ffmpeg)
+add_dependencies(filesystem libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(filesystem ffmpeg)
+endif()
diff --git a/xbmc/guilib/CMakeLists.txt b/xbmc/guilib/CMakeLists.txt
@@ -106,7 +106,11 @@ if(WIN32)
 endif()
 
 core_add_library(guilib)
-add_dependencies(guilib libcpluff ffmpeg)
+add_dependencies(guilib libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(guilib ffmpeg)
+endif()
 
 if(WIN32)
   set(SHADERS_VERTEX guishader_vert.hlsl)

diff --git a/xbmc/interfaces/json-rpc/CMakeLists.txt b/xbmc/interfaces/json-rpc/CMakeLists.txt
@@ -19,4 +19,8 @@ set(SOURCES AddonsOperations.cpp
             XBMCOperations.cpp)
 
 core_add_library(jsonrpc_interface)
-add_dependencies(jsonrpc_interface libcpluff generate_json_header ffmpeg)
+add_dependencies(jsonrpc_interface libcpluff generate_json_header)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(jsonrpc_interface ffmpeg)
+endif()
diff --git a/xbmc/music/tags/CMakeLists.txt b/xbmc/music/tags/CMakeLists.txt
@@ -10,4 +10,8 @@ set(SOURCES MusicInfoTag.cpp
 
 core_add_library(music_tags)
 
-add_dependencies(music_tags libcpluff ffmpeg)
+add_dependencies(music_tags libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(music_tags ffmpeg)
+endif()
diff --git a/xbmc/music/windows/CMakeLists.txt b/xbmc/music/windows/CMakeLists.txt
@@ -5,4 +5,8 @@ set(SOURCES GUIWindowMusicBase.cpp
             GUIWindowVisualisation.cpp)
 
 core_add_library(music_windows)
-add_dependencies(music_windows libcpluff ffmpeg)
+add_dependencies(music_windows libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(music_windows ffmpeg)
+endif()
diff --git a/xbmc/network/CMakeLists.txt b/xbmc/network/CMakeLists.txt
@@ -24,4 +24,7 @@ if(SHAIRPLAY_FOUND OR SHAIRPORT_FOUND)
 endif()
 
 core_add_library(network)
-add_dependencies(network ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(network ffmpeg)
+endif()
diff --git a/xbmc/pictures/CMakeLists.txt b/xbmc/pictures/CMakeLists.txt
@@ -10,4 +10,7 @@ set(SOURCES GUIDialogPictureInfo.cpp
             SlideShowPicture.cpp)
 
 core_add_library(pictures)
-add_dependencies(pictures ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(pictures ffmpeg)
+endif()
diff --git a/xbmc/pvr/windows/CMakeLists.txt b/xbmc/pvr/windows/CMakeLists.txt
@@ -9,4 +9,8 @@ set(SOURCES GUIViewStatePVR.cpp
             GUIWindowPVRTimerRules.cpp)
 
 core_add_library(pvr_windows)
-add_dependencies(pvr_windows libcpluff ffmpeg)
+add_dependencies(pvr_windows libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(pvr_windows ffmpeg)
+endif()
diff --git a/xbmc/settings/CMakeLists.txt b/xbmc/settings/CMakeLists.txt
@@ -14,4 +14,8 @@ set(SOURCES AdvancedSettings.cpp
             VideoSettings.cpp)
 
 core_add_library(settings)
-add_dependencies(settings libcpluff ffmpeg)
+add_dependencies(settings libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(settings ffmpeg)
+endif()
diff --git a/xbmc/settings/dialogs/CMakeLists.txt b/xbmc/settings/dialogs/CMakeLists.txt
@@ -6,4 +6,8 @@ set(SOURCES GUIDialogAudioDSPManager.cpp
             GUIDialogSettingsManualBase.cpp)
 
 core_add_library(settings_dialogs)
-add_dependencies(settings_dialogs libcpluff ffmpeg)
+add_dependencies(settings_dialogs libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(settings_dialogs ffmpeg)
+endif()
diff --git a/xbmc/storage/CMakeLists.txt b/xbmc/storage/CMakeLists.txt
@@ -5,7 +5,10 @@ set(SOURCES AutorunMediaJob.cpp
             MediaManager.cpp)
 
 core_add_library(storage)
-add_dependencies(storage ffmpeg)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(storage ffmpeg)
+endif()
 
 if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_dependencies(storage dvdnav)

diff --git a/xbmc/utils/CMakeLists.txt b/xbmc/utils/CMakeLists.txt
@@ -89,7 +89,11 @@ else()
 endif()
 
 core_add_library(utils)
-add_dependencies(utils libcpluff ffmpeg)
+add_dependencies(utils libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(utils ffmpeg)
+endif()
 
 if(ENABLE_INTERNAL_CROSSGUID)
   add_dependencies(utils crossguid)

diff --git a/xbmc/video/CMakeLists.txt b/xbmc/video/CMakeLists.txt
@@ -13,4 +13,8 @@ set(SOURCES Bookmark.cpp
             VideoThumbLoader.cpp)
 
 core_add_library(video)
-add_dependencies(video libcpluff ffmpeg)
+add_dependencies(video libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(video ffmpeg)
+endif()
diff --git a/xbmc/video/dialogs/CMakeLists.txt b/xbmc/video/dialogs/CMakeLists.txt
@@ -9,4 +9,8 @@ set(SOURCES GUIDialogAudioSubtitleSettings.cpp
 
 core_add_library(video_dialogs)
 
-add_dependencies(video_dialogs libcpluff ffmpeg)
+add_dependencies(video_dialogs libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(video_dialogs ffmpeg)
+endif()
diff --git a/xbmc/windows/CMakeLists.txt b/xbmc/windows/CMakeLists.txt
@@ -12,4 +12,8 @@ set(SOURCES GUIMediaWindow.cpp
             GUIWindowWeather.cpp)
 
 core_add_library(windows)
-add_dependencies(windows libcpluff ffmpeg)
+add_dependencies(windows libcpluff)
+
+if(ENABLE_INTERNAL_FFMPEG)
+  add_dependencies(windows ffmpeg)
+endif()