diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-07-29 10:49:53 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-03 10:33:10 +0100 |
commit | bc149152e2957fbab3af6f97397eeca48185e5f5 (patch) | |
tree | 816ee9e4cb48bbace920cedfb3f8a31cbba6b516 /meta | |
parent | 2a4c430211ce56433cf492424ecd86b5ed461e03 (diff) | |
download | poky-bc149152e2957fbab3af6f97397eeca48185e5f5.tar.gz |
glew: upgrade to 1.10.0
rebased patches
(From OE-Core rev: 7c5c2f554cdfd68133dca73ddfe3f023744e984d)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/glew/files/fix-glew.pc-install.patch | 23 | ||||
-rw-r--r-- | meta/recipes-graphics/glew/glew_1.10.0.bb (renamed from meta/recipes-graphics/glew/glew_1.9.0.bb) | 5 |
2 files changed, 14 insertions, 14 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 index 5b6a94e471..9cbc0a95aa 100644 --- a/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch +++ b/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch | |||
@@ -6,21 +6,21 @@ Upstream-Status: Inappropriate | |||
6 | 6 | ||
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
8 | 8 | ||
9 | Index: glew-1.9.0/Makefile.am | 9 | Index: glew-1.10.0/Makefile.am |
10 | =================================================================== | 10 | =================================================================== |
11 | --- glew-1.9.0.orig/Makefile.am | 11 | --- glew-1.10.0.orig/Makefile.am |
12 | +++ glew-1.9.0/Makefile.am | 12 | +++ glew-1.10.0/Makefile.am |
13 | @@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install | 13 | @@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install |
14 | 14 | ||
15 | SUBDIRS = include src | 15 | SUBDIRS = include src |
16 | 16 | ||
17 | +pkgconfigdir = $(libdir)/pkgconfig | 17 | +pkgconfigdir = $(libdir)/pkgconfig |
18 | +pkgconfig_DATA = glew.pc | 18 | +pkgconfig_DATA = glew.pc |
19 | Index: glew-1.9.0/configure.ac | 19 | Index: glew-1.10.0/configure.ac |
20 | =================================================================== | 20 | =================================================================== |
21 | --- glew-1.9.0.orig/configure.ac | 21 | --- glew-1.10.0.orig/configure.ac |
22 | +++ glew-1.9.0/configure.ac | 22 | +++ glew-1.10.0/configure.ac |
23 | @@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:5:7]) | 23 | @@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) |
24 | 24 | ||
25 | AC_CONFIG_FILES([Makefile | 25 | AC_CONFIG_FILES([Makefile |
26 | include/Makefile | 26 | include/Makefile |
@@ -28,11 +28,11 @@ Index: glew-1.9.0/configure.ac | |||
28 | + src/Makefile | 28 | + src/Makefile |
29 | + glew.pc]) | 29 | + glew.pc]) |
30 | AC_OUTPUT | 30 | AC_OUTPUT |
31 | Index: glew-1.9.0/glew.pc.in | 31 | Index: glew-1.10.0/glew.pc.in |
32 | =================================================================== | 32 | =================================================================== |
33 | --- glew-1.9.0.orig/glew.pc.in | 33 | --- glew-1.10.0.orig/glew.pc.in |
34 | +++ glew-1.9.0/glew.pc.in | 34 | +++ glew-1.10.0/glew.pc.in |
35 | @@ -5,6 +5,6 @@ includedir=@includedir@ | 35 | @@ -5,7 +5,7 @@ includedir=@includedir@ |
36 | 36 | ||
37 | Name: glew | 37 | Name: glew |
38 | Description: The OpenGL Extension Wrangler library | 38 | Description: The OpenGL Extension Wrangler library |
@@ -42,3 +42,4 @@ Index: glew-1.9.0/glew.pc.in | |||
42 | +Version: @VERSION@ | 42 | +Version: @VERSION@ |
43 | +Cflags: -I${includedir} @CFLAGS@ | 43 | +Cflags: -I${includedir} @CFLAGS@ |
44 | +Libs: -L${libdir} -lGLEW | 44 | +Libs: -L${libdir} -lGLEW |
45 | Requires: glu | ||
diff --git a/meta/recipes-graphics/glew/glew_1.9.0.bb b/meta/recipes-graphics/glew/glew_1.10.0.bb index f1ba4e43da..e5a63b482a 100644 --- a/meta/recipes-graphics/glew/glew_1.9.0.bb +++ b/meta/recipes-graphics/glew/glew_1.10.0.bb | |||
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" | |||
7 | 7 | ||
8 | DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" | 8 | DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" |
9 | 9 | ||
10 | PR = "r1" | ||
11 | 10 | ||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ |
13 | file://autotools.patch \ | 12 | file://autotools.patch \ |
@@ -15,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ | |||
15 | file://fix-glew.pc-install.patch \ | 14 | file://fix-glew.pc-install.patch \ |
16 | " | 15 | " |
17 | 16 | ||
18 | SRC_URI[md5sum] = "69ce911decef6249d24742497e6ad06a" | 17 | SRC_URI[md5sum] = "2f09e5e6cb1b9f3611bcac79bc9c2d5d" |
19 | SRC_URI[sha256sum] = "9b36530e414c95d6624be9d6815a5be1531d1986300ae5903f16977ab8aeb787" | 18 | SRC_URI[sha256sum] = "99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307" |
20 | 19 | ||
21 | inherit autotools lib_package | 20 | inherit autotools lib_package |