glew: Upgrade to 1.11.0

Rebase patch and move patches from too generic files to glew

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 13 insertions, 13 deletions

diff --git a/meta/recipes-graphics/glew/files/autotools.patch b/meta/recipes-graphics/glew/glew/autotools.patch
index 7dfe087d52..7dfe087d52 100644
--- a/meta/recipes-graphics/glew/files/autotools.patch
+++ b/meta/recipes-graphics/glew/glew/autotools.patch
diff --git a/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
index 9cbc0a95aa..a20fbfce00 100644
--- a/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch
+++ b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch
@@ -6,20 +6,20 @@ Upstream-Status: Inappropriate
 
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
-Index: glew-1.10.0/Makefile.am
+Index: glew-1.11.0/Makefile.am
 ===================================================================
---- glew-1.10.0.orig/Makefile.am
-+++ glew-1.10.0/Makefile.am
+--- glew-1.11.0.orig/Makefile.am
++++ glew-1.11.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.10.0/configure.ac
+Index: glew-1.11.0/configure.ac
 ===================================================================
---- glew-1.10.0.orig/configure.ac
-+++ glew-1.10.0/configure.ac
+--- glew-1.11.0.orig/configure.ac
++++ glew-1.11.0/configure.ac
 @@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0])
  
  AC_CONFIG_FILES([Makefile
@@ -28,11 +28,11 @@ Index: glew-1.10.0/configure.ac
 +                 src/Makefile
 +                 glew.pc])
  AC_OUTPUT
-Index: glew-1.10.0/glew.pc.in
+Index: glew-1.11.0/glew.pc.in
 ===================================================================
---- glew-1.10.0.orig/glew.pc.in
-+++ glew-1.10.0/glew.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
+--- glew-1.11.0.orig/glew.pc.in
++++ glew-1.11.0/glew.pc.in
+@@ -5,7 +5,7 @@ includedir=${prefix}/include/GL
  
  Name: glew
  Description: The OpenGL Extension Wrangler library
@@ -42,4 +42,4 @@ Index: glew-1.10.0/glew.pc.in
 +Version: @VERSION@
 +Cflags: -I${includedir} @CFLAGS@
 +Libs: -L${libdir} -lGLEW
- Requires: glu
+ Requires: @requireslib@
diff --git a/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch b/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch
index 0707efba26..0707efba26 100644
--- a/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch
+++ b/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch
diff --git a/meta/recipes-graphics/glew/glew_1.10.0.bb b/meta/recipes-graphics/glew/glew_1.11.0.bb
index 94f1bc1ed6..4231320dbd 100644
--- a/meta/recipes-graphics/glew/glew_1.10.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.11.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
            file://fix-glew.pc-install.patch \
           "
 
-SRC_URI[md5sum] = "2f09e5e6cb1b9f3611bcac79bc9c2d5d"
-SRC_URI[sha256sum] = "99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307"
+SRC_URI[md5sum] = "f6d72c7426a5f66580ad09e50816450a"
+SRC_URI[sha256sum] = "69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6"
 
 inherit autotools lib_package pkgconfig