Build for arm64-osx (#564)

* Build for arm64-osx

* More required packages

* Remove unsupported filter for speex and speexdsp

* Fix vcpkg ppc64el

* Make Git available

.gitattributes

@@ -3,3 +3,4 @@
 *.c text eol=lf
 *.cpp text eol=lf
 *.m text eol=lf
+vcpkg-ppc64el.patch text eol=crlf

.github/workflows/maven-and-native.yml

@@ -296,6 +296,7 @@ jobs:
       matrix:
         arch:
           - x86_64
+          - arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -321,12 +322,12 @@ jobs:
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Jitsi GitHub Action"
-          brew install nasm
+          brew install nasm autoconf automake libtool
           resources/mac-cmake.sh ${{ steps.install_java.outputs.path }} ${{ matrix.arch }}
 
       - name: The job has failed
         if: ${{ failure() }}
-        run: tar --exclude *.o -cvJf target/debug-logs.tar.xz src/native/cmake-build
+        run: tar --exclude *.o -cvJf target/debug-logs.tar.xz src/native/cmake-build-${{ matrix.arch }}
 
       - name: Upload Debug logs
         if: ${{ failure() }}

debian/control

@@ -12,6 +12,7 @@ Build-Depends:
  dpkg-dev (>= 1.16.1),
  libtool,
  cmake,
+ git,
  default-jdk,
  libasound2-dev,
  libpulse-dev,

pom.xml

@@ -284,6 +284,14 @@
                   darwin-x86-64/libjnscreencapture.dylib;
                   darwin-x86-64/libjnspeex.dylib;
                   darwin-x86-64/libjnvpx.dylib;osname=Mac OS X;processor=x86-64,
+                  darwin-aarch64/libjnawtrenderer.dylib;
+                  darwin-aarch64/libjnmaccoreaudio.dylib;
+                  darwin-aarch64/libjnopus.dylib;
+                  darwin-aarch64/libjnportaudio.dylib;
+                  darwin-aarch64/libjnquicktime.dylib;
+                  darwin-aarch64/libjnscreencapture.dylib;
+                  darwin-aarch64/libjnspeex.dylib;
+                  darwin-aarch64/libjnvpx.dylib;osname=Mac OS X;processor=AArch64,
                   linux-x86/libjnawtrenderer.so;
                   linux-x86/libjnopus.so;
                   linux-x86/libjnportaudio.so;

resources/deb-prepare.sh

@@ -1,16 +1,36 @@
 #!/usr/bin/env bash
 set -e
 set -x
-sudo apt-get update -
+sudo apt-get update
+sudo apt-get install -y distro-info
+
 # dev-tools from backports because https://bugs.launchpad.net/ubuntu/+source/ubuntu-dev-tools/+bug/1916633
+DEVTOOLS_PACKAGE=ubuntu-dev-tools
+UBUNTUTOOLS_PACKAGE=python3-ubuntutools
+if lsb_release -i -s == "Ubuntu"; then
+  case $(lsb_release -c -s) in
+    bionic | focal)
+      DEVTOOLS_PACKAGE=$DEVTOOLS_PACKAGE/$(lsb_release -c -s)-backports
+      UBUNTUTOOLS_PACKAGE=$UBUNTUTOOLS_PACKAGE/$(lsb_release -c -s)-backports
+      ;;
+  esac
+elif  lsb_release -i -s == "Debian"; then
+  case $(lsb_release -c -s) in
+    stretch | buster)
+      >&2 echo "Packaging needs 'ubuntu-dev-tools' >= 1.181, which is only available in Bullseye"
+      exit 1
+      ;;
+  esac
+fi
+
 sudo apt-get install -y \
   debhelper \
+  aptitude \
   sbuild \
   schroot \
-  ubuntu-dev-tools/$(lsb_release -c -s)-backports \
-  python3-ubuntutools/$(lsb_release -c -s)-backports \
+  "$DEVTOOLS_PACKAGE" \
+  "$UBUNTUTOOLS_PACKAGE" \
   debian-archive-keyring \
   git-buildpackage \
-  rename \
-  distro-info
+  rename
 sudo adduser $USER sbuild

resources/mac-cmake.sh

@@ -23,10 +23,10 @@ case $ARCH in
         ;;
 esac
 
-cmake -B "${PROJECT_DIR}/src/native/cmake-build" \
+cmake -B "${PROJECT_DIR}/src/native/cmake-build-${OSX_ARCH}" \
     -S "${PROJECT_DIR}/src/native" \
     -DJAVA_HOME="$JAVA_HOME" \
     -DCMAKE_INSTALL_PREFIX="${PROJECT_DIR}/src/main/resources/darwin-$INSTALL_PREFIX_ARCH" \
     -DCMAKE_OSX_ARCHITECTURES="$OSX_ARCH" \
     -DVCPKG_TARGET_TRIPLET="$VCPKG_ARCH-osx"
-cmake --build "${PROJECT_DIR}/src/native/cmake-build" --config Release --target install --parallel
+cmake --build "${PROJECT_DIR}/src/native/cmake-build-${OSX_ARCH}" --config Release --target install --parallel

resources/ubuntu-build-image/build-static.sh

@@ -26,7 +26,8 @@ case "$ARCH" in
     JAVA_ARCH="arm64"
     TOOLCHAIN=$LIBROOT/src/native/cmake/toolchains/arm64-linux.cmake
     ;;
-  "ppc64el")
+  "ppc64el"|"ppc64le")
+    ARCH="ppc64el"
     VCPKG_ARCH="ppc64le"
     JAVA_ARCH="ppc64el"
     TOOLCHAIN=$LIBROOT/src/native/cmake/toolchains/ppc64el-linux.cmake
@@ -36,7 +37,6 @@ esac
 export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-$JAVA_ARCH
 
 cd "$LIBROOT/src/native" || exit 1
-cp cmake/vcpkg-triplets/x86-linux.cmake vcpkg/triplets/community
 cmake -B cmake-build-$ARCH \
   -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$TOOLCHAIN \
   -DVCPKG_VERBOSE=ON \

src/native/.gitignore

@@ -1,4 +1,4 @@
-cmake-build-*
+cmake-build*
 .idea/
 .vs/
 out/

src/native/CMakeLists.txt

@@ -11,7 +11,23 @@ foreach(var ${vars})
     endif()
 endforeach()
 
-if (WIN32 OR APPLE OR NOT USE_SYSTEM_VPX)
+if (UNIX AND NOT APPLE)
+    set(DEFAULT_USE_SYSTEM_SPEEX ON)
+    set(DEFAULT_USE_SYSTEM_VPX ON)
+else ()
+    set(DEFAULT_USE_SYSTEM_SPEEX OFF)
+    set(DEFAULT_USE_SYSTEM_VPX OFF)
+endif ()
+
+option(USE_SYSTEM_SPEEX "Use system-installed speex" ${DEFAULT_USE_SYSTEM_SPEEX})
+option(USE_SYSTEM_VPX "Use system-installed vpx" ${DEFAULT_USE_SYSTEM_VPX})
+
+find_package(Git REQUIRED)
+execute_process(
+        COMMAND "${GIT_EXECUTABLE}" apply --verbose --binary ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg-ppc64el.patch
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg"
+)
+if (NOT USE_SYSTEM_SPEEX OR NOT USE_SYSTEM_VPX)
     set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
         CACHE STRING "Vcpkg toolchain file")
 endif ()
@@ -53,7 +69,6 @@ endif ()
 find_package(JNI REQUIRED)
 
 if (WIN32)
-    find_package(Git REQUIRED)
     execute_process(
             COMMAND "${GIT_EXECUTABLE}" describe --match "v[0-9\\.]*" --long --dirty --always
             WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
@@ -92,13 +107,6 @@ set(LIBJITSI_JAVAH "${CMAKE_CURRENT_SOURCE_DIR}/../../target/native/javah")
 include(ExternalProject)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-if (UNIX AND NOT APPLE)
-    set(DEFAULT_USE_SYSTEM_SPEEX ON)
-else ()
-    set(DEFAULT_USE_SYSTEM_SPEEX OFF)
-endif ()
-
-option(USE_SYSTEM_SPEEX "Use system-installed speex" ${DEFAULT_USE_SYSTEM_SPEEX})
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -110,7 +118,6 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64el" OR CMAKE_SYSTEM_PROCESSOR STREQUAL
 endif ()
 
 include(GNUInstallDirs)
-add_subdirectory(third_party/speex)
 
 add_subdirectory(jawtrenderer)
 add_subdirectory(opus)

src/native/portaudio/CMakeLists.txt

@@ -46,13 +46,8 @@ add_library(${PROJECT_NAME} SHARED
             org_jitsi_impl_neomedia_portaudio_Pa.c
             ${OS_SOURCES})
 
-if (NOT ${USE_SYSTEM_SPEEX})
-    add_dependencies(${PROJECT_NAME} ext_lib_speexdsp)
-    add_dependencies(${PROJECT_NAME} ext_lib_speex)
-else ()
-    find_package(speexdsp REQUIRED)
-    find_package(speex REQUIRED)
-endif ()
+find_package(speexdsp REQUIRED)
+find_package(speex REQUIRED)
 
 # we cannot use the system default portaudio - it has no hotplug
 add_dependencies(${PROJECT_NAME} ext_lib_portaudio)

src/native/speex/CMakeLists.txt

@@ -2,7 +2,6 @@ project(jnspeex C)
 
 set(OS_SOURCES "")
 set(OS_LIBS "")
-set(DEFAULT_USE_SYSTEM_SPEEX 0)
 if (WIN32)
     set(OS_SOURCES speex.rc)
 elseif (APPLE)
@@ -14,13 +13,8 @@ add_library(${PROJECT_NAME} SHARED
             org_jitsi_impl_neomedia_codec_audio_speex_Speex.c
             ${OS_SOURCES})
 
-
-if (NOT ${USE_SYSTEM_SPEEX})
-    add_dependencies(${PROJECT_NAME} ext_lib_speex)
-else ()
-    find_package(speexdsp REQUIRED)
-    find_package(speex REQUIRED)
-endif ()
+find_package(speexdsp REQUIRED)
+find_package(speex REQUIRED)
 
 target_link_libraries(${PROJECT_NAME} LINK_PUBLIC
                       ${JNI_LIBRARIES}