Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
From a9e4b41a04b8d1a6d3d687964c146b87f60f9683 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Krus <mike.krus@kdab.com>
|
||||
Date: Mon, 28 Dec 2015 21:02:35 +0000
|
||||
Subject: [PATCH] tvOS support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
QT_ARCH for tvOS is arm64 (not arm, since it’s 64bits only)
|
||||
|
||||
Change-Id: Ia03d3ee07d2543a0e70ee7d77448aff9382d8fc8
|
||||
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
|
||||
|
||||
Upstream: https://code.qt.io/cgit/qt/qtimageformats.git/patch/?id=e4c1d9ece74de212ebe5c55b134de7cb23469e2d
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/3rdparty/libwebp.pri | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri
|
||||
index b7c1bb6..2197953 100644
|
||||
--- a/src/3rdparty/libwebp.pri
|
||||
+++ b/src/3rdparty/libwebp.pri
|
||||
@@ -82,7 +82,7 @@ android {
|
||||
INCLUDEPATH += $$NDK_ROOT/sources/android/cpufeatures
|
||||
}
|
||||
|
||||
-equals(QT_ARCH, arm) {
|
||||
+equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) {
|
||||
SOURCES_FOR_NEON += \
|
||||
$$PWD/libwebp/src/dsp/dec_neon.c \
|
||||
$$PWD/libwebp/src/dsp/enc_neon.c \
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz.mirrorlist
|
||||
sha256 c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5 qtimageformats-opensource-src-5.5.1.tar.xz
|
||||
# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtimageformats-opensource-src-5.6.1-1.tar.xz.mirrorlist
|
||||
sha256 cc45e481394dcc4eb4e565969c9bb50b87b1da23f006bf849a5f8daa375328dd qtimageformats-opensource-src-5.6.1-1.tar.xz
|
||||
|
||||
@@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base
|
||||
QT5IMAGEFORMATS_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
|
||||
QT5IMAGEFORMATS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
|
||||
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
|
||||
QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
|
||||
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
|
||||
else
|
||||
QT5IMAGEFORMATS_LICENSE = Commercial license
|
||||
QT5IMAGEFORMATS_REDISTRIBUTE = NO
|
||||
|
||||
Reference in New Issue
Block a user