diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-09-28 12:56:37 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 12:56:37 -0300 |
| commit | f353e9ac5a3c6a991933e83a8d755ea466e40165 (patch) | |
| tree | 5366b9b3d1bd63587729c9918f4ccad6123a8922 | |
| parent | c4347b507c2ba0d7eb3917303f83631244bf5048 (diff) | |
| parent | 2c964eca3fb462269518b91f7946dfdc7c1e55f1 (diff) | |
| download | meta-freescale-f353e9ac5a3c6a991933e83a8d755ea466e40165.tar.gz | |
Merge pull request #1233 from Freescale/backport-1232-to-dunfell
[Backport dunfell] qt4-imx-support: fix build for imxgpu2d SOCs
3 files changed, 20 insertions, 0 deletions
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc index 187681a8..6b25767b 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc | |||
| @@ -12,6 +12,8 @@ SRC_URI_append_imxgpu2d += " \ | |||
| 12 | file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ | 12 | file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ |
| 13 | file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ | 13 | file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ |
| 14 | file://0003-i.MX6-force-egl-visual-ID-33.patch \ | 14 | file://0003-i.MX6-force-egl-visual-ID-33.patch \ |
| 15 | file://egl-pro-add-defines-to-compile-with-viv-fb.patch \ | ||
| 16 | file://egl4gles1-pro-add-defines-to-compile-with-viv-fb.patch \ | ||
| 15 | " | 17 | " |
| 16 | 18 | ||
| 17 | DEPENDS_append_imxgpu2d = " virtual/kernel virtual/libgles2" | 19 | DEPENDS_append_imxgpu2d = " virtual/kernel virtual/libgles2" |
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl-pro-add-defines-to-compile-with-viv-fb.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl-pro-add-defines-to-compile-with-viv-fb.patch new file mode 100644 index 00000000..e512fd47 --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl-pro-add-defines-to-compile-with-viv-fb.patch | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | --- a/config.tests/unix/egl/egl.pro 2015-05-07 16:14:42.000000000 +0200 | ||
| 2 | +++ b/config.tests/unix/egl/egl.pro 2022-09-28 15:36:53.819893439 +0200 | ||
| 3 | @@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { | ||
| 4 | |||
| 5 | !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL | ||
| 6 | !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL | ||
| 7 | +DEFINES += LINUX=1 EGL_API_FB=1 | ||
| 8 | |||
| 9 | CONFIG -= qt | ||
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl4gles1-pro-add-defines-to-compile-with-viv-fb.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl4gles1-pro-add-defines-to-compile-with-viv-fb.patch new file mode 100644 index 00000000..61b40eb7 --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl4gles1-pro-add-defines-to-compile-with-viv-fb.patch | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | --- a/config.tests/unix/egl4gles1/egl4gles1.pro 2015-05-07 16:14:42.000000000 +0200 | ||
| 2 | +++ b/config.tests/unix/egl4gles1/egl4gles1.pro 2022-09-28 15:36:53.827893490 +0200 | ||
| 3 | @@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { | ||
| 4 | |||
| 5 | !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL | ||
| 6 | !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL | ||
| 7 | +DEFINES += LINUX=1 EGL_API_FB=1 | ||
| 8 | |||
| 9 | CONFIG -= qt | ||