qt5base: fix rpi/egl support (vc_dispmanx_element_change_attributes proto mismatch)
PATCH 1/2 qt5base: fix rpi/egl support (vc_dispmanx_element_change_attributes proto mismatch)
Patch from upstream already included in the next 5.2 release
Fixes:
http://autobuild.buildroot.net/results/347/347577bf1dee0fec3302a45f278eb253118a5b6f/build-end.log
Signed-off-by Samuel Martin <[email protected]>
--- ...ate-vc_dispmanx_element_change_attributes.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch
package/qt5/qt5base/qt5base-0006-qeglfshooksrpi-update-vc_dispmanx_element_change_attributes.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 90005fae17acc994948aa5a79fc262fd07b69865 Mon Sep 17 00:00:00 2001 +From: Dario Freddi <[email protected]> +Date: Fri, 13 Sep 2013 12:10:03 +0200 +Subject: [PATCH] qeglfshooksrpi: update vc_dispmanx_element_change_attributes + +Remove the extern prototype as it's now defined in latest +firmware headers correctly. Moreover, the signature of the function +changed. This patch fixes both issues. + +Change-Id: I0114b436dbaf5a171e6429a1e3760e292c7152cf +Reviewed-by: Andy Nichols <[email protected]> +--- + .../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp | 8 +------- + 1 files changed, 1 insertions(+), 7 deletions(-) + +diff --git a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +index 9b48113..add96bf 100644 +--- a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp ++++ b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +@@ -88,12 +88,6 @@ static EGLNativeWindowType createDispmanxLayer(const QPoint &pos, const QSize &s + return eglWindow; + } + +-// this function is not part of debian squeeze headers +-extern "C" int VCHPOST_ vc_dispmanx_element_change_attributes(DISPMANX_UPDATE_HANDLE_T update, +- DISPMANX_ELEMENT_HANDLE_T element, uint32_t change_flags, int32_t layer, +- uint8_t opacity, const VC_RECT_T *dest_rect, const VC_RECT_T *src_rect, +- DISPMANX_RESOURCE_HANDLE_T mask, VC_IMAGE_TRANSFORM_T transform); +- + // these constants are not in any headers (yet) + #define ELEMENT_CHANGE_LAYER (1<<0) + #define ELEMENT_CHANGE_OPACITY (1<<1) +@@ -128,7 +122,7 @@ static void moveDispmanxLayer(EGLNativeWindowType window, const QPoint &pos) + &dst_rect, + NULL, + 0, +- (VC_IMAGE_TRANSFORM_T)0); ++ (DISPMANX_TRANSFORM_T)0); + + vc_dispmanx_update_submit_sync(dispman_update); + } +-- +1.7.1 +
Signature · 1 line
1.8.4.2
PATCH 2/2 qt5webkit: fix build with bison-3.0
- Add host-bison dependency
- Fetch patch from upstream fixing build with bison-3.0 (already included in the next 5.2 release)
Fixes:
http://autobuild.buildroot.net/results/283/2831c0d859b035f7d2786f51885833a711b46b80/build-end.log
Signed-off-by Samuel Martin <[email protected]>
--- ...t-0002-ANGLE-doesn-t-build-with-bison-3.0.patch | 38 ++++++++++++++++++++++ package/qt5/qt5webkit/qt5webkit.mk | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch
package/qt5/qt5webkit/qt5webkit-0002-ANGLE-doesn-t-build-with-bison-3.0.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <[email protected]> +Date: Fri, 16 Aug 2013 18:27:07 +0200 +Subject: [PATCH] ANGLE doesn't build with bison 3.0 + +https://bugs.webkit.org/show_bug.cgi?id=119798 + +Reviewed by Antti Koivisto. + +Make glslang.y compatible with bison 3.0 +by using %lex-param to set YYLEX_PARAM. + +* src/compiler/glslang.y: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk at 154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +Task-number: QTBUG-32913 +Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3 +Reviewed-by: Jocelyn Turcotte <[email protected]> +--- + Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +index 3cad335..b41e95a 100644 +--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y ++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). + %expect 1 /* One shift reduce conflict because of if | else */ + %pure-parser + %parse-param {TParseContext* context} ++%lex-param {YYLEX_PARAM} + + %union { + struct { +-- +1.8.4.2 +
package/qt5/qt5webkit/qt5webkit.mk +1 -1
@@ -7,7 +7,7 @@ QT5WEBKIT_VERSION = $(QT5_VERSION) QT5WEBKIT_SITE = $(QT5_SITE) QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf +QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison QT5WEBKIT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
Signature · 1 line
1.8.4.2
PATCH 1/2 qt5base: fix rpi/egl support (vc_dispmanx_element_change_attributes proto mismatch)
In reply to Samuel MartinQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
Patch from upstream already included in the next 5.2 release Fixes:
http://autobuild.buildroot.net/results/347/347577bf1dee0fec3302a45f278eb253118a5b6f/build-end.logSigned-off-by Samuel Martin <[email protected]>
Committed both, thanks.
Signature · 1 line
Bye, Peter Korsgaard