Pass -DMESA_EGL_NO_X11_HEADERS=1 when x is disabled

PATCH In review Khem Raj 2 participants 5 messages Mar 8, 2018 – Mar 9, 2018

lore

Share & tools

lore

Khem Raj

author

2018-03-08 17:43 UTC #0 lore raw

PATCH 1/1 Pass -DMESA_EGL_NO_X11_HEADERS=1 when x is disabled

Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h

Fixes

| In file included from /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/egl.h:36:0,
|                  from .moc/../../../../../../git/src/plugins/videonode/egl/qsgvideonode_egl.h:48,
|                  from .moc/moc_qsgvideonode_egl.cpp:9:
| /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:125:10: fatal error: X11/Xlib.h: No such file or directory
|  #include <X11/Xlib.h>
|           ^~~~~~~~~~~~
| compilation terminated.
| make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1

Signed-off-by Khem Raj <[email protected]>

---
 recipes-qt/qt5/qtmultimedia_git.bb | 1 +
 1 file changed, 1 insertion(+)

recipes-qt/qt5/qtmultimedia_git.bb +1 -0

index 2cb1bd5..efe848f 100644
@@ -25,6 +25,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 # Disable GStreamer if completely disabled
 EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
 
+CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}"
 # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10
 # 5.10.meta-qt5.2
 SRC_URI += "\

Signature · 1 line

2.16.2

Andre McCurdy

2018-03-08 22:07 UTC #1 lore raw

Quoted 2 lines · Khem Raj

Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h

Would it be better to patch the header directly rather than try to arrange that every application which uses it defines the correct CFLAGS?

Quoted 36 lines

Fixes

| In file included from /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/egl.h:36:0,
|                  from .moc/../../../../../../git/src/plugins/videonode/egl/qsgvideonode_egl.h:48,
|                  from .moc/moc_qsgvideonode_egl.cpp:9:
| /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:125:10: fatal error: X11/Xlib.h: No such file or directory
|  #include <X11/Xlib.h>
|           ^~~~~~~~~~~~
| compilation terminated.
| make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1

Signed-off-by Khem Raj <[email protected]>

---
 recipes-qt/qt5/qtmultimedia_git.bb | 1 +
 1 file changed, 1 insertion(+)

recipes-qt/qt5/qtmultimedia_git.bb +1 -1

index 2cb1bd5..efe848f 100644
@@ -25,6 +25,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 # Disable GStreamer if completely disabled
 EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
 
+CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}"
 # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10
 # 5.10.meta-qt5.2
 SRC_URI += "\
--

2.16.2

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Khem Raj

author

2018-03-08 23:22 UTC #2 lore raw

Quoted 7 lines · Andre McCurdy

Quoted 2 lines · Khem Raj
Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h
Would it be better to patch the header directly rather than try to arrange that every application which uses it defines the correct CFLAGS?

It would mean to change all of driver sdk for Mali variants and also Mesa

Quoted 46 lines

Quoted 4 lines
Fixes
| In file included from
/mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/egl.h:36:0,
Quoted 1 line
| from
.moc/../../../../../../git/src/plugins/videonode/egl/qsgvideonode_egl.h:48,
Quoted 2 lines
| from .moc/moc_qsgvideonode_egl.cpp:9:
|
/mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:125:10:
fatal error: X11/Xlib.h: No such file or directory
recipes-qt/qt5/
Quoted 11 lines
|  #include <X11/Xlib.h>
|           ^~~~~~~~~~~~
| compilation terminated.
| make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1
Signed-off-by Khem Raj <[email protected]>
---
 recipes-qt/qt5/qtmultimedia_git.bb | 1 +
 1 file changed, 1 insertion(+)
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtmultimedia_git.bb +0 -0
qtmultimedia_git.bb
recipes-qt/qt5/qtmultimedia_git.bb EXTRA_QMAKEVARS_CONFIGURE +=
Quoted 4 lines
index 2cb1bd5..efe848f 100644
recipes-qt/qt5/qtmultimedia_git.bb +0 -0
@@ -25,6 +25,7 @@ EXTRA_QMAKEVARS_CONFIGURE +=
"${PACKAGECONFIG_CONFARGS}"
recipes-qt/qt5/qtmultimedia_git.bb EXTRA_QMAKEVARS_CONFIGURE += · line 26
Quoted 2 lines
recipes-qt/qt5/qtmultimedia_git.bb +0 -0
 # Disable GStreamer if completely disabled
 EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG',
'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
recipes-qt/qt5/qtmultimedia_git.bb EXTRA_QMAKEVARS_CONFIGURE += · line 27
Quoted 2 lines
recipes-qt/qt5/qtmultimedia_git.bb +1 -0
+CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '',
'-DMESA_EGL_NO_X11_HEADERS=1', d)}"
Quoted 11 lines
recipes-qt/qt5/qtmultimedia_git.bb +0 -1
 # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10
 # 5.10.meta-qt5.2
 SRC_URI += "\
--
2.16.2
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Andre McCurdy

2018-03-09 00:00 UTC #3 lore raw

Quoted 4 lines · Khem Raj

Quoted 2 lines · Andre McCurdy
On Thu, Mar 8, 2018 at 9:43 AM, Khem Raj <[email protected]> wrote:

Quoted 8 lines

Quoted 6 lines
Quoted 2 lines
Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h
Would it be better to patch the header directly rather than try to arrange that every application which uses it defines the correct CFLAGS?
It would mean to change all of driver sdk for Mali variants and also Mesa

So there are more recipes providing eglplatform.h than using it?

OK...

Khem Raj

author

2018-03-09 00:06 UTC #4 lore raw

Quoted 9 lines · Andre McCurdy

Quoted 2 lines · Khem Raj
On Thu, Mar 8, 2018 at 2:07 PM Andre McCurdy <[email protected]>
Quoted 5 lines · wrote:
Quoted 5 lines · Khem Raj
Quoted 2 lines
Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h

Quoted 9 lines

Quoted 5 lines
Quoted 3 lines
Would it be better to patch the header directly rather than try to arrange that every application which uses it defines the correct CFLAGS?
It would mean to change all of driver sdk for Mali variants and also Mesa
So there are more recipes providing eglplatform.h than using it?

It’s not about what’s more or less

Actually egl implentations have provided an interface already via this define and apps should be using these defines to configure themselves

It will be wrong to change the api headers

Quoted 2 lines

OK...