From 2e56b33e0011efd5b6913e5f3daef0404bb3a094 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Tue, 10 Dec 2019 19:04:32 -0800 Subject: ffmpeg: Build against libtls-bearssl --- pkg/ffmpeg/gen.lua | 6 +++--- pkg/ffmpeg/options.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkg/ffmpeg') diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua index 4aa66e8a..7cdb2997 100644 --- a/pkg/ffmpeg/gen.lua +++ b/pkg/ffmpeg/gen.lua @@ -8,7 +8,7 @@ cflags{ '-I $outdir/internal', '-I $srcdir', '-I $builddir/pkg/alsa-lib/include', - '-I $builddir/pkg/libressl/include', + '-I $builddir/pkg/libtls-bearssl/include', '-I $builddir/pkg/zlib/include', } nasmflags{ @@ -32,7 +32,7 @@ pkg.deps = { '$outdir/config.asm', '$dir/headers', 'pkg/alsa-lib/headers', - 'pkg/libressl/headers', + 'pkg/libtls-bearssl/headers', 'pkg/zlib/headers', } @@ -202,7 +202,7 @@ lib('libavformat.a', { sources.libavformat, 'libavcodec.a.d', 'libavutil.a', - '$builddir/pkg/libressl/libssl.a.d', + '$builddir/pkg/libtls-bearssl/libtls.a.d', '$builddir/pkg/zlib/libz.a', }) diff --git a/pkg/ffmpeg/options.h b/pkg/ffmpeg/options.h index acb7c126..8a9113d2 100644 --- a/pkg/ffmpeg/options.h +++ b/pkg/ffmpeg/options.h @@ -403,8 +403,8 @@ #define CONFIG_LIBXVID 0 #define CONFIG_DECKLINK 0 #define CONFIG_LIBFDK_AAC 0 -#define CONFIG_OPENSSL 1 -#define CONFIG_LIBTLS 0 +#define CONFIG_OPENSSL 0 +#define CONFIG_LIBTLS 1 #define CONFIG_GMP 0 #define CONFIG_LIBARIBB24 0 #define CONFIG_LIBLENSFUN 0 -- cgit v1.2.3