REVERT_ME: Disable mediaconv and use github gstreamer mirrors.

To mitigate the Freedesktop outage:
https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/407
This commit is contained in:
Arkadiusz Hiler 2021-12-28 13:11:31 +02:00
parent 3f087a8e66
commit 98aa5be741
2 changed files with 5 additions and 29 deletions

10
.gitmodules vendored
View File

@ -12,19 +12,19 @@
url = https://github.com/liberationfonts/liberation-fonts
[submodule "gstreamer"]
path = gstreamer
url = https://gitlab.freedesktop.org/gstreamer/gstreamer.git
url = https://github.com/GStreamer/gstreamer.git
[submodule "gst-plugins-base"]
path = gst-plugins-base
url = https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git
url = https://github.com/GStreamer/gst-plugins-base.git
[submodule "gst-plugins-good"]
path = gst-plugins-good
url = https://gitlab.freedesktop.org/gstreamer/gst-plugins-good.git
url = https://github.com/GStreamer/gst-plugins-good.git
[submodule "gst-plugins-bad"]
path = gst-plugins-bad
url = https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
url = https://github.com/GStreamer/gst-plugins-bad.git
[submodule "gst-orc"]
path = gst-orc
url = https://gitlab.freedesktop.org/gstreamer/orc.git
url = https://github.com/GStreamer/orc.git
[submodule "vkd3d-proton"]
path = vkd3d-proton
url = https://github.com/HansKristian-Work/vkd3d-proton

View File

@ -845,30 +845,6 @@ $(OBJ)/.vkd3d-proton-post-build64:
##
## mediaconv
##
MEDIACONV_SOURCE_ARGS = \
--exclude Cargo.lock \
MEDIACONV_DEPENDS = gst_orc gstreamer gst_base
$(eval $(call rules-source,mediaconv,$(SRCDIR)/media-converter))
$(eval $(call rules-cargo,mediaconv,32))
$(eval $(call rules-cargo,mediaconv,64))
$(OBJ)/.mediaconv-post-build64:
mkdir -p $(MEDIACONV_DST64)/lib64/gstreamer-1.0/
cp -a $(MEDIACONV_OBJ64)/x86_64-unknown-linux-gnu/release/libprotonmediaconverter.so $(MEDIACONV_DST64)/lib64/gstreamer-1.0/
touch $@
$(OBJ)/.mediaconv-post-build32:
mkdir -p $(MEDIACONV_DST32)/lib/gstreamer-1.0/
cp -a $(MEDIACONV_OBJ32)/i686-unknown-linux-gnu/release/libprotonmediaconverter.so $(MEDIACONV_DST32)/lib/gstreamer-1.0/
touch $@
##
## BattlEye Bridge
##