Patchwork [14/18] glew: fix generation of glew.pc needed by mesa-demos

login
register
mail settings
Submitter Saul Wold
Date April 24, 2013, 9:37 p.m.
Message ID <875d5dbcc31bbf49fbbb331ef1b8f989d2385150.1366827512.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/48829/
State Accepted
Commit 0273f31d20f3e3c24e8b309f928595885eb04af2
Headers show

Comments

Saul Wold - April 24, 2013, 9:37 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../glew/files/fix-glew.pc-install.patch           | 44 ++++++++++++++++++++++
 meta/recipes-graphics/glew/glew_1.9.0.bb           |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-graphics/glew/files/fix-glew.pc-install.patch

Patch

diff --git a/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch b/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch
new file mode 100644
index 0000000..5b6a94e
--- /dev/null
+++ b/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch
@@ -0,0 +1,44 @@ 
+
+We maintain the autotools configure.ac and Makefile.am, to correctly
+provide the glew.pc, the following patch is needed.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: glew-1.9.0/Makefile.am
+===================================================================
+--- glew-1.9.0.orig/Makefile.am
++++ glew-1.9.0/Makefile.am
+@@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install
+ 
+ SUBDIRS = include src
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = glew.pc
+Index: glew-1.9.0/configure.ac
+===================================================================
+--- glew-1.9.0.orig/configure.ac
++++ glew-1.9.0/configure.ac
+@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:5:7])
+ 
+ AC_CONFIG_FILES([Makefile
+                  include/Makefile
+-                 src/Makefile])
++                 src/Makefile
++                 glew.pc])
+ AC_OUTPUT
+Index: glew-1.9.0/glew.pc.in
+===================================================================
+--- glew-1.9.0.orig/glew.pc.in
++++ glew-1.9.0/glew.pc.in
+@@ -5,6 +5,6 @@ includedir=@includedir@
+ 
+ Name: glew
+ Description: The OpenGL Extension Wrangler library
+-Version: @version@
+-Cflags: -I${includedir} @cflags@
+-Libs: -L${libdir} -l@libname@
++Version: @VERSION@
++Cflags: -I${includedir} @CFLAGS@
++Libs: -L${libdir} -lGLEW
diff --git a/meta/recipes-graphics/glew/glew_1.9.0.bb b/meta/recipes-graphics/glew/glew_1.9.0.bb
index 599d64b..f1ba4e4 100644
--- a/meta/recipes-graphics/glew/glew_1.9.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.9.0.bb
@@ -12,6 +12,7 @@  PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
            file://autotools.patch \
            file://glew_fix_for_automake-1.12.patch \
+           file://fix-glew.pc-install.patch \
           "
 
 SRC_URI[md5sum] = "69ce911decef6249d24742497e6ad06a"