[vlc-commits] [Git][videolan/vlc][master] 8 commits: configure: remove Qt6ShaderTools from required dependencies

Tue May 7 13:06:53 UTC 2024


Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b44f3fdd by Steve Lhomme at 2024-05-07T12:21:13+00:00
configure: remove Qt6ShaderTools from required dependencies

We never use that code directly. We use qsb but as native with manual detection.

- - - - -
0287e2d5 by Steve Lhomme at 2024-05-07T12:21:13+00:00
contrib: qtdeclarative: fix typo in native tool detection

- - - - -
f194a9b6 by Steve Lhomme at 2024-05-07T12:21:13+00:00
contrib: qtvlcdeps: remove qtshadertools dependency

We don't need the qsb compiler to get the library dependencies of VLC.
In any case it should be the native one, not the cross-compiled one.

- - - - -
0b345853 by Steve Lhomme at 2024-05-07T12:21:13+00:00
contrib: qtshadertools: make the native tool depend on fxc2

We don't call the cross compiled tools. fxc is pretending to be a native tool.

- - - - -
edf3d53a by Steve Lhomme at 2024-05-07T12:21:13+00:00
contrib: qtshadertools: only build the native version

We only need it as a native tool we call.

- - - - -
13518a4b by Steve Lhomme at 2024-05-07T12:21:13+00:00
contrib: qtdeclarative: make qtdeclarative depend on qtdeclarative-tools

It requires the native qmlcachegen to build.

And we don't need the direct dependency on qsb.

- - - - -
06b04130 by Steve Lhomme at 2024-05-07T12:21:13+00:00
contrib: fxc2: fix system fxc detection

Inverted test introduced in 9c80a115fbfb6558eb7f7608dc58cbdcb59365ca.

- - - - -
5a7ca642 by Steve Lhomme at 2024-05-07T12:21:13+00:00
contrib: don't set dependency string as definitive value

Especially when it's modified later.

Some dependencies are not applied properly otherwise.

- - - - -


9 changed files:

- configure.ac
- contrib/src/fxc2/rules.mak
- contrib/src/iconv/rules.mak
- contrib/src/mfx/rules.mak
- contrib/src/orc/rules.mak
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtshadertools/rules.mak
- contrib/src/qtvlcdeps/rules.mak
- contrib/src/wixlzx/rules.mak


Changes:

=====================================
configure.ac
=====================================
@@ -3965,7 +3965,7 @@ AS_IF([test "${enable_qt}" != "no"], [
   QT_MINIMUM_VERSION=6.2
   PKG_CHECK_MODULES([QT], m4_foreach([pkg], [
       Qt6Core Qt6Widgets Qt6Gui Qt6Qml Qt6QmlModels Qt6QmlWorkerScript
-      Qt6Quick Qt6QuickControls2 Qt6QuickLayouts Qt6QuickTemplates2 Qt6ShaderTools
+      Qt6Quick Qt6QuickControls2 Qt6QuickLayouts Qt6QuickTemplates2
       Qt6Svg
     ], [pkg >= ${QT_MINIMUM_VERSION}]), [
 


=====================================
contrib/src/fxc2/rules.mak
=====================================
@@ -2,7 +2,7 @@ FXC2_HASH := 654c29d62a02714ea0bacfb118c3e05127f846e0
 FXC2_VERSION := git-$(FXC2_HASH)
 FXC2_GITURL := $(GITHUB)/mozilla/fxc2.git
 
-ifneq ($(shell fxc --version >/dev/null 2>&1 || echo FAIL),)
+ifeq ($(shell fxc --version >/dev/null 2>&1 || echo FAIL),)
 PKGS_FOUND += fxc2
 endif
 


=====================================
contrib/src/iconv/rules.mak
=====================================
@@ -15,7 +15,7 @@ endif
 endif
 endif
 
-DEPS_iconv :=
+DEPS_iconv =
 ifdef HAVE_WINSTORE
 # gnulib uses GetFileInformationByHandle
 DEPS_iconv += alloweduwp $(DEPS_alloweduwp)


=====================================
contrib/src/mfx/rules.mak
=====================================
@@ -12,7 +12,7 @@ PKGS += mfx
 endif
 endif
 
-DEPS_mfx :=
+DEPS_mfx =
 ifdef HAVE_WINSTORE
 DEPS_mfx += alloweduwp $(DEPS_alloweduwp)
 endif


=====================================
contrib/src/orc/rules.mak
=====================================
@@ -7,7 +7,7 @@ ifeq ($(call need_pkg,"orc-0.4"),)
 PKGS_FOUND += orc
 endif
 
-DEPS_orc :=
+DEPS_orc =
 ifdef HAVE_WINSTORE
 # orc uses VirtualAlloc
 DEPS_orc += alloweduwp $(DEPS_alloweduwp)


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -4,12 +4,9 @@ QTDECLARATIVE_VERSION_MAJOR := 6.7
 QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).0
 QTDECLARATIVE_URL := $(QT)/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
 
-DEPS_qtdeclarative-tools := qt-tools $(DEPS_qt-tools) qtshadertools-tools $(DEPS_qtshadertools-tools)
+DEPS_qtdeclarative-tools = qt-tools $(DEPS_qt-tools) qtshadertools-tools $(DEPS_qtshadertools-tools)
 
-DEPS_qtdeclarative = qt $(DEPS_qt) qtshadertools $(DEPS_qtshadertools)
-ifdef HAVE_CROSS_COMPILE
-DEPS_qtdeclarative += qtdeclarative-tools $(DEPS_qtdeclarative-tools) qtshadertools-tools $(DEPS_qtshadertools-tools)
-endif
+DEPS_qtdeclarative = qt $(DEPS_qt) qtdeclarative-tools $(DEPS_qtdeclarative-tools)
 
 ifdef HAVE_WIN32
 PKGS += qtdeclarative
@@ -25,7 +22,7 @@ endif
 ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qtdeclarative-tools
 else ifeq ($(call system_tool_majmin, qmlcachegen --version),$(QTDECLARATIVE_VERSION_MAJOR))
-PKGS_FOUND += qtshadertools-tools
+PKGS_FOUND += qtdeclarative-tools
 endif
 
 $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:


=====================================
contrib/src/qtshadertools/rules.mak
=====================================
@@ -5,30 +5,18 @@ QTSHADERTOOLS_VERSION_MAJOR := 6.7
 QTSHADERTOOLS_VERSION := $(QTSHADERTOOLS_VERSION_MAJOR).0
 QTSHADERTOOLS_URL := $(QT)/$(QTSHADERTOOLS_VERSION_MAJOR)/$(QTSHADERTOOLS_VERSION)/submodules/qtshadertools-everywhere-src-$(QTSHADERTOOLS_VERSION).tar.xz
 
-DEPS_qtshadertools-tools := qt-tools $(DEPS_qt-tools)
+DEPS_qtshadertools-tools = qt-tools $(DEPS_qt-tools)
 
-DEPS_qtshadertools += qt $(DEPS_qt)
-ifdef HAVE_CROSS_COMPILE
-DEPS_qtshadertools += qtshadertools-tools $(DEPS_qtshadertools-tools)
-endif
 ifdef HAVE_WIN32
-DEPS_qtshadertools += fxc2 $(DEPS_fxc2)
+DEPS_qtshadertools-tools += fxc2 $(DEPS_fxc2)
 endif
 
-ifdef HAVE_WIN32
-PKGS += qtshadertools
-endif
 ifneq ($(findstring qt,$(PKGS)),)
 PKGS_TOOLS += qtshadertools-tools
 endif
 PKGS_ALL += qtshadertools-tools
 
-ifeq ($(call need_pkg,"Qt6ShaderTools >= $(QTSHADERTOOLS_VERSION_MAJOR)"),)
-PKGS_FOUND += qtshadertools
-endif
-ifndef HAVE_CROSS_COMPILE
-PKGS_FOUND += qtshadertools-tools
-else ifeq ($(call system_tool_majmin, qsb --version),$(QTSHADERTOOLS_VERSION_MAJOR))
+ifeq ($(call system_tool_majmin, qsb --version),$(QTSHADERTOOLS_VERSION_MAJOR))
 PKGS_FOUND += qtshadertools-tools
 endif
 
@@ -60,10 +48,3 @@ qtshadertools: qtshadertools-everywhere-src-$(QTSHADERTOOLS_VERSION).tar.xz .sum
 	+$(CMAKEBUILD)
 	$(CMAKEINSTALL)
 	touch $@
-
-.qtshadertools: qtshadertools toolchain.cmake
-	$(CMAKECLEAN)
-	$(HOSTVARS) $(CMAKE) $(QT_SHADETOOLS_CONFIG)
-	+$(CMAKEBUILD)
-	$(CMAKEINSTALL)
-	touch $@


=====================================
contrib/src/qtvlcdeps/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # qtvlcdeps
 
-DEPS_qtvlcdeps += qt $(DEPS_qt) qtsvg $(DEPS_qtsvg) qtshadertools $(DEPS_qtshadertools) qtdeclarative $(DEPS_qtdeclarative) qt5compat $(DEPS_qt5compat)
+DEPS_qtvlcdeps += qt $(DEPS_qt) qtsvg $(DEPS_qtsvg) qtdeclarative $(DEPS_qtdeclarative) qt5compat $(DEPS_qt5compat)
 
 ifdef HAVE_LINUX
 DEPS_qtvlcdeps += qtwayland $(DEPS_qtwayland)


=====================================
contrib/src/wixlzx/rules.mak
=====================================
@@ -33,7 +33,7 @@ PKGS += wixlzx
 PKGS_TOOLS += wixlzx
 endif
 
-DEPS_wixlzx := wix $(DEPS_wix)
+DEPS_wixlzx = wix $(DEPS_wix)
 
 .sum-wixlzx: wix$(WIX_LZX_FULL_VERSION).zip
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5762f3f17e156e49a8759ba14212c3cd50dc7d6f...5a7ca64289e448812880ac7bb215dfe43721cc9a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/5762f3f17e156e49a8759ba14212c3cd50dc7d6f...5a7ca64289e448812880ac7bb215dfe43721cc9a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance
