[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: qtdeclarative: never build qml, qmleasing, qmldom, qmlformat

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
a98c6b75 by Steve Lhomme at 2024-04-25T14:31:44+00:00
contrib: qtdeclarative: never build qml, qmleasing, qmldom, qmlformat

We never use these tools and they're not called internally.

- - - - -
e82dd57c by Steve Lhomme at 2024-04-25T14:31:44+00:00
contrib: qtdeclarative: disable remove Qt Labs code

- - - - -
8efa3324 by Steve Lhomme at 2024-04-25T14:31:44+00:00
contrib: qtdeclarative: fix feature names

- - - - -


1 changed file:

- contrib/src/qtdeclarative/rules.mak


Changes:

=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -39,6 +39,14 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
 qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
 	$(UNPACK)
 	$(APPLY) $(SRC)/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
+	# disable unused CLI tools: qml, qmleasing, qmldom, qmlformat, qmltc
+	sed -i.orig -e 's,add_subdirectory(qml),#add_subdirectory(qml),' $(UNPACK_DIR)/tools/CMakeLists.txt
+	sed -i.orig -e 's,add_subdirectory(qmleasing),#add_subdirectory(qmleasing),' $(UNPACK_DIR)/tools/CMakeLists.txt
+	sed -i.orig -e 's,add_subdirectory(qmldom),#add_subdirectory(qmldom),' $(UNPACK_DIR)/tools/CMakeLists.txt
+	sed -i.orig -e 's,add_subdirectory(qmlformat),#add_subdirectory(qmlformat),' $(UNPACK_DIR)/tools/CMakeLists.txt
+	sed -i.orig -e 's,add_subdirectory(qmltc),#add_subdirectory(qmltc),' $(UNPACK_DIR)/tools/CMakeLists.txt
+	# disable QT labs feature we don't use
+	sed -i.orig -e 's,add_subdirectory(labs),#add_subdirectory(labs),' $(UNPACK_DIR)/src/CMakeLists.txt
 	$(MOVE)
 
 QT_DECLARATIVE_COMMON_CONFIG := \
@@ -67,11 +75,11 @@ QT_DECLARATIVE_NATIVE_CONFIG := $(QT_DECLARATIVE_COMMON_CONFIG) \
 	-DFEATURE_qml_animation=OFF \
 	-DFEATURE_qml_delegate_model=OFF \
 	-DFEATURE_qml_itemmodel=OFF \
-	-DFEATURE_qml_object-model=OFF \
-	-DFEATURE_qml_table-model=OFF \
+	-DFEATURE_qml_object_model=OFF \
+	-DFEATURE_qml_table_model=OFF \
 	-DFEATURE_quick_shadereffect=OFF \
 	-DFEATURE_quick_path=OFF \
-	-DCMAKE_TOOLCHAIN_FILE=$(BUILDPREFIX)/lib/cmake/Qt6/qt.toolchain.cmake \
+	-DCMAKE_TOOLCHAIN_FILE=$(BUILDPREFIX)/lib/cmake/Qt6/qt.toolchain.cmake
 
 .qtdeclarative-tools: BUILD_DIR=$</vlc_native
 .qtdeclarative-tools: qtdeclarative



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4c78bc6063b6006b8bad4bf53bfb2eef0626dffe...8efa3324f0107b7507435abff92bd7eba8283e00

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4c78bc6063b6006b8bad4bf53bfb2eef0626dffe...8efa3324f0107b7507435abff92bd7eba8283e00
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance