Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'mer-5.6-native2' into 'mer-5.6'
[eglfs] Build eglfs kms plugin. MER#2046

See merge request mer-core/qtbase!46
  • Loading branch information
Matti Kosola committed Jul 12, 2019
2 parents 64c6650 + b976bd5 commit 148a5c7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
Expand Up @@ -3,6 +3,8 @@ SOURCES = eglfs-egldevice.cpp
for(p, QMAKE_LIBDIR_EGL) {
LIBS += -L$$p
}
# Avoid X11 header collision
DEFINES += MESA_EGL_NO_X11_HEADERS

INCLUDEPATH += $$QMAKE_INCDIR_EGL
LIBS += $$QMAKE_LIBS_EGL
Expand Down
6 changes: 6 additions & 0 deletions rpm/qtbase.spec
Expand Up @@ -36,6 +36,8 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(mtdev)
BuildRequires: pkgconfig(libsystemd-journal)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(gbm)
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: flex
Expand Down Expand Up @@ -510,6 +512,8 @@ MAKEFLAGS=%{?_smp_mflags} \
%ifarch aarch64
-no-pch \
%endif
-kms \
-gbm \
-qreal float \
-journald \
-no-use-gold-linker
Expand Down Expand Up @@ -893,6 +897,8 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos
%if %{with X11}
%{_libdir}/qt5/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
%endif
%{_libdir}/qt5/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
%{_libdir}/qt5/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
%{_datadir}/qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri

%files plugin-platform-minimalegl
Expand Down

0 comments on commit 148a5c7

Please sign in to comment.