# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1506719701 14400
# Node ID 7d6f1fd0d6720d3f1d76e5cc8ccfa8a0e316317d
# Parent  67c0ec94a9ebfee825a0a4e39ab5d9e5c0feed85
update osmesa package to version 7.2.1

diff -r 67c0ec94a9eb -r 7d6f1fd0d672 src/mingw-osmesa-1-fixes.patch
--- a/src/mingw-osmesa-1-fixes.patch	Fri Sep 29 16:30:49 2017 -0400
+++ b/src/mingw-osmesa-1-fixes.patch	Fri Sep 29 17:15:01 2017 -0400
@@ -1,29 +1,14 @@
-diff -uNr a/scons/gallium.py b/scons/gallium.py
---- a/scons/gallium.py	2014-06-25 00:33:39.000000000 -0400
-+++ b/scons/gallium.py	2015-02-15 12:07:49.271713764 -0500
-@@ -529,10 +529,6 @@
-         else:
-             env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
-         if env['platform'] == 'windows':
--            # Avoid depending on gcc runtime DLLs
--            linkflags += ['-static-libgcc']
--            if 'w64' in env['CC'].split('-'):
--                linkflags += ['-static-libstdc++']
-             # Handle the @xx symbol munging of DLL exports
-             shlinkflags += ['-Wl,--enable-stdcall-fixup']
-             #shlinkflags += ['-Wl,--kill-at']
-diff -ur Mesa-10.2.2.orig/scons/crossmingw.py Mesa-10.2.2/scons/crossmingw.py
---- Mesa-10.2.2.orig/scons/crossmingw.py       2015-06-12 06:33:42.524589500 -0400
-+++ Mesa-10.2.2/scons/crossmingw.py    2015-06-12 22:12:26.181163800 -0400
-@@ -160,7 +160,11 @@
-     env.Append(SHLIBEMITTER = [shlib_emitter])
-     env['LINK'] = mingw_prefix + 'g++'
-     env['AR'] = mingw_prefix + 'ar'
-+    if not SCons.Util.WhereIs(env['AR']):
-+        env['AR'] = env['CC'] + '-ar'
-     env['RANLIB'] = mingw_prefix + 'ranlib'
-+    if not SCons.Util.WhereIs(env['RANLIB']):
-+        env['RANLIB'] = env['CC'] + '-ranlib'
-     env['LINK'] = mingw_prefix + 'g++'
-     env['AS'] = mingw_prefix + 'as'
-     env['WIN32DEFPREFIX']        = ''
+diff -uNr a/src/mesa/main/imports.h b/src/mesa/main/imports.h
+--- a/src/mesa/main/imports.h	2017-09-17 19:03:22.000000000 -0400
++++ b/src/mesa/main/imports.h	2017-10-02 09:54:19.341817963 -0400
+@@ -357,10 +357,6 @@
+ #define snprintf _snprintf
+ #endif
+ 
+-#if defined(_WIN32) && !defined(strtok_r)
+-#define strtok_r strtok_s
+-#endif
+-
+ #ifdef __cplusplus
+ }
+ #endif
diff -r 67c0ec94a9eb -r 7d6f1fd0d672 src/osmesa.mk
--- a/src/osmesa.mk	Fri Sep 29 16:30:49 2017 -0400
+++ b/src/osmesa.mk	Fri Sep 29 17:15:01 2017 -0400
@@ -2,12 +2,12 @@
 # See index.html for further information.
 
 PKG             := osmesa
-$(PKG)_VERSION  := 10.2.2
-$(PKG)_CHECKSUM := 2cc7c5b80fd2ddbf540acf47dbaec68e8cab16a4
-$(PKG)_SUBDIR   := Mesa-$($(PKG)_VERSION)
-$(PKG)_FILE     := MesaLib-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := 
+$(PKG)_VERSION  := 17.2.1
+$(PKG)_CHECKSUM := 7429e74a0ef12ea9d60b41b2b852898b3da0b238
+$(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
+$(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
+$(PKG)_DEPS     := build-mako zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -41,10 +41,10 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
-        --enable-osmesa --disable-dri --disable-egl --disable-xvmc \
-        --disable-glx --disable-shared-glapi --disable-gallium-llvm \
+        --enable-osmesa --disable-gbm --disable-dri --disable-egl \
+        --disable-xvmc --disable-glx --disable-llvm \
         --with-gallium-drivers="" --with-dri-drivers="" \
-        --with-egl-platforms="" --enable-texture-float \
+        --with-platforms="" --enable-texture-float \
         && $(CONFIGURE_POST_HOOK)
 
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'