[vlc-commits] contrib: qt: use upstream tarball names

Konstantin Pavlov git at videolan.org
Tue Apr 16 17:03:17 CEST 2019 

vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Tue Apr 16 17:00:57 2019 +0300| [004e367b8e656db418336dbeae87e5878050288d] | committer: Konstantin Pavlov

contrib: qt: use upstream tarball names

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

 contrib/src/qt/SHA512SUMS                 | 2 +-
 contrib/src/qt/rules.mak                  | 7 +++----
 contrib/src/qtdeclarative/SHA512SUMS      | 2 +-
 contrib/src/qtdeclarative/rules.mak       | 7 +++----
 contrib/src/qtgraphicaleffects/SHA512SUMS | 2 +-
 contrib/src/qtgraphicaleffects/rules.mak  | 7 +++----
 contrib/src/qtquickcontrols2/SHA512SUMS   | 2 +-
 contrib/src/qtquickcontrols2/rules.mak    | 7 +++----
 contrib/src/qtsvg/SHA512SUMS              | 2 +-
 contrib/src/qtsvg/rules.mak               | 7 +++----
 10 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/contrib/src/qt/SHA512SUMS b/contrib/src/qt/SHA512SUMS
index 4ce6931c6a..5b722f03c8 100644
--- a/contrib/src/qt/SHA512SUMS
+++ b/contrib/src/qt/SHA512SUMS
@@ -1 +1 @@
-6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613  qt-5.12.2.tar.xz
+6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613  qtbase-everywhere-src-5.12.2.tar.xz
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 2eb288f5ae..373174c28f 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -20,14 +20,13 @@ ifeq ($(call need_pkg,"Qt5Core >= 5.11 Qt5Gui Qt5Widgets"),)
 PKGS_FOUND += qt
 endif
 
-$(TARBALLS)/qt-$(QT_VERSION_FULL).tar.xz:
+$(TARBALLS)/qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz:
 	$(call download_pkg,$(QT_URL),qt)
 
-.sum-qt: qt-$(QT_VERSION_FULL).tar.xz
+.sum-qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz
 
-qt: qt-$(QT_VERSION_FULL).tar.xz .sum-qt
+qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz .sum-qt
 	$(UNPACK)
-	mv qtbase-everywhere-src-$(QT_VERSION_FULL) qt-$(QT_VERSION_FULL)
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/qt/0001-Windows-QPA-prefer-lower-value-when-rounding-fractio.patch
 	$(APPLY) $(SRC)/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch
diff --git a/contrib/src/qtdeclarative/SHA512SUMS b/contrib/src/qtdeclarative/SHA512SUMS
index 08f23f2d29..ac7ae83a11 100644
--- a/contrib/src/qtdeclarative/SHA512SUMS
+++ b/contrib/src/qtdeclarative/SHA512SUMS
@@ -1 +1 @@
-0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0  qtdeclarative-5.12.2.tar.xz
+0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0  qtdeclarative-everywhere-src-5.12.2.tar.xz
diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak
index 748219d2cc..7fdc618db9 100644
--- a/contrib/src/qtdeclarative/rules.mak
+++ b/contrib/src/qtdeclarative/rules.mak
@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5Quick"),)
 PKGS_FOUND += qtdeclarative
 endif
 
-$(TARBALLS)/qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz:
+$(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
 	$(call download_pkg,$(QTDECLARATIVE_URL),qt)
 
-.sum-qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz
+.sum-qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
 
-qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
+qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
 	$(UNPACK)
-	mv qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION) qtdeclarative-$(QTDECLARATIVE_VERSION)
 	$(MOVE)
 
 .qtdeclarative: qtdeclarative
diff --git a/contrib/src/qtgraphicaleffects/SHA512SUMS b/contrib/src/qtgraphicaleffects/SHA512SUMS
index eeffa37971..1ad3439270 100644
--- a/contrib/src/qtgraphicaleffects/SHA512SUMS
+++ b/contrib/src/qtgraphicaleffects/SHA512SUMS
@@ -1 +1 @@
-13ed4d5fd6004cef408e2ab0fc815ff8187813efe3836c9bca0eedd550ab06df85e30978b0adab74b0075ef8262ae49f182263add00f33820456c44349ea75af  qtgraphicaleffects-5.12.2.tar.xz
+13ed4d5fd6004cef408e2ab0fc815ff8187813efe3836c9bca0eedd550ab06df85e30978b0adab74b0075ef8262ae49f182263add00f33820456c44349ea75af  qtgraphicaleffects-everywhere-src-5.12.2.tar.xz
diff --git a/contrib/src/qtgraphicaleffects/rules.mak b/contrib/src/qtgraphicaleffects/rules.mak
index 55eafc3af7..6e9e9bf31c 100644
--- a/contrib/src/qtgraphicaleffects/rules.mak
+++ b/contrib/src/qtgraphicaleffects/rules.mak
@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5QuickControls2"),)
 PKGS_FOUND += qtgraphicaleffects
 endif
 
-$(TARBALLS)/qtgraphicaleffects-$(QTGE_VERSION).tar.xz:
+$(TARBALLS)/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz:
 	$(call download_pkg,$(QTGE_URL),qt)
 
-.sum-qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz
+.sum-qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz
 
-qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz .sum-qtgraphicaleffects
+qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz .sum-qtgraphicaleffects
 	$(UNPACK)
-	mv qtgraphicaleffects-everywhere-src-$(QTGE_VERSION) qtgraphicaleffects-$(QTGE_VERSION)
 	$(MOVE)
 
 .qtgraphicaleffects: qtgraphicaleffects
diff --git a/contrib/src/qtquickcontrols2/SHA512SUMS b/contrib/src/qtquickcontrols2/SHA512SUMS
index b2c980f517..1138e57de4 100644
--- a/contrib/src/qtquickcontrols2/SHA512SUMS
+++ b/contrib/src/qtquickcontrols2/SHA512SUMS
@@ -1 +1 @@
-ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735  qtquickcontrols2-5.12.2.tar.xz
+ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735  qtquickcontrols2-everywhere-src-5.12.2.tar.xz
diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak
index 55ab59496e..da34d3c9eb 100644
--- a/contrib/src/qtquickcontrols2/rules.mak
+++ b/contrib/src/qtquickcontrols2/rules.mak
@@ -15,14 +15,13 @@ endif
 
 DEPS_qtquickcontrols2 = qtdeclarative $(DEPS_qtdeclarative)
 
-$(TARBALLS)/qtquickcontrols2-$(QTQC2_VERSION).tar.xz:
+$(TARBALLS)/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz:
 	$(call download_pkg,$(QTQC2_URL),qt)
 
-.sum-qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz
+.sum-qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
 
-qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
+qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2
 	$(UNPACK)
-	mv qtquickcontrols2-everywhere-src-$(QTQC2_VERSION) qtquickcontrols2-$(QTQC2_VERSION)
 	$(MOVE)
 
 .qtquickcontrols2: qtquickcontrols2
diff --git a/contrib/src/qtsvg/SHA512SUMS b/contrib/src/qtsvg/SHA512SUMS
index 5d2c790444..81138cd69d 100644
--- a/contrib/src/qtsvg/SHA512SUMS
+++ b/contrib/src/qtsvg/SHA512SUMS
@@ -1 +1 @@
-6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-5.12.2.tar.xz
+6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249  qtsvg-everywhere-src-5.12.2.tar.xz
diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index d1c14e5c0e..84e03f2519 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -14,14 +14,13 @@ ifeq ($(call need_pkg,"Qt5Svg"),)
 PKGS_FOUND += qtsvg
 endif
 
-$(TARBALLS)/qtsvg-$(QTSVG_VERSION).tar.xz:
+$(TARBALLS)/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz:
 	$(call download_pkg,$(QTSVG_URL),qt)
 
-.sum-qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz
+.sum-qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
 
-qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
+qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 	$(UNPACK)
-	mv qtsvg-everywhere-src-$(QTSVG_VERSION) qtsvg-$(QTSVG_VERSION)
 	$(APPLY) $(SRC)/qtsvg/0001-Force-the-usage-of-QtZlib-header.patch
 	$(MOVE)

More information about the vlc-commits mailing list