Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b079a79

Browse filesBrowse files
authored
Merge pull request markus-perl#31 from fpm-peter/openssl
Openssl
2 parents 43d6694 + e4fe985 commit b079a79
Copy full SHA for b079a79

File tree

Expand file treeCollapse file tree

2 files changed

+13
-3
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+13
-3
lines changed

‎Dockerfile

Copy file name to clipboardExpand all lines: Dockerfile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:18.10
22

33
RUN apt-get update \
4-
&& apt-get -y --no-install-recommends install build-essential curl g++ ca-certificates \
4+
&& apt-get -y --no-install-recommends install build-essential curl g++ ca-certificates libz-dev \
55
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
66
&& update-ca-certificates
77

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+12-2Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ remove_dir () {
4343
download () {
4444

4545
DOWNLOAD_PATH=$PACKAGES;
46-
46+
4747
if [ ! -z "$3" ]; then
4848
mkdir -p $PACKAGES/$3
4949
DOWNLOAD_PATH=$PACKAGES/$3
@@ -340,6 +340,15 @@ if build "av1"; then
340340
build_done "av1"
341341
fi
342342

343+
if build "openssl"; then
344+
download "https://www.openssl.org/source/openssl-1.1.1c.tar.gz" "openssl-1.1.1c.tar.gz"
345+
cd $PACKAGES/openssl-1.1.1c || exit
346+
execute ./config --prefix=${WORKSPACE} --openssldir=${WORKSPACE} shared zlib
347+
execute make -j $MJOBS
348+
execute make install
349+
build_done "openssl"
350+
fi
351+
343352
build "ffmpeg"
344353
download "https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2" "ffmpeg-snapshot.tar.bz2"
345354
cd $PACKAGES/ffmpeg-4.2 || exit
@@ -355,6 +364,7 @@ cd $PACKAGES/ffmpeg-4.2 || exit
355364
--disable-shared \
356365
--disable-ffplay \
357366
--disable-doc \
367+
--enable-openssl \
358368
--enable-gpl \
359369
--enable-version3 \
360370
--enable-nonfree \
@@ -408,4 +418,4 @@ elif [[ ! $SKIPINSTALL == "yes" ]]; then
408418
fi
409419
fi
410420

411-
exit 0
421+
exit 0

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.