Message ID | 20170717160939.3159-2-gael.portay@savoirfairelinux.com |
---|---|
State | Superseded |
Headers | show |
Hello, On Mon, 17 Jul 2017 12:09:37 -0400, Gaël PORTAY wrote: > The Qt WebEngine module loads libEGL.so.1 and libGLESv2.so.2 libraries. > Their path are hard-coded [1]. > > This patch sets up cmake to create those library links. > > # ls -l /usr/lib/lib*GL* > lrwxrwxrwx 1 root root 11 Mar 21 17:24 /usr/lib/libEGL.so -> libEGL.so.1 > lrwxrwxrwx 1 root root 15 Mar 21 17:24 /usr/lib/libEGL.so.1 -> libEGL.so.1.0.0 > -rwxr-xr-x 1 root root 163152 Mar 22 14:56 /usr/lib/libEGL.so.1.0.0 > lrwxrwxrwx 1 root root 14 Mar 21 17:24 /usr/lib/libGLESv2.so -> libGLESv2.so.2 > lrwxrwxrwx 1 root root 18 Mar 21 17:24 /usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0 > -rwxr-xr-x 1 root root 78788 Mar 22 14:56 /usr/lib/libGLESv2.so.2.0.0 > > [1] https://github.com/qt/qtwebengine/blob/5.8/src/core/surface_factory_qt.cpp#L76-L86 > > Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> > --- > .../0001-Add-OpenGL-library-versioning.patch | 35 ++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > create mode 100644 package/rpi-userland/0001-Add-OpenGL-library-versioning.patch > > diff --git a/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch b/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch > new file mode 100644 > index 0000000000..ea708f9559 > --- /dev/null > +++ b/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch > @@ -0,0 +1,35 @@ > +From bf388550943afc70798c497e3fc706303394cfdc Mon Sep 17 00:00:00 2001 > +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com> > +Date: Fri, 3 Mar 2017 17:28:41 -0500 > +Subject: [PATCH] Add OpenGL library versioning > + > +Some applications like QtWebEngine dynamically load libraries using > +dlopen. The library name is hardcoded, and it includes the library > +version [1]. > + > +This patch creates symlinks for EGL and GLES libraries. > + > + libEGL.so.1 -> libEGL.so > + libGLESv2.so.2 -> libGLESv2.so > + > +[1] https://github.com/qt/qtwebengine/blob/dev/src/core/surface_factory_qt.cpp#L76-L86 Missing Signed-off-by line here. Has this patch been submitted upstream ? Thanks, Thomas
Hi Thomas, On Tue, Jul 18, 2017 at 09:51:13AM +0200, Thomas Petazzoni wrote: > > diff --git a/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch b/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch > > new file mode 100644 > > index 0000000000..ea708f9559 > > --- /dev/null > > +++ b/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch > > @@ -0,0 +1,35 @@ > > +From bf388550943afc70798c497e3fc706303394cfdc Mon Sep 17 00:00:00 2001 > > +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com> > > +Date: Fri, 3 Mar 2017 17:28:41 -0500 > > +Subject: [PATCH] Add OpenGL library versioning > > + > > +Some applications like QtWebEngine dynamically load libraries using > > +dlopen. The library name is hardcoded, and it includes the library > > +version [1]. > > + > > +This patch creates symlinks for EGL and GLES libraries. > > + > > + libEGL.so.1 -> libEGL.so > > + libGLESv2.so.2 -> libGLESv2.so > > + > > +[1] https://github.com/qt/qtwebengine/blob/dev/src/core/surface_factory_qt.cpp#L76-L86 > > Missing Signed-off-by line here. > I will add it in v4. > Has this patch been submitted upstream ? > Yes, I made a PR[1] couple of month ago. I will ping popcormix. > Thanks, > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com Regards, Gael 1: https://github.com/raspberrypi/userland/pull/379
On 18-07-17 19:32, Gaël PORTAY wrote: >> Has this patch been submitted upstream ? >> > Yes, I made a PR[1] couple of month ago. Please add that URL to the commit log. Regards, Arnout
diff --git a/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch b/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch new file mode 100644 index 0000000000..ea708f9559 --- /dev/null +++ b/package/rpi-userland/0001-Add-OpenGL-library-versioning.patch @@ -0,0 +1,35 @@ +From bf388550943afc70798c497e3fc706303394cfdc Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com> +Date: Fri, 3 Mar 2017 17:28:41 -0500 +Subject: [PATCH] Add OpenGL library versioning + +Some applications like QtWebEngine dynamically load libraries using +dlopen. The library name is hardcoded, and it includes the library +version [1]. + +This patch creates symlinks for EGL and GLES libraries. + + libEGL.so.1 -> libEGL.so + libGLESv2.so.2 -> libGLESv2.so + +[1] https://github.com/qt/qtwebengine/blob/dev/src/core/surface_factory_qt.cpp#L76-L86 +--- + host_applications/android/apps/vidtex/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt +index 1f705ef..d68ae5f 100644 +--- a/host_applications/android/apps/vidtex/CMakeLists.txt ++++ b/host_applications/android/apps/vidtex/CMakeLists.txt +@@ -10,3 +10,8 @@ set (VIDTEX_SOURCES + vidtex.c) + add_executable(vidtex ${VIDTEX_SOURCES}) + target_link_libraries(vidtex GLESv2 EGL m bcm_host mmal_core mmal_components mmal_util mmal_vc_client vcos) ++ ++set(DESTDIR \$ENV{DESTDIR}) ++include(GNUInstallDirs) ++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink libEGL.so ${DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libEGL.so.1)") ++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink libGLESv2.so ${DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libGLESv2.so.2)") +-- +2.12.1 +
The Qt WebEngine module loads libEGL.so.1 and libGLESv2.so.2 libraries. Their path are hard-coded [1]. This patch sets up cmake to create those library links. # ls -l /usr/lib/lib*GL* lrwxrwxrwx 1 root root 11 Mar 21 17:24 /usr/lib/libEGL.so -> libEGL.so.1 lrwxrwxrwx 1 root root 15 Mar 21 17:24 /usr/lib/libEGL.so.1 -> libEGL.so.1.0.0 -rwxr-xr-x 1 root root 163152 Mar 22 14:56 /usr/lib/libEGL.so.1.0.0 lrwxrwxrwx 1 root root 14 Mar 21 17:24 /usr/lib/libGLESv2.so -> libGLESv2.so.2 lrwxrwxrwx 1 root root 18 Mar 21 17:24 /usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0 -rwxr-xr-x 1 root root 78788 Mar 22 14:56 /usr/lib/libGLESv2.so.2.0.0 [1] https://github.com/qt/qtwebengine/blob/5.8/src/core/surface_factory_qt.cpp#L76-L86 Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> --- .../0001-Add-OpenGL-library-versioning.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/rpi-userland/0001-Add-OpenGL-library-versioning.patch