should compile

Author: JonnyBurger

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       - run: curl https://sh.rustup.rs -sSf | sh -s -- -y
       - run: rm /opt/homebrew/opt/libx11/lib/libX11.6.dylib
       - run: node clean.mjs
-      - run: node compile-ffmpeg.mjs
+      - run: node compile-ffmpeg.mjs arm
       - run: node generate-bindings.mjs
       - run: node zip.mjs
       - run: node test-ffmpeg.mjs

Dockerfile

@@ -18,7 +18,7 @@ RUN apk add curl
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 RUN source "$HOME/.cargo/env"
 RUN apk add yasm nasm curl git make ca-certificates pkgconfig bash cmake make cmake build-base llvm-static llvm-dev clang-static clang-dev perl zlib zlib-dev meson ninja autoconf automake libtool patchelf
-RUN cd app && CFLAGS="$CFLAGS -static-libgcc" CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++" node compile-ffmpeg.mjs musl
+RUN cd app && CFLAGS="$CFLAGS -static-libgcc" CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++" node compile-ffmpeg.mjs musl arm
 RUN source "$HOME/.cargo/env" && cd app && node generate-bindings.mjs musl
 RUN source "$HOME/.cargo/env" && cd app && node zip.mjs
 RUN source "$HOME/.cargo/env" && cd app && node test-ffmpeg.mjs

Dockerfile-aws

@@ -21,8 +21,8 @@ RUN amazon-linux-extras list
 RUN amazon-linux-extras install epel python3.8 -y
 RUN python3.8 -m pip install meson
 RUN python3.8 -m pip install ninja
-RUN yum install yasm nasm unzip curl gcc gcc-c++ tar git make ca-certificates pkgconfig bash cmake make cmake build-base llvm-static llvm-dev clang-static clang-dev perl zlib zlib-devel clang-libs clang ninja autoconf automake libtool patchelf -y
-RUN cd app && CFLAGS="$CFLAGS -static-libgcc" CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++" node compile-ffmpeg.mjs || tail -n 30 ffmpeg/ffbuild/config.log
+RUN yum install yasm nasm unzip curl gcc gcc-c++ tar git make ca-certificates pkgconfig bash make cmake3 build-base llvm-static llvm-dev clang-static clang-dev perl zlib zlib-devel clang-libs clang ninja autoconf automake libtool patchelf -y
+RUN cd app && CFLAGS="$CFLAGS -static-libgcc" CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++" node compile-ffmpeg.mjs arm || tail -n 30 ffmpeg/ffbuild/config.log
 RUN source "$HOME/.cargo/env" && cd app && node generate-bindings.mjs
 RUN source "$HOME/.cargo/env" && cd app && node zip.mjs
 RUN source "$HOME/.cargo/env" && cd app && node test-ffmpeg.mjs

compile-ffmpeg.mjs

@@ -121,15 +121,16 @@ if (!existsSync(PREFIX)) {
 }
 
 execSync("git config --global advice.detachedHead false");
-const isWindows = process.argv[2] === "windows";
-const isMusl = process.argv[2] === "musl";
+const isWindows = process.argv.includes("windows");
+const isMusl = process.argv.includes("musl");
+const isArm = process.argv.includes("arm");
 
 await enableFdkAac(isWindows);
 enableAv1(isWindows);
 enableZimg(isWindows);
 enableVpx(isWindows);
 enableX264(isMusl, isWindows);
-enableX265(isMusl, isWindows);
+enableX265(isMusl, isWindows, isArm);
 enableLibMp3Lame(isWindows);
 enableOpus(isWindows);
 

compile-x265.mjs

@@ -4,7 +4,7 @@ import { execSync } from "child_process";
 import { PREFIX } from "./const.mjs";
 import { compileFunction } from "vm";
 
-export const enableX265 = (isMusl, isWindows) => {
+export const enableX265 = (isMusl, isWindows, isArm) => {
   if (isWindows) {
     execSync("cp x265-windows/lib/libx265.a remotion/lib/libx265.a");
     execSync(
@@ -22,23 +22,36 @@ export const enableX265 = (isMusl, isWindows) => {
   ].filter(Boolean);
 
   if (!fs.existsSync("x265")) {
-    execSync(
-      "git clone https://bitbucket.org/multicoreware/x265_git.git x265",
-      {
+    if (isArm && isMusl) {
+      execSync("git clone https://github.com/videolan/x265 x265", {
         stdio: "inherit",
-      }
-    );
+      });
+    } else {
+      execSync(
+        "git clone https://bitbucket.org/multicoreware/x265_git.git x265",
+        {
+          stdio: "inherit",
+        }
+      );
+    }
   }
 
   execSync("git fetch", {
     cwd: "x265",
     stdio: "inherit",
   });
 
-  execSync("git checkout 8f11c33acc267ba3f1d2bde60a6aa906e494cbde", {
-    cwd: "x265",
-    stdio: "inherit",
-  });
+  if (isArm && isMusl) {
+    execSync("git checkout 8f11c33acc267ba3f1d2bde60a6aa906e494cbde", {
+      cwd: "x265",
+      stdio: "inherit",
+    });
+  } else {
+    execSync("git checkout stable", {
+      cwd: "x265",
+      stdio: "inherit",
+    });
+  }
 
   const staticallyLinkCLibrary = isMusl || isWindows;