old cmake

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 arm
+      - run: node compile-ffmpeg.mjs
       - 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 arm
+RUN cd app && CFLAGS="$CFLAGS -static-libgcc" CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++" node compile-ffmpeg.mjs musl old-cmake
 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

@@ -22,7 +22,7 @@ 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 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 cd app && CFLAGS="$CFLAGS -static-libgcc" CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++" node compile-ffmpeg.mjs old-cmake || 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

@@ -123,14 +123,14 @@ if (!existsSync(PREFIX)) {
 execSync("git config --global advice.detachedHead false");
 const isWindows = process.argv.includes("windows");
 const isMusl = process.argv.includes("musl");
-const isArm = process.argv.includes("arm");
+const isOldCmake = process.argv.includes("old-cmake");
 
 await enableFdkAac(isWindows);
 enableAv1(isWindows);
 enableZimg(isWindows);
 enableVpx(isWindows);
 enableX264(isMusl, isWindows);
-enableX265(isMusl, isWindows, isArm);
+enableX265(isMusl, isWindows, isOldCmake);
 enableLibMp3Lame(isWindows);
 enableOpus(isWindows);
 

compile-x265.mjs

@@ -1,10 +1,8 @@
-import fs, { existsSync, readFileSync, unlinkSync } from "fs";
-import path from "path";
+import fs, { readFileSync } from "fs";
 import { execSync } from "child_process";
 import { PREFIX } from "./const.mjs";
-import { compileFunction } from "vm";
 
-export const enableX265 = (isMusl, isWindows, isArm) => {
+export const enableX265 = (isMusl, isWindows, isOldCmake) => {
   if (isWindows) {
     execSync("cp x265-windows/lib/libx265.a remotion/lib/libx265.a");
     execSync(
@@ -22,7 +20,7 @@ export const enableX265 = (isMusl, isWindows, isArm) => {
   ].filter(Boolean);
 
   if (!fs.existsSync("x265")) {
-    if (isArm && isMusl) {
+    if (isOldCmake) {
       execSync("git clone https://github.com/videolan/x265 x265", {
         stdio: "inherit",
       });
@@ -41,7 +39,7 @@ export const enableX265 = (isMusl, isWindows, isArm) => {
     stdio: "inherit",
   });
 
-  if (isArm && isMusl) {
+  if (isOldCmake) {
     // stable as marked on the github repo
     // for older cmake versions
     execSync("git checkout 02d2f496c94c0ef253766b826d95af3404b2781e", {