diff options
author | Mauro Salvini <m.salvini@koansoftware.com> | 2022-09-29 16:15:52 +0200 |
---|---|---|
committer | Mauro Salvini <m.salvini@koansoftware.com> | 2022-10-03 12:09:20 +0200 |
commit | d2107e1927c18b3a93f853708e3c8ae71cdc5df1 (patch) | |
tree | ad0802d4251433d8ebe21cdddae25e736c3a75af | |
parent | 4aed4a58335af8e96815124f17f47060d1053c48 (diff) | |
download | meta-freescale-d2107e1927c18b3a93f853708e3c8ae71cdc5df1.tar.gz |
qt4-imx-support: change format of patches added by commit 4aed4a5
Patches are the same but now are in git format ad have Signed-off-by
and From fields as required
Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com>
5 files changed, 52 insertions, 20 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 ac009a3a..794a0bad 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,8 +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 \ | 15 | file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \ |
16 | file://egl4gles1-pro-add-defines-to-compile-with-viv-fb.patch \ | 16 | file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | 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/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch new file mode 100644 index 00000000..7eee7cf2 --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 234580de9d63fd79a8b444358cdaeac111a17061 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mauro Salvini <m.salvini@koansoftware.com> | ||
3 | Date: Thu, 29 Sep 2022 16:06:04 +0200 | ||
4 | Subject: [PATCH 1/2] config.tests: add DEFINES to compile egl test with | ||
5 | imxgpu2d (Vivante) | ||
6 | |||
7 | Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> | ||
8 | --- | ||
9 | config.tests/unix/egl/egl.pro | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/config.tests/unix/egl/egl.pro b/config.tests/unix/egl/egl.pro | ||
13 | index f04d0535..bc35b908 100644 | ||
14 | --- a/config.tests/unix/egl/egl.pro | ||
15 | +++ b/config.tests/unix/egl/egl.pro | ||
16 | @@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { | ||
17 | |||
18 | !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL | ||
19 | !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL | ||
20 | +DEFINES += LINUX=1 EGL_API_FB=1 | ||
21 | |||
22 | CONFIG -= qt | ||
23 | -- | ||
24 | 2.17.1 | ||
25 | |||
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch new file mode 100644 index 00000000..993df85e --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From adb19c68d3c92eb1a88e49e447ce827f14943486 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mauro Salvini <m.salvini@koansoftware.com> | ||
3 | Date: Thu, 29 Sep 2022 16:12:11 +0200 | ||
4 | Subject: [PATCH 2/2] config.tests: add DEFINES to compile egl4gles1 test with | ||
5 | imxgpu2d (Vivante) | ||
6 | |||
7 | Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> | ||
8 | --- | ||
9 | config.tests/unix/egl4gles1/egl4gles1.pro | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/config.tests/unix/egl4gles1/egl4gles1.pro b/config.tests/unix/egl4gles1/egl4gles1.pro | ||
13 | index 667ea8e3..14cb4a76 100644 | ||
14 | --- a/config.tests/unix/egl4gles1/egl4gles1.pro | ||
15 | +++ b/config.tests/unix/egl4gles1/egl4gles1.pro | ||
16 | @@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { | ||
17 | |||
18 | !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL | ||
19 | !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL | ||
20 | +DEFINES += LINUX=1 EGL_API_FB=1 | ||
21 | |||
22 | CONFIG -= qt | ||
23 | -- | ||
24 | 2.17.1 | ||
25 | |||
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 deleted file mode 100644 index e512fd47..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl-pro-add-defines-to-compile-with-viv-fb.patch +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
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 deleted file mode 100644 index 61b40eb7..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/egl4gles1-pro-add-defines-to-compile-with-viv-fb.patch +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
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 | ||