Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/libepoxy/dist initial import of libepoxy-1.5.4
details: https://anonhg.NetBSD.org/xsrc/rev/fe16f2373378
branches: trunk
changeset: 10610:fe16f2373378
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Nov 02 04:43:17 2020 +0000
description:
initial import of libepoxy-1.5.4
diffstat:
external/mit/libepoxy/dist/.appveyor.yml | 12 +-
external/mit/libepoxy/dist/.travis.yml | 34 +-
external/mit/libepoxy/dist/.travis/Dockerfile | 29 +
external/mit/libepoxy/dist/.travis/epoxy-ci-linux.sh | 32 +
external/mit/libepoxy/dist/.travis/epoxy-ci-osx.sh | 27 +
external/mit/libepoxy/dist/.travis/run-docker.sh | 12 +
external/mit/libepoxy/dist/README.md | 3 +-
external/mit/libepoxy/dist/configure.ac | 51 +-
external/mit/libepoxy/dist/epoxy.pc.in | 1 +
external/mit/libepoxy/dist/include/epoxy/common.h | 7 +
external/mit/libepoxy/dist/include/epoxy/gl.h | 15 +
external/mit/libepoxy/dist/meson.build | 92 +-
external/mit/libepoxy/dist/meson_options.txt | 14 +-
external/mit/libepoxy/dist/registry/egl.xml | 370 +-
external/mit/libepoxy/dist/registry/gl.xml | 7829 +++++++--
external/mit/libepoxy/dist/registry/glx.xml | 99 +-
external/mit/libepoxy/dist/registry/wgl.xml | 91 +-
external/mit/libepoxy/dist/src/Makefile.am | 2 +-
external/mit/libepoxy/dist/src/dispatch_egl.c | 10 +-
external/mit/libepoxy/dist/src/dispatch_glx.c | 12 +-
external/mit/libepoxy/dist/src/dispatch_wgl.c | 6 +-
external/mit/libepoxy/dist/src/gen_dispatch.py | 39 +-
external/mit/libepoxy/dist/src/meson.build | 81 +-
external/mit/libepoxy/dist/test/Makefile.am | 35 +-
external/mit/libepoxy/dist/test/cgl_core.c | 54 +
external/mit/libepoxy/dist/test/cgl_epoxy_api.c | 83 +
external/mit/libepoxy/dist/test/dlwrap.c | 40 +-
external/mit/libepoxy/dist/test/egl_common.c | 1 +
external/mit/libepoxy/dist/test/egl_epoxy_api.c | 148 +
external/mit/libepoxy/dist/test/egl_gl.c | 2 +-
external/mit/libepoxy/dist/test/egl_has_extension_nocontext.c | 5 +
external/mit/libepoxy/dist/test/egl_without_glx.c | 14 +-
external/mit/libepoxy/dist/test/gl_version.c | 89 +
external/mit/libepoxy/dist/test/glx_common.c | 7 +-
external/mit/libepoxy/dist/test/glx_public_api.c | 10 +-
external/mit/libepoxy/dist/test/glx_public_api_core.c | 15 +-
external/mit/libepoxy/dist/test/glx_static.c | 4 +-
external/mit/libepoxy/dist/test/khronos_typedefs_nonepoxy.c | 2 +-
external/mit/libepoxy/dist/test/meson.build | 89 +-
external/mit/libepoxy/dist/test/wgl_common.c | 6 +-
external/mit/libepoxy/dist/test/wgl_core_and_exts.c | 6 +-
external/mit/libepoxy/dist/test/wgl_per_context_funcptrs.c | 10 +-
external/mit/libepoxy/dist/test/wgl_usefontbitmaps.c | 4 +-
43 files changed, 7370 insertions(+), 2122 deletions(-)
diffs (truncated from 17055 to 300 lines):
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/.appveyor.yml
--- a/external/mit/libepoxy/dist/.appveyor.yml Sun Nov 01 12:00:12 2020 +0000
+++ b/external/mit/libepoxy/dist/.appveyor.yml Mon Nov 02 04:43:17 2020 +0000
@@ -21,12 +21,12 @@
- mkdir build
- mkdir libepoxy-shared-%pout%
- cd build
-- curl -LsSO https://github.com/mesonbuild/meson/releases/download/0.39.1/meson-0.39.1.tar.gz
-- 7z x meson-0.39.1.tar.gz
-- move dist\meson-0.39.1.tar .
-- 7z x meson-0.39.1.tar
+- curl -LsSO https://github.com/mesonbuild/meson/releases/download/0.47.1/meson-0.47.1.tar.gz
+- 7z x meson-0.47.1.tar.gz
+- move dist\meson-0.47.1.tar .
+- 7z x meson-0.47.1.tar
- rmdir dist
-- del meson-0.39.1.tar meson-0.39.1.tar.gz
+- del meson-0.47.1.tar meson-0.47.1.tar.gz
- curl -LsSO https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip
- 7z x ninja-win.zip
- del ninja-win.zip
@@ -36,7 +36,7 @@
build_script:
- cd build
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
-- C:\Python36\python.exe meson-0.39.1\meson.py .. . --backend=ninja --prefix=%APPVEYOR_BUILD_FOLDER%\libepoxy-shared-%pout%
+- C:\Python36\python.exe meson-0.47.1\meson.py .. . --backend=ninja --prefix=%APPVEYOR_BUILD_FOLDER%\libepoxy-shared-%pout%
- ninja
- ninja install
- cd ..
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/.travis.yml
--- a/external/mit/libepoxy/dist/.travis.yml Sun Nov 01 12:00:12 2020 +0000
+++ b/external/mit/libepoxy/dist/.travis.yml Mon Nov 02 04:43:17 2020 +0000
@@ -7,6 +7,7 @@
os:
- linux
+ - osx
compiler:
- gcc
@@ -18,15 +19,36 @@
services:
- docker
+matrix:
+ exclude:
+ - os: osx
+ compiler: gcc
+
before_install:
+ - |
+ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+ brew update
+ brew install python@3 meson
+ # Use a Ninja with QuLogic's patch: https://github.com/ninja-build/ninja/issues/1219
+ mkdir -p $HOME/tools; curl -L http://nirbheek.in/files/binaries/ninja/macos/ninja -o $HOME/tools/ninja; chmod +x $HOME/tools/ninja
+ fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ebassi/epoxyci ; fi
before_script:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM ebassi/epoxyci > Dockerfile ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
+ - |
+ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+ echo FROM ebassi/epoxyci > Dockerfile
+ echo ADD . /root >> Dockerfile
+ echo WORKDIR /root >> Dockerfile
+ docker build -t withgit .
+ fi
+
+env:
+ - BUILD_OPTS=""
+ - BUILD_OPTS="-Dglx=no"
+ - BUILD_OPTS="-Degl=no"
+ - BUILD_OPTS="-Dx11=false"
script:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh" ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh -Denable-glx=no" ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh -Denable-egl=no" ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "CC=$CC .travis/epoxy-ci-linux.sh $BUILD_OPTS" ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then /bin/sh -c "CC=$CC .travis/epoxy-ci-osx.sh $BUILD_OPTS" ; fi
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/.travis/Dockerfile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/libepoxy/dist/.travis/Dockerfile Mon Nov 02 04:43:17 2020 +0000
@@ -0,0 +1,29 @@
+FROM debian:stretch-slim
+MAINTAINER Emmanuele Bassi <ebassi%gmail.com@localhost>
+
+RUN apt-get update -qq && \
+ apt-get install --no-install-recommends -qq -y \
+ ca-certificates \
+ clang \
+ gcc \
+ libgl1-mesa-dev \
+ libegl1-mesa-dev \
+ libgles1-mesa-dev \
+ libgles2-mesa-dev \
+ libgl1-mesa-dri \
+ locales \
+ ninja-build \
+ pkg-config \
+ python3 \
+ python3-pip \
+ python3-setuptools \
+ python3-wheel \
+ xvfb && \
+ rm -rf /usr/share/doc/* /usr/share/man/*
+
+RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8
+ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
+
+RUN pip3 install meson
+
+WORKDIR /root
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/.travis/epoxy-ci-linux.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/libepoxy/dist/.travis/epoxy-ci-linux.sh Mon Nov 02 04:43:17 2020 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+dump_log_and_quit() {
+ local exitcode=$1
+
+ cat meson-logs/testlog.txt
+
+ exit $exitcode
+}
+
+# Start Xvfb
+XVFB_WHD=${XVFB_WHD:-1280x720x16}
+
+Xvfb :99 -ac -screen 0 $XVFB_WHD -nolisten tcp &
+xvfb=$!
+
+export DISPLAY=:99
+
+srcdir=$( pwd )
+builddir=$( mktemp -d build_XXXXXX )
+
+meson --prefix /usr "$@" $builddir $srcdir || exit $?
+
+cd $builddir
+
+ninja || exit $?
+meson test || dump_log_and_quit $?
+
+cd ..
+
+# Stop Xvfb
+kill -9 ${xvfb}
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/.travis/epoxy-ci-osx.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/libepoxy/dist/.travis/epoxy-ci-osx.sh Mon Nov 02 04:43:17 2020 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+dump_log_and_quit() {
+ local exitcode=$1
+
+ cat meson-logs/testlog.txt
+
+ exit $exitcode
+}
+
+export SDKROOT=$( xcodebuild -version -sdk macosx Path )
+export CPPFLAGS=-I/usr/local/include
+export LDFLAGS=-L/usr/local/lib
+export OBJC=$CC
+export PATH=$HOME/tools:$PATH
+
+srcdir=$( pwd )
+builddir=$( mktemp -d build_XXXXXX )
+
+meson ${BUILDOPTS} $builddir $srcdir || exit $?
+
+cd $builddir
+
+ninja || exit $?
+meson test || dump_log_and_quit $?
+
+cd ..
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/.travis/run-docker.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/libepoxy/dist/.travis/run-docker.sh Mon Nov 02 04:43:17 2020 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -xe
+
+srcdir="$(pwd)/.."
+
+sudo docker build \
+ --tag "epoxyci" \
+ --file "Dockerfile" .
+sudo docker run --rm \
+ --volume "${srcdir}:/root/epoxy" \
+ --tty --interactive "epoxyci" bash
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/README.md
--- a/external/mit/libepoxy/dist/README.md Sun Nov 01 12:00:12 2020 +0000
+++ b/external/mit/libepoxy/dist/README.md Mon Nov 02 04:43:17 2020 +0000
@@ -17,7 +17,7 @@
--------
* Automatically initializes as new GL functions are used.
- * GL 4.5 core and compatibility context support.
+ * GL 4.6 core and compatibility context support.
* GLES 1/2/3 context support.
* Knows about function aliases so (e.g.) `glBufferData()` can be
used with `GL_ARB_vertex_buffer_object` implementations, along
@@ -91,7 +91,6 @@
`glPointParameterfv()`, for example, and you don't want to have to
choose which one to call when they're all the same).
* Doesn't support OpenGL ES.
- * Doesn't support EGL.
* Has a hard-to-maintain parser of extension specification text
instead of using the old .spec file or the new .xml.
* Has significant startup time overhead when `glewInit()`
diff -r ad7f931b2078 -r fe16f2373378 external/mit/libepoxy/dist/configure.ac
--- a/external/mit/libepoxy/dist/configure.ac Sun Nov 01 12:00:12 2020 +0000
+++ b/external/mit/libepoxy/dist/configure.ac Mon Nov 02 04:43:17 2020 +0000
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([libepoxy],
- [1.4.3],
+ [1.5.4],
[https://github.com/anholt/libepoxy],
[libepoxy])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -59,6 +59,11 @@
# uintptr_t to a void *") by default. Kill that.
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
+AC_ARG_ENABLE([x11],
+ [AC_HELP_STRING([--enable-x11=@<:@yes,no@:>@], [Enable X11 support @<:@default=yes@:>@])],
+ [enable_x11=$enableval],
+ [enable_x11=yes])
+
AC_ARG_ENABLE([glx],
[AC_HELP_STRING([--enable-glx=@<:@auto,yes,no@:>@], [Enable GLX support @<:@default=auto@:>@])],
[enable_glx=$enableval],
@@ -119,7 +124,7 @@
build_wgl=yes
has_znow=yes
# On windows, the DLL has to have all of its functions
- # resolved at link time, so we have to link directly aginst
+ # resolved at link time, so we have to link directly against
# opengl32.dll. But that's the only GL provider, anyway.
EPOXY_LINK_LIBS="-lopengl32"
@@ -132,7 +137,6 @@
[darwin*], [
build_wgl=no
- build_apple=yes
has_znow=no
EPOXY_LINK_LIBS=""
],
@@ -148,6 +152,15 @@
AC_SUBST(EPOXY_LINK_LIBS)
+if test x$enable_x11 = xno; then
+ if test x$enable_glx = xyes; then
+ AC_MSG_ERROR([GLX support is explicitly enabled, but X11 was disabled])
+ fi
+ build_glx=no
+else
+ AC_DEFINE([ENABLE_X11], [1], [Whether X11 support is enabled])
+fi
+
AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes)
if test x$build_egl = xyes; then
PKG_CHECK_MODULES(EGL, [egl])
@@ -165,11 +178,6 @@
AC_DEFINE([BUILD_WGL], [1], [build WGL tests])
fi
-AM_CONDITIONAL(BUILD_APPLE, test x$build_apple = xyes)
-if test x$build_apple = xyes; then
- AC_DEFINE([BUILD_APPLE], [1], [build APPLE is apple (for testing)])
-fi
-
AM_CONDITIONAL(HAS_ZNOW, test x$has_znow = xyes)
AC_CHECK_LIB([GLESv1_CM], [glFlush], [has_gles1=yes], [has_gles1=no])
@@ -178,6 +186,12 @@
AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])
AC_SUBST([DLOPEN_LIBS])
+savelibs=$LIBS
+LIBS=$DLOPEN_LIBS
+AC_CHECK_FUNCS([dlvsym], [have_dlvsym=1], [have_dlvsym=0])
+AM_CONDITIONAL(HAVE_DLVSYM, test $have_dlvsym = 1)
+LIBS=$savelibs
+
VISIBILITY_CFLAGS=""
Home |
Main Index |
Thread Index |
Old Index