From c77f6ab553cca891bd2ef6ddf84d1db357773f84 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 14 Sep 2019 17:11:33 +0200 Subject: mesa: rework pkgconfig patch to meson OE-core changed to build mesa with meson. Rework our patches accordingly. Signed-off-by: Max Krummenacher --- .../0001-pkg-config-files-add-tegra-paths.patch | 128 ++++++++++++--------- 1 file changed, 71 insertions(+), 57 deletions(-) diff --git a/recipes-graphics/mesa/mesa/0001-pkg-config-files-add-tegra-paths.patch b/recipes-graphics/mesa/mesa/0001-pkg-config-files-add-tegra-paths.patch index 010ec74..b657b3e 100644 --- a/recipes-graphics/mesa/mesa/0001-pkg-config-files-add-tegra-paths.patch +++ b/recipes-graphics/mesa/mesa/0001-pkg-config-files-add-tegra-paths.patch @@ -1,67 +1,81 @@ -From 376a4dc8af02b45a79c44000e9d172fd0169d89a Mon Sep 17 00:00:00 2001 +From e0e65da315173902b909627ac3067463ab5c8710 Mon Sep 17 00:00:00 2001 From: Max Krummenacher -Date: Wed, 19 Sep 2018 15:43:34 +0200 +Date: Sat, 7 Sep 2019 13:17:21 +0000 Subject: [PATCH] pkg config files: add tegra paths Add the paths to the tegra specific libraries. Signed-off-by: Max Krummenacher --- - src/egl/main/egl.pc.in | 2 +- - src/mapi/es1api/glesv1_cm.pc.in | 2 +- - src/mapi/es2api/glesv2.pc.in | 2 +- - src/mesa/gl.pc.in | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + src/egl/meson.build | 1 + + src/mapi/es1api/meson.build | 3 +- + src/mapi/es2api/meson.build | 3 +- + src/meson.build | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) -diff --git a/src/egl/main/egl.pc.in b/src/egl/main/egl.pc.in -index fd6904b..ceaff42 100644 ---- a/src/egl/main/egl.pc.in -+++ b/src/egl/main/egl.pc.in -@@ -7,6 +7,6 @@ Name: egl - Description: Mesa EGL library - Requires.private: @GL_PC_REQ_PRIV@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lEGL -+Libs: -L=${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lEGL - Libs.private: @GL_PC_LIB_PRIV@ - Cflags: -I${includedir} @GL_PC_CFLAGS@ -diff --git a/src/mapi/es1api/glesv1_cm.pc.in b/src/mapi/es1api/glesv1_cm.pc.in -index 0c2fed7..d76f418 100644 ---- a/src/mapi/es1api/glesv1_cm.pc.in -+++ b/src/mapi/es1api/glesv1_cm.pc.in -@@ -7,6 +7,6 @@ Name: glesv1_cm - Description: Mesa OpenGL ES 1.1 CM library - Requires.private: - Version: @VERSION@ --Libs: -L${libdir} -lGLESv1_CM -+Libs: -L=${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lGLESv1_CM - Libs.private: @GLESv1_CM_PC_LIB_PRIV@ - Cflags: -I${includedir} -diff --git a/src/mapi/es2api/glesv2.pc.in b/src/mapi/es2api/glesv2.pc.in -index e5bf12f..fd1fccc 100644 ---- a/src/mapi/es2api/glesv2.pc.in -+++ b/src/mapi/es2api/glesv2.pc.in -@@ -7,6 +7,6 @@ Name: glesv2 - Description: Mesa OpenGL ES 2.0 library - Requires.private: - Version: @VERSION@ --Libs: -L${libdir} -lGLESv2 -+Libs: -L=${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lGLESv2 - Libs.private: @GLESv2_PC_LIB_PRIV@ - Cflags: -I${includedir} -diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in -index 680f742..1416def 100644 ---- a/src/mesa/gl.pc.in -+++ b/src/mesa/gl.pc.in -@@ -7,7 +7,7 @@ Name: gl - Description: Mesa OpenGL library - Requires.private: @GL_PC_REQ_PRIV@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -l@GL_PKGCONF_LIB@ -+Libs: -L=${libdir}/arm-linux-gnueabihf/tegra -L${libdir} -l@GL_PKGCONF_LIB@ - Libs.private: @GL_PC_LIB_PRIV@ - Cflags: -I${includedir} @GL_PC_CFLAGS@ - glx_tls: @GLX_TLS@ +diff --git a/src/egl/meson.build b/src/egl/meson.build +index 3a0fd01..48e0b2a 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -181,6 +181,7 @@ if with_glvnd + else + _egl = libegl + endif ++_egl = ' -L=${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lEGL' + + pkg.generate( + name : 'egl', +diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build +index 53bdc16..c042fe2 100644 +--- a/src/mapi/es1api/meson.build ++++ b/src/mapi/es1api/meson.build +@@ -43,12 +43,13 @@ libglesv1_cm = shared_library( + install : true, + ) + ++_lib_tegra_gl1 = '-L=${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lGLESv1_CM' + pkg.generate( + name : 'glesv1_cm', + filebase : 'glesv1_cm', + description : 'Mesa OpenGL ES 1.1 CM library', + version : meson.project_version(), +- libraries : libglesv1_cm, ++ libraries : _lib_tegra_gl1, + libraries_private : gl_priv_libs, + ) + +diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build +index d374bd8..9c56933 100644 +--- a/src/mapi/es2api/meson.build ++++ b/src/mapi/es2api/meson.build +@@ -43,12 +43,13 @@ libgles2 = shared_library( + install : true, + ) + ++_lib_tegra_gl2 = '-L=${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lGLESv2' + pkg.generate( + name : 'glesv2', + filebase : 'glesv2', + description : 'Mesa OpenGL ES 2.0 library', + version : meson.project_version(), +- libraries : libgles2, ++ libraries : _lib_tegra_gl2, + libraries_private : gl_priv_libs, + ) + +diff --git a/src/meson.build b/src/meson.build +index 6d04b5f..691811d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -107,7 +107,7 @@ if with_glx != 'disabled' + else + _gl = libgl + endif +- ++ _gl = '-L=${libdir}/arm-linux-gnueabihf/tegra -L${libdir} -lGL' + pkg.generate( + name : 'gl', + description : 'Mesa OpenGL Library', -- -2.13.6 +2.20.1 -- cgit v1.2.3