oasis

commit: 2e56b33e0011efd5b6913e5f3daef0404bb3a094
parent 8cacd5484616194d773d0f74e2adc2105dadc6a2
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 10 Dec 2019 19:04:32 -0800

ffmpeg: Build against libtls-bearssl

Diffstat:
M
pkg/ffmpeg/gen.lua
6
+++---
M
pkg/ffmpeg/options.h
4
++--

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git 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
@@ -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