From 976e090f42b3ac8b1436726ef73333dfda29db01 Mon Sep 17 00:00:00 2001 From: Rudra Sankha Sinhamahapatra Date: Sun, 9 Mar 2025 03:31:35 +0530 Subject: [PATCH 1/4] adding ffmpeg v7 --- packages/build/src/extensions/core/ffmpeg.ts | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/packages/build/src/extensions/core/ffmpeg.ts b/packages/build/src/extensions/core/ffmpeg.ts index 84a91d7061..4f54394e80 100644 --- a/packages/build/src/extensions/core/ffmpeg.ts +++ b/packages/build/src/extensions/core/ffmpeg.ts @@ -38,3 +38,40 @@ export function ffmpeg(options: FfmpegOptions = {}): BuildExtension { }, }; } + +/** + * Add ffmpeg 7.x to the build, and automatically set the FFMPEG_PATH and FFPROBE_PATH environment variables. + * This uses the static build from johnvansickle.com to install the latest 7.x version. + * + * @returns The build extension. + */ + +export function ffmpeg7(): BuildExtension { + return { + name:"ffmpeg7", + onBuildComplete(context) { + if(context.target === "dev") { + return; + } + + context.logger.debug("Adding ffmpeg 7"); + + context.addLayer({ + id:"ffmpeg", + image: { + instructions:[ + "RUN apt-get update && apt-get install -y --no-install-recommends wget xz-utils && apt-get clean && rm -rf /var/lib/apt/lists/*", + "RUN wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -O ffmpeg.tar.xz && tar xvf ffmpeg.tar.xz -C /usr/bin --strip-components=1 --no-anchored 'ffmpeg' 'ffprobe' && rm ffmpeg.tar.xz", + ], + }, + deploy : { + env: { + FFMPEG_PATH: "/usr/bin/ffmpeg", + FFPROBE_PATH: "/usr/bin/ffprobe", + }, + override: true, + } + }) + } + } +} \ No newline at end of file From 5e4d8ea77fbd25b1db924052041e7fba46783a05 Mon Sep 17 00:00:00 2001 From: Rudra Sankha Sinhamahapatra Date: Sun, 9 Mar 2025 03:44:29 +0530 Subject: [PATCH 2/4] Renaming id ffmpeg to ffmpeg7 --- packages/build/src/extensions/core/ffmpeg.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/extensions/core/ffmpeg.ts b/packages/build/src/extensions/core/ffmpeg.ts index 4f54394e80..bdcadbd90b 100644 --- a/packages/build/src/extensions/core/ffmpeg.ts +++ b/packages/build/src/extensions/core/ffmpeg.ts @@ -57,7 +57,7 @@ export function ffmpeg7(): BuildExtension { context.logger.debug("Adding ffmpeg 7"); context.addLayer({ - id:"ffmpeg", + id:"ffmpeg7", image: { instructions:[ "RUN apt-get update && apt-get install -y --no-install-recommends wget xz-utils && apt-get clean && rm -rf /var/lib/apt/lists/*", From cba27619dee82e8db1fc89ce33a9f2b9948df141 Mon Sep 17 00:00:00 2001 From: Rudra Sankha Sinhamahapatra Date: Sun, 9 Mar 2025 15:24:26 +0530 Subject: [PATCH 3/4] added space --- packages/build/src/extensions/core/ffmpeg.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/extensions/core/ffmpeg.ts b/packages/build/src/extensions/core/ffmpeg.ts index bdcadbd90b..96a00db2e5 100644 --- a/packages/build/src/extensions/core/ffmpeg.ts +++ b/packages/build/src/extensions/core/ffmpeg.ts @@ -48,7 +48,7 @@ export function ffmpeg(options: FfmpegOptions = {}): BuildExtension { export function ffmpeg7(): BuildExtension { return { - name:"ffmpeg7", + name: "ffmpeg7", onBuildComplete(context) { if(context.target === "dev") { return; From e523e4d84be905891fb059ee26e0ce75fd303205 Mon Sep 17 00:00:00 2001 From: Rudra Sankha Sinhamahapatra Date: Sun, 9 Mar 2025 15:29:52 +0530 Subject: [PATCH 4/4] fixing formatting issue --- packages/build/src/extensions/core/ffmpeg.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/build/src/extensions/core/ffmpeg.ts b/packages/build/src/extensions/core/ffmpeg.ts index 96a00db2e5..953c2bf688 100644 --- a/packages/build/src/extensions/core/ffmpeg.ts +++ b/packages/build/src/extensions/core/ffmpeg.ts @@ -50,21 +50,21 @@ export function ffmpeg7(): BuildExtension { return { name: "ffmpeg7", onBuildComplete(context) { - if(context.target === "dev") { + if (context.target === "dev") { return; } context.logger.debug("Adding ffmpeg 7"); context.addLayer({ - id:"ffmpeg7", + id: "ffmpeg7", image: { instructions:[ "RUN apt-get update && apt-get install -y --no-install-recommends wget xz-utils && apt-get clean && rm -rf /var/lib/apt/lists/*", "RUN wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -O ffmpeg.tar.xz && tar xvf ffmpeg.tar.xz -C /usr/bin --strip-components=1 --no-anchored 'ffmpeg' 'ffprobe' && rm ffmpeg.tar.xz", ], }, - deploy : { + deploy: { env: { FFMPEG_PATH: "/usr/bin/ffmpeg", FFPROBE_PATH: "/usr/bin/ffprobe",