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

[Martin Storsjö]

On Fri, 1 Feb 2019, Pierre Lamot wrote:

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

The sed expression here loses the space that separates the arguments from 
the next one.

// Martin