mesa: refresh patch

While at it create it with git which leads to a changed file name.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

3 files changed, 68 insertions, 46 deletions

diff --git a/recipes-graphics/mesa/mesa/apalis-tk1/0001-pkg-config-files-add-tegra-paths.patch b/recipes-graphics/mesa/mesa/apalis-tk1/0001-pkg-config-files-add-tegra-paths.patch
new file mode 100644
index 0000000..0637c7f
--- /dev/null
+++ b/recipes-graphics/mesa/mesa/apalis-tk1/0001-pkg-config-files-add-tegra-paths.patch
@@ -0,0 +1,67 @@
+From 376a4dc8af02b45a79c44000e9d172fd0169d89a Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Wed, 19 Sep 2018 15:43:34 +0200
+Subject: [PATCH] pkg config files: add tegra paths
+
+Add the paths to the tegra specific libraries.
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ 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(-)
+
+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@
+-- 
+2.13.6
+
diff --git a/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.patch b/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.patch
deleted file mode 100644
index a565ef3..0000000
--- a/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur mesa-12.0.1.orig/src/egl/main/egl.pc.in mesa-12.0.1/src/egl/main/egl.pc.in
---- mesa-12.0.1.orig/src/egl/main/egl.pc.in	2016-01-18 08:39:25.000000000 +0100
-+++ mesa-12.0.1/src/egl/main/egl.pc.in	2016-11-27 20:01:40.284075822 +0100
-@@ -7,6 +7,6 @@
- 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 -Naur mesa-12.0.1.orig/src/mapi/es1api/glesv1_cm.pc.in mesa-12.0.1/src/mapi/es1api/glesv1_cm.pc.in
---- mesa-12.0.1.orig/src/mapi/es1api/glesv1_cm.pc.in	2016-01-18 08:39:26.000000000 +0100
-+++ mesa-12.0.1/src/mapi/es1api/glesv1_cm.pc.in	2016-11-27 20:04:44.513960821 +0100
-@@ -7,6 +7,6 @@
- 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 -Naur mesa-12.0.1.orig/src/mapi/es2api/glesv2.pc.in mesa-12.0.1/src/mapi/es2api/glesv2.pc.in
---- mesa-12.0.1.orig/src/mapi/es2api/glesv2.pc.in	2016-01-18 08:39:26.000000000 +0100
-+++ mesa-12.0.1/src/mapi/es2api/glesv2.pc.in	2016-11-27 20:04:46.913972352 +0100
-@@ -7,6 +7,6 @@
- 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 -Naur mesa-12.0.1.orig/src/mesa/gl.pc.in mesa-12.0.1/src/mesa/gl.pc.in
---- mesa-12.0.1.orig/src/mesa/gl.pc.in	2016-01-18 08:39:26.000000000 +0100
-+++ mesa-12.0.1/src/mesa/gl.pc.in	2016-11-27 20:02:52.146421033 +0100
-@@ -7,7 +7,7 @@
- Description: Mesa OpenGL library
- Requires.private: @GL_PC_REQ_PRIV@
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -l@GL_LIB@
-+Libs: -L${libdir}/arm-linux-gnueabihf/tegra -L${libdir} -l@GL_LIB@
- Libs.private: @GL_PC_LIB_PRIV@
- Cflags: -I${includedir} @GL_PC_CFLAGS@
- glx_tls: @GLX_TLS@
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 14500a3..bc26ea5 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -16,7 +16,7 @@ DEPENDS_REMOVE = "linux-driver-package"
 DEPENDS_REMOVE_tegra124 = ""
 DEPENDS_remove = "${DEPENDS_REMOVE}"
 
-SRC_URI_append_tegra124 = " file://tegra-path-add.patch"
+SRC_URI_append_tegra124 = " file://0001-pkg-config-files-add-tegra-paths.patch"
 
 PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}"