Browse Source

Add Embedded Deps downloading for Codecs build

Mark Walker 9 years ago
parent
commit
eaec8441ca
2 changed files with 29 additions and 9 deletions
  1. 8 3
      CMakeModules/DependencyConfiguration.cmake
  2. 21 6
      CMakeModules/FetchDependencies.cmake

+ 8 - 3
CMakeModules/DependencyConfiguration.cmake

@@ -3,9 +3,14 @@ option(DISABLE_BUNDLED_DEPS "Disable the bundled deps on certain platforms" OFF)
 
 include(FetchDependencies)
 
-if((APPLE OR WIN32) AND NOT DISABLE_BUNDLED_DEPS)
+if(NOT DISABLE_BUNDLED_DEPS)
+  if(OPENELEC)
+    set(DEPENDCY_FOLDER plexmediaplayer-openelec-codecs)
+  elseif(APPLE OR WIN32)
+    set(DEPENDCY_FOLDER plexmediaplayer-dependencies-codecs)
+  endif()
   download_deps(
-    "plexmediaplayer-dependencies-codecs"
+    "${DEPENDCY_FOLDER}"
     ARTIFACTNAME konvergo-codecs-depends
     DIRECTORY dir
     DEPHASH_VAR DEPS_HASH
@@ -13,7 +18,7 @@ if((APPLE OR WIN32) AND NOT DISABLE_BUNDLED_DEPS)
   )
   message("dependencies are: ${dir}")
   set(DEFAULT_ROOT ${dir})
-endif()
+endif(NOT DISABLE_BUNDLED_DEPS)
 
 if(WIN32)
   if(NOT EXISTS ${dir}/lib/mpv.lib)

+ 21 - 6
CMakeModules/FetchDependencies.cmake

@@ -12,6 +12,12 @@ elseif(WIN32)
   else()
     set(ARCHSTR "windows-i386")
   endif()
+elseif(OPENELEC)
+  if (OE_ARCH STREQUAL "x86_64")
+    set(ARCHSTR "linux-openelec-x86_64")
+  elseif(OE_ARCH STREQUAL "armv7")
+    set(ARCHSTR "linux-openelec-armv7")
+  endif()
 elseif(UNIX)
   set(ARCHSTR ${PLEX_BUILD_TARGET})
 endif(APPLE)
@@ -20,12 +26,21 @@ option(ENABLE_CODECS "Enable CodecManifest downloading for Codecs on Demand" OFF
 if(ENABLE_CODECS)
   add_definitions(-DHAVE_CODEC_MANIFEST)
 
-  set(CODECS_BUILD_NUMBER 117)
-  message(STATUS "Downloading https://nightlies.plex.tv/codecs/${CODECS_BUILD_NUMBER}/CodecManifest-${ARCHSTR}.h")
-  file(
-    DOWNLOAD https://nightlies.plex.tv/codecs/${CODECS_BUILD_NUMBER}/CodecManifest-${ARCHSTR}.h  ${CMAKE_CURRENT_BINARY_DIR}/src/CodecManifest.h
-    STATUS DL_STATUS
-  )
+  if(OPENELEC)
+    set(CODECS_BUILD_NUMBER 11)
+    message(STATUS "Downloading https://nightlies.plex.tv/codecs/${CODECS_BUILD_NUMBER}/CodecManifest-openelec-${OE_ARCH}.h")
+    file(
+      DOWNLOAD https://nightlies.plex.tv/codecs/${CODECS_BUILD_NUMBER}/CodecManifest-openelec-${OE_ARCH}.h  ${CMAKE_CURRENT_BINARY_DIR}/src/CodecManifest.h
+      STATUS DL_STATUS
+    )
+  elseif()
+    set(CODECS_BUILD_NUMBER 117)
+    message(STATUS "Downloading https://nightlies.plex.tv/codecs/${CODECS_BUILD_NUMBER}/CodecManifest-${ARCHSTR}.h")
+    file(
+      DOWNLOAD https://nightlies.plex.tv/codecs/${CODECS_BUILD_NUMBER}/CodecManifest-${ARCHSTR}.h  ${CMAKE_CURRENT_BINARY_DIR}/src/CodecManifest.h
+      STATUS DL_STATUS
+    )
+  endif()
   message(STATUS "Result: ${DL_STATUS}")
 endif()