summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartyn Welch <martyn.welch@collabora.co.uk>2016-04-27 12:25:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 12:37:06 +0100
commit877a6b3ef42a5d185cfef1f6e63fd25d3a3b85d1 (patch)
tree3534f7a92b26b2161497ac5ec0bc01824377fc3e
parented3fc1ab85cd7a83fa359ad026594c412b57e88d (diff)
downloadpoky-877a6b3ef42a5d185cfef1f6e63fd25d3a3b85d1.tar.gz
glew: Correct version in autotooling patches
The additional autotooling patched into glew claims the version is 1.9.0 whilst we are building 1.12.0. The version in the autotooling is used to set the version number in the pkgconfig file, this results in the configuration of packages which depend on glew > 1.9.0 failing. This patch updates the version number used in the patches to match that of the version being built. (From OE-Core rev: 0ef7c0f30456cc242de331b273b92c1dfe835350) Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/glew/glew/autotools.patch4
-rw-r--r--meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/glew/glew/autotools.patch b/meta/recipes-graphics/glew/glew/autotools.patch
index 7dfe087d52..81a1343a5f 100644
--- a/meta/recipes-graphics/glew/glew/autotools.patch
+++ b/meta/recipes-graphics/glew/glew/autotools.patch
@@ -20,7 +20,7 @@ Index: glew/configure.ac
20+# Process this file with autoconf to produce a configure script. 20+# Process this file with autoconf to produce a configure script.
21+ 21+
22+AC_PREREQ([2.62]) 22+AC_PREREQ([2.62])
23+AC_INIT([glew], [1.9.0], [BUG-REPORT-ADDRESS]) 23+AC_INIT([glew], [1.12.0], [BUG-REPORT-ADDRESS])
24+AC_CONFIG_SRCDIR([src/glew.c]) 24+AC_CONFIG_SRCDIR([src/glew.c])
25+AC_CONFIG_HEADERS([config.h]) 25+AC_CONFIG_HEADERS([config.h])
26+AM_INIT_AUTOMAKE([-Wall -Werror foreign]) 26+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
@@ -77,7 +77,7 @@ Index: glew/configure.ac
77+# for now we use the same version as the package, but that should be avoided 77+# for now we use the same version as the package, but that should be avoided
78+# in the future 78+# in the future
79+ 79+
80+AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) 80+AC_SUBST([LIBGLEW_SO_VERSION], [1:12:0])
81+ 81+
82+AC_CONFIG_FILES([Makefile 82+AC_CONFIG_FILES([Makefile
83+ include/Makefile 83+ include/Makefile
diff --git a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
index 70a99aeeee..baab9ff68d 100644
--- a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
+++ b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
@@ -20,7 +20,7 @@ Index: glew-1.11.0/configure.ac
20=================================================================== 20===================================================================
21--- glew-1.11.0.orig/configure.ac 21--- glew-1.11.0.orig/configure.ac
22+++ glew-1.11.0/configure.ac 22+++ glew-1.11.0/configure.ac
23@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) 23@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:12:0])
24 24
25 AC_CONFIG_FILES([Makefile 25 AC_CONFIG_FILES([Makefile
26 include/Makefile 26 include/Makefile