Update glew to 1.12.0

Many of our patches are now upstream.

Change-Id: I6c59973eea491148e92d7fa1a0b3681a9fcd2f2d

download.lst

@@ -57,7 +57,7 @@ export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-p
 export FREEHAND_MD5SUM := 8cf70c5dc4d24d2dc4a107f509d2d6d7
 export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
-export GLEW_TARBALL := 594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
+export GLEW_TARBALL := 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
 export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GRAPHITE_MD5SUM := 2ef839348fe28e3b923bf8cced440227
 export GRAPHITE_TARBALL := graphite2-1.2.4.tgz

external/glew/0001-stop-linking-to-unneeded-Xmu-Xi-Xext-libraries.patch.1

-From 820df42a87322eef69a8d02451caa705d53b7dda Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Thu, 30 Jan 2014 12:12:00 +0100
-Subject: [PATCH] stop linking to unneeded Xmu, Xi, Xext libraries
-
-Apparently Xmu and Xi were needed when glewinfo was using glut, but that
-dependency was removed 11 years ago in
-031afdf03be1d123b7a442f64cfa28c6066c1490.
----
- auto/doc/build.html           | 2 +-
- config/Makefile.cygwin        | 2 +-
- config/Makefile.darwin        | 2 +-
- config/Makefile.darwin-ppc    | 2 +-
- config/Makefile.darwin-x86_64 | 2 +-
- config/Makefile.freebsd       | 2 +-
- config/Makefile.gnu           | 2 +-
- config/Makefile.kfreebsd      | 2 +-
- config/Makefile.linux         | 2 +-
- config/Makefile.netbsd        | 2 +-
- config/Makefile.openbsd       | 2 +-
- config/Makefile.solaris       | 2 +-
- config/Makefile.solaris-gcc   | 2 +-
- doc/build.html                | 2 +-
- 14 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin
-index b044273..8600fd0 100644
---- a/config/Makefile.cygwin
-+++ b/config/Makefile.cygwin
-@@ -6,7 +6,7 @@ LD := cc
- LN :=
- LDFLAGS.EXTRA =
- LIBDIR = $(GLEW_DEST)/lib
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- WARN = -Wall -W
-diff --git a/config/Makefile.darwin b/config/Makefile.darwin
-index 0c05ed1..bf34a0e 100644
---- a/config/Makefile.darwin
-+++ b/config/Makefile.darwin
-@@ -6,7 +6,7 @@ CFLAGS.EXTRA = -dynamic -fno-common
- LDFLAGS.EXTRA =
- ifneq (undefined, $(origin GLEW_APPLE_GLX))
- CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
--LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
- else
- LDFLAGS.GL = -framework AGL -framework OpenGL
- endif
-diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc
-index 2aaf66a..46c8b73 100644
---- a/config/Makefile.darwin-ppc
-+++ b/config/Makefile.darwin-ppc
-@@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch ppc -dynamic -fno-common
- LDFLAGS.EXTRA = -arch ppc
- ifneq (undefined, $(origin GLEW_APPLE_GLX))
- CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
--LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
- else
- LDFLAGS.GL = -framework AGL -framework OpenGL
- endif
-diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64
-index 83e5c47..e6eb050 100644
---- a/config/Makefile.darwin-x86_64
-+++ b/config/Makefile.darwin-x86_64
-@@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch x86_64 -dynamic -fno-common
- LDFLAGS.EXTRA = -arch x86_64
- ifneq (undefined, $(origin GLEW_APPLE_GLX))
- CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
--LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
- else
- LDFLAGS.GL = -framework AGL -framework OpenGL
- endif
-diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd
-index ab9d9d9..bb66fcc 100644
---- a/config/Makefile.freebsd
-+++ b/config/Makefile.freebsd
-@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
- CC = cc
- LD = ld
- LDFLAGS.EXTRA = -L/usr/X11R6/lib
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- CFLAGS.EXTRA += -I/usr/X11R6/include
-diff --git a/config/Makefile.gnu b/config/Makefile.gnu
-index 2398ab0..b7c58be 100644
---- a/config/Makefile.gnu
-+++ b/config/Makefile.gnu
-@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
- CC = cc
- LD = cc
- LDFLAGS.EXTRA = -L/usr/X11R6/lib
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- NAME = GLEW
-diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd
-index 9501091..faf1046 100644
---- a/config/Makefile.kfreebsd
-+++ b/config/Makefile.kfreebsd
-@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
- CC = cc
- LD = cc
- LDFLAGS.EXTRA = -L/usr/X11R6/lib
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- NAME = GLEW
-diff --git a/config/Makefile.linux b/config/Makefile.linux
-index 234adc6..b460b4b 100644
---- a/config/Makefile.linux
-+++ b/config/Makefile.linux
-@@ -16,7 +16,7 @@ else
-   LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
-   LIBDIR = $(GLEW_DEST)/lib
- endif
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- NAME = GLEW
-diff --git a/config/Makefile.netbsd b/config/Makefile.netbsd
-index 5f69cd6..6da47b1 100644
---- a/config/Makefile.netbsd
-+++ b/config/Makefile.netbsd
-@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
- CC = cc
- LD = ld
- LDFLAGS.EXTRA = -L/usr/X11R7/lib -R /usr/X11R7/lib 
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC
-diff --git a/config/Makefile.openbsd b/config/Makefile.openbsd
-index 365ea9e..ade993e 100644
---- a/config/Makefile.openbsd
-+++ b/config/Makefile.openbsd
-@@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
- CC = cc
- LD = ld
- LDFLAGS.EXTRA = -L/usr/X11R6/lib
--LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 -lm
-+LDFLAGS.GL = -lGLU -lGL -lX11 -lm
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic
- CFLAGS.EXTRA += -I/usr/X11R6/include
-diff --git a/config/Makefile.solaris b/config/Makefile.solaris
-index befba5a..fe78ca1 100644
---- a/config/Makefile.solaris
-+++ b/config/Makefile.solaris
-@@ -4,7 +4,7 @@ LD = ld
- CFLAGS.EXTRA = -I/usr/openwin/include
- LDFLAGS.SO = -G
- LDFLAGS.EXTRA = -L/usr/openwin/lib
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- NAME = GLEW
- BIN.SUFFIX =
- POPT = -xO2
-diff --git a/config/Makefile.solaris-gcc b/config/Makefile.solaris-gcc
-index c0373f4..e00a95b 100644
---- a/config/Makefile.solaris-gcc
-+++ b/config/Makefile.solaris-gcc
-@@ -4,7 +4,7 @@ LD = ld
- CFLAGS.EXTRA = -I/usr/openwin/include
- LDFLAGS.SO = -G
- LDFLAGS.EXTRA = -L/usr/openwin/lib
--LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
-+LDFLAGS.GL = -lGL -lX11
- NAME = GLEW
- BIN.SUFFIX =
- POPT = -O2
--- 
-1.8.3.1
-

external/glew/ExternalPackage_glew.mk

@@ -20,14 +20,14 @@ endif
 endif
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.1.10.0.dylib,lib/libGLEW.1.10.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.1.12.0.dylib,lib/libGLEW.1.12.0.dylib))
 else ifeq ($(OS)-$(COM),WNT-GCC)
 else ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalPackage_add_files,glew,$(LIBO_LIB_FOLDER), \
 	bin/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/$(glew_arch_subdir)/glew32d.dll,Release/$(glew_arch_subdir)/glew32.dll) \
 ))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.so.1.10,lib/libGLEW.so.1.10.0))
+$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.so.1.12,lib/libGLEW.so.1.12.0))
 endif
 
 # vim: set noet sw=4 ts=4:

external/glew/UnpackedTarball_glew.mk

@@ -22,13 +22,10 @@ ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_UnpackedTarball_set_patchflags,glew,--binary))
 $(eval $(call gb_UnpackedTarball_add_patches,glew,\
 	external/glew/glew-msvc-disable-sse2.patch.1 \
-	external/glew/glew-fix-rc-error.patch.1 \
-	external/glew/glew-vc2013-project.patch.1 \
 ))
 else
 $(eval $(call gb_UnpackedTarball_add_patches,glew,\
 	external/glew/glew_use_CC_variable.patch.1 \
-	external/glew/0001-stop-linking-to-unneeded-Xmu-Xi-Xext-libraries.patch.1 \
 ))
 endif
 
@@ -50,9 +47,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,glew,\
 ))
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,glew,\
-	external/glew/glew-debug.patch.1 \
-	external/glew/glew-config-guess.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

external/glew/glew-debug.patch.1

--*- Mode: Diff -*-
---- glew/Makefile
-+++ glew/Makefile
-@@ -65,7 +65,7 @@
- RM      ?= rm -f
- LN      ?= ln -sf
- 
--ifeq ($(MAKECMDGOALS), debug)
-+ifneq (,$(filter debug,$(MAKECMDGOALS)))
- OPT = -g
- else
- OPT = $(POPT)

external/glew/glew-fix-rc-error.patch.1

-diff -ur glew.org/build/glew.rc glew/build/glew.rc
---- glew.org/build/glew.rc	2014-01-28 06:54:52.910765800 +0100
-+++ glew/build/glew.rc	2014-01-28 06:56:46.719717700 +0100
-@@ -56,7 +56,7 @@
-     BEGIN
-         BLOCK "040904b0"
-         BEGIN
--            VALUE "Comments", "The OpenGL Extension Wrangler Library\r\nCopyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>\r\nCopyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>\r\nCopyright (C) 2002, Lev Povalahev\r\nAll rights reserved.\r\n\r\nRedistribution and use in source and binary forms, with or without \r\nmodification, are permitted provided that the following conditions are met:\r\n\r\n* Redistributions of source code must retain the above copyright notice, \r\n  this list of conditions and the following disclaimer.\r\n* Redistributions in binary form must reproduce the above copyright notice, \r\n  this list of conditions and the following disclaimer in the documentation \r\n  and/or other materials provided with the distribution.\r\n* The name of the author may be used to endorse or promote products \r\n  derived from this software without specific prior written permission.\r\n\r\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ''AS IS'' \r\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE \r\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\r\nARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE \r\nLIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR \r\nCONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF \r\nSUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\r\nINTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\r\nCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\r\nARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\r\nTHE POSSIBILITY OF SUCH DAMAGE.\r\n\r\n\r\nMesa 3-D graphics library\r\n\r\nVersion:  7.0\r\n\r\nCopyright (C) 1999-2007  Brian Paul   All Rights Reserved.\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a\r\ncopy of this software and associated documentation files (the ''Software''),\r\nto deal in the Software without restriction, including without limitation\r\nthe rights to use, copy, modify, merge, publish, distribute, sublicense,\r\nand/or sell copies of the Software, and to permit persons to whom the\r\nSoftware is furnished to do so, subject to the following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included\r\nin all copies or substantial portions of the Software.\r\n\r\nTHE SOFTWARE IS PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS\r\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\r\nBRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\r\nAN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r\n\r\n\r\nCopyright (c) 2007 The Khronos Group Inc.\r\n\r\nPermission is hereby granted, free of charge, to any person obtaining a\r\ncopy of this software and/or associated documentation files (the\r\n''Materials''), to deal in the Materials without restriction, including\r\nwithout limitation the rights to use, copy, modify, merge, publish,\r\ndistribute, sublicense, and/or sell copies of the Materials, and to\r\npermit persons to whom the Materials are furnished to do so, subject to\r\nthe following conditions:\r\n\r\nThe above copyright notice and this permission notice shall be included\r\nin all copies or substantial portions of the Materials.\r\n\r\nTHE MATERIALS ARE PROVIDED ''AS IS'', WITHOUT WARRANTY OF ANY KIND,\r\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\r\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\r\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\r\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\r\nMATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.\0"
-+            VALUE "Comments", "The OpenGL Extension Wrangler Library\0"
-             VALUE "CompanyName", "\0"
-             VALUE "FileDescription", "The OpenGL Extension Wrangler Library\0"
-             VALUE "FileVersion", "1,10,0,0\0"