Merge pull request #22 from phunkyfish/tvos-fix-alwin

Fix tvOS build
xbmc · Mar 18, 2020 · 48287bb · 48287bb
2 parents cf1dc46 + 74e8c6d
commit 48287bb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/depends/common/gmp/CMakeLists.txt b/depends/common/gmp/CMakeLists.txt
@@ -6,13 +6,14 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 include(ExternalProject)
 
 if(CORE_SYSTEM_NAME STREQUAL osx OR
-   CORE_SYSTEM_NAME STREQUAL ios OR
    CORE_SYSTEM_NAME STREQUAL darwin_embedded)
 
-  if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+  if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
     set(EXTRA_ARGS "--disable-assembly")
+    set(EXTRA_ARGS "${EXTRA_ARGS} --host=aarch64-apple-darwin")
   else()
     set(EXTRA_ARGS "--with-pic")
+    set(EXTRA_ARGS "${EXTRA_ARGS} --host=x86_64-apple-darwin")
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
       set(EXTRA_ARGS "${EXTRA_ARGS} ABI=64")
     else()
@@ -30,7 +31,6 @@ if(CORE_SYSTEM_NAME STREQUAL osx OR
                           LDFLAGS='${CMAKE_EXE_LINKER_FLAGS}' \
                           CPP='${CMAKE_C_COMPILER} -E' \
                           CPPFLAGS='${CMAKE_C_FLAGS}' \
-                          --host=x86_64-apple-darwin \
                           ${EXTRA_ARGS} \
                           --enable-static \
                           --disable-shared"

diff --git a/depends/common/gnutls/CMakeLists.txt b/depends/common/gnutls/CMakeLists.txt
@@ -13,9 +13,10 @@ list(APPEND gnutls_conf CPPFLAGS=-I${CMAKE_INSTALL_PREFIX}/include)
 list(APPEND gnutls_conf LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib)
 list(APPEND gnutls_conf LIBS=-lgmp)
 
-if(APPLE)
+if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   list(APPEND gnutls_conf ac_cv_func_vfork_works=no)
   list(APPEND gnutls_conf ac_cv_func_fork=no)
+  list(APPEND gnutls_conf --disable-hardware-acceleration)
 endif()
 
 include(ExternalProject)

diff --git a/depends/common/nettle/CMakeLists.txt b/depends/common/nettle/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.5)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
-if(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   list(APPEND nettle_conf -disable-assembler)
 endif()
 

diff --git a/inputstream.ffmpegdirect/addon.xml.in b/inputstream.ffmpegdirect/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.ffmpegdirect"
-  version="1.7.0"
+  version="1.7.1"
   name="Inputstream FFmpeg Direct"
   provider-name="phunkyfish">
   <requires>@ADDON_DEPENDS@</requires>
@@ -23,6 +23,9 @@
       <fanart>fanart.jpg</fanart>
     </assets>
     <news>
+v1.7.1
+- Fixed: tvOS build
+
 v1.7.0
 - Update: remove unrequired gnutls patch
 - Fixed: Replace ;'s workaround for cmake bug for ffmpeg LDFLAGS

diff --git a/inputstream.ffmpegdirect/changelog.txt b/inputstream.ffmpegdirect/changelog.txt
@@ -1,3 +1,6 @@
+v1.7.1
+- Fixed: tvOS build
+
 v1.7.0
 - Update: remove unrequired gnutls patch
 - Fixed: Replace ;'s workaround for cmake bug for ffmpeg LDFLAGS