[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libglu][debian-unstable] 16 commits: build: fix the debug parameter to properly handle --disable-debug

Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libglu

Commits:

16 changed files:

Changes:

  • .editorconfig
    1 
    +root = true
    2 
    +
    3 
    +[{meson.build,meson_options.txt}]
    4 
    +indent_size = 2
    5 
    +indent_style = space
    6 
    +insert_final_newline = true
    \ No newline at end of file

  • Makefile.am
    ... ... @@ -30,13 +30,12 @@ AM_CPPFLAGS = -DLIBRARYBUILD \
    30 30 
     	-I$(top_srcdir)/src/libnurbs/internals \
    31 31 
     	-I$(top_srcdir)/src/libnurbs/interface \
    32 32 
     	-I$(top_srcdir)/src/libnurbs/nurbtess
    33 
    -AM_CFLAGS = $(GL_CFLAGS) $(OSMESA_CFLAGS) $(WARNCFLAGS) $(VISIBILITY_CFLAGS)
    34 
    -AM_CXXFLAGS = $(GL_CFLAGS) $(OSMESA_CFLAGS) $(WARNCXXFLAGS) $(VISIBILITY_CXXFLAGS)
    33 
    +AM_CFLAGS = $(GL_CFLAGS) $(LIBGLVND_CFLAGS) $(OSMESA_CFLAGS) $(WARNCFLAGS) $(VISIBILITY_CFLAGS)
    34 
    +AM_CXXFLAGS = $(GL_CFLAGS) $(LIBGLVND_CFLAGS) $(OSMESA_CFLAGS) $(WARNCXXFLAGS) $(VISIBILITY_CXXFLAGS)
    35 35
    36 36 
     GL_includedir = $(includedir)/GL
    37 37 
     GL_include_HEADERS = \
    38 
    -	$(top_srcdir)/include/GL/glu.h \
    39 
    -	$(top_srcdir)/include/GL/glu_mangle.h
    38 
    +	$(top_srcdir)/include/GL/glu.h
    40 39
    41 40 
     GLU_LIBRARY_VERSION=1:3:1
    42 41 
     lib_LTLIBRARIES = libGLU.la
    ... ... @@ -130,12 +129,14 @@ libGLU_la_SOURCES = \
    130 129 
     	src/libnurbs/nurbtess/sampleMonoPoly.cc			\
    131 130 
     	src/libnurbs/nurbtess/sampledLine.cc			\
    132 131 
     	src/libnurbs/nurbtess/searchTree.cc
    133 
    -libGLU_la_LIBADD = $(GL_LIBS) $(OSMESA_LIBS)
    132 
    +libGLU_la_LIBADD = $(GL_LIBS) $(LIBGLVND_LIBS) $(OSMESA_LIBS)
    134 133 
     libGLU_la_LDFLAGS = -version-number $(GLU_LIBRARY_VERSION) -no-undefined -export-symbols-regex '^glu'
    135 134
    136 135 
     EXTRA_DIST =							\
    136 
    +	meson.build     					\
    137 
    +	meson_options.txt					\
    137 138 
     	include/GL/glu.h					\
    138 
    -	include/GL/glu_mangle.h					\
    139 
    +	src/meson.build     					\
    139 140 
     	src/libtess/render.h					\
    140 141 
     	src/libtess/tessmono.h					\
    141 142 
     	src/libtess/mesh.h					\

  • configure.ac
    ... ... @@ -21,8 +21,8 @@
    21 21
    22 22 
     AC_PREREQ([2.60])
    23 23 
     AC_INIT([glu],
    24 
    -        [9.0.1],
    25 
    -        [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa&component=GLU])
    24 
    +        [9.0.2],
    25 
    +        [https://gitlab.freedesktop.org/mesa/glu/issues])
    26 26 
     AC_CONFIG_SRCDIR([Makefile.am])
    27 27 
     AC_CANONICAL_HOST
    28 28
    ... ... @@ -42,8 +42,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
    42 42 
     AC_ARG_ENABLE(debug,
    43 43 
                   AS_HELP_STRING([--enable-debug],
    44 44 
                     [Enable debugging information]),
    45 
    -              [CFLAGS="$CFLAGS -g -O0 -DDEBUG"
    46 
    -               CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"],
    45 
    +              [if test x$enableval = xyes; then
    46 
    +               CFLAGS="$CFLAGS -g -O0 -DDEBUG"
    47 
    +               CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"; else
    48 
    +               CFLAGS="$CFLAGS -DNDEBUG"
    49 
    +               CXXFLAGS="$CXXFLAGS -DNDEBUG"; fi],
    47 50 
                   [CFLAGS="$CFLAGS -DNDEBUG"
    48 51 
                    CXXFLAGS="$CXXFLAGS -DNDEBUG"])
    49 52
    ... ... @@ -55,34 +58,52 @@ m4_ifndef([PKG_PROG_PKG_CONFIG],
    55 58 
       ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
    56 59 
     PKG_PROG_PKG_CONFIG()
    57 60
    61 
    +AC_ARG_ENABLE(libglvnd,
    62 
    +              AS_HELP_STRING([--enable-libglvnd],
    63 
    +                [Enable use of libglvnd]),
    64 
    +              [LIBGLVND="$enableval"],
    65 
    +              [LIBGLVND=no])
    66 
    +
    58 67 
     AC_ARG_ENABLE(osmesa,
    59 68 
                   AS_HELP_STRING([--enable-osmesa],
    60 69 
                     [Enable use of OSMesa instead of libGL]),
    61 70 
                   [OSMESA="$enableval"],
    62 71 
                   [OSMESA=no])
    63 72
    64 
    -dnl Get the pkg-config definitions for libGL/OSMesa.  We include a fallback
    65 
    -dnl path for implementations that don't provide a .pc file
    66 
    -if test "x$OSMESA" = "xyes"; then
    73 
    +dnl Get the pkg-config definitions for libglvnd/OSMesa/libGL.  We include a
    74 
    +dnl fallback path for implementations that don't provide a .pc file
    75 
    +AS_IF([test "x$LIBGLVND" = "xyes"], [
    76 
    +    GLU_REQUIRES="libglvnd"
    77 
    +    PKG_CHECK_MODULES(LIBGLVND, [opengl], [], [
    78 
    +        AC_CHECK_HEADER([GL/gl.h],
    79 
    +                        [],
    80 
    +                        AC_MSG_ERROR([libglvnd GL not found]))
    81 
    +        AC_CHECK_LIB([OpenGL],
    82 
    +                     [glBegin],
    83 
    +                     [GL_LIBS=-lOpenGL],
    84 
    +                     AC_MSG_ERROR([libglvnd libOpenGL required]))
    85 
    +    ])
    86 
    +], [test "x$OSMESA" = "xyes"], [
    67 87 
         GLU_REQUIRES="osmesa"
    68 88 
         PKG_CHECK_MODULES(OSMESA, [osmesa], [], [
    69 
    -          AC_CHECK_LIB([OSMesa],
    70 
    -                   [glBegin],
    71 
    -                   [OSMESA_LIBS=-lOSMesa],
    72 
    -                   AC_MSG_ERROR([OSMesa required]))
    73 
    -          ])
    74 
    -else
    89 
    +        AC_CHECK_LIB([OSMesa],
    90 
    +                     [glBegin],
    91 
    +                     [OSMESA_LIBS=-lOSMesa],
    92 
    +                     AC_MSG_ERROR([OSMesa required]))
    93 
    +    ])
    94 
    +], [
    75 95 
         GLU_REQUIRES="gl"
    76 96 
         PKG_CHECK_MODULES(GL, [gl], [], [
    77 
    -          AC_CHECK_HEADER([GL/gl.h],
    78 
    -                  [],
    79 
    -                  AC_MSG_ERROR([GL not found]))
    80 
    -          AC_CHECK_LIB([GL],
    81 
    -                   [glBegin],
    82 
    -                   [GL_LIBS=-lGL],
    83 
    -                   AC_MSG_ERROR([GL required]))
    84 
    -          ])
    85 
    -fi
    97 
    +        AC_CHECK_HEADER([GL/gl.h],
    98 
    +                        [],
    99 
    +                        AC_MSG_ERROR([GL not found]))
    100 
    +        AC_CHECK_LIB([GL],
    101 
    +                     [glBegin],
    102 
    +                     [GL_LIBS=-lGL],
    103 
    +                     AC_MSG_ERROR([GL required]))
    104 
    +    ])
    105 
    +])
    106 
    +
    86 107 
     AC_SUBST([GLU_REQUIRES])
    87 108
    88 109 
     dnl Set up C warning and visibility flags.

  • debian/changelog
    1 
    -libglu (9.0.1-2) UNRELEASED; urgency=medium
    1 
    +libglu (9.0.2-1) unstable; urgency=medium
    2 2
    3 
    +  * New upstream release.
    3 4 
       * Use secure copyright file specification URI.
    5 
    +  * control: Migrate to libgl-dev.
    6 
    +  * watch: Updated.
    7 
    +  * control, rules: Migrate to debhelper-compat, bump to 13.
    8 
    +  * copyright, install: glu_mangle.h is gone.
    9 
    +  * control, rules: Build with meson, add support for glvnd.
    4 10
    5 
    - -- Debian Janitor <janitor@jelmer.uk>  Sat, 18 Jan 2020 12:43:24 +0000
    11 
    + -- Timo Aaltonen <tjaalton@debian.org>  Fri, 04 Mar 2022 16:49:49 +0200
    6 12
    7 13 
     libglu (9.0.1-1) unstable; urgency=medium
    8 14

  • debian/compat deleted
    1 
    -12

  • debian/control
    ... ... @@ -2,11 +2,12 @@ Source: libglu
    2 2 
     Section: graphics
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 
    -Standards-Version: 4.4.1
    6 5 
     Build-Depends:
    7 
    - debhelper (>= 12),
    6 
    + debhelper-compat (= 13),
    7 
    + meson,
    8 8 
      pkg-config,
    9 
    - libgl1-mesa-dev,
    9 
    + libglvnd-dev,
    10 
    +Standards-Version: 4.6.0
    10 11 
     Vcs-Git: https://salsa.debian.org/xorg-team/lib/libglu.git
    11 12 
     Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libglu
    12 13
    ... ... @@ -41,7 +42,7 @@ Architecture: any
    41 42 
     Multi-Arch: same
    42 43 
     Depends:
    43 44 
      libglu1-mesa (= ${binary:Version}),
    44 
    - libgl1-mesa-dev | libgl-dev,
    45 
    + libgl-dev,
    45 46 
      ${misc:Depends},
    46 47 
     Provides: libglu-dev, xlibmesa-glu-dev
    47 48 
     Conflicts: mesag-dev (<< 5.0.0-1), mesa-glide2-dev (<< 5.0.0-1), mesag3+ggi-dev (<< 5.0.0-1), xlibmesa-dev

  • debian/copyright
    ... ... @@ -63,25 +63,6 @@ Comment:
    63 63 
      Covered Code under the terms of a subsequent version of the license.  Debian
    64 64 
      makes use of that possibility, using the 2.0 version as above.
    65 65
    66 
    -Files: include/GL/glu_mangle.h
    67 
    -Copyright: 1995-1998 Brian Paul
    68 
    -License: LGPL-2
    69 
    - This library is free software; you can redistribute it and/or
    70 
    - modify it under the terms of the GNU Library General Public
    71 
    - License as published by the Free Software Foundation; either
    72 
    - version 2 of the License, or (at your option) any later version.
    73 
    - .
    74 
    - This library is distributed in the hope that it will be useful,
    75 
    - but WITHOUT ANY WARRANTY; without even the implied warranty of
    76 
    - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    77 
    - Library General Public License for more details.
    78 
    - .
    79 
    - You should have received a copy of the GNU Library General Public
    80 
    - License along with this library; if not, see <http://www.gnu.org/licenses/>
    81 
    - .
    82 
    - On Debian systems, the complete text of the GNU Library General
    83 
    - Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
    84 
    -
    85 66 
     Files: debian/*
    86 67 
     Copyright: 2012 Timo Aaltonen
    87 68 
     License: GPL-2

  • debian/libglu1-mesa-dev.install.in
    1 1 
     usr/include/GL/glu.h
    2 
    -usr/include/GL/glu_mangle.h
    3 2 
     usr/lib/${DEB_HOST_MULTIARCH}/libGLU.a
    4 3 
     usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so
    5 4 
     usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glu.pc

  • debian/rules
    ... ... @@ -2,9 +2,6 @@
    2 2
    3 3 
     DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
    4 4
    5 
    -override_dh_auto_configure:
    6 
    -	dh_auto_configure -- --disable-silent-rules
    7 
    -
    8 5 
     override_dh_clean:
    9 6 
     	for file in debian/*.in; do rm -f $${file%%.in}; done
    10 7 
     	dh_clean
    ... ... @@ -21,11 +18,9 @@ override_dh_install:
    21 18
    22 19 
     	dh_install
    23 20
    24 
    -override_dh_missing:
    25 
    -	dh_missing --fail-missing
    26 
    -
    27 21 
     %:
    28 
    -	dh $@ --builddirectory=build/
    22 
    +	dh $@ --builddirectory=build/ \
    23 
    +		--buildsystem=meson
    29 24
    30 25 
     gentarball: SOURCE=libglu
    31 26 
     gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//')

  • debian/watch
    1 
    -#git=git://anongit.freedesktop.org/mesa/glu
    1 
    +#git=https://gitlab.freedesktop.org/mesa/glu
    2 2 
     version=3
    3 
    -ftp://freedesktop.org/pub/mesa/glu/ glu-(.*)\.tar\.gz
    3 
    +https://archive.mesa3d.org/glu/ glu-(.*)\.tar\.gz

  • include/GL/glu.h
    ... ... @@ -31,10 +31,6 @@
    31 31 
     #ifndef __glu_h__
    32 32 
     #define __glu_h__
    33 33
    34 
    -#if defined(USE_MGL_NAMESPACE)
    35 
    -#include "glu_mangle.h"
    36 
    -#endif
    37 
    -
    38 34 
     #include <GL/gl.h>
    39 35
    40 36 
     #ifndef GLAPIENTRY

  • include/GL/glu_mangle.h deleted
    1 
    -/*
    2 
    - * Mesa 3-D graphics library
    3 
    - * Version:  3.0
    4 
    - * Copyright (C) 1995-1998  Brian Paul
    5 
    - *
    6 
    - * This library is free software; you can redistribute it and/or
    7 
    - * modify it under the terms of the GNU Library General Public
    8 
    - * License as published by the Free Software Foundation; either
    9 
    - * version 2 of the License, or (at your option) any later version.
    10 
    - *
    11 
    - * This library is distributed in the hope that it will be useful,
    12 
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    13 
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    14 
    - * Library General Public License for more details.
    15 
    - *
    16 
    - * You should have received a copy of the GNU Library General Public
    17 
    - * License along with this library; if not, write to the Free
    18 
    - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    19 
    - */
    20 
    -
    21 
    -
    22 
    -#ifndef GLU_MANGLE_H
    23 
    -#define GLU_MANGLE_H
    24 
    -
    25 
    -
    26 
    -#define gluLookAt mgluLookAt
    27 
    -#define gluOrtho2D mgluOrtho2D
    28 
    -#define gluPerspective mgluPerspective
    29 
    -#define gluPickMatrix mgluPickMatrix
    30 
    -#define gluProject mgluProject
    31 
    -#define gluUnProject mgluUnProject
    32 
    -#define gluErrorString mgluErrorString
    33 
    -#define gluScaleImage mgluScaleImage
    34 
    -#define gluBuild1DMipmaps mgluBuild1DMipmaps
    35 
    -#define gluBuild2DMipmaps mgluBuild2DMipmaps
    36 
    -#define gluNewQuadric mgluNewQuadric
    37 
    -#define gluDeleteQuadric mgluDeleteQuadric
    38 
    -#define gluQuadricDrawStyle mgluQuadricDrawStyle
    39 
    -#define gluQuadricOrientation mgluQuadricOrientation
    40 
    -#define gluQuadricNormals mgluQuadricNormals
    41 
    -#define gluQuadricTexture mgluQuadricTexture
    42 
    -#define gluQuadricCallback mgluQuadricCallback
    43 
    -#define gluCylinder mgluCylinder
    44 
    -#define gluSphere mgluSphere
    45 
    -#define gluDisk mgluDisk
    46 
    -#define gluPartialDisk mgluPartialDisk
    47 
    -#define gluNewNurbsRenderer mgluNewNurbsRenderer
    48 
    -#define gluDeleteNurbsRenderer mgluDeleteNurbsRenderer
    49 
    -#define gluLoadSamplingMatrices mgluLoadSamplingMatrices
    50 
    -#define gluNurbsProperty mgluNurbsProperty
    51 
    -#define gluGetNurbsProperty mgluGetNurbsProperty
    52 
    -#define gluBeginCurve mgluBeginCurve
    53 
    -#define gluEndCurve mgluEndCurve
    54 
    -#define gluNurbsCurve mgluNurbsCurve
    55 
    -#define gluBeginSurface mgluBeginSurface
    56 
    -#define gluEndSurface mgluEndSurface
    57 
    -#define gluNurbsSurface mgluNurbsSurface
    58 
    -#define gluBeginTrim mgluBeginTrim
    59 
    -#define gluEndTrim mgluEndTrim
    60 
    -#define gluPwlCurve mgluPwlCurve
    61 
    -#define gluNurbsCallback mgluNurbsCallback
    62 
    -#define gluNewTess mgluNewTess
    63 
    -#define gluDeleteTess mgluDeleteTess
    64 
    -#define gluTessBeginPolygon mgluTessBeginPolygon
    65 
    -#define gluTessBeginContour mgluTessBeginContour
    66 
    -#define gluTessVertex mgluTessVertex
    67 
    -#define gluTessEndPolygon mgluTessEndPolygon
    68 
    -#define gluTessEndContour mgluTessEndContour
    69 
    -#define gluTessProperty mgluTessProperty
    70 
    -#define gluTessNormal mgluTessNormal
    71 
    -#define gluTessCallback mgluTessCallback
    72 
    -#define gluGetTessProperty mgluGetTessProperty
    73 
    -#define gluBeginPolygon mgluBeginPolygon
    74 
    -#define gluNextContour mgluNextContour
    75 
    -#define gluEndPolygon mgluEndPolygon
    76 
    -#define gluGetString mgluGetString
    77 
    -#define gluBuild1DMipmapLevels mgluBuild1DMipmapLevels
    78 
    -#define gluBuild2DMipmapLevels mgluBuild2DMipmapLevels
    79 
    -#define gluBuild3DMipmapLevels mgluBuild3DMipmapLevels
    80 
    -#define gluBuild3DMipmaps mgluBuild3DMipmaps
    81 
    -#define gluCheckExtension mgluCheckExtension
    82 
    -#define gluUnProject4 mgluUnProject4
    83 
    -#define gluNurbsCallbackData mgluNurbsCallbackData
    84 
    -#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
    85 
    -
    86 
    -#endif

  • meson.build
    1 
    +# SPDX-License-Identifier: MIT
    2 
    +# Copyright © 2021 Intel Corporation
    3 
    +
    4 
    +project(
    5 
    +  'glu',
    6 
    +  ['c', 'cpp'],
    7 
    +  version : '9.0.2',
    8 
    +  meson_version : '>= 0.52.0',
    9 
    +  license : 'SGI-B-1.1 AND SGI-B-2.0 AND MIT',
    10 
    +  default_options : ['default_library=both', 'b_ndebug=if-release']
    11 
    +)
    12 
    +
    13 
    +if get_option('debug')
    14 
    +  add_project_arguments('-DDEBUG', language : ['c', 'cpp'])
    15 
    +endif
    16 
    +
    17 
    +gl_provider = get_option('gl_provider')
    18 
    +if gl_provider == 'glvnd'
    19 
    +  gl_provider = 'opengl'
    20 
    +endif
    21 
    +dep_gl = dependency(gl_provider)
    22 
    +
    23 
    +inc_include = include_directories('include')
    24 
    +
    25 
    +subdir('src')
    26 
    +
    27 
    +install_headers(
    28 
    +  'include/GL/glu.h',
    29 
    +  subdir : 'GL',
    30 
    +)
    31 
    +
    32 
    +pkgconf = import('pkgconfig')
    33 
    +pkgconf.generate(
    34 
    +  libglu,
    35 
    +  name : 'glu',
    36 
    +  description : 'Mesa OpenGL Utility Library',
    37 
    +)

  • meson_options.txt
    1 
    +# SPDX-License-Identifier: MIT
    2 
    +# Copyright © 2021 Intel Corporation
    3 
    +
    4 
    +option(
    5 
    +  'gl_provider',
    6 
    +  type : 'combo',
    7 
    +  choices : ['glvnd', 'gl', 'osmesa'],
    8 
    +  value : 'glvnd',
    9 
    +  description : 'Which OpenGL to link with'
    10 
    +)

  • src/libutil/error.c
    ... ... @@ -48,8 +48,10 @@ static const struct token_string Errors[] = {
    48 48 
        { GL_STACK_OVERFLOW, "stack overflow" },
    49 49 
        { GL_STACK_UNDERFLOW, "stack underflow" },
    50 50 
        { GL_OUT_OF_MEMORY, "out of memory" },
    51 
    +#ifdef GL_TABLE_TOO_LARGE
    51 52 
        { GL_TABLE_TOO_LARGE, "table too large" },
    52 
    -#ifdef GL_EXT_framebuffer_object
    53 
    +#endif
    54 
    +#ifdef GL_INVALID_FRAMEBUFFER_OPERATION_EXT
    53 55 
        { GL_INVALID_FRAMEBUFFER_OPERATION_EXT, "invalid framebuffer operation" },
    54 56 
     #endif
    55 57 
        /* GLU */

  • src/meson.build
    1 
    +# SPDX-License-Identifier: MIT
    2 
    +# Copyright © 2021 Intel Corporation
    3 
    +
    4 
    +libglu = library(
    5 
    +  'GLU',
    6 
    +  [
    7 
    +    'libutil/error.c',
    8 
    +    'libutil/glue.c',
    9 
    +    'libutil/mipmap.c',
    10 
    +    'libutil/project.c',
    11 
    +    'libutil/quad.c',
    12 
    +    'libutil/registry.c',
    13 
    +    'libtess/dict.c',
    14 
    +    'libtess/geom.c',
    15 
    +    'libtess/memalloc.c',
    16 
    +    'libtess/mesh.c',
    17 
    +    'libtess/normal.c',
    18 
    +    'libtess/priorityq.c',
    19 
    +    'libtess/render.c',
    20 
    +    'libtess/sweep.c',
    21 
    +    'libtess/tess.c',
    22 
    +    'libtess/tessmono.c',
    23 
    +    'libnurbs/interface/bezierEval.cc',
    24 
    +    'libnurbs/interface/bezierPatch.cc',
    25 
    +    'libnurbs/interface/bezierPatchMesh.cc',
    26 
    +    'libnurbs/interface/glcurveval.cc',
    27 
    +    'libnurbs/interface/glinterface.cc',
    28 
    +    'libnurbs/interface/glrenderer.cc',
    29 
    +    'libnurbs/interface/glsurfeval.cc',
    30 
    +    'libnurbs/interface/incurveeval.cc',
    31 
    +    'libnurbs/interface/insurfeval.cc',
    32 
    +    'libnurbs/internals/arc.cc',
    33 
    +    'libnurbs/internals/arcsorter.cc',
    34 
    +    'libnurbs/internals/arctess.cc',
    35 
    +    'libnurbs/internals/backend.cc',
    36 
    +    'libnurbs/internals/basiccrveval.cc',
    37 
    +    'libnurbs/internals/basicsurfeval.cc',
    38 
    +    'libnurbs/internals/bin.cc',
    39 
    +    'libnurbs/internals/bufpool.cc',
    40 
    +    'libnurbs/internals/cachingeval.cc',
    41 
    +    'libnurbs/internals/ccw.cc',
    42 
    +    'libnurbs/internals/coveandtiler.cc',
    43 
    +    'libnurbs/internals/curve.cc',
    44 
    +    'libnurbs/internals/curvelist.cc',
    45 
    +    'libnurbs/internals/curvesub.cc',
    46 
    +    'libnurbs/internals/dataTransform.cc',
    47 
    +    'libnurbs/internals/displaylist.cc',
    48 
    +    'libnurbs/internals/flist.cc',
    49 
    +    'libnurbs/internals/flistsorter.cc',
    50 
    +    'libnurbs/internals/hull.cc',
    51 
    +    'libnurbs/internals/intersect.cc',
    52 
    +    'libnurbs/internals/knotvector.cc',
    53 
    +    'libnurbs/internals/mapdesc.cc',
    54 
    +    'libnurbs/internals/mapdescv.cc',
    55 
    +    'libnurbs/internals/maplist.cc',
    56 
    +    'libnurbs/internals/mesher.cc',
    57 
    +    'libnurbs/internals/monoTriangulationBackend.cc',
    58 
    +    'libnurbs/internals/monotonizer.cc',
    59 
    +    'libnurbs/internals/mycode.cc',
    60 
    +    'libnurbs/internals/nurbsinterfac.cc',
    61 
    +    'libnurbs/internals/nurbstess.cc',
    62 
    +    'libnurbs/internals/patch.cc',
    63 
    +    'libnurbs/internals/patchlist.cc',
    64 
    +    'libnurbs/internals/quilt.cc',
    65 
    +    'libnurbs/internals/reader.cc',
    66 
    +    'libnurbs/internals/renderhints.cc',
    67 
    +    'libnurbs/internals/slicer.cc',
    68 
    +    'libnurbs/internals/sorter.cc',
    69 
    +    'libnurbs/internals/splitarcs.cc',
    70 
    +    'libnurbs/internals/subdivider.cc',
    71 
    +    'libnurbs/internals/tobezier.cc',
    72 
    +    'libnurbs/internals/trimline.cc',
    73 
    +    'libnurbs/internals/trimregion.cc',
    74 
    +    'libnurbs/internals/trimvertpool.cc',
    75 
    +    'libnurbs/internals/uarray.cc',
    76 
    +    'libnurbs/internals/varray.cc',
    77 
    +    'libnurbs/nurbtess/directedLine.cc',
    78 
    +    'libnurbs/nurbtess/gridWrap.cc',
    79 
    +    'libnurbs/nurbtess/monoChain.cc',
    80 
    +    'libnurbs/nurbtess/monoPolyPart.cc',
    81 
    +    'libnurbs/nurbtess/monoTriangulation.cc',
    82 
    +    'libnurbs/nurbtess/partitionX.cc',
    83 
    +    'libnurbs/nurbtess/partitionY.cc',
    84 
    +    'libnurbs/nurbtess/polyDBG.cc',
    85 
    +    'libnurbs/nurbtess/polyUtil.cc',
    86 
    +    'libnurbs/nurbtess/primitiveStream.cc',
    87 
    +    'libnurbs/nurbtess/quicksort.cc',
    88 
    +    'libnurbs/nurbtess/rectBlock.cc',
    89 
    +    'libnurbs/nurbtess/sampleComp.cc',
    90 
    +    'libnurbs/nurbtess/sampleCompBot.cc',
    91 
    +    'libnurbs/nurbtess/sampleCompRight.cc',
    92 
    +    'libnurbs/nurbtess/sampleCompTop.cc',
    93 
    +    'libnurbs/nurbtess/sampleMonoPoly.cc',
    94 
    +    'libnurbs/nurbtess/sampledLine.cc',
    95 
    +    'libnurbs/nurbtess/searchTree.cc',
    96 
    +  ],
    97 
    +  c_args : ['-DLIBRARYBUILD'],
    98 
    +  cpp_args : ['-DLIBRARYBUILD'],
    99 
    +  include_directories : [
    100 
    +    'include',
    101 
    +    'libnurbs/internals',
    102 
    +    'libnurbs/interface',
    103 
    +    'libnurbs/nurbtess',
    104 
    +    inc_include,
    105 
    +  ],
    106 
    +  gnu_symbol_visibility : 'hidden',
    107 
    +  dependencies : [dep_gl],
    108 
    +  version : '1.3.1',
    109 
    +  install : true,
    110 
    +)
    111 
    +
    112 
    +# for subproject users
    113 
    +dep_glu = declare_dependency(
    114 
    +  link_with : libglu,
    115 
    +  include_directories : inc_include,
    116 
    +)

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: