Skip to content

Commit 041b73e

Browse files
author
Srikanth Kotagiri
committed
Working linux prebuild
1 parent 1bf57f2 commit 041b73e

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

.github/workflows/prebuild.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
shell: bash
1717
run: |
1818
apt update
19-
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends --no-install-suggests -y git git-lfs libxcb1 unzip nodejs curl nodejs npm
20-
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends --no-install-suggests -y python3-setuptools build-essential
19+
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends --no-install-suggests -y git git-lfs \
20+
libxcb1 unzip nodejs curl nodejs npm python3-setuptools build-essential
2121
2222
- uses: actions/checkout@v2
2323
with:
@@ -34,9 +34,6 @@ jobs:
3434
- name: prebuild for Linux (x64)
3535
run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
3636

37-
# - name: prebuild for Linux (arm64)
38-
# run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }}
39-
4037
windows-package:
4138
permissions:
4239
contents: write

binding.gyp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,21 @@
3434
],
3535

3636
"link_settings": {
37+
"ldflags": [
38+
"--verbose"
39+
],
3740
"libraries": [
38-
"-L<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-linux-<(target_arch_override).<(ffmpeg_version)/"
41+
"-Wl,-rpath,./build/Release/ "
42+
"-L<(module_root_dir)/ffmpeg/ffmpeg-ffprobe-shared-linux-<(target_arch_override).<(ffmpeg_version)/ "
43+
"-lavcodec",
44+
"-lavdevice",
45+
"-lavfilter",
46+
"-lavformat",
47+
"-lavutil",
48+
"-lpostproc",
49+
"-lswresample",
50+
"-lswscale",
51+
"-lzimg"
3952
]
4053
},
4154
"copies": [

install_ffmpeg.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,26 +158,31 @@ async function linux() {
158158
const tag = `v${version}`;
159159

160160
await access(`ffmpeg/${ffmpegFilename}`, fs.constants.R_OK).catch(async () => {
161-
const ws = fs.createWriteStream(`ffmpeg/${ffmpegFilename}.zip`);
162-
const url = `https://github.com/descriptinc/ffmpeg-build-script/releases/download/${tag}/${ffmpegFilename}.zip`
161+
const ws = fs.createWriteStream(`ffmpeg/${ffmpegFilename}.tar.gz`);
162+
const url = `https://github.com/descriptinc/ffmpeg-build-script/releases/download/${tag}/${ffmpegFilename}.tar.gz`
163163
console.log(url);
164164
await get(
165165
ws,
166166
url,
167-
`${ffmpegFilename}.zip`
167+
`${ffmpegFilename}.tar.gz`
168168
).catch(async (err) => {
169169
if (err.name === 'RedirectError') {
170170
const redirectURL = err.message;
171-
await get(ws, redirectURL, `${ffmpegFilename}.zip`);
171+
await get(ws, redirectURL, `${ffmpegFilename}.tar.gz`);
172172
} else {
173173
console.error(err);
174174
throw err;
175175
}
176176
});
177177

178-
await exec(`unzip ffmpeg/${ffmpegFilename}.zip -d ffmpeg/${ffmpegFilename}/`);
178+
await mkdir(`ffmpeg/${ffmpegFilename}`).catch(e => {
179+
if (e.code === 'EEXIST') return;
180+
else throw e;
181+
});
182+
183+
await exec(`tar xvzf ffmpeg/${ffmpegFilename}.tar.gz -C ffmpeg/${ffmpegFilename}/`);
179184

180-
console.log('Adding path "$PWD/ffmpeg/${ffmpegFilename}/" to ldconfig path');
185+
console.log(`Adding path "$PWD/ffmpeg/${ffmpegFilename}/" to ldconfig path`);
181186
await exec(`echo "$PWD/ffmpeg/${ffmpegFilename}/" | tee -a /etc/ld.so.conf.d/ffmpeg.conf`)
182187
console.log('Running LDCONFIG');
183188
await exec(`ldconfig`)

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)