fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-02-14 11:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl: Remove GLEW from the build system and the source tree

Browse source
This commit is contained in:
Alexandros Frantzis 2010-12-06 14:01:20 +02:00 • committed by Chris Wilson
parent 7cf9893546
commit 2a632b1f54
9 changed files with 1 additions and 25947 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/configure.ac.features
View file

@ -395,7 +395,6 @@ AC_DEFUN([CAIRO_REPORT],
echo ""
echo "The following functions:"
echo " PNG functions: $use_png"
echo " GLEW functions: $use_glew"
echo " GLX functions: $use_glx"
echo " WGL functions: $use_wgl"
echo " EGL functions: $use_egl"

21
configure.ac
View file

@ -298,7 +298,6 @@ CAIRO_ENABLE_FUNCTIONS(png, PNG, yes, [
])
dnl ===========================================================================
use_glew="no (not required by any backend)"
CAIRO_ENABLE_SURFACE_BACKEND(gl, OpenGL, no, [
gl_REQUIRES="gl"
PKG_CHECK_MODULES(gl, $gl_REQUIRES,, [
@ -309,30 +308,10 @@ CAIRO_ENABLE_SURFACE_BACKEND(gl, OpenGL, no, [
gl_NONPKGCONFIG_LIBS="-lGL"
fi])
# Disable system GLEW on UNIX since it assumes X and crashes with EGL
have_glew="no"
case "$host" in
*-linux*|*-*bsd*|*-solaris*)
;;
*)
AC_CHECK_HEADER(GL/glew.h,
[AC_CHECK_LIB(GLEW, glewInit, [have_glew="GLEW"],
[AC_CHECK_LIB(glew32, glewInit, [have_glew="glew32"],
[])])])
;;
esac
AS_IF([test "x$have_glew" != "xno"],[
gl_NONPKGCONFIG_LIBS="-l$have_glew $gl_NONPKGCONFIG_LIBS"
use_glew="yes (system library)"
], [
use_glew="yes (private copy)"
CAIRO_CFLAGS="$CAIRO_CFLAGS -I\$(top_srcdir)/src/glew"
])
need_glx_functions=yes
need_wgl_functions=yes
need_egl_functions=yes
])
AM_CONDITIONAL(BUILD_PRIVATE_GLEW, test "x$use_glew" = "xyes (private copy)")
dnl ===========================================================================

1
doc/public/Makefile.am
View file

@ -21,7 +21,6 @@ EXTRA_HFILES=$(top_builddir)/src/cairo-supported-features.h
# Headers to ignore
IGNORE_HFILES= \
drm \
glew \
cairo-features.h \
cairo-features-win32.h \
$(all_cairo_private) \

2
src/Makefile.am
View file

@ -6,8 +6,6 @@ include $(srcdir)/Makefile.am.features
EXTRA_DIST += Makefile.win32 Makefile.win32.features
#MAINTAINERCLEANFILES += $(srcdir)/Makefile.win32.features
EXTRA_DIST += glew/LICENSE.txt
AM_CPPFLAGS = -I$(srcdir) $(CAIRO_CFLAGS)
AM_LDFLAGS = $(CAIRO_LDFLAGS)

7
src/Makefile.sources
View file

@ -315,9 +315,7 @@ cairo_gl_headers = cairo-gl.h
cairo_gl_private = cairo-gl-private.h \
cairo-gl-dispatch-private.h \
cairo-gl-ext-def-private.h \
cairo-gl-gradient-private.h \
glew/GL/glew.h \
glew/GL/glxew.h
cairo-gl-gradient-private.h
cairo_gl_sources = cairo-gl-composite.c \
cairo-gl-device.c \
@ -327,9 +325,6 @@ cairo_gl_sources = cairo-gl-composite.c \
cairo-gl-info.c \
cairo-gl-shaders.c \
cairo-gl-surface.c
if BUILD_PRIVATE_GLEW
cairo_gl_sources += glew/glew.c
endif
cairo_egl_sources += cairo-egl-context.c
cairo_glx_sources += cairo-glx-context.c

12255
src/glew/GL/glew.h
View file

File diff suppressed because it is too large Load diff

1399
src/glew/GL/glxew.h
View file

File diff suppressed because it is too large Load diff

73
src/glew/LICENSE.txt
View file

@ -1,73 +0,0 @@
The OpenGL Extension Wrangler Library
Copyright (C) 2002-2007, Milan Ikits <milan ikits[]ieee org>
Copyright (C) 2002-2007, Marcelo E. Magallon <mmagallo[]debian org>
Copyright (C) 2002, Lev Povalahev
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* The name of the author may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
Mesa 3-D graphics library
Version: 7.0
Copyright (C) 1999-2007 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.
Copyright (c) 2007 The Khronos Group Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
"Materials"), to deal in the Materials without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Materials, and to
permit persons to whom the Materials are 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 Materials.
THE MATERIALS ARE 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 THE AUTHORS OR COPYRIGHT HOLDERS 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
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

12189
src/glew/glew.c
View file

File diff suppressed because it is too large Load diff