mesa_%.bbappend: port patch to newer upstream mesa version

Moving from patching the "*.pc" files to patching there "*.pc.in" files
should hopefully make the patch more independent of the mesa version.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

3 files changed, 47 insertions, 49 deletions

diff --git a/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.patch b/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.patch
new file mode 100644
index 0000000..a565ef3
--- /dev/null
+++ b/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.patch
@@ -0,0 +1,45 @@
+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/apalis-tk1/tegra-path-add.pcp b/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.pcp
deleted file mode 100644
index cf6db3b..0000000
--- a/recipes-graphics/mesa/mesa/apalis-tk1/tegra-path-add.pcp
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/usr/lib/pkgconfig/egl.pc b/usr/lib/pkgconfig/egl.pc
-index 1a817e5..a82163d 100644
---- a/usr/lib/pkgconfig/egl.pc
-+++ b/usr/lib/pkgconfig/egl.pc
-@@ -7,6 +7,6 @@ Name: egl
- Description: Mesa EGL library
- Requires.private:  libdrm >= 2.4.60 x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8 xxf86vm
- Version: 11.1.1
--Libs: -L${libdir} -lEGL
-+Libs: -L${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lEGL
- Libs.private: -lm -lpthread -ldl
- Cflags: -I${includedir} 
-diff --git a/usr/lib/pkgconfig/gl.pc b/usr/lib/pkgconfig/gl.pc
-index c753814..20876c7 100644
---- a/usr/lib/pkgconfig/gl.pc
-+++ b/usr/lib/pkgconfig/gl.pc
-@@ -7,7 +7,7 @@ Name: gl
- Description: Mesa OpenGL library
- Requires.private:  libdrm >= 2.4.60 x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8 xxf86vm
- Version: 11.1.1
--Libs: -L${libdir} -lGL
-+Libs: -L${libdir}/arm-linux-gnueabihf/tegra -L${libdir} -lGL
- Libs.private: -lm -lpthread -ldl
- Cflags: -I${includedir} 
- glx_tls: yes
-diff --git a/usr/lib/pkgconfig/glesv1_cm.pc b/usr/lib/pkgconfig/glesv1_cm.pc
-index 0598afe..d7c36a5 100644
---- a/usr/lib/pkgconfig/glesv1_cm.pc
-+++ b/usr/lib/pkgconfig/glesv1_cm.pc
-@@ -7,6 +7,6 @@ Name: glesv1_cm
- Description: Mesa OpenGL ES 1.1 CM library
- Requires.private:
- Version: 11.1.1
--Libs: -L${libdir} -lGLESv1_CM
-+Libs: -L${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lGLESv1_CM
- Libs.private: -lm -lpthread -ldl
- Cflags: -I${includedir}
-diff --git a/usr/lib/pkgconfig/glesv2.pc b/usr/lib/pkgconfig/glesv2.pc
-index edd1b35..f06578b 100644
---- a/usr/lib/pkgconfig/glesv2.pc
-+++ b/usr/lib/pkgconfig/glesv2.pc
-@@ -7,6 +7,6 @@ Name: glesv2
- Description: Mesa OpenGL ES 2.0 library
- Requires.private:
- Version: 11.1.1
--Libs: -L${libdir} -lGLESv2
-+Libs: -L${libdir}/arm-linux-gnueabihf/tegra-egl -L${libdir} -lGLESv2
- Libs.private: -lm -lpthread -ldl
- Cflags: -I${includedir}
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 3fdda76..b63e8f2 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -23,3 +23,5 @@ DEPENDS_remove = "${DEPENDS_REMOVE}"
 
 # until meta-jetson-tk1 adds it through its bbappend:
 DEPENDS_append_tegra124= " linux-driver-package "
+
+SRC_URI_append_tegra123 = " tegra-path-add.patch"
\ No newline at end of file