qt5: fix arm* build [skip ci]

- closes #877
- set MesaLib-devel last in makedepends to overwrite conflicting egl.pc and
  glesv2.pc from rpi-userland
- added libGLES because the above also needs Mesa’s libGLESv2.so
- remove qtwayland-egl.patch which is RPi specific, but the build is now
  generic for ARM devices and fails with that patch
- remove not required variable QMAKE_LIBS_OPENGL_ES2

Closes: #995 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>

srcpkgs/qt5/files/qtwayland-egl.patch

@@ -1,35 +0,0 @@
---- qtwayland/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp	2018-02-05 14:01:14.000000000 +0100
-+++ qtwayland/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp	2018-02-14 09:45:48.986677335 +0100
-@@ -121,7 +121,7 @@
-     XCompositeRedirectWindow(m_glxIntegration->xDisplay(), m_xWindow, CompositeRedirectManual);
-     XMapWindow(m_glxIntegration->xDisplay(), m_xWindow);
- 
--    m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, m_xWindow,0);
-+    m_surface = eglCreateWindowSurface(m_glxIntegration->eglDisplay(), m_config, (void *)m_xWindow,0);
-     if (m_surface == EGL_NO_SURFACE) {
-         qFatal("Could not make eglsurface");
-     }
---- qtwayland/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp	2018-02-05 14:01:14.000000000 +0100
-+++ qtwayland/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp	2018-02-14 09:47:53.579686221 +0100
-@@ -129,7 +129,7 @@
-     attribList.append(EGL_TEXTURE_2D);
-     attribList.append(EGL_NONE);
- 
--    EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(),config,pixmap,attribList.constData());
-+    EGLSurface surface = eglCreatePixmapSurface(m_integration->eglDisplay(),config,(void *)pixmap,attribList.constData());
-     if (surface == EGL_NO_SURFACE) {
-         qDebug() << "Failed to create eglsurface" << pixmap << compositorBuffer->window();
-     }
---- qtwayland/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp	2018-02-05 14:01:14.000000000 +0100
-+++ qtwayland/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp	2018-02-14 11:39:28.604163714 +0100
-@@ -52,8 +52,8 @@
- 
- #include <EGL/eglext_brcm.h>
- 
--#include <GLES2/gl2.h>
--#include <GLES2/gl2ext.h>
-+#include <GLES3/gl3.h>
-+#include <GLES3/gl3ext.h>
- 
- QT_BEGIN_NAMESPACE
- 

srcpkgs/qt5/template

@@ -1,11 +1,11 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.10.1
-revision=10
+revision=11
 wrksrc="qt-everywhere-src-${version}"
 build_style=gnu-configure
 hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja"
-makedepends="libressl-devel libpng-devel MesaLib-devel libXrender-devel unixodbc-devel
+makedepends="libressl-devel libpng-devel libXrender-devel unixodbc-devel
  fontconfig-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel
  libXcursor-devel libXScrnSaver-devel dbus-devel glib-devel icu-devel
  cups-devel libjpeg-turbo-devel sqlite-devel alsa-lib-devel tiff-devel SDL2-devel
@@ -17,7 +17,8 @@ makedepends="libressl-devel libpng-devel MesaLib-devel libXrender-devel unixodbc
  mtdev-devel freetds-devel libmysqlclient-devel postgresql-libs-devel
  pulseaudio-devel libbluetooth-devel gst-plugins-base1-devel libxslt-devel
  opus-devel pciutils-devel nss-devel libcap-devel libinput-devel libproxy-devel
- libxcb-devel libxkbcommon-devel tslib-devel wayland-devel libwayland-egl"
+ libxcb-devel libxkbcommon-devel tslib-devel wayland-devel libwayland-egl
+ libGLES MesaLib-devel"
 depends="qtchooser"
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1"
@@ -152,8 +153,6 @@ _create_config() {
 	echo "QMAKE_LFLAGS = ${LDFLAGS}" >> ${qmake_conf}
 	echo "QMAKE_CFLAGS = ${CFLAGS}" >> ${qmake_conf}
 	echo "QMAKE_CXXFLAGS = ${CXXFLAGS}" >> ${qmake_conf}
-	# FIXME: is this required?
-	echo "QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2" >> ${qmake_conf}
 	echo >> ${qmake_conf}
 	case "$XBPS_TARGET_MACHINE" in
 		arm*)
@@ -256,11 +255,6 @@ do_configure() {
 			-e"/gn.file = gn.pro/,+3d"
 
 		case "$XBPS_TARGET_MACHINE" in
-		armv5*)	# Patch not needed for armv5*
-			;;
-		arm*)	# Patch for qtwayland using egl from rpi-userland
-			patch -p0 -i ${FILESDIR}/qtwayland-egl.patch
-			;;
 		mips*)	# sgidefs.h is in /usr/include/asm
 			find ${wrksrc} -name Platform.h  -exec sed -i "{}" \
 				-e "s;<sgidefs.h>;<asm/sgidefs.h>;" \;