diff options
Diffstat (limited to 'recipes-qt')
56 files changed, 182 insertions, 153 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 9832eee4..b1207332 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -38,7 +38,7 @@ SRC_URI += " \ | |||
38 | file://OEQt5Toolchain.cmake \ | 38 | file://OEQt5Toolchain.cmake \ |
39 | " | 39 | " |
40 | 40 | ||
41 | SRCREV = "a782369071db1d89448c0b94248d31fa877bcf8c" | 41 | SRCREV = "f58e882b7594c59b6050d3c87562fcf836d10f60" |
42 | 42 | ||
43 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ | 43 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ |
44 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ | 44 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ |
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb index b659f906..7ce17473 100644 --- a/recipes-qt/qt5/nativesdk-qttools_git.bb +++ b/recipes-qt/qt5/nativesdk-qttools_git.bb | |||
@@ -4,7 +4,7 @@ require ${PN}.inc | |||
4 | # prepend this again, because ${PN}.inc prepends ${PN} | 4 | # prepend this again, because ${PN}.inc prepends ${PN} |
5 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" | 5 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" |
6 | 6 | ||
7 | SRCREV = "638c278b76c56a51f83ef8c5cc9c03f18a887f74" | 7 | SRCREV = "7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ |
10 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ | 10 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ |
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index a1ce9f2f..f34aed42 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e04fdddaeb59006c2d599b8b261ce714341029ba Mon Sep 17 00:00:00 2001 | 1 | From 08f6be97c3f088fd8a2d752441c638093eedd990 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform |
@@ -347,5 +347,5 @@ index 0000000..dd12003 | |||
347 | + | 347 | + |
348 | +#endif // QPLATFORMDEFS_H | 348 | +#endif // QPLATFORMDEFS_H |
349 | -- | 349 | -- |
350 | 2.3.1 | 350 | 2.3.5 |
351 | 351 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 306af7f5..ec2bcb49 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 182e7a96a99e9bcabcbd8858c377035a47e4e3e8 Mon Sep 17 00:00:00 2001 | 1 | From 31fa051d53e26301ef6abf72bd3f992d7c16cad2 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside |
@@ -35,5 +35,5 @@ index d66007b..91ca643 100644 | |||
35 | if(!QFile::exists(qtconfig)) | 35 | if(!QFile::exists(qtconfig)) |
36 | qtconfig = qt_libraryInfoFile(); | 36 | qtconfig = qt_libraryInfoFile(); |
37 | -- | 37 | -- |
38 | 2.3.1 | 38 | 2.3.5 |
39 | 39 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index 4451751d..779ea918 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 457efc32bb79060a0a58a82ff8a35d67655ef6d6 Mon Sep 17 00:00:00 2001 | 1 | From cf4e996876e0b467b7aae124c7cb285f677bf6b0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/12] Add -external-hostbindir option | 4 | Subject: [PATCH 03/12] Add -external-hostbindir option |
@@ -95,10 +95,10 @@ index 0a00d6d..ad5f4cd 100755 | |||
95 | "qt_hostspec=$shortspec", | 95 | "qt_hostspec=$shortspec", |
96 | #endif | 96 | #endif |
97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
98 | index 7961f65..e11b23d 100644 | 98 | index 79b4eab..8c6913e 100644 |
99 | --- a/mkspecs/features/qt_functions.prf | 99 | --- a/mkspecs/features/qt_functions.prf |
100 | +++ b/mkspecs/features/qt_functions.prf | 100 | +++ b/mkspecs/features/qt_functions.prf |
101 | @@ -192,7 +192,11 @@ defineTest(qtAddRpathLink) { | 101 | @@ -198,7 +198,11 @@ defineTest(qtAddRpathLink) { |
102 | defineTest(qtPrepareTool) { | 102 | defineTest(qtPrepareTool) { |
103 | cmd = $$eval(QT_TOOL.$${2}.binary) | 103 | cmd = $$eval(QT_TOOL.$${2}.binary) |
104 | isEmpty(cmd) { | 104 | isEmpty(cmd) { |
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 | |||
229 | _qt5_Widgets_check_file_exists(${imported_location}) | 229 | _qt5_Widgets_check_file_exists(${imported_location}) |
230 | 230 | ||
231 | -- | 231 | -- |
232 | 2.3.1 | 232 | 2.3.5 |
233 | 233 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 20ddff94..c586775f 100644 --- a/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8c5554c1ee9a18548c166f6c3a7b487b9d3cdc3e Mon Sep 17 00:00:00 2001 | 1 | From bf9f8df42f5a7ac4a0cb4bdad8c849228aa79b35 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 04/12] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 04/12] qt_module: Fix pkgconfig and libtool replacements |
@@ -80,7 +80,7 @@ index eb65e73..4db40d0 100644 | |||
80 | lib_replace.CONFIG = path | 80 | lib_replace.CONFIG = path |
81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace | 81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace |
82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
83 | index d213f9e..915c596 100644 | 83 | index 2437efe..2e1f014 100644 |
84 | --- a/mkspecs/features/qt_module.prf | 84 | --- a/mkspecs/features/qt_module.prf |
85 | +++ b/mkspecs/features/qt_module.prf | 85 | +++ b/mkspecs/features/qt_module.prf |
86 | @@ -192,10 +192,25 @@ unix|mingw { | 86 | @@ -192,10 +192,25 @@ unix|mingw { |
@@ -110,5 +110,5 @@ index d213f9e..915c596 100644 | |||
110 | } | 110 | } |
111 | 111 | ||
112 | -- | 112 | -- |
113 | 2.3.1 | 113 | 2.3.5 |
114 | 114 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch index 02dc13a6..9723beac 100644 --- a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 825043f0a657cd4b8c3af0e00c79684388460d5c Mon Sep 17 00:00:00 2001 | 1 | From f8a4e063b45b5b941738dd90ea7c74063bc1e49f Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 | 3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 |
4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" |
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974a 100644 | |||
93 | } | 93 | } |
94 | 94 | ||
95 | -- | 95 | -- |
96 | 2.3.1 | 96 | 2.3.5 |
97 | 97 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 251cdc6e..04fb3709 100644 --- a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b4d4c91bb504c9e90b69a2d78453bf3523ec6822 Mon Sep 17 00:00:00 2001 | 1 | From 6061c8457ea1f76745bd9918e61bda01ef96ce56 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 | 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 |
4 | Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h |
@@ -26,5 +26,5 @@ index 2b5d5f5..a0aab03 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformScreen; | 27 | class QEGLPlatformScreen; |
28 | -- | 28 | -- |
29 | 2.3.1 | 29 | 2.3.5 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch index 23bfa77f..be75d72c 100644 --- a/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e4235e3a0ebe4494ad1f4f550ddb070100e530e1 Mon Sep 17 00:00:00 2001 | 1 | From a6b01490248be28c1db3abd5f710c5d7d9afee55 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 | 3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 |
4 | Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters |
@@ -25,5 +25,5 @@ index ad5f4cd..c19ff6a 100755 | |||
25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", | 25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", |
26 | "qt_docspath=$QT_SYSROOT_DOCS", | 26 | "qt_docspath=$QT_SYSROOT_DOCS", |
27 | -- | 27 | -- |
28 | 2.3.1 | 28 | 2.3.5 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index e7e50844..e4d4327c 100644 --- a/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 715b5d739b36588cd2e34962b33a59da1f5427fe Mon Sep 17 00:00:00 2001 | 1 | From d1712999887b9809cce57b1e6c008c454330cd2e Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 | 3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 |
4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one |
@@ -68,5 +68,5 @@ index 39a3ef9..2c05979 100644 | |||
68 | 68 | ||
69 | if (isRaster()) { | 69 | if (isRaster()) { |
70 | -- | 70 | -- |
71 | 2.3.1 | 71 | 2.3.5 |
72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch index 2f5835c0..bebb3d95 100644 --- a/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ab8aa4e79e156ac6df8cd36e287faf838bc32344 Mon Sep 17 00:00:00 2001 | 1 | From a34538ff13c520fa85df689255469a316f037d0d Mon Sep 17 00:00:00 2001 |
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | 2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> |
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | 3 | Date: Thu, 16 May 2013 09:52:07 +0300 |
4 | Subject: [PATCH 09/12] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 09/12] QOpenGLPaintDevice sub-area support |
@@ -153,5 +153,5 @@ index cd268cd..997bc35 100644 | |||
153 | } else { | 153 | } else { |
154 | if (m_vao.isCreated()) { | 154 | if (m_vao.isCreated()) { |
155 | -- | 155 | -- |
156 | 2.3.1 | 156 | 2.3.5 |
157 | 157 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch index 1f92eed8..f2eed114 100644 --- a/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +++ b/recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 276b5046788007bcbc5607046becdd44151960c0 Mon Sep 17 00:00:00 2001 | 1 | From 16a55457ce31d467cb331ab8e94b672757ef42b9 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 | 3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 |
4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir | 4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir |
@@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 | |||
38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) | 38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) |
39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") | 39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") |
40 | -- | 40 | -- |
41 | 2.3.1 | 41 | 2.3.5 |
42 | 42 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch index 3ff193a5..da17878e 100644 --- a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c87f9a5ec9a08c415ede4d5118deeb4177778338 Mon Sep 17 00:00:00 2001 | 1 | From 5a6ad20dd4fde6a0581be895d763aae43f1fc2b6 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH 11/13] Always build uic | 4 | Subject: [PATCH 11/13] Always build uic |
@@ -27,5 +27,5 @@ index 83f7587..9dbcf70 100644 | |||
27 | nacl: SUBDIRS -= src_network src_testlib | 27 | nacl: SUBDIRS -= src_network src_testlib |
28 | 28 | ||
29 | -- | 29 | -- |
30 | 2.3.1 | 30 | 2.3.5 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 83457f02..96198b1f 100644 --- a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f298d49fd1b88ae9bf8f35339a52cd333f42434b Mon Sep 17 00:00:00 2001 | 1 | From 6c0cc990522454e0c9e52ba969c3a8c5937157b8 Mon Sep 17 00:00:00 2001 |
2 | From: Michael Krelin <hacker@klever.net> | 2 | From: Michael Krelin <hacker@klever.net> |
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | 3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 |
4 | Subject: [PATCH 11/12] qmake: don't build it in configure, but allow to build | 4 | Subject: [PATCH 11/12] qmake: don't build it in configure, but allow to build |
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644 | |||
64 | VPATH += \ | 64 | VPATH += \ |
65 | ../src/corelib/global \ | 65 | ../src/corelib/global \ |
66 | -- | 66 | -- |
67 | 2.3.1 | 67 | 2.3.5 |
68 | 68 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch index 82505a7a..4c044c0d 100644 --- a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e598364920b2ff4a90aaaaeb0c58162d1cb64221 Mon Sep 17 00:00:00 2001 | 1 | From 6425d71d52c5587f323fe28af62530d5c82b02fd Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) |
@@ -104,5 +104,5 @@ index 6e9d4aa..0ca4daf 100644 | |||
104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl |
105 | << "#endif" << endl | 105 | << "#endif" << endl |
106 | -- | 106 | -- |
107 | 2.3.1 | 107 | 2.3.5 |
108 | 108 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch index 204819c8..0a7eb15e 100644 --- a/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch +++ b/recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dbfa83051ddb8db0b4a59b226d4e4a41101ae26e Mon Sep 17 00:00:00 2001 | 1 | From 84c23fc01b28087de35604ef971227b57fb77876 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Thu, 22 Jan 2015 16:09:35 +0100 | 3 | Date: Thu, 22 Jan 2015 16:09:35 +0100 |
4 | Subject: [PATCH 12/12] Set paths for target properly | 4 | Subject: [PATCH 12/12] Set paths for target properly |
@@ -68,5 +68,5 @@ index 7a34b11..7bb4476 100755 | |||
68 | }; | 68 | }; |
69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; | 69 | static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; |
70 | -- | 70 | -- |
71 | 2.3.1 | 71 | 2.3.5 |
72 | 72 | ||
diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch index 4b48b5b6..0b271a35 100644 --- a/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4ccd1823b88c039415b68a1dc2040859178cb56f Mon Sep 17 00:00:00 2001 | 1 | From 6b980c8132800001b2f0c5c0e76f7cc7c60d14ee Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 | 3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 |
4 | Subject: [PATCH 13/13] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 13/13] configure: preserve built qmake and swap with native |
@@ -26,5 +26,5 @@ index c19ff6a..2d920e3 100755 | |||
26 | echo "Running configuration tests..." | 26 | echo "Running configuration tests..." |
27 | 27 | ||
28 | -- | 28 | -- |
29 | 2.3.1 | 29 | 2.3.5 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index e558ee6d..8ba9170c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -31,7 +31,7 @@ do_install_append() { | |||
31 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 31 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
32 | } | 32 | } |
33 | 33 | ||
34 | SRCREV = "a782369071db1d89448c0b94248d31fa877bcf8c" | 34 | SRCREV = "f58e882b7594c59b6050d3c87562fcf836d10f60" |
35 | 35 | ||
36 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ | 36 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ |
37 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ | 37 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1be31ea5..ed6878c3 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -25,7 +25,7 @@ SRC_URI += "\ | |||
25 | file://0012-Set-paths-for-target-properly.patch \ | 25 | file://0012-Set-paths-for-target-properly.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | SRCREV = "a782369071db1d89448c0b94248d31fa877bcf8c" | 28 | SRCREV = "f58e882b7594c59b6050d3c87562fcf836d10f60" |
29 | 29 | ||
30 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ | 30 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ |
31 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ | 31 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index d3586e27..0e62a236 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${BPN}.inc | 2 | require ${BPN}.inc |
3 | 3 | ||
4 | SRCREV = "dbf0bd93096f8ef54ebcf550ff104237742778dd" | 4 | SRCREV = "b4bf23453e65995bdd8827b6e146edd5cafeddc3" |
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch index 8766c345..16031006 100644 --- a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch +++ b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f1285bfd6f12cc4dc7727408a38edea13d3d0f46 Mon Sep 17 00:00:00 2001 | 1 | From 1abe7b1d4de10ba3739db8a685661e99fb274a00 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> |
3 | Date: Sun, 26 May 2013 14:26:19 +0200 | 3 | Date: Sun, 26 May 2013 14:26:19 +0200 |
4 | Subject: [PATCH] qmltestexample: fix link | 4 | Subject: [PATCH] qmltestexample: fix link |
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644 | |||
84 | 84 | ||
85 | load(qt_tool) | 85 | load(qt_tool) |
86 | -- | 86 | -- |
87 | 2.3.1 | 87 | 2.3.5 |
88 | 88 | ||
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index af825c7e..caa851a3 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "d43a963e49956ba772644e9f3448dc3672147f77" | 4 | SRCREV = "2b3c2339616680537145a9cc2e7567575add1abb" |
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 5b3f4406..9e2c703f 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -2,4 +2,4 @@ require qt5-git.inc | |||
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | QT_MODULE_BRANCH = "1.1" | 4 | QT_MODULE_BRANCH = "1.1" |
5 | SRCREV = "5581890d3c5919c3bd4b6aafdba650c14a97c312" | 5 | SRCREV = "30ee95cd19f9a435ce337b4f651175ed2e8ba2e5" |
diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch index 1e45f2aa..24395209 100644 --- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 706c5aec2b49c685abe5e1ad4d09674d55add789 Mon Sep 17 00:00:00 2001 | 1 | From f7cc9df393826c1697e45e87c929ad17ab225256 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 4 Aug 2014 19:19:05 +0200 | 3 | Date: Mon, 4 Aug 2014 19:19:05 +0200 |
4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic | 4 | Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic |
@@ -27,5 +27,5 @@ index 8382e5c..63d13ce 100644 | |||
27 | 27 | ||
28 | load(qt_parts) | 28 | load(qt_parts) |
29 | -- | 29 | -- |
30 | 2.3.1 | 30 | 2.3.5 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index db65e6b3..149148ea 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "2cf398f541d68f60e0205820524b79b37045bf0f" | 4 | SRCREV = "98f83553e9fe2aa5fc54b32513af6ba3aa60a07b" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index b0258a8d..75b4f724 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "e746e794dc27933467f6aed0c813e0cc9d0dae77" | 4 | SRCREV = "b13fec3c7ed08b7d0e79c08312a3c3285eb20ef3" |
diff --git a/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch index 4020471e..e2a46df6 100644 --- a/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch +++ b/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a42d29588f9c65d8c480fd9fbcbbd0606f01170f Mon Sep 17 00:00:00 2001 | 1 | From 8b306a5a70d431b8e142b3a7efb32d897cb79ab5 Mon Sep 17 00:00:00 2001 |
2 | From: Yoann Lopes <yoann.lopes@digia.com> | 2 | From: Yoann Lopes <yoann.lopes@digia.com> |
3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 | 3 | Date: Thu, 31 Oct 2013 15:06:30 +0100 |
4 | Subject: [PATCH] Initial porting effort to GStreamer 1.0. | 4 | Subject: [PATCH] Initial porting effort to GStreamer 1.0. |
@@ -13,6 +13,7 @@ Sergio Schvezov <sergio.schvezov@canonical.com> | |||
13 | Change-Id: I10fa5e5078efa4564ce833befd417008e26a90a9 | 13 | Change-Id: I10fa5e5078efa4564ce833befd417008e26a90a9 |
14 | Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> | 14 | Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> |
15 | (cherry picked from commit d91dac090d92fdbc3a3425e8d969c62e5c79eff9) | 15 | (cherry picked from commit d91dac090d92fdbc3a3425e8d969c62e5c79eff9) |
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
16 | 17 | ||
17 | Conflicts: | 18 | Conflicts: |
18 | src/gsttools/qgstreamervideorenderer.cpp | 19 | src/gsttools/qgstreamervideorenderer.cpp |
@@ -38,7 +39,7 @@ Conflicts: | |||
38 | src/gsttools/qgstreamervideowindow.cpp | 79 +++++++- | 39 | src/gsttools/qgstreamervideowindow.cpp | 79 +++++++- |
39 | src/gsttools/qgstutils.cpp | 27 ++- | 40 | src/gsttools/qgstutils.cpp | 27 ++- |
40 | src/gsttools/qgstvideobuffer.cpp | 18 +- | 41 | src/gsttools/qgstvideobuffer.cpp | 18 +- |
41 | src/gsttools/qvideosurfacegstsink.cpp | 138 +++++++++++++- | 42 | src/gsttools/qvideosurfacegstsink.cpp | 136 +++++++++++++- |
42 | src/multimedia/gsttools_headers/qgstappsrc_p.h | 3 + | 43 | src/multimedia/gsttools_headers/qgstappsrc_p.h | 3 + |
43 | .../qgstreameraudioprobecontrol_p.h | 5 +- | 44 | .../qgstreameraudioprobecontrol_p.h | 5 +- |
44 | .../qgstreamervideoprobecontrol_p.h | 4 + | 45 | .../qgstreamervideoprobecontrol_p.h | 4 + |
@@ -58,7 +59,7 @@ Conflicts: | |||
58 | .../mediaplayer/qgstreamerplayerserviceplugin.cpp | 27 ++- | 59 | .../mediaplayer/qgstreamerplayerserviceplugin.cpp | 27 ++- |
59 | .../mediaplayer/qgstreamerplayersession.cpp | 154 ++++++++++++++-- | 60 | .../mediaplayer/qgstreamerplayersession.cpp | 154 ++++++++++++++-- |
60 | .../mediaplayer/qgstreamerplayersession.h | 9 + | 61 | .../mediaplayer/qgstreamerplayersession.h | 9 + |
61 | 36 files changed, 872 insertions(+), 130 deletions(-) | 62 | 36 files changed, 871 insertions(+), 129 deletions(-) |
62 | 63 | ||
63 | diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro | 64 | diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro |
64 | index 02a7e34..6b9843a 100644 | 65 | index 02a7e34..6b9843a 100644 |
@@ -772,7 +773,7 @@ index 2b66f76..804dce9 100644 | |||
772 | #include <gst/gst.h> | 773 | #include <gst/gst.h> |
773 | 774 | ||
774 | diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp | 775 | diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp |
775 | index 4960187..230fbf4 100644 | 776 | index b26369a..23674bb 100644 |
776 | --- a/src/gsttools/qgstreamervideowidget.cpp | 777 | --- a/src/gsttools/qgstreamervideowidget.cpp |
777 | +++ b/src/gsttools/qgstreamervideowidget.cpp | 778 | +++ b/src/gsttools/qgstreamervideowidget.cpp |
778 | @@ -40,8 +40,13 @@ | 779 | @@ -40,8 +40,13 @@ |
@@ -789,7 +790,7 @@ index 4960187..230fbf4 100644 | |||
789 | 790 | ||
790 | QT_BEGIN_NAMESPACE | 791 | QT_BEGIN_NAMESPACE |
791 | 792 | ||
792 | @@ -164,9 +169,13 @@ bool QGstreamerVideoWidgetControl::processSyncMessage(const QGstreamerMessage &m | 793 | @@ -161,9 +166,13 @@ bool QGstreamerVideoWidgetControl::processSyncMessage(const QGstreamerMessage &m |
793 | { | 794 | { |
794 | GstMessage* gm = message.rawMessage(); | 795 | GstMessage* gm = message.rawMessage(); |
795 | 796 | ||
@@ -804,7 +805,7 @@ index 4960187..230fbf4 100644 | |||
804 | setOverlay(); | 805 | setOverlay(); |
805 | QMetaObject::invokeMethod(this, "updateNativeVideoSize", Qt::QueuedConnection); | 806 | QMetaObject::invokeMethod(this, "updateNativeVideoSize", Qt::QueuedConnection); |
806 | return true; | 807 | return true; |
807 | @@ -194,18 +203,29 @@ bool QGstreamerVideoWidgetControl::processBusMessage(const QGstreamerMessage &me | 808 | @@ -191,18 +200,29 @@ bool QGstreamerVideoWidgetControl::processBusMessage(const QGstreamerMessage &me |
808 | 809 | ||
809 | void QGstreamerVideoWidgetControl::setOverlay() | 810 | void QGstreamerVideoWidgetControl::setOverlay() |
810 | { | 811 | { |
@@ -835,7 +836,7 @@ index 4960187..230fbf4 100644 | |||
835 | 836 | ||
836 | if (caps) { | 837 | if (caps) { |
837 | m_widget->setNativeSize(QGstUtils::capsCorrectedResolution(caps)); | 838 | m_widget->setNativeSize(QGstUtils::capsCorrectedResolution(caps)); |
838 | @@ -220,8 +240,13 @@ void QGstreamerVideoWidgetControl::updateNativeVideoSize() | 839 | @@ -217,8 +237,13 @@ void QGstreamerVideoWidgetControl::updateNativeVideoSize() |
839 | 840 | ||
840 | void QGstreamerVideoWidgetControl::windowExposed() | 841 | void QGstreamerVideoWidgetControl::windowExposed() |
841 | { | 842 | { |
@@ -1134,7 +1135,7 @@ index 18702ec..93f22f5 100644 | |||
1134 | } | 1135 | } |
1135 | 1136 | ||
1136 | diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp | 1137 | diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp |
1137 | index f3e2d88..a964e82 100644 | 1138 | index f3e2d88..94aaee7 100644 |
1138 | --- a/src/gsttools/qvideosurfacegstsink.cpp | 1139 | --- a/src/gsttools/qvideosurfacegstsink.cpp |
1139 | +++ b/src/gsttools/qvideosurfacegstsink.cpp | 1140 | +++ b/src/gsttools/qvideosurfacegstsink.cpp |
1140 | @@ -43,7 +43,11 @@ | 1141 | @@ -43,7 +43,11 @@ |
@@ -1317,11 +1318,10 @@ index f3e2d88..a964e82 100644 | |||
1317 | "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, INT_MAX, 1, | 1318 | "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, INT_MAX, 1, |
1318 | "width" , GST_TYPE_INT_RANGE, 1, INT_MAX, | 1319 | "width" , GST_TYPE_INT_RANGE, 1, INT_MAX, |
1319 | "height" , GST_TYPE_INT_RANGE, 1, INT_MAX, | 1320 | "height" , GST_TYPE_INT_RANGE, 1, INT_MAX, |
1320 | - "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, | ||
1321 | +#if GST_CHECK_VERSION(1,0,0) | 1321 | +#if GST_CHECK_VERSION(1,0,0) |
1322 | + "format" , G_TYPE_STRING, gst_video_format_to_string(qt_yuvColorLookup[index].vfmt), | 1322 | + "format" , G_TYPE_STRING, gst_video_format_to_string(qt_yuvColorLookup[index].vfmt), |
1323 | +#else | 1323 | +#else |
1324 | + "format" , G_TYPE_STRING, qt_yuvColorLookup[index].fourcc, | 1324 | "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, |
1325 | +#endif | 1325 | +#endif |
1326 | NULL)); | 1326 | NULL)); |
1327 | continue; | 1327 | continue; |
@@ -2365,5 +2365,5 @@ index f2e760a..50bda3d 100644 | |||
2365 | 2365 | ||
2366 | QT_END_NAMESPACE | 2366 | QT_END_NAMESPACE |
2367 | -- | 2367 | -- |
2368 | 2.3.1 | 2368 | 2.3.5 |
2369 | 2369 | ||
diff --git a/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch b/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch deleted file mode 100644 index 1654e00d..00000000 --- a/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From b5c058f62a79efa213e4492ac7209b3a92f45e3b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 5 Jul 2014 09:10:02 +0200 | ||
4 | Subject: [PATCH 2/2] qtmultimedia.pro: Respect | ||
5 | OE_GSTREAMER_ENABLED,OE_GSTREAMER010_ENABLED and OE_OPENAL_ENABLED | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | qtmultimedia.pro | 21 ++++++++++++--------- | ||
10 | 1 file changed, 12 insertions(+), 9 deletions(-) | ||
11 | |||
12 | diff --git a/qtmultimedia.pro b/qtmultimedia.pro | ||
13 | index 109dd81..54b67a8 100644 | ||
14 | --- a/qtmultimedia.pro | ||
15 | +++ b/qtmultimedia.pro | ||
16 | @@ -1,7 +1,7 @@ | ||
17 | requires(qtHaveModule(gui)) | ||
18 | |||
19 | load(configure) | ||
20 | -qtCompileTest(openal) | ||
21 | +OE_OPENAL_ENABLED:qtCompileTest(openal) | ||
22 | win32 { | ||
23 | qtCompileTest(directshow) { | ||
24 | qtCompileTest(wshellitem) | ||
25 | @@ -18,14 +18,17 @@ win32 { | ||
26 | qtCompileTest(alsa) | ||
27 | qtCompileTest(pulseaudio) | ||
28 | !done_config_gstreamer { | ||
29 | - gstver=1.0 | ||
30 | - cache(GST_VERSION, set, gstver); | ||
31 | - qtCompileTest(gstreamer) { | ||
32 | - qtCompileTest(gstreamer_photography) | ||
33 | - qtCompileTest(gstreamer_encodingprofiles) | ||
34 | - qtCompileTest(gstreamer_appsrc) | ||
35 | - qtCompileTest(linux_v4l) | ||
36 | - } else { | ||
37 | + OE_GSTREAMER_ENABLED { | ||
38 | + gstver=1.0 | ||
39 | + cache(GST_VERSION, set, gstver); | ||
40 | + qtCompileTest(gstreamer) { | ||
41 | + qtCompileTest(gstreamer_photography) | ||
42 | + qtCompileTest(gstreamer_encodingprofiles) | ||
43 | + qtCompileTest(gstreamer_appsrc) | ||
44 | + qtCompileTest(linux_v4l) | ||
45 | + } | ||
46 | + } | ||
47 | + !OE_GSTREAMER_ENABLED:OE_GSTREAMER010_ENABLED { | ||
48 | gstver=0.10 | ||
49 | cache(GST_VERSION, set, gstver); | ||
50 | # Force a re-run of the test | ||
51 | -- | ||
52 | 2.1.3 | ||
53 | |||
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index fa8d67c1..17951699 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "0e161675e6014faeeaa490a9c73a62c1577c674e" | 4 | SRCREV = "6fe3061c1f6b7438d20c7bfb92c7652cedc5b049" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 6991e0ee..7cc23d5c 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "41119e843f099ce7d80f966cc754324bfe0f063f" | 4 | SRCREV = "c78f720de6de9340492f8395109252919283a955" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 1b33c0ee..ddc4ccfc 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "e10dcd4c98631d1d433073b43101b8c36be05520" | 4 | SRCREV = "de9145dcd904068256e28e130fdfda2e8014efe8" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index a1d41729..4b99e381 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "e12a92d71f2910c961a6ea7d6b28f7c9f55b4e96" | 4 | SRCREV = "822df36f252c5a16cdf82f5666f36e7011df46c4" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 14a99498..982b2f72 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "a6a01b612fdb162378c4c184351e7cb8e5a559a0" | 4 | SRCREV = "26c99a8f7832a5549d315ad434e038ae3964e224" |
diff --git a/recipes-qt/qt5/qtserialport-git/0001-Unix-Clear-serial_struct-instances.patch b/recipes-qt/qt5/qtserialport-git/0001-Unix-Clear-serial_struct-instances.patch index b14cf013..d0f4eb9b 100644 --- a/recipes-qt/qt5/qtserialport-git/0001-Unix-Clear-serial_struct-instances.patch +++ b/recipes-qt/qt5/qtserialport-git/0001-Unix-Clear-serial_struct-instances.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 53afe73154c7c00b54cd280fa3d6c9127a2bc84b Mon Sep 17 00:00:00 2001 | 1 | From cdaa89e30e12d247a8086763d341e5f020151b67 Mon Sep 17 00:00:00 2001 |
2 | From: Jonathan Liu <net147@gmail.com> | 2 | From: Jonathan Liu <net147@gmail.com> |
3 | Date: Mon, 9 Mar 2015 22:35:56 +1100 | 3 | Date: Mon, 9 Mar 2015 22:35:56 +1100 |
4 | Subject: [PATCH] Unix: Clear serial_struct instances | 4 | Subject: [PATCH] Unix: Clear serial_struct instances |
@@ -16,10 +16,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
16 | 1 file changed, 4 insertions(+) | 16 | 1 file changed, 4 insertions(+) |
17 | 17 | ||
18 | diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp | 18 | diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp |
19 | index 34ef41d..7cf356b 100644 | 19 | index cda73b2..62c454c 100644 |
20 | --- a/src/serialport/qserialport_unix.cpp | 20 | --- a/src/serialport/qserialport_unix.cpp |
21 | +++ b/src/serialport/qserialport_unix.cpp | 21 | +++ b/src/serialport/qserialport_unix.cpp |
22 | @@ -439,6 +439,8 @@ QSerialPortPrivate::setStandardBaudRate(qint32 baudRate, QSerialPort::Directions | 22 | @@ -451,6 +451,8 @@ QSerialPortPrivate::setStandardBaudRate(qint32 baudRate, QSerialPort::Directions |
23 | { | 23 | { |
24 | struct serial_struct currentSerialInfo; | 24 | struct serial_struct currentSerialInfo; |
25 | 25 | ||
@@ -28,7 +28,7 @@ index 34ef41d..7cf356b 100644 | |||
28 | if ((::ioctl(descriptor, TIOCGSERIAL, ¤tSerialInfo) != -1) | 28 | if ((::ioctl(descriptor, TIOCGSERIAL, ¤tSerialInfo) != -1) |
29 | && (currentSerialInfo.flags & ASYNC_SPD_CUST)) { | 29 | && (currentSerialInfo.flags & ASYNC_SPD_CUST)) { |
30 | currentSerialInfo.flags &= ~ASYNC_SPD_CUST; | 30 | currentSerialInfo.flags &= ~ASYNC_SPD_CUST; |
31 | @@ -469,6 +471,8 @@ QSerialPortPrivate::setCustomBaudRate(qint32 baudRate, QSerialPort::Directions d | 31 | @@ -481,6 +483,8 @@ QSerialPortPrivate::setCustomBaudRate(qint32 baudRate, QSerialPort::Directions d |
32 | 32 | ||
33 | struct serial_struct currentSerialInfo; | 33 | struct serial_struct currentSerialInfo; |
34 | 34 | ||
@@ -38,5 +38,5 @@ index 34ef41d..7cf356b 100644 | |||
38 | return decodeSystemError(); | 38 | return decodeSystemError(); |
39 | 39 | ||
40 | -- | 40 | -- |
41 | 2.3.2 | 41 | 2.3.5 |
42 | 42 | ||
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 7eb98b46..ea253d6f 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb | |||
@@ -6,4 +6,4 @@ QT_MODULE_BRANCH = "dev" | |||
6 | # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 | 6 | # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 |
7 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.4 | 7 | # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.4 |
8 | 8 | ||
9 | SRCREV = "44f70d99a2ecd5f3f320650461f1d69142d11bcc" | 9 | SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3" |
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index ec58a115..cb12fc1e 100644 --- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4d4794880eecd27b006b4d00f44c611162d24538 Mon Sep 17 00:00:00 2001 | 1 | From 6d3adbdeee29af76b41a319016dfd396659ac0b0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.jansa@gmail.com> | 2 | From: Martin Jansa <Martin.jansa@gmail.com> |
3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert |
@@ -151,5 +151,5 @@ index df240e3..27ee687 100644 | |||
151 | installed_cmake.depends = cmake | 151 | installed_cmake.depends = cmake |
152 | 152 | ||
153 | -- | 153 | -- |
154 | 2.3.1 | 154 | 2.3.5 |
155 | 155 | ||
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch index f473041c..72fc3a47 100644 --- a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d6fd9b34cd507b054e20c61aaf8bee4bf800abb1 Mon Sep 17 00:00:00 2001 | 1 | From 5bf38c5d5555ddcaea4a601fdfa304b3f0e5b943 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries |
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 2.3.1 | 31 | 2.3.5 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch index 6eb4d840..7ceb84a3 100644 --- a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9868ff8a11f36712f9bc2fe45ad129214994947a Mon Sep 17 00:00:00 2001 | 1 | From c9f7a83107d01b30cb150f7783441fe73003cfa1 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH 3/3] add noqtwebkit configuration | 4 | Subject: [PATCH 3/3] add noqtwebkit configuration |
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 | |||
47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt | 47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt |
48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget | 48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget |
49 | -- | 49 | -- |
50 | 2.3.1 | 50 | 2.3.5 |
51 | 51 | ||
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb index 159f1ba7..bbaafc52 100644 --- a/recipes-qt/qt5/qttools-native_git.bb +++ b/recipes-qt/qt5/qttools-native_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "638c278b76c56a51f83ef8c5cc9c03f18a887f74" | 4 | SRCREV = "7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ |
7 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ | 7 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 159f1ba7..bbaafc52 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "638c278b76c56a51f83ef8c5cc9c03f18a887f74" | 4 | SRCREV = "7f5b11a4a6357d2969e5b24bfb25c47aeb3d99f5" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ |
7 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ | 7 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index fba976dc..a16b6fff 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "35a64da9fd6fa38e92373798ed17f6cab73586ef" | 4 | SRCREV = "1224b6890e0b0971e5eeea9f52d806f1890de0ed" |
diff --git a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch index 21cc637d..e1a41db3 100644 --- a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch +++ b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 256ceb71a2f56060a2716075b8258ad68d992b73 Mon Sep 17 00:00:00 2001 | 1 | From 90fc9f3f059c19e84ffd29718482a2f06ec3f0bf Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 | 3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 |
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | 4 | Subject: [PATCH] examples/wayland: include server-buffer only when building |
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644 | |||
27 | + } | 27 | + } |
28 | } | 28 | } |
29 | -- | 29 | -- |
30 | 2.3.1 | 30 | 2.3.5 |
31 | 31 | ||
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 200f5861..3be3e510 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bb +++ b/recipes-qt/qt5/qtwayland-native_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "1e32e71403a6a9cb117343464fbc34564598e831" | 4 | SRCREV = "d5e7965a87d81e2d7157c785403b0aba681de62a" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index f03bcb55..93ef54aa 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "1e32e71403a6a9cb117343464fbc34564598e831" | 4 | SRCREV = "d5e7965a87d81e2d7157c785403b0aba681de62a" |
5 | 5 | ||
6 | SRC_URI += " \ | 6 | SRC_URI += " \ |
7 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ | 7 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index f9267dcf..134133b3 100644 --- a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 09f65b11a89e90ac115fad2403d22c723b287f31 Mon Sep 17 00:00:00 2001 | 1 | From b6ca6c086aa21985e17d11592a830f18159f1c3b Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 | 3 | Date: Mon, 30 Jun 2014 20:08:17 +0200 |
4 | Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H | 4 | Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H |
@@ -25,5 +25,5 @@ index 4c2547d..64c08ad 100644 | |||
25 | } | 25 | } |
26 | 26 | ||
27 | -- | 27 | -- |
28 | 2.3.1 | 28 | 2.3.5 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index cbd67cf7..8d1c5fd1 100644 --- a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 22c68425fb780c435267a867677ec0f54d7dbcd2 Mon Sep 17 00:00:00 2001 | 1 | From cfe706846298d41defbf0386f85b17e70108b7af Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to |
@@ -25,5 +25,5 @@ index 64c08ad..b46478b 100644 | |||
25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) | 25 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) |
26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) | 26 | out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) |
27 | -- | 27 | -- |
28 | 2.3.1 | 28 | 2.3.5 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index 57bac32a..4e5e4530 100644 --- a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c2b2432649b15b4d7fcec24dd68501c4613e010a Mon Sep 17 00:00:00 2001 | 1 | From 9595a2dd48dbf45ba1661cf1fd4d38fac8192a4f Mon Sep 17 00:00:00 2001 |
2 | From: Frieder Schrempf <frieder.schrempf@online.de> | 2 | From: Frieder Schrempf <frieder.schrempf@online.de> |
3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 | 3 | Date: Mon, 1 Dec 2014 14:34:40 +0000 |
4 | Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform | 4 | Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform |
@@ -25,5 +25,5 @@ index b46478b..6205bf4 100644 | |||
25 | 25 | ||
26 | skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") | 26 | skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") |
27 | -- | 27 | -- |
28 | 2.3.1 | 28 | 2.3.5 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 45b1d8cd..81c53335 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -11,8 +11,8 @@ SRC_URI += " \ | |||
11 | file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ | 11 | file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ |
12 | file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ | 12 | file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ |
13 | " | 13 | " |
14 | SRCREV_qtwebengine = "8b2cb3b6b4546d333ff7d265d3875d2ed46c2c0a" | 14 | SRCREV_qtwebengine = "b0c48cb3a0c9630899a357fb8a01ba13ccad5395" |
15 | SRCREV_chromium = "f9c03801de86b5e9da2b915a9e490c2f2254fecf" | 15 | SRCREV_chromium = "140893bef70011645c686f5fabe45018dd2e392a" |
16 | SRCREV = "${SRCREV_qtwebengine}" | 16 | SRCREV = "${SRCREV_qtwebengine}" |
17 | 17 | ||
18 | SRCREV_FORMAT = "qtwebengine" | 18 | SRCREV_FORMAT = "qtwebengine" |
diff --git a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch index e6d9199c..dd73fe67 100644 --- a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch +++ b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 71c988d599f624aa78772f9d68aa637d420e69c2 Mon Sep 17 00:00:00 2001 | 1 | From 52f75c43702ab04f3426025eea80155aa27b3422 Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Tue, 8 Oct 2013 00:18:10 -0400 | 3 | Date: Tue, 8 Oct 2013 00:18:10 -0400 |
4 | Subject: [PATCH] qtwebkit-examples: enable building examples by default | 4 | Subject: [PATCH] qtwebkit-examples: enable building examples by default |
@@ -25,5 +25,5 @@ index 3fcecf1..2da8a36 100644 | |||
25 | -SUBDIRS += doc | 25 | -SUBDIRS += doc |
26 | +SUBDIRS += doc examples | 26 | +SUBDIRS += doc examples |
27 | -- | 27 | -- |
28 | 2.3.1 | 28 | 2.3.5 |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 0414cbb3..7225ae52 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "69a9c9193abe008a9a52640b19a409e4a86c4899" | 4 | SRCREV = "734663277730bc20dacf0a6b07427002a53cc107" |
diff --git a/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index 3c6c4d3f..886a954d 100644 --- a/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 83a7ef8c92b4363bd0aa372c804858c5882db0af Mon Sep 17 00:00:00 2001 | 1 | From b3d43d2b8c1e11122ac36e3e0b102c2ffef83010 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | 2 | From: Trevor Woerner <trevor.woerner@linaro.org> |
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | 3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 |
4 | Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) | 4 | Subject: [PATCH 1/2] qtwebkit: fix QA issue (bad RPATH) |
5 | 5 | ||
6 | Building qtwebkit causes a QA issue such that QtWebPluginProcess and | 6 | Building qtwebkit causes a QA issue such that QtWebPluginProcess and |
7 | QtWebProcess contain bad RPATHs which point into the build location. This fix | 7 | QtWebProcess contain bad RPATHs which point into the build location. This fix |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 deletion(-) | 14 | 1 file changed, 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf | 16 | diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf |
17 | index 9c52406..a68a101 100644 | 17 | index fd66af6..ef754c3 100644 |
18 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf | 18 | --- a/Tools/qmake/mkspecs/features/unix/default_post.prf |
19 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf | 19 | +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf |
20 | @@ -59,7 +59,6 @@ linux-*g++* { | 20 | @@ -61,7 +61,6 @@ linux-*g++* { |
21 | } | 21 | } |
22 | } | 22 | } |
23 | 23 | ||
@@ -26,5 +26,5 @@ index 9c52406..a68a101 100644 | |||
26 | CONFIG(debug, debug|release)|force_debug_info { | 26 | CONFIG(debug, debug|release)|force_debug_info { |
27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | 27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. |
28 | -- | 28 | -- |
29 | 2.1.3 | 29 | 2.3.5 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtwebkit-git/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit-git/0002-Remove-TEXTREL-tag-in-x86.patch new file mode 100644 index 00000000..de21a7c3 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-git/0002-Remove-TEXTREL-tag-in-x86.patch | |||
@@ -0,0 +1,79 @@ | |||
1 | From 491cbd653eb7b992202f06bd2e62cf29f5f495af Mon Sep 17 00:00:00 2001 | ||
2 | From: Magnus Granberg <zorry@gentoo.org> | ||
3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 | ||
4 | Subject: [PATCH 2/2] Remove TEXTREL tag in x86 | ||
5 | |||
6 | Fix textrel QA warnings when building qtwebkit for x86: | ||
7 | |||
8 | WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel] | ||
9 | |||
10 | Patch from upstream webkit: | ||
11 | |||
12 | https://bugs.webkit.org/show_bug.cgi?id=70610 | ||
13 | |||
14 | Minor refresh required to apply cleanly to the older webkit sources used | ||
15 | by qtwebkit. Specifically, the patch needed to be modified to account | ||
16 | for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not | ||
17 | part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ). | ||
18 | |||
19 | Upstream status [webkit] : backport | ||
20 | Upstream status [qtwebkit] : unclear | ||
21 | |||
22 | Bug: https://bugs.webkit.org/show_bug.cgi?id=70610 | ||
23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
24 | --- | ||
25 | Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++ | ||
26 | Source/WTF/wtf/InlineASM.h | 2 ++ | ||
27 | 2 files changed, 26 insertions(+) | ||
28 | |||
29 | diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp | ||
30 | index 9684df2..8af82d8 100644 | ||
31 | --- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp | ||
32 | +++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp | ||
33 | @@ -524,6 +524,30 @@ double jsRound(double d) | ||
34 | } \ | ||
35 | static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; | ||
36 | |||
37 | +#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__) | ||
38 | +#define defineUnaryDoubleOpWrapper(function) \ | ||
39 | + asm( \ | ||
40 | + ".text\n" \ | ||
41 | + ".globl " SYMBOL_STRING(function##Thunk) "\n" \ | ||
42 | + HIDE_SYMBOL(function##Thunk) "\n" \ | ||
43 | + SYMBOL_STRING(function##Thunk) ":" "\n" \ | ||
44 | + "pushl %ebx\n" \ | ||
45 | + "subl $20, %esp\n" \ | ||
46 | + "movsd %xmm0, (%esp) \n" \ | ||
47 | + "call __x86.get_pc_thunk.bx\n" \ | ||
48 | + "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \ | ||
49 | + "call " GLOBAL_REFERENCE(function) "\n" \ | ||
50 | + "fstpl (%esp) \n" \ | ||
51 | + "movsd (%esp), %xmm0 \n" \ | ||
52 | + "addl $20, %esp\n" \ | ||
53 | + "popl %ebx\n" \ | ||
54 | + "ret\n" \ | ||
55 | + );\ | ||
56 | + extern "C" { \ | ||
57 | + MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \ | ||
58 | + } \ | ||
59 | + static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; | ||
60 | + | ||
61 | #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX)) | ||
62 | #define defineUnaryDoubleOpWrapper(function) \ | ||
63 | asm( \ | ||
64 | diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h | ||
65 | index 0a2fe78..2dc40ef 100644 | ||
66 | --- a/Source/WTF/wtf/InlineASM.h | ||
67 | +++ b/Source/WTF/wtf/InlineASM.h | ||
68 | @@ -46,6 +46,8 @@ | ||
69 | #define GLOBAL_REFERENCE(name) #name "@plt" | ||
70 | #elif CPU(X86) && COMPILER(MINGW) | ||
71 | #define GLOBAL_REFERENCE(name) "@" #name "@4" | ||
72 | +#elif OS(LINUX) && CPU(X86) && defined(__PIC__) | ||
73 | +#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt" | ||
74 | #else | ||
75 | #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) | ||
76 | #endif | ||
77 | -- | ||
78 | 2.3.5 | ||
79 | |||
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 1027b4c9..38f2b2b4 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc | |||
@@ -17,7 +17,6 @@ ARM_INSTRUCTION_SET = "arm" | |||
17 | SRC_URI += "\ | 17 | SRC_URI += "\ |
18 | file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ | 18 | file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ |
19 | file://0002-Remove-TEXTREL-tag-in-x86.patch \ | 19 | file://0002-Remove-TEXTREL-tag-in-x86.patch \ |
20 | file://0003-Fix-building-with-glib-2.43.patch \ | ||
21 | " | 20 | " |
22 | 21 | ||
23 | PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel" | 22 | PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel" |
diff --git a/recipes-qt/qt5/qtwebkit_5.4.1.bb b/recipes-qt/qt5/qtwebkit_5.4.1.bb index 9c8d59f6..909696b2 100644 --- a/recipes-qt/qt5/qtwebkit_5.4.1.bb +++ b/recipes-qt/qt5/qtwebkit_5.4.1.bb | |||
@@ -1,5 +1,9 @@ | |||
1 | require qt5-${PV}.inc | 1 | require qt5-${PV}.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRC_URI += "\ | ||
5 | file://0003-Fix-building-with-glib-2.43.patch \ | ||
6 | " | ||
7 | |||
4 | SRC_URI[md5sum] = "186627b1ea5b614811fbd0cfa9b4d073" | 8 | SRC_URI[md5sum] = "186627b1ea5b614811fbd0cfa9b4d073" |
5 | SRC_URI[sha256sum] = "6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf" | 9 | SRC_URI[sha256sum] = "6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index c7f25c06..3d391783 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "67aba37ab361fc117366e283365920013b8d8464" | 4 | SRCREV = "738ad7e37c66f2afdbc7a77aff3ab7fa510361a2" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 2913d88d..4c96e256 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require qt5-git.inc | 1 | require qt5-git.inc |
2 | require ${PN}.inc | 2 | require ${PN}.inc |
3 | 3 | ||
4 | SRCREV = "fc2b42c874fb41487b86700a04e932e2afaded94" | 4 | SRCREV = "5b469aa3c4d6b9c68feb9cf92d03614077518894" |