oasis

commit: a74c98d4d508e6ff253a38fb20f5ebd8265b19bc
parent f303ccd2420acdbd4f902f2d0642ac96adeba3f6
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  7 Sep 2018 16:27:29 -0700

ffmpeg: Enable zlib support

Diffstat:
M
pkg/ffmpeg/gen.lua
5
++++-
M
pkg/ffmpeg/options.h
2
+-

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua
@@ -9,6 +9,7 @@ cflags{
 	'-I $srcdir',
 	'-I $builddir/pkg/alsa-lib/include',
 	'-I $builddir/pkg/libressl/include',
+	'-I $builddir/pkg/zlib/include',
 }
 nasmflags{
 	'-i $srcdir/',
@@ -30,8 +31,9 @@ pkg.hdrs = {
 pkg.deps = {
 	'$outdir/config.asm',
 	'$dir/headers',
-	'pkg/libressl/headers',
 	'pkg/alsa-lib/headers',
+	'pkg/libressl/headers',
+	'pkg/zlib/headers',
 }
 
 build('awk', '$outdir/config.asm', '$dir/options.h', {
@@ -199,6 +201,7 @@ lib('libavformat.a', {
 	'libavcodec.a.d',
 	'libavutil.a',
 	'$builddir/pkg/libressl/libssl.a.d',
+	'$builddir/pkg/zlib/libz.a',
 })
 
 lib('libavutil.a', {
diff --git a/pkg/ffmpeg/options.h b/pkg/ffmpeg/options.h
@@ -481,7 +481,7 @@
 #define CONFIG_SECURETRANSPORT 0
 #define CONFIG_SNDIO 0
 #define CONFIG_XLIB 0
-#define CONFIG_ZLIB 0
+#define CONFIG_ZLIB 1
 #define CONFIG_CUDA_SDK 0
 #define CONFIG_LIBNPP 0
 #define CONFIG_LIBMFX 0