From 7c5c2f554cdfd68133dca73ddfe3f023744e984d Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 29 Jul 2013 10:49:53 +0300 Subject: glew: upgrade to 1.10.0 rebased patches Signed-off-by: Saul Wold --- .../glew/files/fix-glew.pc-install.patch | 23 +++++++++++----------- meta/recipes-graphics/glew/glew_1.10.0.bb | 20 +++++++++++++++++++ meta/recipes-graphics/glew/glew_1.9.0.bb | 21 -------------------- 3 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 meta/recipes-graphics/glew/glew_1.10.0.bb delete mode 100644 meta/recipes-graphics/glew/glew_1.9.0.bb (limited to 'meta/recipes-graphics') 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 Signed-off-by: Saul Wold -Index: glew-1.9.0/Makefile.am +Index: glew-1.10.0/Makefile.am =================================================================== ---- glew-1.9.0.orig/Makefile.am -+++ glew-1.9.0/Makefile.am +--- glew-1.10.0.orig/Makefile.am ++++ glew-1.10.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 +Index: glew-1.10.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]) +--- glew-1.10.0.orig/configure.ac ++++ glew-1.10.0/configure.ac +@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) AC_CONFIG_FILES([Makefile include/Makefile @@ -28,11 +28,11 @@ Index: glew-1.9.0/configure.ac + src/Makefile + glew.pc]) AC_OUTPUT -Index: glew-1.9.0/glew.pc.in +Index: glew-1.10.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@ +--- glew-1.10.0.orig/glew.pc.in ++++ glew-1.10.0/glew.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ Name: glew Description: The OpenGL Extension Wrangler library @@ -42,3 +42,4 @@ Index: glew-1.9.0/glew.pc.in +Version: @VERSION@ +Cflags: -I${includedir} @CFLAGS@ +Libs: -L${libdir} -lGLEW + Requires: glu diff --git a/meta/recipes-graphics/glew/glew_1.10.0.bb b/meta/recipes-graphics/glew/glew_1.10.0.bb new file mode 100644 index 0000000000..e5a63b482a --- /dev/null +++ b/meta/recipes-graphics/glew/glew_1.10.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." +HOMEPAGE = "http://glew.sourceforge.net/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" + +DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" + + +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] = "2f09e5e6cb1b9f3611bcac79bc9c2d5d" +SRC_URI[sha256sum] = "99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307" + +inherit autotools lib_package diff --git a/meta/recipes-graphics/glew/glew_1.9.0.bb b/meta/recipes-graphics/glew/glew_1.9.0.bb deleted file mode 100644 index f1ba4e43da..0000000000 --- a/meta/recipes-graphics/glew/glew_1.9.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." -HOMEPAGE = "http://glew.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" - -DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" - -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" -SRC_URI[sha256sum] = "9b36530e414c95d6624be9d6815a5be1531d1986300ae5903f16977ab8aeb787" - -inherit autotools lib_package -- cgit v1.2.3