Bin mesa_headers completely

We don't need them in a MSVC or OS X compilation either.

Change-Id: I00181fe0a047df09bbdfcce34c07eb2ebc45a2da

RepositoryExternal.mk

@@ -37,22 +37,6 @@ endif
 
 # External headers
 
-ifneq ($(SYSTEM_MESA_HEADERS),)
-
-gb_LinkTarget__use_mesa_headers :=
-
-else # !SYSTEM_MESA_HEADERS
-
-define gb_LinkTarget__use_mesa_headers
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(SRCDIR)/external/Mesa/inc \
-	$$(INCLUDE) \
-)
-
-endef
-
-endif # SYSTEM_MESA_HEADERS
-
 ifneq ($(SYSTEM_NPAPI_HEADERS),)
 
 # yes this uses internal headers too...

avmedia/Library_avmedia.mk

@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,avmedia,\
 $(eval $(call gb_Library_use_externals,avmedia,\
 	boost_headers \
 	glew \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\

avmedia/Library_avmediaogl.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_Library_use_externals,avmediaogl, \
     libgltf \
     glew \
     glm_headers \
-    $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_use_libraries,avmediaogl,\

canvas/Library_oglcanvas.mk

@@ -43,7 +43,6 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\
 $(eval $(call gb_Library_use_externals,oglcanvas,\
 	boost_headers \
 	glew \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 ifeq ($(strip $(OS)),MACOSX)

chart2/Library_chartcore.mk

@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_externals,chartcore,\
 	boost_headers \
 	glm_headers \
 	glew \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,chartcore,\

chart2/Library_chartopengl.mk

@@ -22,7 +22,6 @@ $(eval $(call gb_Library_set_precompiled_header,chartopengl,$(SRCDIR)/chart2/inc
 $(eval $(call gb_Library_use_externals,chartopengl,\
 	boost_headers \
 	glm_headers \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 	glew \
 ))
 

config_host.mk.in

@@ -552,7 +552,6 @@ export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@
 export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@
 export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@
 export SYSTEM_MDDS=@SYSTEM_MDDS@
-export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@
 export SYSTEM_MARIADB=@SYSTEM_MARIADB@
 export SYSTEM_MSPUB=@SYSTEM_MSPUB@
 export SYSTEM_MWAW=@SYSTEM_MWAW@

configure.ac

@@ -1893,11 +1893,6 @@ AC_ARG_WITH(system-bluez,
         [Use bluetooth.h already on system.]),,
     [with_system_bluez="$with_system_headers"])
 
-AC_ARG_WITH(system-mesa-headers,
-    AS_HELP_STRING([--with-system-mesa-headers],
-        [Use Mesa headers already on system.]),,
-    [with_system_mesa_headers="$with_system_headers"])
-
 AC_ARG_WITH(system-curl,
     AS_HELP_STRING([--with-system-curl],
         [Use curl already on system.]),,
@@ -10396,43 +10391,16 @@ elif test "$_os" = "Darwin"; then
     # We use frameworks on Mac OS X, no need for detail checks
     ENABLE_OPENGL=TRUE
     ENABLE_OPENGL_CANVAS=TRUE
-    SYSTEM_MESA_HEADERS=TRUE
 elif test $_os = WINNT; then
-    # Experimental: try to use OpenGL on Windows
     ENABLE_OPENGL=TRUE
     ENABLE_OPENGL_CANVAS=TRUE
-    # We need the internal "Mesa" headers.
-    SYSTEM_MESA_HEADERS=
-    BUILD_TYPE="$BUILD_TYPE MESA"
 else
     if test "$USING_X11" = TRUE; then
         ENABLE_OPENGL=TRUE
     fi
     ENABLE_OPENGL_CANVAS=TRUE
-
-    if test "$USING_X11" != TRUE; then
-        dnl ===================================================================
-        dnl Check for system Mesa
-        dnl ===================================================================
-        AC_MSG_CHECKING([which Mesa headers to use])
-        if test "$with_system_mesa_headers" = "yes"; then
-            AC_MSG_RESULT([external])
-            SYSTEM_MESA_HEADERS=TRUE
-            AC_LANG_PUSH(C)
-            AC_CHECK_HEADER(GL/glxext.h, [],
-               [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
-            AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
-            AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
-            AC_LANG_POP(C)
-        else
-            AC_MSG_RESULT([internal])
-            SYSTEM_MESA_HEADERS=
-            BUILD_TYPE="$BUILD_TYPE MESA"
-        fi
-    fi
 fi
 
-AC_SUBST(SYSTEM_MESA_HEADERS)
 AC_SUBST(ENABLE_OPENGL)
 AC_SUBST(ENABLE_OPENGL_CANVAS)
 

external/Mesa/README

-A copy of OpenGL headers from Mesa and Khronos. Needed on older Linux
-distros and for Windows.

external/Mesa/inc/GL/glu_mangle.h

-/*
- * Mesa 3-D graphics library
- * Version:  3.0
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef GLU_MANGLE_H
-#define GLU_MANGLE_H
-
-
-#define gluLookAt mgluLookAt
-#define gluOrtho2D mgluOrtho2D
-#define gluPerspective mgluPerspective
-#define gluPickMatrix mgluPickMatrix
-#define gluProject mgluProject
-#define gluUnProject mgluUnProject
-#define gluErrorString mgluErrorString
-#define gluScaleImage mgluScaleImage
-#define gluBuild1DMipmaps mgluBuild1DMipmaps
-#define gluBuild2DMipmaps mgluBuild2DMipmaps
-#define gluNewQuadric mgluNewQuadric
-#define gluDeleteQuadric mgluDeleteQuadric
-#define gluQuadricDrawStyle mgluQuadricDrawStyle
-#define gluQuadricOrientation mgluQuadricOrientation
-#define gluQuadricNormals mgluQuadricNormals
-#define gluQuadricTexture mgluQuadricTexture
-#define gluQuadricCallback mgluQuadricCallback
-#define gluCylinder mgluCylinder
-#define gluSphere mgluSphere
-#define gluDisk mgluDisk
-#define gluPartialDisk mgluPartialDisk
-#define gluNewNurbsRenderer mgluNewNurbsRenderer
-#define gluDeleteNurbsRenderer mgluDeleteNurbsRenderer
-#define gluLoadSamplingMatrices mgluLoadSamplingMatrices
-#define gluNurbsProperty mgluNurbsProperty
-#define gluGetNurbsProperty mgluGetNurbsProperty
-#define gluBeginCurve mgluBeginCurve
-#define gluEndCurve mgluEndCurve
-#define gluNurbsCurve mgluNurbsCurve
-#define gluBeginSurface mgluBeginSurface
-#define gluEndSurface mgluEndSurface
-#define gluNurbsSurface mgluNurbsSurface
-#define gluBeginTrim mgluBeginTrim
-#define gluEndTrim mgluEndTrim
-#define gluPwlCurve mgluPwlCurve
-#define gluNurbsCallback mgluNurbsCallback
-#define gluNewTess mgluNewTess
-#define gluDeleteTess mgluDeleteTess
-#define gluTessBeginPolygon mgluTessBeginPolygon
-#define gluTessBeginContour mgluTessBeginContour
-#define gluTessVertex mgluTessVertex
-#define gluTessEndPolygon mgluTessEndPolygon
-#define gluTessEndContour mgluTessEndContour
-#define gluTessProperty mgluTessProperty
-#define gluTessNormal mgluTessNormal
-#define gluTessCallback mgluTessCallback
-#define gluGetTessProperty mgluGetTessProperty
-#define gluBeginPolygon mgluBeginPolygon
-#define gluNextContour mgluNextContour
-#define gluEndPolygon mgluEndPolygon
-#define gluGetString mgluGetString
-#define gluBuild1DMipmapLevels mgluBuild1DMipmapLevels
-#define gluBuild2DMipmapLevels mgluBuild2DMipmapLevels
-#define gluBuild3DMipmapLevels mgluBuild3DMipmapLevels
-#define gluBuild3DMipmaps mgluBuild3DMipmaps
-#define gluCheckExtension mgluCheckExtension
-#define gluUnProject4 mgluUnProject4
-#define gluNurbsCallbackData mgluNurbsCallbackData
-#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
-
-#endif

external/Mesa/inc/GL/glx_mangle.h

-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef GLX_MANGLE_H
-#define GLX_MANGLE_H
-
-#define glXChooseVisual mglXChooseVisual
-#define glXCreateContext mglXCreateContext
-#define glXDestroyContext mglXDestroyContext
-#define glXMakeCurrent mglXMakeCurrent
-#define glXCopyContext mglXCopyContext
-#define glXSwapBuffers mglXSwapBuffers
-#define glXCreateGLXPixmap mglXCreateGLXPixmap
-#define glXDestroyGLXPixmap mglXDestroyGLXPixmap
-#define glXQueryExtension mglXQueryExtension
-#define glXQueryVersion mglXQueryVersion
-#define glXIsDirect mglXIsDirect
-#define glXGetConfig mglXGetConfig
-#define glXGetCurrentContext mglXGetCurrentContext
-#define glXGetCurrentDrawable mglXGetCurrentDrawable
-#define glXWaitGL mglXWaitGL
-#define glXWaitX mglXWaitX
-#define glXUseXFont mglXUseXFont
-#define glXQueryExtensionsString mglXQueryExtensionsString
-#define glXQueryServerString mglXQueryServerString
-#define glXGetClientString mglXGetClientString
-#define glXCreateGLXPixmapMESA mglXCreateGLXPixmapMESA
-#define glXReleaseBuffersMESA mglXReleaseBuffersMESA
-#define glXCopySubBufferMESA mglXCopySubBufferMESA
-#define glXGetVideoSyncSGI mglXGetVideoSyncSGI
-#define glXWaitVideoSyncSGI mglXWaitVideoSyncSGI
-
-/* GLX 1.2 */
-#define glXGetCurrentDisplay mglXGetCurrentDisplay
-
-/* GLX 1.3 */
-#define glXChooseFBConfig mglXChooseFBConfig
-#define glXGetFBConfigAttrib mglXGetFBConfigAttrib
-#define glXGetFBConfigs mglXGetFBConfigs
-#define glXGetVisualFromFBConfig mglXGetVisualFromFBConfig
-#define glXCreateWindow mglXCreateWindow
-#define glXDestroyWindow mglXDestroyWindow
-#define glXCreatePixmap mglXCreatePixmap
-#define glXDestroyPixmap mglXDestroyPixmap
-#define glXCreatePbuffer mglXCreatePbuffer
-#define glXDestroyPbuffer mglXDestroyPbuffer
-#define glXQueryDrawable mglXQueryDrawable
-#define glXCreateNewContext mglXCreateNewContext
-#define glXMakeContextCurrent mglXMakeContextCurrent
-#define glXGetCurrentReadDrawable mglXGetCurrentReadDrawable
-#define glXQueryContext mglXQueryContext
-#define glXSelectEvent mglXSelectEvent
-#define glXGetSelectedEvent mglXGetSelectedEvent
-
-/* GLX 1.4 */
-#define glXGetProcAddress mglXGetProcAddress
-
-
-#endif

include/vcl/opengl/OpenGLContext.hxx

@@ -31,9 +31,7 @@
 #endif
 
 #if defined( _WIN32 )
-#include <GL/glext.h>
 #include <GL/wglew.h>
-#include <GL/wglext.h>
 #elif defined( MACOSX )
 #include <OpenGL/OpenGL.h>
 #ifdef __OBJC__

slideshow/Library_OGLTrans.mk

@@ -31,7 +31,6 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\
 $(eval $(call gb_Library_use_externals,OGLTrans,\
 	boost_headers \
 	glew \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 	glm_headers \
 ))
 

slideshow/Library_slideshow.mk

@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in
 $(eval $(call gb_Library_use_externals,slideshow,\
 	boost_headers \
 	glew \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,slideshow))

svx/Library_svxcore.mk

@@ -84,7 +84,6 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 	boost_headers \
 	icuuc \
 	icu_headers \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 	glew \
 	libxml2 \
 ))

vcl/CppunitTest_vcl_bitmap_test.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
 	boost_headers \
 	glew \
 	glm_headers \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\

vcl/Executable_icontest.mk

@@ -13,7 +13,6 @@ $(eval $(call gb_Executable_use_externals,icontest,\
     boost_headers \
     glew \
 	glm_headers \
-	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Executable_use_api,icontest,\