[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: add the contrib native tools libexec to the PATH

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
6563bc38 by Steve Lhomme at 2024-04-21T09:50:13+00:00
contrib: add the contrib native tools libexec to the PATH

Some native tools we build may be usable by other targets.

- - - - -
6140b72e by Steve Lhomme at 2024-04-21T09:50:13+00:00
contrib: qt: fix the native tools version detection

We don't care about qt-cmake, it doesn't even match our Qt version.
We want to know the tools match the version we want to build.

- - - - -
46151086 by Steve Lhomme at 2024-04-21T09:50:13+00:00
contrib: qt: only detect the native tools once

When not cross-compiling, we assume the tools match the Qt6 package.
We don't need to check again the binary as it will have no effect.

- - - - -


4 changed files:

- contrib/src/main.mak
- contrib/src/qt/rules.mak
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtshadertools/rules.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -40,7 +40,7 @@ BUILDPREFIX := $(abspath $(BUILDPREFIX))
 BUILDBINDIR ?= $(BUILDPREFIX)/bin
 
 SYSTEM_PATH := $(abspath $(VLC_TOOLS)/bin):$(PATH)
-PATH :=$(abspath $(BUILDBINDIR)):$(SYSTEM_PATH)
+PATH :=$(abspath $(BUILDBINDIR)):$(abspath $(BUILDBINDIR)/../libexec):$(SYSTEM_PATH)
 export PATH
 
 ifneq ($(HOST),$(BUILD))


=====================================
contrib/src/qt/rules.mak
=====================================
@@ -27,8 +27,7 @@ PKGS_FOUND += qt
 endif
 ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qt-tools
-endif
-ifeq ($(call system_tool_version, qt-cmake --version),3.22)
+else ifeq ($(call system_tool_version, moc --version),$(QTBASE_VERSION_MAJOR))
 PKGS_FOUND += qt-tools
 endif
 


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -24,8 +24,7 @@ PKGS_FOUND += qtdeclarative
 endif
 ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qtdeclarative-tools
-endif
-ifeq ($(call system_tool_majmin, qml --version),$(QTDECLARATIVE_VERSION_MAJOR))
+else ifeq ($(call system_tool_majmin, qmlcachegen --version),$(QTDECLARATIVE_VERSION_MAJOR))
 PKGS_FOUND += qtshadertools-tools
 endif
 


=====================================
contrib/src/qtshadertools/rules.mak
=====================================
@@ -28,8 +28,7 @@ PKGS_FOUND += qtshadertools
 endif
 ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qtshadertools-tools
-endif
-ifeq ($(call system_tool_majmin, qsb --version),$(QTSHADERTOOLS_VERSION_MAJOR))
+else ifeq ($(call system_tool_majmin, qsb --version),$(QTSHADERTOOLS_VERSION_MAJOR))
 PKGS_FOUND += qtshadertools-tools
 endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c0470455a92077db5b840d5bd31f3dc45e95e7d4...461510866165c9a849b3941fcf3a82380f414c7c

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c0470455a92077db5b840d5bd31f3dc45e95e7d4...461510866165c9a849b3941fcf3a82380f414c7c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance