videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Merge branch 'rav1e-contrib' into 'master' 

Cleanup some rav1e contrib usage

See merge request videolan/vlc!2932
This commit is contained in:
Steve Lhomme 2024-04-28 07:10:55 +00:00
parent 7d6abadd24 91178f364f
commit 30b5c84d5d
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/cargo/rules.mak
View File

@ -5,6 +5,8 @@ CARGOC_VERSION=0.9.29
RUSTUP_VERSION=1.25.1
RUSTUP_URL=$(GITHUB)/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz
PKGS_ALL += rustup
RUSTUP = . $(CARGO_HOME)/env && \
RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) rustup

16
contrib/src/main-rust.mak
View File

@ -108,12 +108,10 @@ download_vendor = \
mv $(patsubst %.tar.bz2,%,$(notdir $(f))) $(patsubst .%,%,$@))
touch $@
CARGO_VENDOR_SETUP = \
if test -d $@-vendor; then \
mkdir -p $(UNPACK_DIR)/.cargo; \
echo "[source.crates-io]" > $(UNPACK_DIR)/.cargo/config.toml; \
echo "replace-with = \"vendored-sources\"" >> $(UNPACK_DIR)/.cargo/config.toml; \
echo "[source.vendored-sources]" >> $(UNPACK_DIR)/.cargo/config.toml; \
echo "directory = \"../$@-vendor\"" >> $(UNPACK_DIR)/.cargo/config.toml; \
echo "Using cargo vendor archive for $(UNPACK_DIR)"; \
fi;
cargo_vendor_setup = \
mkdir -p $1/.cargo; \
echo "[source.crates-io]" > $1/.cargo/config.toml; \
echo "replace-with = \"vendored-sources\"" >> $1/.cargo/config.toml; \
echo "[source.vendored-sources]" >> $1/.cargo/config.toml; \
echo "directory = \"../$2-vendor/vendor\"" >> $1/.cargo/config.toml; \
echo "Using cargo vendor archive for $2";

1
contrib/src/rav1e-vendor/SHA512SUMS
View File

@ -1 +0,0 @@
33527a381fe402fc7372ad853d0fb3a15c9ea0be45ff288c41621a979f97967d187f3694f2e2cb2f84af774bbf444ae2d2e22ce3237d76e427b746b03602afc8 rav1e-0.3.4-vendor.tar.bz2

3
contrib/src/rav1e-vendor/rules.mak
View File

@ -3,4 +3,7 @@
$(TARBALLS)/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2:
$(call download_vendor,rav1e-$(RAV1E_VERSION)-vendor.tar.bz2,rav1e)
.sum-rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2
touch $@
.rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2

6
contrib/src/rav1e/rules.mak
View File

@ -23,14 +23,16 @@ $(TARBALLS)/rav1e-$(RAV1E_VERSION).tar.gz:
RAV1E_FEATURES=--features=asm
rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e .rav1e-vendor
DEPS_rav1e = rav1e-vendor $(DEPS_rav1e-vendor)
rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e
$(UNPACK)
ifdef HAVE_WIN32
ifndef HAVE_WIN64
$(APPLY) $(SRC)/rav1e/unwind-resume-stub.patch
endif
endif
$(CARGO_VENDOR_SETUP)
$(call cargo_vendor_setup,$(UNPACK_DIR),$@)
$(MOVE)
.rav1e: rav1e .cargo