Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-07-16 10:16:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Add gst-libav and ffmpeg to build.

Browse Source 
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
This commit is contained in:
Derek Lesho 2021-12-20 17:34:26 -05:00
parent d54bd682b6
commit 36ef402031
4 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -46,3 +46,9 @@
[submodule "Vulkan-Loader"] [submodule "Vulkan-Loader"]
path = Vulkan-Loader path = Vulkan-Loader
url = https://github.com/KhronosGroup/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

32
build/makefile_base.mak
View File

@ -353,7 +353,7 @@ $(DIST_FONTS): fonts
ALL_TARGETS += dist ALL_TARGETS += dist
GOAL_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_LIBDIR32)/wine -type f -execdir chmod a-w '{}' '+'
find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+' find $(DST_LIBDIR64)/wine -type f -execdir chmod a-w '{}' '+'
rm -rf $(abspath $(DIST_PREFIX)) 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,32))
$(eval $(call rules-meson,gst_good,64)) $(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 ## FAudio

1
ffmpeg Submodule

@ -0,0 +1 @@
Subproject commit 31efd11a705495ec77d9eb8cbc1e08286e49aed0

1
gst-libav Submodule

@ -0,0 +1 @@
Subproject commit e896aabe3c3d278510fb567712c4a55ed0eae075