Skip to content

Commit 9a31b3c

Browse files
committed
fix(build): nasm man page install, use FFmpeg 7.1.3, bump DEPS_VERSION to v9
- Skip man page installation when using NASM GitHub fallback (requires asciidoc) - Change default FFmpeg from n8.0 to n7.1.3 - Bump DEPS_VERSION to v9 in ci.yml and build-prebuilds.yml
1 parent 7833771 commit 9a31b3c

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

.github/workflows/build-ffmpeg.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ env:
5252
LIBAOM_VERSION: 'v3.12.1'
5353
OPUS_VERSION: '1.5.2'
5454
LAME_VERSION: '3.100'
55-
FFMPEG_VERSION: 'n8.0'
55+
FFMPEG_VERSION: 'n7.1.3'
5656
# npm scope for platform packages
5757
NPM_SCOPE: '@pproenca/ffmpeg'
5858
# Bump this to invalidate all caches
@@ -274,6 +274,7 @@ jobs:
274274
NASM_GITHUB="https://github.com/netwide-assembler/nasm/archive/refs/tags/nasm-${NASM_VERSION}.tar.gz"
275275
276276
# Try primary source with retries, fallback to GitHub mirror
277+
NASM_FROM_GITHUB=false
277278
if curl -fSL --retry 3 --retry-delay 5 "$NASM_URL" -o nasm.tar.bz2 2>/dev/null; then
278279
echo "Downloaded nasm from primary source"
279280
tar xjf nasm.tar.bz2
@@ -283,13 +284,22 @@ jobs:
283284
curl -fSL --retry 3 "$NASM_GITHUB" -o nasm.tar.gz
284285
tar xzf nasm.tar.gz
285286
cd nasm-nasm-${NASM_VERSION}
287+
NASM_FROM_GITHUB=true
286288
# GitHub source archive requires autogen.sh to create configure script
287289
./autogen.sh
288290
fi
289291
290292
./configure --prefix="$TARGET"
291293
make -j$(sysctl -n hw.ncpu)
292-
make install
294+
295+
# GitHub source doesn't include pre-generated man pages (requires asciidoc)
296+
# Install binaries directly to avoid man page install failure
297+
if [ "$NASM_FROM_GITHUB" = true ]; then
298+
mkdir -p "$TARGET/bin"
299+
install -c nasm ndisasm "$TARGET/bin/"
300+
else
301+
make install
302+
fi
293303
cd ..
294304
295305
echo "=== Building x264 (GPL) ==="

.github/workflows/build-prebuilds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
name: "prebuild-${{ matrix.platform }}"
4343
runs-on: ${{ matrix.os }}
4444
env:
45-
DEPS_VERSION: ${{ inputs.deps_version || 'v8' }}
45+
DEPS_VERSION: ${{ inputs.deps_version || 'v9' }}
4646
strategy:
4747
fail-fast: false
4848
matrix:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
name: "build-${{ matrix.platform }}-nodejs-${{ matrix.nodejs_version }}"
3737
runs-on: ${{ matrix.os }}
3838
env:
39-
DEPS_VERSION: v8 # Bump when running new build-ffmpeg workflow
39+
DEPS_VERSION: v9 # Bump when running new build-ffmpeg workflow
4040
strategy:
4141
fail-fast: false
4242
matrix:

0 commit comments

Comments
 (0)