Compare commits

...

15 Commits

Author SHA1 Message Date
Peter Korsgaard
083c0735e9 Update for 2017.02
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 22:00:23 +01:00
Peter Seiderer
962d153084 qt5base: fix VNC platform plugin build on big-endian machines
Fixes [1], [2]:

  In file included from qvncintegration.cpp:38:0:
  qvncscreen.h:76:22: error: expected ';' at end of member declaration
       bool swapBytes() const

[1] http://autobuild.buildroot.net/results/718/7180ad7d7e78f1c3ce6a1f83a5a8fcc5e0ac03a2
[2] http://autobuild.buildroot.net/results/14f/14f8c436b184192681fb79c7f0c0d0daa35f867b

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 22:00:00 +01:00
Zakharov Vlad
1a8b1eac87 mpv: disable with ARC external toolchain
This package fails when building with ARC external toolchain

Marking this with special comment "# ARC toolchain issue" as the package
is to be enabled as soon as the issue with the ARC toolchain is
resolved.

Fixes:
  http://autobuild.buildroot.net/results/fb6/fb677a917545adee321bdcd2c2519c81326448c4//

Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 20:59:45 +01:00
Zakharov Vlad
f920873b41 xterm: disable with ARC external toolchain
This package fails when building with ARC external toolchain

Marking this with special comment "# ARC toolchain issue" as the package
is to be enabled as soon as the issue with the ARC toolchain is
resolved.

Fixes:
  http://autobuild.buildroot.net/results/28a/28a92049a6ceef005787c5779f77ecf3fe8ad642//

Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 20:59:23 +01:00
Arnout Vandecappelle
1c186c6ca1 qt5quickcontrols: fix installation of PrivateWidgets
Commit e482ebf51d attempted to fix the
installation of qt5quickcontrols by only installing the PrivateWidgets
directory for the 5.8.0 version.

However, the availability of PrivateWidgets has nothing to do with the
version; in both 5.6.2 and 5.8.0, the installation is gated by the
following statement in src/src.pro:

qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += widgets

i.e. it is installed when both the Quick and the Widgets module are
available. The Widgets module is controlled by Buildroot's
BR2_PACKAGE_QT5BASE_WIDGETS symbol, the Quick module is controlled by
Buildroot's BR2_PACKAGE_QT5DECLARATIVE_QUICK. The qt5quickcontrols
package selects BR2_PACKAGE_QT5DECLARATIVE_QUICK so it is not really
needed to include it in the condition. However, it is theoretically
possible to build this package without QtQuick. Also, adding this
condition makes it consistent with src.pro.

Note that commit e482ebf51d introduces a
second fix (not mentioned in the commit message): for version 5.6.2, the
Layouts directory is installed, but in 5.8.0 this directory doesn't
exist any more. Therefore, a separate condition on the version is still
needed.

Fixes:
http://autobuild.buildroot.net/results/1ff3e9ad4ba518d0a37f9fc12038bf9020f28094

Cc: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 15:55:29 +01:00
Marcus Hoffmann
6395652c0a genimage: Fix typo in description
Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 15:54:18 +01:00
Thomas Petazzoni
39b5a72ee5 classpath: only allow on supported architectures
In commit a75ab1fc1d ("package/classpath:
Don't depend on jamvm"), we removed the dependency of classpath on
jamvm. Since jamvm is only available for a reduced set of architectures,
classpath could until this commit until be built on those architectures.

However, now that this dependency has been removed, classpath can
potentially be built for all architectures supported by Buildroot, even
though it doesn't support all of them.

Since adding support for additional architectures in classpath doesn't
make much sense, because classpath is in Buildroot only usable with
JamVM anyway, and JamVM is only available for a small set of
architectures, this commit simply makes classpath available on the
architectures that it supports.

By doing so, it also removes the or1k support patch which was added by
commit f12a146f81, since anyway or1k is
not supported by JamVM.

Fixes:

  http://autobuild.buildroot.net/results/55eb89f89e96b94a821778bc18ed844af08b7460/
  (classpath on microblaze)

  http://autobuild.buildroot.net/results/279dd731bd9ecf5f9d54bda3715caeaa7cbcdbb3/
  (classpath on nios2)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 10:00:30 +01:00
Thomas Petazzoni
84617352f3 openocd: avoid documentation rebuild to fix build issues
On PowerPC64(le), we patch all configure scripts. Due to this, the
version.texi in OpenOCD files gets regenerated, and then since it has
a newer date than openocd.info, openocd build system rebuilds the
documentation. Unfortunately, this documentation rebuild fails on old
machines.

We work around this by faking the date of the generated version.texi
file, to make the build system believe the documentation doesn't need
to be regenerated.

Fixes:

  http://autobuild.buildroot.net/results/3cbe65a46e75b8e67846d593884c96df97dec7a4

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 09:51:42 +01:00
Yann E. MORIN
4422eca2d4 dependencies/cmake: blacklist cmake 3.7
cmake-3.7 has a bug in how it handles rpath, linking with libraries from
the host.

Until we completely understand the issue, just blacklist cmake-3.7.

The issue has been reported upstream:
    http://public.kitware.com/pipermail/cmake/2017-February/064970.html

Reported-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jörg Krause <joerg.krause@embedded.rocks>
Cc: Ben Boeckel <mathstuf@gmail.com>
Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-28 09:40:27 +01:00
Thomas Petazzoni
35e02aeb7b assimp: fix gcc version condition
In commit 68cebedeb9 ("assimp: work around
gcc bug on SuperH"), a work around was added to make the package build
with gcc on SuperH. The condition included a test on the gcc version,
which was mistakenly done on the host gcc version, while a test on the
target gcc version was intended.

Thanks to Peter Korsgaard for spotting the issue.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-27 22:53:24 +01:00
Thomas Petazzoni
68cebedeb9 assimp: work around gcc bug on SuperH
gcc versions earlier than gcc 6.x fail to build assimp on SuperH when
static linking:

  AssxmlExporter.cpp:623:1: error: unable to find a register to spill in class 'GENERAL_REGS'

It's the combination of -Os and *not* having -fPIC that makes gcc
fail, which explains why configurations with dynamic linking work
fine.

 -Os -fPIC -> works
 -Os       -> fails
 -O2 -fPIC -> works
 -O2       -> works

Therefore, as a workaround, we are forcing the use of -O2 on SuperH
when the gcc version is older than gcc 6.x and we're statically
linking.

Fixes:

  http://autobuild.buildroot.net/results/ec88aa8118179e30e24603cc45292047dca19216/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-27 21:38:49 +01:00
Thomas Petazzoni
0fae8618a3 assimp: remove dead "depends on" dependency
BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX has been removed in commit
311bc137da ("toolchain: kill ADI
Blackfin toolchain"), so this "depends on" is useless.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-27 21:38:45 +01:00
Waldemar Brodkorb
ba1dd18a49 vlc: workaround microblaze gcc internal compiler error
Override gcc optimization flags with -O0. The workaround is not required
for gcc6 anymore, so we take this into account into our condition.

Fixes:

  http://autobuild.buildroot.net/results/a318f0838a6a602046e719103ac81965c0084d52

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
[Thomas: add gcc 6.x condition.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-27 21:35:46 +01:00
Thomas Petazzoni
076095a860 mplayer: not supported on or1k
MPlayer doesn't support OpenRISC:

The architecture of your CPU (or1k) is not supported by this configure script
It seems nobody has ported MPlayer to your OS or CPU type yet.

so disable it on this architecture.

Fixes:

  http://autobuild.buildroot.net/results/47207dfd10ff6e5ec4ccdcf8454aaf5f408ad1e3/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-26 23:43:28 +01:00
Thomas Petazzoni
2c2920c457 python-libconfig: disable on musl
The python-libconfig package fails to build with musl with very weird
errors coming all the way from Boost Python, which nobody ever
bothered to fix. It's time to disable this package on musl to avoid
the repetitive build failures.

Fixes:

  http://autobuild.buildroot.net/results/f0f6cdc8c38c024772615d5e677b0f4ad63ef7ec

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-26 23:41:22 +01:00
20 changed files with 216 additions and 51 deletions

12
CHANGES
View File

@@ -1,3 +1,15 @@
2017.02, Released February 28th, 2017
Minor fixes, mainly fixing autobuilder issues.
Don't use cmake 3.7.x from the build host as it is also
affected by the RPATH handling issues, and instead build our
own if needed.
Updated/fixed packages: assimp, classpath, genimage, mplayer,
mpv, openocd, python-libconfig, qt5base, qt5quickcontrols,
vlc, xterm
2017.02-rc3, Released February 26th, 2017
Fixes all over the tree.

View File

@@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O)
all:
# Set and export the version string
export BR2_VERSION := 2017.02-rc3
export BR2_VERSION := 2017.02
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1488147000
BR2_VERSION_EPOCH = 1488315000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)

View File

@@ -8,40 +8,40 @@
<div class="panel-heading">Download</div>
<div class="panel-body">
<h3 style="text-align: center;">Latest stable release: <b>2016.11.2</b></h3>
<h3 style="text-align: center;">Latest stable release: <b>2017.02</b></h3>
<div class="row mt centered">
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2016.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2016.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2016.11.2.tar.gz">buildroot-2016.11.2.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2016.11.2.tar.gz.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2017.02.tar.gz">buildroot-2017.02.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2017.02.tar.gz.sign">PGP signature</a></p>
</div>
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2016.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2016.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2016.11.2.tar.bz2">buildroot-2016.11.2.tar.bz2</a></h3>
<p><a href="/downloads/buildroot-2016.11.2.tar.bz2.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2017.02.tar.bz2">buildroot-2017.02.tar.bz2</a></h3>
<p><a href="/downloads/buildroot-2017.02.tar.bz2.sign">PGP signature</a></p>
</div>
</div>
<!--
<h3 style="text-align: center;">Latest release candidate: <b>2017.02-rc3</b></h3>
<div class="row mt centered">
<div class="col-sm-6">
@@ -75,7 +75,7 @@
<p><a href="/downloads/buildroot-2017.02-rc3.tar.bz2.sign">PGP signature</a></p>
</div>
</div>
-->
This and earlier releases (and their PGP signatures) can always be downloaded from
<a href="/downloads/">http://buildroot.net/downloads/</a>.
</div>

View File

@@ -9,6 +9,24 @@
<h2>News</h2>
<ul class="timeline">
<li>
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
<div class="timeline-heading">
<h4 class="timeline-title">2017.02 released</h4>
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 February 2017</small></p>
</div>
<div class="timeline-body">
<p>The stable 2017.02 release is out - Thanks to everyone
contributing and testing the release candidates. See the
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02">CHANGES</a>
file for more details
and go to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2017.02.tar.bz2">2017.02 release</a>.</p>
</div>
</div>
</li>
<li class="timeline-inverted">
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">

View File

@@ -4,11 +4,6 @@ config BR2_PACKAGE_ASSIMP
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
# cause an infinite loop in gcc when building this package.
depends on !BR2_microblaze
# The ADI Blackfin toolchain does not build assimp properly,
# fails with "internal compiler error: in simplify_subreg, at
# simplify-rtx.c:5001". It builds fine with a mainline gcc for
# Blackfin.
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_ZLIB
help

View File

@@ -16,6 +16,14 @@ ifeq ($(BR2_m68k),y)
ASSIMP_CXXFLAGS += -mxgot
endif
# workaround SuperH compiler failure when static linking (i.e -fPIC is
# not passed) in gcc versions 5.x or older. The -Os optimization level
# causes a "unable to find a register to spill in class
# GENERAL_REGS" error. -O2 works fine.
ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
ASSIMP_CXXFLAGS += -O2
endif
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"

View File

@@ -1,18 +0,0 @@
Set endianess for or1k
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff -Nur classpath-0.98.orig/native/fdlibm/ieeefp.h classpath-0.98/native/fdlibm/ieeefp.h
--- classpath-0.98.orig/native/fdlibm/ieeefp.h 2008-01-13 18:33:50.000000000 +0100
+++ classpath-0.98/native/fdlibm/ieeefp.h 2017-02-26 12:39:12.316327363 +0100
@@ -123,6 +123,10 @@
#define __IEEE_BIG_ENDIAN
#endif
+#ifdef __or1k__
+#define __IEEE_BIG_ENDIAN
+#endif
+
#ifdef __v800
#define __IEEE_LITTLE_ENDIAN
#endif

View File

@@ -1,7 +1,15 @@
config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
bool
default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
|| BR2_sh || BR2_x86_64
config BR2_PACKAGE_CLASSPATH
bool "classpath"
select BR2_NEEDS_HOST_JAR
select BR2_NEEDS_HOST_JAVAC
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
help
GNU Classpath, Essential Libraries for Java, is a GNU
project to create free core class libraries for use with

View File

@@ -5,7 +5,7 @@ config BR2_PACKAGE_HOST_GENIMAGE
images from a given root filesystem tree. genimage is
intended to be run in a fakeroot environment.
Configuration is done is a config file parsed by
Configuration is done in a config file parsed by
libconfuse. Options like the path to tools can be given in
environment variables, the config file or commandline
switches.

View File

@@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM
depends on !BR2_STATIC_LIBS
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|| BR2_mips || BR2_mipsel || BR2_powerpc
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_CLASSPATH
help
@@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM
comment "jamvm needs a toolchain w/ threads, dynamic library"
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|| BR2_mips || BR2_mipsel || BR2_powerpc
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

View File

@@ -3,7 +3,7 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
default y
# Those architectures are not supported by MPlayer
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
|| BR2_m68k || BR2_microblaze || BR2_nios2)
|| BR2_m68k || BR2_microblaze || BR2_nios2 || BR2_or1k)
# Broken support for <ARMv5
depends on !BR2_ARM_CPU_ARMV4
# configure script barfs on the -Wl,-elf2flt we add in the toolchain

View File

@@ -4,6 +4,8 @@ config BR2_PACKAGE_MPV
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
# ARC toolchain issue
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE
@@ -21,3 +23,4 @@ comment "mpv needs a toolchain w/ threads, gcc >= 4.5"
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC

View File

@@ -99,5 +99,20 @@ HOST_OPENOCD_CONF_OPTS = \
HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat
# Avoid documentation rebuild. On PowerPC64(le), we patch the
# configure script. Due to this, the version.texi files gets
# regenerated, and then since it has a newer date than openocd.info,
# openocd build system rebuilds the documentation. Unfortunately, this
# documentation rebuild fails on old machines. We work around this by
# faking the date of the generated version.texi file, to make the
# build system believe the documentation doesn't need to be
# regenerated.
define OPENOCD_FIX_VERSION_TEXI
touch -r $(@D)/doc/openocd.info $(@D)/doc/version.texi
endef
OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
HOST_OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
$(eval $(autotools-package))
$(eval $(host-autotools-package))

View File

@@ -1,5 +1,6 @@
comment "python-libconfig needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
comment "python-libconfig needs a glibc or uClibc toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_TOOLCHAIN_USES_MUSL
config BR2_PACKAGE_PYTHON_LIBCONFIG
bool "python-libconfig"
@@ -8,6 +9,8 @@ config BR2_PACKAGE_PYTHON_LIBCONFIG
select BR2_PACKAGE_LIBCONFIG
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
# error: invalid use of incomplete type 'struct _IO_FILE'
depends on !BR2_TOOLCHAIN_USES_MUSL
help
Python bindings to the C++ library libconfig

View File

@@ -0,0 +1,97 @@
From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Fri, 10 Feb 2017 13:56:58 +0100
Subject: [PATCH] fix VNC platform plugin build on big-endian machines
Task-number: QTBUG-58734
Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
src/plugins/platforms/vnc/qvncclient.cpp | 6 +++---
src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++-
src/plugins/platforms/vnc/qvncscreen.h | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
index dae3e83f..58dcfc9b 100644
--- a/src/plugins/platforms/vnc/qvncclient.cpp
+++ b/src/plugins/platforms/vnc/qvncclient.cpp
@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const
case 16: {
quint16 p = *reinterpret_cast<const quint16*>(src);
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
- if (swapBytes)
+ if (m_swapBytes)
p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8);
#endif
r = (p >> 11) & 0x1f;
@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat()
m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian;
m_needConversion = pixelConversionNeeded();
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
- m_swapBytes = qvnc_screen->swapBytes();
+ m_swapBytes = server()->screen()->swapBytes();
#endif
}
}
@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const
return true;
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
- if (qvnc_screen->swapBytes())
+ if (server()->screen()->swapBytes())
return true;
#endif
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
index 34def457..64f1bc0b 100644
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
@@ -43,6 +43,7 @@
#include <QtFbSupport/private/qfbcursor_p.h>
#include <QtGui/QPainter>
+#include <QtGui/QScreen>
#include <QtCore/QRegularExpression>
@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
}
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-bool QVNCScreen::swapBytes() const
+bool QVncScreen::swapBytes() const
{
+ return false;
+
+ /* TODO
if (depth() != 16)
return false;
if (screen())
return screen()->frameBufferLittleEndian();
return frameBufferLittleEndian();
+ */
}
#endif
diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
index 785abd6d..0b42c3c7 100644
--- a/src/plugins/platforms/vnc/qvncscreen.h
+++ b/src/plugins/platforms/vnc/qvncscreen.h
@@ -73,7 +73,7 @@ public:
void clearDirty() { dirtyRegion = QRegion(); }
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
- bool swapBytes() const
+ bool swapBytes() const;
#endif
QStringList mArgs;
--
2.11.0

View File

@@ -30,20 +30,25 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
endef
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
endef
else
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
endif
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
endef
endif
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
$(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS)
$(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS)
endef
$(eval $(generic-package))

View File

@@ -15,6 +15,13 @@ VLC_AUTORECONF = YES
# Install vlc libraries in staging.
VLC_INSTALL_STAGING = YES
# gcc bug internal compiler error: in merge_overlapping_regs, at
# regrename.c:304. This bug is fixed since gcc 6.
ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
VLC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
VLC_CONF_OPTS += --disable-optimizations
endif
# VLC defines two autoconf functions which are also defined by our own pkg.m4
# from pkgconf. Unfortunately, they are defined in a different way: VLC adds
# --enable- options, but pkg.m4 adds --with- options. To make sure we use

View File

@@ -4,6 +4,8 @@ config BR2_PACKAGE_XTERM
select BR2_PACKAGE_XLIB_LIBXAW
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_MMU # fork()
# ARC toolchain issue
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
help
xterm terminal emulator

View File

@@ -6,6 +6,9 @@ version_min="${2}"
major_min="${version_min%.*}"
minor_min="${version_min#*.}"
# cmake-3.7 incorrectly handles rpath, linking to host libraries
blacklist_version="3.7"
cmake=`which ${candidate}`
if [ ! -x "${cmake}" ]; then
# echo nothing: no suitable cmake found
@@ -27,6 +30,11 @@ version="$(${cmake} --version \
major="${version%.*}"
minor="${version#*.}"
if [ "${version}" = "${blacklist_version}" ]; then
# echo nothing: no suitable cmake found
exit 1
fi
if [ ${major} -gt ${major_min} ]; then
echo "${cmake}"
else

View File

@@ -5,7 +5,7 @@
################################################################################
# Buildroot version to use
RELEASE='2016.11.2'
RELEASE='2017.02'
### Change here for more memory/cores ###
VM_MEMORY=2048