mirror of
https://github.com/ValveSoftware/Proton.git
synced 2025-07-27 15:41:41 +03:00
amend! REVERT_ME: Disable mediaconv and use github gstreamer mirrors.
REVERT_ME: Use github / our local gstreamer mirrors. The git call is there because of gst submodules with absolute urls. To mitigate the Freedesktop outage: https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/407
This commit is contained in:
parent
7bb7ddb71a
commit
dcd4f8e7e0
24
Makefile.in
24
Makefile.in
@ -837,6 +837,30 @@ $(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
|
## BattlEye Bridge
|
||||||
##
|
##
|
||||||
|
@ -7,7 +7,12 @@ define create-rules-cargo
|
|||||||
$(call create-rules-common,$(1),$(2),$(3))
|
$(call create-rules-common,$(1),$(2),$(3))
|
||||||
|
|
||||||
ifeq ($(CONTAINER),1)
|
ifeq ($(CONTAINER),1)
|
||||||
$$(OBJ)/.$(1)-configure$(3):
|
$$(OBJ)/.$(1)-pre-configure:
|
||||||
|
@echo ":: setting freedesktop url override..." >&2
|
||||||
|
git config --global url."https://gitlab.codeweavers.com/gstreamer-mirror/".insteadOf "https://gitlab.freedesktop.org/gstreamer/"
|
||||||
|
touch $$@
|
||||||
|
|
||||||
|
$$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure
|
||||||
@echo ":: configuring $(3)bit $(1)..." >&2
|
@echo ":: configuring $(3)bit $(1)..." >&2
|
||||||
touch $$@
|
touch $$@
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user