Skip to content

Commit 5691d9c

Browse files
author
Srikanth Kotagiri
committed
Working linux packager
1 parent 7006bc0 commit 5691d9c

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

build-ffmpeg

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,13 +1215,17 @@ if $SHARED_LIBRARIES; then
12151215
CONFIGURE_OPTIONS+=("--enable-libsnappy")
12161216

12171217

1218-
if build "xz" "5.2.5"; then
1219-
download "https://tukaani.org/xz/xz-5.2.5.tar.gz"
1218+
if build "xz" "5.4.5"; then
1219+
download "https://tukaani.org/xz/xz-5.4.5.tar.gz"
1220+
if $SHARED_LIBRARIES; then
12201221
execute ./configure --prefix="${WORKSPACE}" --enable-shared --disable-static
1222+
else
1223+
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static
1224+
fi
12211225
execute make -j $MJOBS
12221226
execute make install
12231227

1224-
build_done "xz" "5.2.5"
1228+
build_done "xz" "5.4.5"
12251229
fi
12261230

12271231
fi
@@ -1329,4 +1333,4 @@ elif [[ ! "$SKIPINSTALL" == "yes" ]]; then
13291333
esac
13301334
fi
13311335

1332-
exit 0
1336+
exit 0

descript/build-ffmpeg-linux.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,9 @@ def main():
415415

416416
# bundle up the build artifacts
417417
os.chdir(temp_dir)
418-
shared_zip_name = base_artifact_name + '.zip'
418+
shared_zip_name = base_artifact_name + '.tar.gz'
419419
dest_file = os.path.join(output_dir, shared_zip_name)
420-
args = ['/usr/bin/zip', '--symlinks', '-r', os.path.join('..', shared_zip_name), '.']
420+
args = ['/usr/bin/tar', 'cvzf', os.path.join('..', shared_zip_name), '.']
421421
log(' '.join(args))
422422
subprocess.check_output(args)
423423

0 commit comments

Comments
 (0)