From 8d73b3b028bf81a2b3369960e98c3139e0c11943 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 19 Aug 2014 07:49:10 -0700 Subject: glew: Upgrade to 1.11.0 Rebase patch and move patches from too generic files to glew Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/glew/files/autotools.patch | 149 --------------------- .../glew/files/fix-glew.pc-install.patch | 45 ------- .../glew/files/glew_fix_for_automake-1.12.patch | 25 ---- meta/recipes-graphics/glew/glew/autotools.patch | 149 +++++++++++++++++++++ .../glew/glew/fix-glew.pc-install.patch | 45 +++++++ .../glew/glew/glew_fix_for_automake-1.12.patch | 25 ++++ meta/recipes-graphics/glew/glew_1.10.0.bb | 21 --- meta/recipes-graphics/glew/glew_1.11.0.bb | 21 +++ 8 files changed, 240 insertions(+), 240 deletions(-) delete mode 100644 meta/recipes-graphics/glew/files/autotools.patch delete mode 100644 meta/recipes-graphics/glew/files/fix-glew.pc-install.patch delete mode 100644 meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch create mode 100644 meta/recipes-graphics/glew/glew/autotools.patch create mode 100644 meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch create mode 100644 meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-graphics/glew/glew_1.10.0.bb create mode 100644 meta/recipes-graphics/glew/glew_1.11.0.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/glew/files/autotools.patch b/meta/recipes-graphics/glew/files/autotools.patch deleted file mode 100644 index 7dfe087d52..0000000000 --- a/meta/recipes-graphics/glew/files/autotools.patch +++ /dev/null @@ -1,149 +0,0 @@ - -Upstream-Status: Inappropriate [configuration] - -Index: glew/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/Makefile.am 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,5 @@ -+ -+ACLOCAL_AMFLAGS = -I m4 --install -+ -+SUBDIRS = include src -+ -Index: glew/configure.ac -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/configure.ac 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,67 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.62]) -+AC_INIT([glew], [1.9.0], [BUG-REPORT-ADDRESS]) -+AC_CONFIG_SRCDIR([src/glew.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AC_CONFIG_MACRO_DIR([m4]) -+ -+LT_INIT -+ -+# Checks for programs. -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_TYPE_INT32_T -+AC_TYPE_INT64_T -+AC_TYPE_UINT64_T -+AC_CHECK_TYPES([ptrdiff_t]) -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_CHECK_FUNCS([strtol]) -+ -+# Check for pkgconfig libs -+ -+PKG_CHECK_MODULES([X11], [x11]) -+AC_SUBST([X11_LIBS]) -+AC_SUBST([X11_CFLAGS]) -+ -+PKG_CHECK_MODULES([XMU], [xmu]) -+AC_SUBST([XMU_LIBS]) -+AC_SUBST([XMU_CFLAGS]) -+ -+PKG_CHECK_MODULES([XI], [xi]) -+AC_SUBST([XI_LIBS]) -+AC_SUBST([XI_CFLAGS]) -+ -+PKG_CHECK_MODULES([XEXT], [xext]) -+AC_SUBST([XEXT_LIBS]) -+AC_SUBST([XEXT_CFLAGS]) -+ -+# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS -+PKG_CHECK_MODULES([GLU], [glu]) -+AC_SUBST([GLU_LIBS]) -+AC_SUBST([GLU_CFLAGS]) -+ -+# ENABLE option for Multiple Rendering Contexts support -+AC_CHECK_ENABLE_GLEWMX -+ -+# for now we use the same version as the package, but that should be avoided -+# in the future -+ -+AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) -+ -+AC_CONFIG_FILES([Makefile -+ include/Makefile -+ src/Makefile]) -+AC_OUTPUT -Index: glew/src/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/src/Makefile.am 2009-12-02 00:33:48.690786110 +0100 -@@ -0,0 +1,35 @@ -+ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ -+if ENABLE_GLEWMX -+AM_CPPFLAGS += -DGLEW_MX -+endif -+ -+AM_CFLAGS = @X11_CFLAGS@ \ -+ @XMU_CFLAGS@ \ -+ @XI_CFLAGS@ \ -+ @XEXT_CFLAGS@ \ -+ @GLU_CFLAGS@ -+ -+lib_LTLIBRARIES = libGLEW.la -+ -+libGLEW_la_SOURCES = glew.c -+ -+libGLEW_la_LIBADD = @X11_LIBS@ \ -+ @XMU_LIBS@ \ -+ @XI_LIBS@ \ -+ @XEXT_LIBS@ \ -+ @GLU_LIBS@ -+ -+libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@ -+ -+bin_PROGRAMS = glewinfo visualinfo -+ -+glewinfo_SOURCES = glewinfo.c -+ -+glewinfo_LDADD = libGLEW.la -+ -+visualinfo_SOURCES = visualinfo.c -+ -+visualinfo_LDADD = libGLEW.la -+ -Index: glew/m4/glewmx.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/m4/glewmx.m4 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,11 @@ -+ -+AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[ -+AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support]) -+AC_ARG_ENABLE([glewmx], -+ [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])], -+ [ENABLE_GLEWMX="$enableval"], -+ [ENABLE_GLEWMX="no"]) -+AC_MSG_RESULT([${ENABLE_GLEWMX}]) -+AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"]) -+]) -+ -Index: glew/include/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/include/Makefile.am 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,3 @@ -+ -+nobase_include_HEADERS = GL/glew.h GL/glxew.h GL/wglew.h -+ diff --git a/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch b/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch deleted file mode 100644 index 9cbc0a95aa..0000000000 --- a/meta/recipes-graphics/glew/files/fix-glew.pc-install.patch +++ /dev/null @@ -1,45 +0,0 @@ - -We maintain the autotools configure.ac and Makefile.am, to correctly -provide the glew.pc, the following patch is needed. - -Upstream-Status: Inappropriate - -Signed-off-by: Saul Wold - -Index: glew-1.10.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.10.0/configure.ac -=================================================================== ---- 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 -- src/Makefile]) -+ src/Makefile -+ glew.pc]) - AC_OUTPUT -Index: glew-1.10.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@ - - Name: glew - Description: The OpenGL Extension Wrangler library --Version: @version@ --Cflags: -I${includedir} @cflags@ --Libs: -L${libdir} -l@libname@ -+Version: @VERSION@ -+Cflags: -I${includedir} @CFLAGS@ -+Libs: -L${libdir} -lGLEW - Requires: glu diff --git a/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch b/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch deleted file mode 100644 index 0707efba26..0000000000 --- a/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| automake: warnings are treated as errors -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libGLEW.la': linking libtool libraries using a non-POSIX -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-Off-By: Nitin A Kamble -2012/05/03 - -Index: glew-1.7.0/configure.ac -=================================================================== ---- glew-1.7.0.orig/configure.ac -+++ glew-1.7.0/configure.ac -@@ -14,6 +14,9 @@ LT_INIT - AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_LN_S -+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it -+m4_pattern_allow([AM_PROG_AR]) -+AM_PROG_AR - - # Checks for libraries. - diff --git a/meta/recipes-graphics/glew/glew/autotools.patch b/meta/recipes-graphics/glew/glew/autotools.patch new file mode 100644 index 0000000000..7dfe087d52 --- /dev/null +++ b/meta/recipes-graphics/glew/glew/autotools.patch @@ -0,0 +1,149 @@ + +Upstream-Status: Inappropriate [configuration] + +Index: glew/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/Makefile.am 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,5 @@ ++ ++ACLOCAL_AMFLAGS = -I m4 --install ++ ++SUBDIRS = include src ++ +Index: glew/configure.ac +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/configure.ac 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,67 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.62]) ++AC_INIT([glew], [1.9.0], [BUG-REPORT-ADDRESS]) ++AC_CONFIG_SRCDIR([src/glew.c]) ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++LT_INIT ++ ++# Checks for programs. ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++ ++# Checks for libraries. ++ ++# Checks for header files. ++AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_TYPE_INT32_T ++AC_TYPE_INT64_T ++AC_TYPE_UINT64_T ++AC_CHECK_TYPES([ptrdiff_t]) ++ ++# Checks for library functions. ++AC_FUNC_MALLOC ++AC_CHECK_FUNCS([strtol]) ++ ++# Check for pkgconfig libs ++ ++PKG_CHECK_MODULES([X11], [x11]) ++AC_SUBST([X11_LIBS]) ++AC_SUBST([X11_CFLAGS]) ++ ++PKG_CHECK_MODULES([XMU], [xmu]) ++AC_SUBST([XMU_LIBS]) ++AC_SUBST([XMU_CFLAGS]) ++ ++PKG_CHECK_MODULES([XI], [xi]) ++AC_SUBST([XI_LIBS]) ++AC_SUBST([XI_CFLAGS]) ++ ++PKG_CHECK_MODULES([XEXT], [xext]) ++AC_SUBST([XEXT_LIBS]) ++AC_SUBST([XEXT_CFLAGS]) ++ ++# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS ++PKG_CHECK_MODULES([GLU], [glu]) ++AC_SUBST([GLU_LIBS]) ++AC_SUBST([GLU_CFLAGS]) ++ ++# ENABLE option for Multiple Rendering Contexts support ++AC_CHECK_ENABLE_GLEWMX ++ ++# for now we use the same version as the package, but that should be avoided ++# in the future ++ ++AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) ++ ++AC_CONFIG_FILES([Makefile ++ include/Makefile ++ src/Makefile]) ++AC_OUTPUT +Index: glew/src/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/src/Makefile.am 2009-12-02 00:33:48.690786110 +0100 +@@ -0,0 +1,35 @@ ++ ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ ++if ENABLE_GLEWMX ++AM_CPPFLAGS += -DGLEW_MX ++endif ++ ++AM_CFLAGS = @X11_CFLAGS@ \ ++ @XMU_CFLAGS@ \ ++ @XI_CFLAGS@ \ ++ @XEXT_CFLAGS@ \ ++ @GLU_CFLAGS@ ++ ++lib_LTLIBRARIES = libGLEW.la ++ ++libGLEW_la_SOURCES = glew.c ++ ++libGLEW_la_LIBADD = @X11_LIBS@ \ ++ @XMU_LIBS@ \ ++ @XI_LIBS@ \ ++ @XEXT_LIBS@ \ ++ @GLU_LIBS@ ++ ++libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@ ++ ++bin_PROGRAMS = glewinfo visualinfo ++ ++glewinfo_SOURCES = glewinfo.c ++ ++glewinfo_LDADD = libGLEW.la ++ ++visualinfo_SOURCES = visualinfo.c ++ ++visualinfo_LDADD = libGLEW.la ++ +Index: glew/m4/glewmx.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/m4/glewmx.m4 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,11 @@ ++ ++AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[ ++AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support]) ++AC_ARG_ENABLE([glewmx], ++ [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])], ++ [ENABLE_GLEWMX="$enableval"], ++ [ENABLE_GLEWMX="no"]) ++AC_MSG_RESULT([${ENABLE_GLEWMX}]) ++AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"]) ++]) ++ +Index: glew/include/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ glew/include/Makefile.am 2009-12-02 00:30:23.296641663 +0100 +@@ -0,0 +1,3 @@ ++ ++nobase_include_HEADERS = GL/glew.h GL/glxew.h GL/wglew.h ++ diff --git a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch new file mode 100644 index 0000000000..a20fbfce00 --- /dev/null +++ b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch @@ -0,0 +1,45 @@ + +We maintain the autotools configure.ac and Makefile.am, to correctly +provide the glew.pc, the following patch is needed. + +Upstream-Status: Inappropriate + +Signed-off-by: Saul Wold + +Index: glew-1.11.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.11.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 + include/Makefile +- src/Makefile]) ++ src/Makefile ++ glew.pc]) + AC_OUTPUT +Index: glew-1.11.0/glew.pc.in +=================================================================== +--- 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 +-Version: @version@ +-Cflags: -I${includedir} @cflags@ +-Libs: -L${libdir} -l@libname@ ++Version: @VERSION@ ++Cflags: -I${includedir} @CFLAGS@ ++Libs: -L${libdir} -lGLEW + Requires: @requireslib@ diff --git a/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch b/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..0707efba26 --- /dev/null +++ b/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch @@ -0,0 +1,25 @@ +Upstream-Status: Pending + +This patch fixes following issue with automake 1.12 + +| automake: warnings are treated as errors +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libGLEW.la': linking libtool libraries using a non-POSIX +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-Off-By: Nitin A Kamble +2012/05/03 + +Index: glew-1.7.0/configure.ac +=================================================================== +--- glew-1.7.0.orig/configure.ac ++++ glew-1.7.0/configure.ac +@@ -14,6 +14,9 @@ LT_INIT + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_LN_S ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR + + # Checks for libraries. + diff --git a/meta/recipes-graphics/glew/glew_1.10.0.bb b/meta/recipes-graphics/glew/glew_1.10.0.bb deleted file mode 100644 index 94f1bc1ed6..0000000000 --- a/meta/recipes-graphics/glew/glew_1.10.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "OpenGL extension loading library" -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 pkgconfig diff --git a/meta/recipes-graphics/glew/glew_1.11.0.bb b/meta/recipes-graphics/glew/glew_1.11.0.bb new file mode 100644 index 0000000000..4231320dbd --- /dev/null +++ b/meta/recipes-graphics/glew/glew_1.11.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "OpenGL extension loading library" +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] = "f6d72c7426a5f66580ad09e50816450a" +SRC_URI[sha256sum] = "69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6" + +inherit autotools lib_package pkgconfig -- cgit 1.2.3-korg