Merge pull request #195 from phunkyfish/osx-arm64

Support osx-arm64
xbmc · Jul 25, 2022 · e122f56 · e122f56
2 parents 9e29c33 + 264136c
commit e122f56
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(version: "Nexus", platforms: ["android-armv7", "android-aarch64", "ios-aarch64", "osx-x86_64", "tvos-aarch64", "ubuntu-ppa", "windows-i686", "windows-x86_64"], UBUNTU_DISTS: ['focal'])
+buildPlugin(version: "Nexus", UBUNTU_DISTS: ['focal'])
diff --git a/depends/common/gmp/CMakeLists.txt b/depends/common/gmp/CMakeLists.txt
@@ -13,7 +13,11 @@ if(CORE_SYSTEM_NAME STREQUAL osx OR
     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(CPU STREQUAL "arm64")
+      set(EXTRA_ARGS "${EXTRA_ARGS} --host=aarch64-apple-darwin")
+    else()
+      set(EXTRA_ARGS "${EXTRA_ARGS} --host=x86_64-apple-darwin")
+    endif()
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
       set(EXTRA_ARGS "${EXTRA_ARGS} ABI=64")
     else()

diff --git a/depends/common/gmp/gmp.sha256 b/depends/common/gmp/gmp.sha256
@@ -1 +1 @@
-258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
+fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
diff --git a/depends/common/gmp/gmp.txt b/depends/common/gmp/gmp.txt
@@ -1 +1 @@
-gmp https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz
+gmp https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz
diff --git a/depends/common/libpng/0001-disable-neon-arm-apple.patch b/depends/common/libpng/0001-disable-neon-arm-apple.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,6 +79,8 @@
+   if(index EQUAL -1)
+     message(FATAL_ERROR
+             "PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
++  elseif(APPLE)
++    add_definitions(-DPNG_ARM_NEON_OPT=0)
+   elseif(NOT ${PNG_ARM_NEON} STREQUAL "off")
+     set(libpng_arm_sources
+       arm/arm_init.c
diff --git a/.../0001-fix-compile-if-libm-not-found.patch → .../0002-fix-compile-if-libm-not-found.patch b/.../0001-fix-compile-if-libm-not-found.patch → .../0002-fix-compile-if-libm-not-found.patch
diff --git a/depends/darwin_embedded/libpng/deps.txt b/depends/darwin_embedded/libpng/deps.txt
diff --git a/depends/darwin_embedded/libpng/flags.txt b/depends/darwin_embedded/libpng/flags.txt
diff --git a/depends/darwin_embedded/libpng/libpng.sha256 b/depends/darwin_embedded/libpng/libpng.sha256
diff --git a/depends/darwin_embedded/libpng/libpng.txt b/depends/darwin_embedded/libpng/libpng.txt
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="20.3.0"
+  version="20.4.0"
   name="Inputstream FFmpeg Direct"
   provider-name="Ross Nicholson">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/inputstream.ffmpegdirect/changelog.txt b/inputstream.ffmpegdirect/changelog.txt
@@ -1,3 +1,6 @@
+v20.4.0
+- Support osx-arm64, i.e. OSX on Apple Silicon
+
 v20.3.0
 - Support ${duration} format specifier
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		buildPlugin(version: "Nexus", platforms: ["android-armv7", "android-aarch64", "ios-aarch64", "osx-x86_64", "tvos-aarch64", "ubuntu-ppa", "windows-i686", "windows-x86_64"], UBUNTU_DISTS: ['focal'])
		buildPlugin(version: "Nexus", UBUNTU_DISTS: ['focal'])
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
		fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		gmp https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz
		gmp https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz