diff mbox series

[meta-oe] jasper: enable opengl only wih x11

Message ID 20231213084327.1840248-1-samuli.piippo@qt.io
State Accepted
Headers show
Series [meta-oe] jasper: enable opengl only wih x11 | expand

Commit Message

Samuli Piippo Dec. 13, 2023, 8:43 a.m. UTC
The opengl PACKAGECONFIG depends on freeglut, but after commit
f721876add48dccfd228cc09ef261909afeb2d25 that's only available
with x11. Enable it only when both openg and x11 are available.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
 meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Khem Raj Dec. 19, 2023, 6:27 a.m. UTC | #1
On Wed, 13 Dec 2023 08:43:27 +0000, Samuli Piippo wrote:
> The opengl PACKAGECONFIG depends on freeglut, but after commit
> f721876add48dccfd228cc09ef261909afeb2d25 that's only available
> with x11. Enable it only when both openg and x11 are available.
> 
> 

Applied, thanks!

[1/1] jasper: enable opengl only wih x11
      commit: 5f76240e8810e681e822e51ea40c8332b5e6d978

Best regards,
diff mbox series

Patch

diff --git a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb b/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb
index 9052855d1..14f50d0b2 100644
--- a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb
+++ b/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb
@@ -18,7 +18,7 @@  do_configure:prepend() {
 
 EXTRA_OECMAKE:append = " -DJAS_STDC_VERSION=${JAS_STDC_VERSION}"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl', '', d)} \
 		   jpeg"
 
 PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=ON,-DJAS_ENABLE_LIBJPEG=OFF,jpeg,"