From 36ef402031c24a8ae58235ef7509950a24c676d9 Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Mon, 20 Dec 2021 17:34:26 -0500
Subject: [PATCH] proton: Add gst-libav and ffmpeg to build.

Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
---
 .gitmodules             |  6 ++++++
 build/makefile_base.mak | 32 +++++++++++++++++++++++++++++++-
 ffmpeg                  |  1 +
 gst-libav               |  1 +
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 160000 ffmpeg
 create mode 160000 gst-libav

diff --git a/.gitmodules b/.gitmodules
index aa853bc3..d3ffc647 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,9 @@
 [submodule "Vulkan-Loader"]
 	path = Vulkan-Loader
 	url = https://github.com/KhronosGroup/Vulkan-Loader
+[submodule "gst-libav"]
+	path = gst-libav
+	url = https://gitlab.freedesktop.org/gstreamer/gst-libav.git
+[submodule "ffmpeg"]
+	path = ffmpeg
+	url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index 363e91c2..b26862af 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -353,7 +353,7 @@ $(DIST_FONTS): fonts
 ALL_TARGETS += dist
 GOAL_TARGETS += dist
 
-dist_prefix: wine gst_good
+dist_prefix: wine gst_good gst_libav
 	find $(DST_LIBDIR32)/wine -type f -execdir chmod a-w '{}' '+'
 	find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+'
 	rm -rf $(abspath $(DIST_PREFIX))
@@ -543,6 +543,36 @@ $(eval $(call rules-source,gst_good,$(SRCDIR)/gst-plugins-good))
 $(eval $(call rules-meson,gst_good,32))
 $(eval $(call rules-meson,gst_good,64))
 
+##
+## FFmpeg
+##
+
+$(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
+$(eval $(call rules-meson,ffmpeg,32))
+$(eval $(call rules-meson,ffmpeg,64))
+
+$(OBJ)/.ffmpeg-post-source:
+	sed -i 's/0.54/0.47/g' $(FFMPEG_SRC)/meson.build
+
+## Only use ffmpeg to build gst-libav; we don't ship it, as it may contain implementations of patented codecs
+$(OBJ)/.ffmpeg-dist32:
+	touch $@
+$(OBJ)/.ffmpeg-dist64:
+	touch $@
+
+##
+## gst-libav
+##
+
+GST_LIBAV_MESON_ARGS := \
+$(GST_COMMON_MESON_ARGS)
+
+GST_LIBAV_DEPENDS = gst_orc gstreamer gst_base ffmpeg
+
+$(eval $(call rules-source,gst_libav,$(SRCDIR)/gst-libav))
+$(eval $(call rules-meson,gst_libav,32))
+$(eval $(call rules-meson,gst_libav,64))
+
 
 ##
 ## FAudio
diff --git a/ffmpeg b/ffmpeg
new file mode 160000
index 00000000..31efd11a
--- /dev/null
+++ b/ffmpeg
@@ -0,0 +1 @@
+Subproject commit 31efd11a705495ec77d9eb8cbc1e08286e49aed0
diff --git a/gst-libav b/gst-libav
new file mode 160000
index 00000000..e896aabe
--- /dev/null
+++ b/gst-libav
@@ -0,0 +1 @@
+Subproject commit e896aabe3c3d278510fb567712c4a55ed0eae075