[vlc-commits] [Git][videolan/vlc][master] contrib: always depend on the dependencies of a dependency

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
a12187ee by Steve Lhomme at 2022-09-10T17:33:29+00:00
contrib: always depend on the dependencies of a dependency

So the order of build is always respected, even in case of build error.

- - - - -


7 changed files:

- contrib/src/aribb24/rules.mak
- contrib/src/ffmpeg/rules.mak
- contrib/src/gcrypt/rules.mak
- contrib/src/libarchive/rules.mak
- contrib/src/libdsm/rules.mak
- contrib/src/libplacebo/rules.mak
- contrib/src/spatialaudio/rules.mak


Changes:

=====================================
contrib/src/aribb24/rules.mak
=====================================
@@ -23,7 +23,7 @@ aribb24: aribb24-$(ARIBB24_VERSION).tar.gz .sum-aribb24
 	$(call pkg_static,"src/aribb24.pc.in")
 	$(MOVE)
 
-DEPS_aribb24 = png
+DEPS_aribb24 = png $(DEPS_png)
 
 .aribb24: aribb24
 	$(REQUIRE_GPL)


=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -36,7 +36,7 @@ FFMPEGCONF += \
 	--disable-securetransport
 endif
 
-DEPS_ffmpeg = zlib gsm
+DEPS_ffmpeg = zlib $(DEPS_zlib) gsm $(DEPS_gsm)
 
 FFMPEGCONF += \
 	--enable-libopenjpeg


=====================================
contrib/src/gcrypt/rules.mak
=====================================
@@ -33,7 +33,7 @@ endif
 	$(APPLY) $(SRC)/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch
 	$(MOVE)
 
-DEPS_gcrypt = gpg-error
+DEPS_gcrypt = gpg-error $(DEPS_gpg-error)
 
 GCRYPT_CONF = \
 	--enable-ciphers=aes,des,rfc2268,arcfour \


=====================================
contrib/src/libarchive/rules.mak
=====================================
@@ -7,7 +7,7 @@ ifeq ($(call need_pkg,"libarchive >= 3.2.0"),)
 PKGS_FOUND += libarchive
 endif
 
-DEPS_libarchive = zlib
+DEPS_libarchive = zlib $(DEPS_zlib)
 
 LIBARCHIVE_CONF := $(HOSTCONF) \
 		--disable-bsdcpio --disable-bsdtar --disable-bsdcat \


=====================================
contrib/src/libdsm/rules.mak
=====================================
@@ -21,7 +21,7 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.xz .sum-libdsm
 	$(UNPACK)
 	$(MOVE)
 
-DEPS_libdsm = libtasn1 iconv
+DEPS_libdsm = libtasn1 $(DEPS_libtasn1) iconv $(DEPS_iconv)
 ifdef HAVE_WIN32
 DEPS_libdsm += pthreads $(DEPS_pthreads)
 endif


=====================================
contrib/src/libplacebo/rules.mak
=====================================
@@ -9,7 +9,7 @@ PLACEBOCONF := -Dglslang=enabled \
 	-Ddemos=false \
 	-Dtests=false
 
-DEPS_libplacebo = glslang
+DEPS_libplacebo = glslang $(DEPS_glslang)
 
 ifndef HAVE_WINSTORE
 PKGS += libplacebo


=====================================
contrib/src/spatialaudio/rules.mak
=====================================
@@ -3,7 +3,7 @@
 SPATIALAUDIO_VERSION := 0.3.0
 SPATIALAUDIO_URL = https://github.com/videolabs/libspatialaudio/releases/download/$(SPATIALAUDIO_VERSION)/spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2
 
-DEPS_spatialaudio = zlib mysofa
+DEPS_spatialaudio = zlib $(DEPS_zlib) mysofa $(DEPS_mysofa)
 
 PKGS += spatialaudio
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/a12187eef1d22f567ef2212aa694c9c7873fdeb4

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/a12187eef1d22f567ef2212aa694c9c7873fdeb4
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance