summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-04-21 14:43:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-29 14:45:09 +0100
commitd5bc211255599e88e54b2dd746b65651d10045f3 (patch)
tree26bf88f2fa0ed050922e5ad4824ce209e4aedf24 /meta/recipes-graphics
parent7e83fd7bd8ca79161a706bd35863cbf42f655b8a (diff)
downloadpoky-d5bc211255599e88e54b2dd746b65651d10045f3.tar.gz
glew: fix generation of glew.pc needed by mesa-demos
(From OE-Core rev: 0273f31d20f3e3c24e8b309f928595885eb04af2) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/glew/files/fix-glew.pc-install.patch44
-rw-r--r--meta/recipes-graphics/glew/glew_1.9.0.bb1
2 files changed, 45 insertions, 0 deletions
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 0000000000..5b6a94e471
--- /dev/null
+++ b/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch
@@ -0,0 +1,44 @@
1
2We maintain the autotools configure.ac and Makefile.am, to correctly
3provide the glew.pc, the following patch is needed.
4
5Upstream-Status: Inappropriate
6
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8
9Index: glew-1.9.0/Makefile.am
10===================================================================
11--- glew-1.9.0.orig/Makefile.am
12+++ glew-1.9.0/Makefile.am
13@@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install
14
15 SUBDIRS = include src
16
17+pkgconfigdir = $(libdir)/pkgconfig
18+pkgconfig_DATA = glew.pc
19Index: glew-1.9.0/configure.ac
20===================================================================
21--- glew-1.9.0.orig/configure.ac
22+++ glew-1.9.0/configure.ac
23@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:5:7])
24
25 AC_CONFIG_FILES([Makefile
26 include/Makefile
27- src/Makefile])
28+ src/Makefile
29+ glew.pc])
30 AC_OUTPUT
31Index: glew-1.9.0/glew.pc.in
32===================================================================
33--- glew-1.9.0.orig/glew.pc.in
34+++ glew-1.9.0/glew.pc.in
35@@ -5,6 +5,6 @@ includedir=@includedir@
36
37 Name: glew
38 Description: The OpenGL Extension Wrangler library
39-Version: @version@
40-Cflags: -I${includedir} @cflags@
41-Libs: -L${libdir} -l@libname@
42+Version: @VERSION@
43+Cflags: -I${includedir} @CFLAGS@
44+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 599d64bceb..f1ba4e43da 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"
12SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
13 file://autotools.patch \ 13 file://autotools.patch \
14 file://glew_fix_for_automake-1.12.patch \ 14 file://glew_fix_for_automake-1.12.patch \
15 file://fix-glew.pc-install.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "69ce911decef6249d24742497e6ad06a" 18SRC_URI[md5sum] = "69ce911decef6249d24742497e6ad06a"