Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/vlc: fix opengl library check
@ 2022-11-13 10:00 Bernd Kuhls
  2022-11-13 21:47 ` Thomas Petazzoni via buildroot
  2022-11-15 13:24 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2022-11-13 10:00 UTC (permalink / raw)
  To: buildroot; +Cc: Simon Dawson

Fixes:
http://autobuild.buildroot.net/results/9710753984a38b8c6f83a136b39c3bc320ba558b/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
While this upstream patch fixes the insufficient check for opengl the
reason why we saw this bug is due to the fact that the libglvnd package
installs GL/gl.h to staging dir even if the defconfig does not enable
libgl support, but fixing this is another topic.


 .../0012-opengl-missing-library-check.patch   | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 package/vlc/0012-opengl-missing-library-check.patch

diff --git a/package/vlc/0012-opengl-missing-library-check.patch b/package/vlc/0012-opengl-missing-library-check.patch
new file mode 100644
index 0000000000..3a28fe34e3
--- /dev/null
+++ b/package/vlc/0012-opengl-missing-library-check.patch
@@ -0,0 +1,57 @@
+From 4ab41404cb85684125d73977cadebf83bbc246f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Sat, 22 Jan 2022 11:34:38 +0200
+Subject: [PATCH] opengl: missing library check
+
+Traditionally the presence of the header file was not considered
+sufficient, though this was somewhat forgotten with the prevalence of
+pkg-config.
+
+However most libraries have portable headers, while the shared library
+is platform-dependent. It is common for the header to be present while
+the library is absent with "multilib" installations (i.e. Linux
+installation with multiple architectures).
+
+Downloaded from upstream commit:
+https://code.videolan.org/videolan/vlc/-/commit/4ab41404cb85684125d73977cadebf83bbc246f5
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f50808d597..0d57fadbf8b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3169,7 +3169,6 @@ have_gl="no"
+ PKG_CHECK_MODULES([GL], [gl], [
+   have_gl="yes"
+ ], [
+-  AC_MSG_CHECKING([for OpenGL])
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef _WIN32
+ # include <GL/glew.h>
+@@ -3179,13 +3178,17 @@ PKG_CHECK_MODULES([GL], [gl], [
+     [int t0 = GL_TEXTURE0;]])
+   ], [
+     GL_CFLAGS=""
+-    have_gl="yes"
+     AS_IF([test "${SYS}" != "mingw32"], [
+-      GL_LIBS="-lGL"
++      AC_CHECK_LIB([GL], [glTexture2D], [
++        have_gl="yes"
++        GL_LIBS="-lGL"
++      ])
+     ], [
++      have_gl="yes"
+       GL_LIBS="-lopengl32"
+     ])
+   ])
++  AC_MSG_CHECKING([for OpenGL])
+   AC_MSG_RESULT([${have_gl}])
+ ])
+ AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"])
+-- 
+GitLab
+
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/vlc: fix opengl library check
  2022-11-13 10:00 [Buildroot] [PATCH 1/1] package/vlc: fix opengl library check Bernd Kuhls
@ 2022-11-13 21:47 ` Thomas Petazzoni via buildroot
  2022-11-15 13:24 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-11-13 21:47 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: Simon Dawson, Yann E. MORIN, buildroot

On Sun, 13 Nov 2022 11:00:57 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Fixes:
> http://autobuild.buildroot.net/results/9710753984a38b8c6f83a136b39c3bc320ba558b/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Applied to master, thanks!

> ---
> While this upstream patch fixes the insufficient check for opengl the
> reason why we saw this bug is due to the fact that the libglvnd package
> installs GL/gl.h to staging dir even if the defconfig does not enable
> libgl support, but fixing this is another topic.

Indeed, just tested:

BR2_aarch64=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_LIBGLVND=y
# BR2_TARGET_ROOTFS_TAR is not set

and GL/gl.h is there, but there's no actual OpenGL provider. Didn't
think too much about how to fix this, though.

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/vlc: fix opengl library check
  2022-11-13 10:00 [Buildroot] [PATCH 1/1] package/vlc: fix opengl library check Bernd Kuhls
  2022-11-13 21:47 ` Thomas Petazzoni via buildroot
@ 2022-11-15 13:24 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2022-11-15 13:24 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: Simon Dawson, buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Fixes:
 > http://autobuild.buildroot.net/results/9710753984a38b8c6f83a136b39c3bc320ba558b/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 > While this upstream patch fixes the insufficient check for opengl the
 > reason why we saw this bug is due to the fact that the libglvnd package
 > installs GL/gl.h to staging dir even if the defconfig does not enable
 > libgl support, but fixing this is another topic.

Committed to 2022.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-11-15 13:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-13 10:00 [Buildroot] [PATCH 1/1] package/vlc: fix opengl library check Bernd Kuhls
2022-11-13 21:47 ` Thomas Petazzoni via buildroot
2022-11-15 13:24 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox