[vlc-devel] [RFC 09/82] contrib: add qtdeclarative, qtquickcontrols2 and qtgraphicaleffects

[Pierre Lamot]

---
 contrib/src/qtdeclarative/SHA512SUMS      | 2 +-
 contrib/src/qtdeclarative/rules.mak       | 8 +++++---
 contrib/src/qtgraphicaleffects/SHA512SUMS | 2 +-
 contrib/src/qtgraphicaleffects/rules.mak  | 6 ++++--
 contrib/src/qtquickcontrols2/SHA512SUMS   | 2 +-
 contrib/src/qtquickcontrols2/rules.mak    | 9 +++++----
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/contrib/src/qtdeclarative/SHA512SUMS b/contrib/src/qtdeclarative/SHA512SUMS
index 57583fc4c3..c4c9f61070 100644
--- a/contrib/src/qtdeclarative/SHA512SUMS
+++ b/contrib/src/qtdeclarative/SHA512SUMS
@@ -1 +1 @@
-e8dbd3390faaecd833e373d76580c47cf1cec5fa518aa0d30eb305616e0e9c2f58fb8866c0f0ac25622b7b67d102ec3a50c6e48f572a20ab198bc007d5485111  qtdeclarative-5.11.0.tar.xz
+858d33bfcd5b87904bb08e0fec04665d3f43ed84de4f4336f4ef4ad2f2bd6d4ea79c048c8f8f8adfd4c30d6a9e01cd46175dc0e5a1335a000c57c0d0058999bd  qtdeclarative-5.12.0.tar.xz
diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak
index 817ec82874..2fbd1cf49e 100644
--- a/contrib/src/qtdeclarative/rules.mak
+++ b/contrib/src/qtdeclarative/rules.mak
@@ -1,7 +1,8 @@
 # QtDeclarative
 
-QTDECLARATIVE_VERSION := 5.11.0
-QTDECLARATIVE_URL := http://download.qt.io/official_releases/qt/5.11/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
+QTDECLARATIVE_VERSION_MAJOR := 5.12
+QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).0
+QTDECLARATIVE_URL := http://download.qt.io/official_releases/qt/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
 
 DEPS_qtdeclarative += qt $(DEPS_qt)
 
@@ -46,8 +47,9 @@ qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
 	cp $(PREFIX)/qml/QtQml/Models.2/libmodelsplugin.a $(PREFIX)/lib/
 	rm -rf $(PREFIX)/qml
 	cd $(PREFIX)/lib/pkgconfig; for i in Qt5Quick.pc Qt5Qml.pc Qt5QuickWidgets.pc; do \
-		sed -i.orig -e 's/d\.a/.a/g' -e 's/-lQt\([^ ]*\)d/-lQt\1/g' $$i; done
+		sed -i.orig -e 's/d\.a/.a/g' -e 's/-lQt\([^ ]*\)d[[:space:]]/-lQt\1/g' -e 's/-llibEGLd -llibGLESv2d/-llibEGL -llibGLESv2/' $$i; done
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Quick/ -lqtquick2plugin -lqquicklayoutsplugin -lwindowplugin -lQt5Quick/' Qt5Quick.pc
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Qml/ -lmodelsplugin -lQt5Qml/' Qt5Qml.pc
 
+
 	touch $@
diff --git a/contrib/src/qtgraphicaleffects/SHA512SUMS b/contrib/src/qtgraphicaleffects/SHA512SUMS
index d606a457aa..efdb540e5d 100644
--- a/contrib/src/qtgraphicaleffects/SHA512SUMS
+++ b/contrib/src/qtgraphicaleffects/SHA512SUMS
@@ -1 +1 @@
-d3ed8aea4d0c45a887e0b02a5ea0845486cd60b321868520f2153915d2de608d65464947387e17f923b13a3cc7d11530f673c754a9c39a8c0509ed493bf0fc85  qtgraphicaleffects-5.11.0.tar.xz
+88545f9f11d5f97aa70b293539aa10b4e87bbf1f585ba57cbf337c0300b2cdad52ab9d25867a663714ae345c21006d10f567fdbb839df235a9faf7f7674a5835  qtgraphicaleffects-5.12.0.tar.xz
diff --git a/contrib/src/qtgraphicaleffects/rules.mak b/contrib/src/qtgraphicaleffects/rules.mak
index 669265fc9b..c88469b40b 100644
--- a/contrib/src/qtgraphicaleffects/rules.mak
+++ b/contrib/src/qtgraphicaleffects/rules.mak
@@ -1,7 +1,8 @@
 # QtGraphicalEffects
 
-QTGE_VERSION := 5.11.0
-QTGE_URL := http://download.qt.io/official_releases/qt/5.11/$(QTGE_VERSION)/submodules/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz
+QTGE_VERSION_MAJOR := 5.12
+QTGE_VERSION := $(QTGE_VERSION_MAJOR).0
+QTGE_URL := http://download.qt.io/official_releases/qt/$(QTGE_VERSION_MAJOR)/$(QTGE_VERSION)/submodules/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz
 
 DEPS_qtgraphicaleffects += qtdeclarative $(DEPS_qtdeclarative)
 
@@ -35,5 +36,6 @@ qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz .sum-qtgraphicalef
 	rm -rf $(PREFIX)/qml
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig \
 		-e 's/ -lQt5QuickWidgets/ -lqtgraphicaleffectsplugin -lqtgraphicaleffectsprivate -lQt5QuickWidgets/' \
+		-e 's/-llibEGLd -llibGLESv2d/-llibEGL -llibGLESv2/' \
 		Qt5QuickWidgets.pc
 	touch $@
diff --git a/contrib/src/qtquickcontrols2/SHA512SUMS b/contrib/src/qtquickcontrols2/SHA512SUMS
index 50981cef38..4037b8d63b 100644
--- a/contrib/src/qtquickcontrols2/SHA512SUMS
+++ b/contrib/src/qtquickcontrols2/SHA512SUMS
@@ -1 +1 @@
-89f9543a03b2123fd81d5a9320efd742a119ff52acadf6d4bf4447628fee85916f497f97da5b60fd8cba68d04c652612a26da1a81efc35ad2784efc8f89a6593  qtquickcontrols2-5.11.0.tar.xz
+e954832787fcb36cc3bab529b5ddf88ffa96d90924b9193a99e524831aff24026c9b278b4f3bb41afb2cc52a89888621637863ad0cda928901d9eb81e49017a5  qtquickcontrols2-5.12.0.tar.xz
diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak
index cff4aaf767..9a64d53e8a 100644
--- a/contrib/src/qtquickcontrols2/rules.mak
+++ b/contrib/src/qtquickcontrols2/rules.mak
@@ -1,7 +1,8 @@
 # QtQuickControls 2
 
-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
+QTQC2_VERSION_MAJOR := 5.12
+QTQC2_VERSION := $(QTQC2_VERSION_MAJOR).0
+QTQC2_URL := http://download.qt.io/official_releases/qt/$(QTQC2_VERSION_MAJOR)/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
 
 ifdef HAVE_WIN32
 ifeq ($(findstring $(ARCH), arm aarch64),)
@@ -38,7 +39,7 @@ qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig \
 		-e 's/d\.a/.a/g' \
 		-e 's/-lQt\([^ ]*\)d/-lQt\1/g' \
-		-e 's/ -lQt5QuickControls2/ -lqtquickcontrolsplugin -lqtquickcontrols2plugin -lqtquicktemplates2plugin -lQt5QuickControls2/' \
+		-e 's/ -lQt5QuickControls2/ -lqtquickcontrols2plugin -lqtquicktemplates2plugin -lQt5QuickControls2/' \
+		-e 's/-llibEGLd -llibGLESv2d/-llibEGL -llibGLESv2/g' \
 		Qt5QuickControls2.pc
 	touch $@
-
-- 
2.19.1