lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-20 05:19:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Use wayland libs provided by distro

Browse Source 
Redhat repositories includes needed wayland
libraries. Let's use those instead providing
those through provisioning.


Task-number: QTQAINFRA-1925
Change-Id: I543a6b9fb8876f64d4b9c17ef909b9c61129e62e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
Heikki Halmet
2018-04-12 09:51:05 +03:00
committed by Liang Qi
parent ba30e967d0
commit f9e9dd1393
3 changed files with 6 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
View File

@@ -89,6 +89,12 @@ installPackages+=(libxml2-devel)
installPackages+=(libxslt-devel)
# For building Wayland from source
installPackages+=(libffi-devel)
# QtWayland
installPackages+=(mesa-libwayland-egl)
installPackages+=(mesa-libwayland-egl-devel)
installPackages+=(libwayland-client)
installPackages+=(libwayland-cursor)
installPackages+=(libwayland-server)
sudo yum -y install "${installPackages[@]}"

63
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-wayland.sh
View File

@@ -1,63 +0,0 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
set -ex
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
version=1.12.0
sha1="9a0dd96f53fff3e227035ed76caaa209b632ea8d"
archive="wayland-$version.tar.xz"
primaryUrl="https://wayland.freedesktop.org/releases/$archive"
cacheUrl="http://ci-files01-hki.intra.qt.io/input/wayland/$archive"
echo "Installing Wayland $version $sha1 on RHEL"
targetFile="/tmp/$archive"
DownloadURL $primaryUrl $cacheUrl $sha1 $targetFile
tar xf $targetFile --directory /tmp/
rm $targetFile
cd /tmp/wayland-$version
./configure \
--prefix=/usr \
--libdir=/usr/lib64 \
--disable-static \
--disable-documentation
make
sudo make install
rm -rf /tmp/wayland-$version
echo "wayland = $version" >> ~/versions.txt

61
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/61-wayland-egl.sh
View File

@@ -1,61 +0,0 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
set -ex
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
version="17.0.1-6.20170307.wayland"
wayland_egl_rpm="mesa-libwayland-egl-$version.el7.x86_64.rpm"
wayland_egl_sha1="0a42fddd9a58c0bcd93efdaf84fd54b872f050d0"
wayland_egl_devel_rpm="mesa-libwayland-egl-devel-$version.el7.x86_64.rpm"
wayland_egl_devel_sha1="3ece8768e6bdd8603ce15d75f3b80895da038f15"
mirror1="http://ci-files01-hki.intra.qt.io/input/wayland"
mirror2=$mirror1
echo "Installing libwayland-egl development packages on RHEL"
# We're installing the packages with `--nodeps` because we've already installed
# the Wayland libraries, but not through the package manager.
DownloadURL $mirror1/$wayland_egl_rpm $mirror2/$wayland_egl_rpm $wayland_egl_sha1 /tmp/$wayland_egl_rpm
sudo rpm -i --nodeps /tmp/$wayland_egl_rpm
rm /tmp/$wayland_egl_rpm
DownloadURL $mirror1/$wayland_egl_devel_rpm $mirror2/$wayland_egl_devel_rpm $wayland_egl_devel_sha1 /tmp/$wayland_egl_devel_rpm
sudo rpm -i --nodeps /tmp/$wayland_egl_devel_rpm
rm /tmp/$wayland_egl_devel_rpm
echo "mesa-libwayland-egl = $version" >> ~/versions.txt