Skip to content

Commit 02e3274

Browse files
author
Srikanth Kotagiri
committed
Adding support for shared build from descripinc/ffmpeg-build-script for lix
1 parent 0ec8a28 commit 02e3274

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

.github/workflows/prebuild.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,32 @@ jobs:
55
linux-package:
66
runs-on: ubuntu-24.04
77
container:
8-
image: node:16.20.2-bookworm
8+
image: ubuntu:24.04
99
steps:
1010
- uses: actions/checkout@v2
1111
with:
1212
lfs: true
1313

14+
- name: check Linux dependencies
15+
shell: bash
16+
run: |
17+
apt update
18+
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends --no-install-suggests -y libxcb1 unzip nodejs curl nodejs npm
19+
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends --no-install-suggests -y python3-setuptools build-essential
20+
1421
- name: npm install
1522
run: npm install
1623
env:
1724
PREBUILD: true
1825

19-
2026
- name: check Linux dependencies
2127
run: node ./install_ffmpeg.js
2228

2329
- name: prebuild for Linux (x64)
2430
run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
2531

26-
- name: prebuild for Linux (arm64)
27-
run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
32+
# - name: prebuild for Linux (arm64)
33+
# run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
2834

2935
package:
3036
runs-on: ${{ matrix.os }}

binding.gyp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,8 @@
3434
],
3535

3636
"link_settings": {
37-
"library_dirs": [
38-
"<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-linux-<(target_arch_override).<(ffmpeg_version)/"
39-
],
4037
"libraries": [
41-
"-lavcodec",
42-
"-lavdevice",
43-
"-lavfilter",
44-
"-lavformat",
45-
"-lavutil",
46-
"-lpostproc",
47-
"-lswresample",
48-
"-lswscale",
49-
"-lzimg"
38+
"-L<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-linux-<(target_arch_override).<(ffmpeg_version)/"
5039
]
5140
},
5241
"copies": [

install_ffmpeg.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,10 @@ async function linux() {
176176
});
177177

178178
await exec(`unzip ffmpeg/${ffmpegFilename}.zip -d ffmpeg/${ffmpegFilename}/`);
179+
180+
console.log('Adding path "$PWD/ffmpeg/${ffmpegFilename}/" to ldconfig path');
179181
await exec(`echo "$PWD/ffmpeg/${ffmpegFilename}/" | tee -a /etc/ld.so.conf.d/ffmpeg.conf`)
182+
console.log('Running LDCONFIG');
180183
await exec(`ldconfig`)
181184
});
182185

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "beamcoder-prebuild",
3-
"version": "0.7.1-rc.6",
3+
"version": "0.7.1-rc.7",
44
"description": "Node.js native bindings to FFmpeg.",
55
"main": "index.js",
66
"types": "index.d.ts",

0 commit comments

Comments
 (0)