Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • Thrillseekr/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
400 results
Show changes
Commits on Source (11)
......@@ -296,6 +296,10 @@ case "${OS}" in
then
add_make_enabled "HAVE_BITCODE_ENABLED"
fi
if test "$BUILDFORSIMULATOR"
then
add_make_enabled "HAVE_SIMULATOR"
fi
;;
*bsd*)
MAKE=gmake
......
......@@ -3,7 +3,7 @@
CARGOC_VERSION := 0.9.29
ifdef BUILD_RUST
PKGS_TOOLS += cargo-c
# PKGS_TOOLS += cargo-c
ifneq ($(call system_tool_majmin, cargo-capi --version),)
PKGS_FOUND += cargo-c
......@@ -11,11 +11,7 @@ endif
endif
ifdef HAVE_CROSS_COMPILE
DEPS_cargo-c = rustc-cross $(DEPS_rustc-cross)
else
DEPS_cargo-c = rustc $(DEPS_rustc)
endif
.sum-cargo-c:
touch $@
......@@ -32,5 +28,5 @@ endif
.cargo-c:
+unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH CFLAGS CPPFLAGS LDFLAGS; \
$(CARGO) install --locked $(CARGOC_FEATURES) cargo-c --version $(CARGOC_VERSION)
$(CARGO_NATIVE) install --target=$(RUST_HOST) --locked $(CARGOC_FEATURES) cargo-c --version $(CARGOC_VERSION)
touch $@
#!/bin/sh
# SPDX-License-Identifier: ISC
# Copyright (C) 2024 VideoLabs, VLC authors and VideoLAN
#
# Authors: Denis Charmet <typx@dinauz.org>
# Steve Lhomme <robux4@videolabs.io>
#
# Transform a compilation triplet into a Rust Tier 1 and Tier 2 target
# based on https://doc.rust-lang.org/rustc/platform-support.html
DARWIN=
ARCH=
OS=
UWP=
UCRT=
SIMULATOR=
TRIPLET=
abort_err()
{
echo "ERROR: $1" >&2
exit 1
}
return_triplet()
{
echo "$1"
exit 0
}
validate_darwin()
{
D=$(echo $1 | cut -f2 -d"=")
case $D in
macos)
DARWIN=macos
;;
ios)
DARWIN=ios
;;
tvos)
DARWIN=tvos
;;
watchos)
DARWIN=watchos
;;
xros)
DARWIN=xros
;;
*)
abort_err "Unsupported Darwin variant '$D'"
;;
esac
}
validate_triplet()
{
TRIPLET=$1
ARCH=$(echo $1 | cut -f 1 -d '-')
UNUSED=$(echo $1 | cut -f 2 -d '-')
OS=$(echo $1 | cut -f 3 -d '-')
REST=$(echo $1 | cut -f 4 -d '-')
if test ! -z "$REST"; then
OS=$REST
fi
if test -z "$ARCH" || test -z "$UNUSED" || test -z "$OS"; then
abort_err "Unsupported triplet '$1'"
fi
}
print_usage()
{
echo "Usage: $0 [--ucrt] [--uwp] [--darwin {macos,ios,tvos,watchos,xros}] [--simulator] triplet"
}
for ARG in "$@"; do
case $ARG in
--uwp)
UWP=1
;;
--ucrt)
UCRT=1
;;
--simulator)
SIMULATOR=1
;;
--darwin=*)
validate_darwin $ARG
;;
*-*-*)
validate_triplet $ARG
break
;;
*)
print_usage
abort_err "Unknown parameter $ARG"
;;
esac
done
case $OS in
mingw32|mingw32ucrt|mingw32uwp)
if test ! -z "$UWP"; then
abort_err "UWP Windows is Tier 3"
fi
if test ! -z "$UCRT"; then
return_triplet $ARCH-pc-windows-gnullvm
else
return_triplet $ARCH-pc-windows-gnu
fi
;;
android)
case $ARCH in
aarch64|i686|x86_64)
return_triplet $TRIPLET
;;
esac
;;
androideabi)
case $ARCH in
arm|armv7|thumbv7neon)
return_triplet $TRIPLET
;;
esac
;;
darwin*)
case $DARWIN in
macos)
case $ARCH in
aarch64|arm64)
return_triplet aarch64-apple-darwin
;;
x86_64)
return_triplet x86_64-apple-darwin
;;
esac
;;
ios)
if test ! -z "$SIMULATOR"; then
case $ARCH in
aarch64|arm64)
return_triplet aarch64-apple-ios-sim
;;
esac
else
case $ARCH in
aarch64|arm64)
return_triplet aarch64-apple-ios
;;
x86_64)
return_triplet x86_64-apple-ios
;;
esac
fi
;;
esac
abort_err "Unsupported Darwin triplet '$TRIPLET' for '$DARWIN'"
;;
gnueabihf)
case $ARCH in
arm|armv7|thumbv7neon)
return_triplet $ARCH-unknown-linux-gnueabihf
;;
esac
;;
gnu)
case $ARCH in
riscv64)
return_triplet riscv64gc-unknown-linux-gnu
;;
x86_64|aarch64|i686|loongarch64|powerpc|powerpc64|powerpcle|s390x|i586|sparc64)
return_triplet $ARCH-unknown-linux-gnu
;;
esac
;;
netbsd)
case $ARCH in
x86_64)
return_triplet x86_64-unknown-netbsd
;;
esac
;;
freebsd)
case $ARCH in
x86_64)
return_triplet x86_64-unknown-freebsd
;;
esac
;;
emscripten)
case $ARCH in
wasm32)
return_triplet wasm32-unknown-emscripten
;;
esac
;;
*)
abort_err "Unknown OS '$OS'"
;;
esac
abort_err "Unsupported triplet '$TRIPLET'"
......@@ -7,64 +7,46 @@
RUST_VERSION_MIN=1.63.0
ifdef HAVE_WIN32
ifdef HAVE_WINSTORE
RUST_TARGET_FLAGS += --uwp
endif
ifdef HAVE_UCRT
# does not work as Tier 2 before that
RUST_VERSION_MIN=1.79.0
ifndef HAVE_WINSTORE # UWP is available as Tier 3
ifeq ($(HOST),i686-w64-mingw32)
RUST_TARGET = i686-pc-windows-gnullvm # ARCH is i386
else ifneq ($(HOST),armv7-w64-mingw32)
# Not supported on armv7
RUST_TARGET = $(ARCH)-pc-windows-gnullvm
endif # archs
endif # WINSTORE
else # MSVCRT
ifeq ($(HOST),i686-w64-mingw32)
RUST_TARGET = i686-pc-windows-gnu # ARCH is i386
else ifeq ($(HOST),x86_64-w64-mingw32)
RUST_TARGET = $(ARCH)-pc-windows-gnu
else
# Not supported on armv7/aarch64 yet
endif # archs
endif # MSVCRT
else ifdef HAVE_ANDROID
RUST_TARGET = $(HOST)
else ifdef HAVE_IOS
ifneq ($(ARCH),arm) # iOS 32bit is Tier 3
ifneq ($(ARCH),i386) # iOS 32bit is Tier 3
ifndef HAVE_TVOS # tvOS is Tier 3
RUST_TARGET = $(ARCH)-apple-ios
endif
RUST_TARGET_FLAGS += --ucrt
endif
endif
else ifdef HAVE_MACOSX
RUST_TARGET = $(ARCH)-apple-darwin
# else ifdef HAVE_SOLARIS
# Solaris x86_64 is Tier 3
# RUST_TARGET = x86_64-sun-solaris
else ifdef HAVE_LINUX
ifeq ($(HOST),arm-linux-gnueabihf)
RUST_TARGET = arm-unknown-linux-gnueabihf #add eabihf
else
ifeq ($(HOST),riscv64-linux-gnu)
RUST_TARGET = riscv64gc-unknown-linux-gnu
ifdef HAVE_DARWIN_OS
ifdef HAVE_TVOS
RUST_TARGET_FLAGS += --darwin=tvos
else ifdef HAVE_WATCHOS
RUST_TARGET_FLAGS += --darwin=watchos
else ifdef HAVE_IOS
RUST_TARGET_FLAGS += --darwin=ios
else
RUST_TARGET = $(ARCH)-unknown-linux-gnu
RUST_TARGET_FLAGS += --darwin=macos
endif
ifdef HAVE_SIMULATOR
RUST_TARGET_FLAGS += --simulator
endif
endif
else ifdef HAVE_BSD
RUST_TARGET = $(HOST)
else ifdef HAVE_EMSCRIPTEN
RUST_TARGET = $(HOST)
ifneq ($(findstring darwin,$(BUILD)),)
RUST_BUILD_FLAGS += --darwin=macos
endif
RUST_TARGET := $(shell $(SRC)/get-rust-target.sh $(RUST_TARGET_FLAGS) $(HOST) 2>/dev/null || echo FAIL)
RUST_HOST := $(shell $(SRC)/get-rust-target.sh $(RUST_BUILD_FLAGS) $(BUILD) 2>/dev/null || echo FAIL)
ifneq ($(RUST_HOST),FAIL)
# For now, VLC don't support Tier 3 platforms (ios 32bit, tvOS).
# Supporting a Tier 3 platform means building an untested rust toolchain.
# TODO Let's hope tvOS move from Tier 3 to Tier 2 before the VLC 4.0 release.
ifneq ($(RUST_TARGET),)
ifneq ($(RUST_TARGET),FAIL)
BUILD_RUST="1"
endif
endif
RUSTUP_HOME= $(BUILDBINDIR)/.rustup
CARGO_HOME = $(BUILDBINDIR)/.cargo
......@@ -84,12 +66,17 @@ endif
CARGO_ENV = TARGET_CC="$(CC)" TARGET_AR="$(AR)" TARGET_RANLIB="$(RANLIB)" \
TARGET_CFLAGS="$(CFLAGS)" RUSTFLAGS="$(RUSTFLAGS)"
CARGO_ENV_NATIVE = TARGET_CC="$(BUILDCC)" TARGET_AR="$(BUILDAR)" TARGET_RANLIB="$(BUILDRANLIB)" \
TARGET_CFLAGS="$(BUILDCFLAGS)"
ifneq ($(call system_tool_majmin, cargo --version),)
CARGO = RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV) cargo
CARGO_NATIVE = RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV_NATIVE) cargo
else
CARGO = . $(CARGO_HOME)/env && \
RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV) cargo
CARGO_NATIVE = . $(CARGO_HOME)/env && \
RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) $(CARGO_ENV_NATIVE) cargo
endif
CARGO_INSTALL_ARGS = --target=$(RUST_TARGET) --prefix=$(PREFIX) \
......
......@@ -23,12 +23,11 @@ RAV1E_FEATURES=--features=asm
# we may not need cargo if the tarball is downloaded, but it will be needed by rav1e anyway
ifdef HAVE_CROSS_COMPILE
DEPS_rav1e-vendor = rustc-cross $(DEPS_rustc-cross)
DEPS_rav1e = rustc-cross $(DEPS_rustc-cross)
else
DEPS_rav1e-vendor = rustc $(DEPS_rustc)
DEPS_rav1e = rustc $(DEPS_rustc)
endif
DEPS_rav1e-vendor = rustc $(DEPS_rustc)
DEPS_rav1e += rav1e-vendor $(DEPS_rav1e-vendor) cargo-c $(DEPS_cargo-c)
# rav1e-vendor
......@@ -37,7 +36,7 @@ rav1e-vendor-build:
$(RM) -R $@
mkdir -p $@
tar xzfo $(TARBALLS)/rav1e-$(RAV1E_VERSION).tar.gz -C $@ --strip-components=1
cd $@ && $(CARGO) vendor --locked rav1e-$(RAV1E_VERSION)-vendor
cd $@ && $(CARGO_NATIVE) vendor --locked rav1e-$(RAV1E_VERSION)-vendor
cd $@ && tar -jcf rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 rav1e-$(RAV1E_VERSION)-vendor
install $@/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 "$(TARBALLS)"
# cd $@ && sha512sum rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 > SHA512SUMS
......
......@@ -17,13 +17,14 @@ RUSTUP = . $(CARGO_HOME)/env && \
RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) rustup
endif
ifeq ($(call system_tool_matches_min, cargo --version,$(RUST_VERSION_MIN)),)
ifeq ($(call system_tool_matches_min, echo 'fn main() {}' | rustc --target=$(RUST_HOST) --emit=dep-info - -o /dev/null 2>/dev/null && rustc --target=$(RUST_HOST) --version,$(RUST_VERSION_MIN)),)
PKGS_FOUND += rustc
# TODO detect if the target is available
# PKGS_FOUND += rustc-cross
else
DEPS_rustc = rustup $(DEPS_rustup)
endif
ifeq ($(call system_tool_matches_min, echo 'fn main() {}' | rustc --target=$(RUST_TARGET) --emit=dep-info - -o /dev/null 2>/dev/null && rustc --target=$(RUST_TARGET) --version,$(RUST_VERSION_MIN)),)
PKGS_FOUND += rustc-cross
endif
endif
......
......@@ -637,6 +637,9 @@ elif [ "$VLC_HOST_OS" = "watchos" ]; then
export BUILDFORIOS="yes"
export BUILDFORWATCHOS="yes"
fi
if [ "$VLC_HOST_PLATFORM_SIMULATOR" = "yes" ]; then
export BUILDFORSIMULATOR="yes"
fi
# Default to "make" if there is no MAKE env variable
MAKE=${MAKE:-make}
......