forked from HandBrake/HandBrake
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
contrib: macOS arm and intel cross compilation.
- Loading branch information
Showing
27 changed files
with
344 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/builds/unix/config.sub b/builds/unix/config.sub | ||
index 5b158ac..99917b9 100755 | ||
--- a/builds/unix/config.sub | ||
+++ b/builds/unix/config.sub | ||
@@ -1159,7 +1159,7 @@ case $cpu-$vendor in | ||
case $cpu in | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| abacus \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/config.sub b/config.sub | ||
index 20f7cf2..9c52d5b 100755 | ||
--- a/config.sub | ||
+++ b/config.sub | ||
@@ -264,7 +264,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -393,7 +393,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/config.sub b/config.sub | ||
index 3580aaf..4a81e12 100755 | ||
--- a/config.sub | ||
+++ b/config.sub | ||
@@ -248,7 +248,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -370,7 +370,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* | arceb-* \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/config.sub b/config.sub | ||
index 7ffe373..49e3909 100755 | ||
--- a/config.sub | ||
+++ b/config.sub | ||
@@ -248,7 +248,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -370,7 +370,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/build-aux/config.sub b/build-aux/config.sub | ||
index 1d8e98b..7adaaee 100755 | ||
--- a/build-aux/config.sub | ||
+++ b/build-aux/config.sub | ||
@@ -244,7 +244,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -368,7 +368,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/x86_64-darwin-gcc.meson b/x86_64-darwin-gcc.meson | ||
new file mode 100644 | ||
index 0000000..2ddbe93 | ||
--- /dev/null | ||
+++ b/x86_64-darwin-gcc.meson | ||
@@ -0,0 +1,9 @@ | ||
+[binaries] | ||
+c = 'clang' | ||
+cpp = 'clang++' | ||
+[host_machine] | ||
+system = 'darwin' | ||
+cpu_family = 'x86_64' | ||
+cpu = 'x86_64' | ||
+endian = 'little' | ||
+ | ||
-- | ||
2.24.2 (Apple Git-127) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/config.sub b/config.sub | ||
index 1d8e98b..7adaaee 100755 | ||
--- a/config.sub | ||
+++ b/config.sub | ||
@@ -244,7 +244,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -368,7 +368,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/config.sub b/config.sub | ||
index 1d8e98b..7adaaee 100755 | ||
--- a/config.sub | ||
+++ b/config.sub | ||
@@ -244,7 +244,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -368,7 +368,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 4e2d5bd..fecd54a 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -4,6 +4,9 @@ if(CMAKE_EXECUTABLE_SUFFIX) | ||
set(CMAKE_EXECUTABLE_SUFFIX_TMP ${CMAKE_EXECUTABLE_SUFFIX}) | ||
endif() | ||
|
||
+# Something overwrite CMAKE_SYSTEM_PROCESSOR is we try to read it later | ||
+string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC) | ||
+ | ||
project(libjpeg-turbo C) | ||
set(VERSION 2.0.4) | ||
string(REPLACE "." ";" VERSION_TRIPLET ${VERSION}) | ||
@@ -40,7 +43,6 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") | ||
|
||
# Detect CPU type and whether we're building 64-bit or 32-bit code | ||
math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8") | ||
-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC) | ||
if(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86_64" OR | ||
CMAKE_SYSTEM_PROCESSOR_LC MATCHES "amd64" OR | ||
CMAKE_SYSTEM_PROCESSOR_LC MATCHES "i[0-9]86" OR |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/config.sub b/config.sub | ||
index 1acc966..7b7db42 100755 | ||
--- a/config.sub | ||
+++ b/config.sub | ||
@@ -248,7 +248,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -371,7 +371,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/config.sub b/config.sub | ||
index f4bafc1..cc30ca6 100755 | ||
--- a/config.sub | ||
+++ b/config.sub | ||
@@ -247,7 +247,7 @@ case $basic_machine in | ||
# Some are omitted here because they have special meanings below. | ||
1750a | 580 \ | ||
| a29k \ | ||
- | aarch64 | aarch64_be \ | ||
+ | aarch64 | aarch64_be | arm64 \ | ||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | ||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | ||
| am33_2.0 \ | ||
@@ -372,7 +372,7 @@ case $basic_machine in | ||
# Recognize the basic CPU types with company name. | ||
580-* \ | ||
| a29k-* \ | ||
- | aarch64-* | aarch64_be-* \ | ||
+ | aarch64-* | aarch64_be-* | arm64*-* \ | ||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | ||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
Oops, something went wrong.