[vlc-commits] contribs: Split qtquickcontrols in 2 specific packages

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Aug 27 10:19:03 2018 +0200| [821c2fb13a1928253adb071e7a740d58f6327bb3] | committer: Hugo Beauzée-Luyssen

contribs: Split qtquickcontrols in 2 specific packages

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=821c2fb13a1928253adb071e7a740d58f6327bb3
---

 contrib/src/qtquickcontrols/SHA512SUMS  |  1 +
 contrib/src/qtquickcontrols/rules.mak   | 26 +++++++++++++++++++++
 contrib/src/qtquickcontrols2/SHA512SUMS |  1 -
 contrib/src/qtquickcontrols2/rules.mak  | 40 +++++++++++----------------------
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/contrib/src/qtquickcontrols/SHA512SUMS b/contrib/src/qtquickcontrols/SHA512SUMS
new file mode 100644
index 0000000000..eb9fa7af56
--- /dev/null
+++ b/contrib/src/qtquickcontrols/SHA512SUMS
@@ -0,0 +1 @@
+3c221d4d9f7636baef3dcb50719a589fa9ff54d38a0891dc1464aebda74f2a989b35241bee895db5b27960e88737e81e9262c9c9a4d3e99bf167e94640204436  qtquickcontrols-5.11.0.tar.xz
diff --git a/contrib/src/qtquickcontrols/rules.mak b/contrib/src/qtquickcontrols/rules.mak
new file mode 100644
index 0000000000..63b710bc8e
--- /dev/null
+++ b/contrib/src/qtquickcontrols/rules.mak
@@ -0,0 +1,26 @@
+#QtQuickControls 1
+QTQC_VERSION := 5.11.0
+QTQC_URL := http://download.qt.io/official_releases/qt/5.11/$(QTQC_VERSION)/submodules/qtquickcontrols-everywhere-src-$(QTQC_VERSION).tar.xz
+
+DEPS_qtquickcontrols = qtquickcontrols2 $(DEPS_qtquickcontrols2)
+
+$(TARBALLS)/qtquickcontrols-$(QTQC_VERSION).tar.xz:
+	$(call download,$(QTQC_URL))
+
+qtquickcontrols: qtquickcontrols-$(QTQC_VERSION).tar.xz .sum-qtquickcontrols2
+	$(UNPACK)
+	mv qtquickcontrols-everywhere-src-$(QTQC_VERSION) qtquickcontrols-$(QTQC_VERSION)
+	$(MOVE)
+
+.qtquickcontrols: qtquickcontrols
+ifdef HAVE_CROSS_COMPILE
+	cd $< && $(PREFIX)/bin/qmake
+else
+	cd $< && ../qt/bin/qmake
+endif
+	# Make && Install libraries
+	cd $< && $(MAKE)
+	cd $< && $(MAKE) -C src sub-controls-install_subtargets
+	cp $(PREFIX)/qml/QtQuick/Controls/libqtquickcontrolsplugin.a $(PREFIX)/lib/
+	rm -rf $(PREFIX)/qml
+	touch $@
diff --git a/contrib/src/qtquickcontrols2/SHA512SUMS b/contrib/src/qtquickcontrols2/SHA512SUMS
index 2fb1a19473..50981cef38 100644
--- a/contrib/src/qtquickcontrols2/SHA512SUMS
+++ b/contrib/src/qtquickcontrols2/SHA512SUMS
@@ -1,2 +1 @@
-3c221d4d9f7636baef3dcb50719a589fa9ff54d38a0891dc1464aebda74f2a989b35241bee895db5b27960e88737e81e9262c9c9a4d3e99bf167e94640204436  qtquickcontrols-5.11.0.tar.xz
 89f9543a03b2123fd81d5a9320efd742a119ff52acadf6d4bf4447628fee85916f497f97da5b60fd8cba68d04c652612a26da1a81efc35ad2784efc8f89a6593  qtquickcontrols2-5.11.0.tar.xz
diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak
index d37c94cb7b..cf260b0d5b 100644
--- a/contrib/src/qtquickcontrols2/rules.mak
+++ b/contrib/src/qtquickcontrols2/rules.mak
@@ -1,8 +1,7 @@
-# QtQuickControls 1 & 2
+# QtQuickControls 2
 
-QTQC_VERSION := 5.11.0
-QTQC_URL := http://download.qt.io/official_releases/qt/5.11/$(QTQC_VERSION)/submodules/qtquickcontrols-everywhere-src-$(QTQC_VERSION).tar.xz
-QTQC2_URL := http://download.qt.io/official_releases/qt/5.11/$(QTQC_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC_VERSION).tar.xz
+QTQC2_VERSION := 5.11.0
+QTQC2_URL := http://download.qt.io/official_releases/qt/5.11/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
 
 ifdef HAVE_WIN32
 PKGS += qtquickcontrols2
@@ -15,22 +14,14 @@ endif
 
 DEPS_qtquickcontrols2 = qtdeclarative $(DEPS_qtdeclarative)
 
-$(TARBALLS)/qtquickcontrols-$(QTQC_VERSION).tar.xz:
-	$(call download,$(QTQC_URL))
-
-$(TARBALLS)/qtquickcontrols2-$(QTQC_VERSION).tar.xz:
+$(TARBALLS)/qtquickcontrols2-$(QTQC2_VERSION).tar.xz:
 	$(call download,$(QTQC2_URL))
 
-.sum-qtquickcontrols2: qtquickcontrols-$(QTQC_VERSION).tar.xz qtquickcontrols2-$(QTQC_VERSION).tar.xz
-
-qtquickcontrols: qtquickcontrols-$(QTQC_VERSION).tar.xz .sum-qtquickcontrols2
-	$(UNPACK)
-	mv qtquickcontrols-everywhere-src-$(QTQC_VERSION) qtquickcontrols-$(QTQC_VERSION)
-	$(MOVE)
+.sum-qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz
 
-qtquickcontrols2: qtquickcontrols2-$(QTQC_VERSION).tar.xz .sum-qtquickcontrols2
+qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
 	$(UNPACK)
-	mv qtquickcontrols2-everywhere-src-$(QTQC_VERSION) qtquickcontrols2-$(QTQC_VERSION)
+	mv qtquickcontrols2-everywhere-src-$(QTQC2_VERSION) qtquickcontrols2-$(QTQC2_VERSION)
 	$(MOVE)
 
 
@@ -40,17 +31,13 @@ else
 QMAKE=../qt/bin/qmake
 endif
 
-.qtquickcontrols: qtquickcontrols
-	cd $< && $(QMAKE)
-	# Make && Install libraries
-	cd $< && $(MAKE)
-	cd $< && $(MAKE) -C src sub-controls-install_subtargets
-	cp $(PREFIX)/qml/QtQuick/Controls/libqtquickcontrolsplugin.a $(PREFIX)/lib/
-	rm -rf $(PREFIX)/qml
-	touch $@
 
-.qtquickcontrols2: qtquickcontrols2 .qtquickcontrols
-	cd $< && $(QMAKE)
+.qtquickcontrols2: qtquickcontrols2
+ifdef HAVE_CROSS_COMPILE
+	cd $< && $(PREFIX)/bin/qmake
+else
+	cd $< && ../qt/bin/qmake
+endif
 	# Make && Install libraries
 	cd $< && $(MAKE)
 	cd $< && $(MAKE) -C src sub-quickcontrols2-install_subtargets sub-imports-install_subtargets
@@ -62,6 +49,5 @@ endif
 		-e 's/-lQt\([^ ]*\)d/-lQt\1/g' \
 		-e 's/ -lQt5QuickControls2/ -lqtquickcontrolsplugin -lqtquickcontrols2plugin -lqtquicktemplates2plugin -lQt5QuickControls2/' \
 		Qt5QuickControls2.pc
-
 	touch $@