diff options
Diffstat (limited to 'src')
12 files changed, 36 insertions, 23 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri index eb8e450f9..c4ccdcc6e 100644 --- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri @@ -7,12 +7,7 @@ contains(QT_CONFIG, no-pkg-config) { LIBS += -lwayland-client } -for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p -} - -LIBS += $$QMAKE_LIBS_EGL -INCLUDEPATH += $$QMAKE_INCDIR_EGL +CONFIG += egl SOURCES += $$PWD/qwaylandbrcmeglintegration.cpp \ $$PWD/qwaylandbrcmglcontext.cpp \ diff --git a/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri b/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri index dbc8dacf9..c3d592a98 100644 --- a/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri +++ b/src/hardwareintegration/client/drm-egl-server/drm-egl-server.pri @@ -1,12 +1,14 @@ INCLUDEPATH += $$PWD contains(QT_CONFIG, no-pkg-config) { - LIBS += -lEGL -lwayland-client + LIBS += -lwayland-client } else { CONFIG += link_pkgconfig - PKGCONFIG += egl wayland-client + PKGCONFIG += wayland-client } +CONFIG += egl + SOURCES += \ $$PWD/drmeglserverbufferintegration.cpp diff --git a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri index 107a96f93..951d28c52 100644 --- a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri +++ b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri @@ -1,11 +1,13 @@ INCLUDEPATH += $$PWD !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig - PKGCONFIG += wayland-client wayland-egl egl + PKGCONFIG += wayland-client wayland-egl } else { - LIBS += -lwayland-egl -lEGL + LIBS += -lwayland-egl } +CONFIG += egl + SOURCES += $$PWD/qwaylandeglclientbufferintegration.cpp \ $$PWD/qwaylandglcontext.cpp \ $$PWD/qwaylandeglwindow.cpp diff --git a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri index 89ec9840d..4435f481b 100644 --- a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri +++ b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri @@ -3,11 +3,13 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri) !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig - PKGCONFIG += wayland-client xcomposite egl x11 + PKGCONFIG += wayland-client xcomposite x11 } else { - LIBS += -lXcomposite -lEGL -lX11 + LIBS += -lXcomposite -lX11 } +CONFIG += egl + SOURCES += \ $$PWD/qwaylandxcompositeeglcontext.cpp \ $$PWD/qwaylandxcompositeeglclientbufferintegration.cpp \ diff --git a/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri b/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri index cd2e24719..2ed5db686 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri +++ b/src/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri @@ -1,12 +1,14 @@ INCLUDEPATH += $$PWD contains(QT_CONFIG, no-pkg-config) { - LIBS += -lwayland-server -lEGL + LIBS += -lwayland-server } else { CONFIG += link_pkgconfig - PKGCONFIG += wayland-server egl + PKGCONFIG += wayland-server } +CONFIG += egl + SOURCES += \ $$PWD/drmeglserverbufferintegration.cpp diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri b/src/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri index 84d901351..5cbcb6b7c 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri @@ -1,12 +1,14 @@ INCLUDEPATH += $$PWD contains(QT_CONFIG, no-pkg-config) { - LIBS += -lwayland-server -lEGL + LIBS += -lwayland-server } else { CONFIG += link_pkgconfig - PKGCONFIG += wayland-server egl + PKGCONFIG += wayland-server } +CONFIG += egl + SOURCES += \ $$PWD/libhybriseglserverbufferintegration.cpp diff --git a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri index 2d4771a2a..8dacc130b 100644 --- a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri +++ b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri @@ -2,11 +2,13 @@ INCLUDEPATH += $$PWD !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig - PKGCONFIG += wayland-server wayland-egl egl + PKGCONFIG += wayland-server wayland-egl } else { - LIBS += -lwayland-egl -lwayland-server -lEGL + LIBS += -lwayland-egl -lwayland-server } +CONFIG += egl + SOURCES += \ $$PWD/waylandeglclientbufferintegration.cpp diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index e28d2f53e..9b62d082d 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -59,6 +59,10 @@ #define GL_TEXTURE_EXTERNAL_OES 0x8D65 #endif +#ifndef EGL_WAYLAND_BUFFER_WL +#define EGL_WAYLAND_BUFFER_WL 0x31D5 +#endif + /* Needed for compatibility with Mesa older than 10.0. */ typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWL_compat) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri b/src/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri index cde790bdc..d748c2b57 100644 --- a/src/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri +++ b/src/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri @@ -2,11 +2,13 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri) !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig - PKGCONFIG += xcomposite egl x11 wayland-server + PKGCONFIG += xcomposite x11 wayland-server } else { - LIBS += -lXcomposite -lEGL -lX11 + LIBS += -lXcomposite -lX11 } +CONFIG += egl + INCLUDEPATH += $$PWD HEADERS += \ diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro index b7a9b46ee..37a90ab0d 100644 --- a/src/plugins/hardwareintegration/client/client.pro +++ b/src/plugins/hardwareintegration/client/client.pro @@ -7,7 +7,7 @@ config_brcm_egl: \ SUBDIRS += brcm-egl config_xcomposite { - config_egl: \ + contains(QT_CONFIG, egl): \ SUBDIRS += xcomposite-egl !contains(QT_CONFIG, opengles2):config_glx: \ diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro index 215cd2571..1ecfe37a0 100644 --- a/src/plugins/hardwareintegration/compositor/compositor.pro +++ b/src/plugins/hardwareintegration/compositor/compositor.pro @@ -6,7 +6,7 @@ config_brcm_egl: \ SUBDIRS += brcm-egl config_xcomposite { - config_egl: \ + contains(QT_CONFIG, egl): \ SUBDIRS += xcomposite-egl !contains(QT_CONFIG, opengles2):config_glx: \ diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index 0665511c5..43c02be03 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -13,7 +13,7 @@ contains(CONFIG, wayland-compositor) { SUBDIRS += qwayland-brcm-egl config_xcomposite { - config_egl: \ + contains(QT_CONFIG, egl): \ SUBDIRS += qwayland-xcomposite-egl !contains(QT_CONFIG, opengles2):config_glx: \ SUBDIRS += qwayland-xcomposite-glx |