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

Merge branch 'shadertools_native' into 'master' 

contrib: qtshadertools: only build the native variant

See merge request videolan/vlc!5314
This commit is contained in:
Steve Lhomme 2024-05-07 12:21:21 +00:00
parent 5762f3f17e 5a7ca64289
commit dd030e80e3
9 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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}]), [

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

@ -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

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

@ -15,7 +15,7 @@ endif
endif
endif
DEPS_iconv :=
DEPS_iconv =
ifdef HAVE_WINSTORE
# gnulib uses GetFileInformationByHandle
DEPS_iconv += alloweduwp $(DEPS_alloweduwp)

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

@ -12,7 +12,7 @@ PKGS += mfx
endif
endif
DEPS_mfx :=
DEPS_mfx =
ifdef HAVE_WINSTORE
DEPS_mfx += alloweduwp $(DEPS_alloweduwp)
endif

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

@ -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)

9
contrib/src/qtdeclarative/rules.mak
View File

@ -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:

27
contrib/src/qtshadertools/rules.mak
View File

@ -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 += qt $(DEPS_qt)
ifdef HAVE_CROSS_COMPILE
DEPS_qtshadertools += qtshadertools-tools $(DEPS_qtshadertools-tools)
endif
ifdef HAVE_WIN32
DEPS_qtshadertools += fxc2 $(DEPS_fxc2)
endif
DEPS_qtshadertools-tools = qt-tools $(DEPS_qt-tools)
ifdef HAVE_WIN32
PKGS += qtshadertools
DEPS_qtshadertools-tools += fxc2 $(DEPS_fxc2)
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 $@

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

@ -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)

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

@ -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