diff -Nru libepoxy-1.5.5/.appveyor.yml libepoxy-1.5.7/.appveyor.yml --- libepoxy-1.5.5/.appveyor.yml 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/.appveyor.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -version: 1.0.{build} - -image: Visual Studio 2015 - -configuration: Release - -# Configure both 32-bit and 64-bit builds -environment: - matrix: - - platform: x86 - config: Win32 - pout: x86 - - platform: x64 - config: x64 - pout: x64 - -shallow_clone: true - -# Download Meson and Ninja, create install directory -before_build: -- mkdir build -- mkdir libepoxy-shared-%pout% -- cd build -- 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.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 -- cd .. - -# Build and install -build_script: -- cd build -- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% -- C:\Python36\python.exe meson-0.47.1\meson.py .. . --backend=ninja --prefix=%APPVEYOR_BUILD_FOLDER%\libepoxy-shared-%pout% -- ninja -- ninja install -- cd .. - -# Copy license into install directory and create .zip file -after_build: -- copy COPYING libepoxy-shared-%pout% -- dir libepoxy-shared-%pout% /s /b -- 7z a -tzip libepoxy-shared-%pout%.zip libepoxy-shared-%pout% - -artifacts: - - path: libepoxy-shared-%pout%.zip - name: libepoxy-shared-%pout% - -test: off - -# Upload .zip file to GitHub release -deploy: - release: $(APPVEYOR_REPO_TAG_NAME) - description: "Epoxy $(APPVEYOR_REPO_TAG_NAME)" - provider: GitHub - auth_token: - secure: X7Ro8Y2RWYo/M1AAn93f9X0dEQFvu7gPb6li2eKRtzPYLGj/JKm7MNWRw2cCcjm6 - artifact: libepoxy-shared-$(pout) - draft: false - prerelease: false - on: - appveyor_repo_tag: true # deploy on tag push only diff -Nru libepoxy-1.5.5/debian/changelog libepoxy-1.5.7/debian/changelog --- libepoxy-1.5.5/debian/changelog 2021-02-22 09:34:30.000000000 +0000 +++ libepoxy-1.5.7/debian/changelog 2021-05-05 21:00:09.000000000 +0000 @@ -1,8 +1,17 @@ -libepoxy (1.5.5-1build1) hirsute; urgency=medium +libepoxy (1.5.7-1) experimental; urgency=medium - * No-change rebuild to drop the udeb package. + [ Debian Janitor ] + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. - -- Matthias Klose Mon, 22 Feb 2021 10:34:30 +0100 + [ Alexander Volkov ] + * Don't run tests when nocheck profile is enabled. (Closes: #918840) + + [ Timo Aaltonen ] + * New upstream release. + * Drop xutils-dev from build-depends, not used. (Closes: #981785) + + -- Timo Aaltonen Thu, 06 May 2021 00:00:09 +0300 libepoxy (1.5.5-1) unstable; urgency=medium diff -Nru libepoxy-1.5.5/debian/control libepoxy-1.5.7/debian/control --- libepoxy-1.5.5/debian/control 2021-01-28 22:36:17.000000000 +0000 +++ libepoxy-1.5.7/debian/control 2021-05-05 20:57:11.000000000 +0000 @@ -3,7 +3,6 @@ Maintainer: Debian X Strike Force Build-Depends: debhelper-compat (= 13), meson (>= 0.48.0), - xutils-dev, pkg-config, libx11-dev, libgl-dev, diff -Nru libepoxy-1.5.5/debian/rules libepoxy-1.5.7/debian/rules --- libepoxy-1.5.5/debian/rules 2021-01-20 10:53:52.000000000 +0000 +++ libepoxy-1.5.7/debian/rules 2021-05-05 20:50:32.000000000 +0000 @@ -7,11 +7,13 @@ # Ignore test results on s390x and most ports where tests fail override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter s390x alpha hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 riscv64 sparc64 x32,$(DEB_HOST_ARCH))) -xvfb-run -a dh_auto_test else xvfb-run -a dh_auto_test endif +endif # No symbols for udebs, specify the highest version from symbols file: override_dh_makeshlibs: diff -Nru libepoxy-1.5.5/debian/upstream/metadata libepoxy-1.5.7/debian/upstream/metadata --- libepoxy-1.5.5/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libepoxy-1.5.7/debian/upstream/metadata 2021-05-05 20:50:32.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/anholt/libepoxy/issues +Bug-Submit: https://github.com/anholt/libepoxy/issues/new +Repository: https://github.com/anholt/libepoxy.git +Repository-Browse: https://github.com/anholt/libepoxy diff -Nru libepoxy-1.5.5/.github/scripts/epoxy-ci-linux.sh libepoxy-1.5.7/.github/scripts/epoxy-ci-linux.sh --- libepoxy-1.5.5/.github/scripts/epoxy-ci-linux.sh 1970-01-01 00:00:00.000000000 +0000 +++ libepoxy-1.5.7/.github/scripts/epoxy-ci-linux.sh 2021-04-30 11:56:41.000000000 +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 -Nru libepoxy-1.5.5/.github/scripts/epoxy-ci-osx.sh libepoxy-1.5.7/.github/scripts/epoxy-ci-osx.sh --- libepoxy-1.5.5/.github/scripts/epoxy-ci-osx.sh 1970-01-01 00:00:00.000000000 +0000 +++ libepoxy-1.5.7/.github/scripts/epoxy-ci-osx.sh 2021-04-30 11:56:41.000000000 +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 -Nru libepoxy-1.5.5/.github/workflows/ci.yml libepoxy-1.5.7/.github/workflows/ci.yml --- libepoxy-1.5.5/.github/workflows/ci.yml 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/.github/workflows/ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -name: Build -on: - push: - branches-ignore: - - debian - - khronos-registry -jobs: - build: - strategy: - matrix: - os: - - ubuntu-18.04 - - macos-10.15 - compiler: - - gcc - - clang - build-opts: - - '' - - '-Dglx=no' - - '-Degl=no' - - '-Dx11=false' - exclude: - - os: macos-10.15 - compiler: gcc - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - if: runner.os == 'macOS' - run: brew install ninja - - if: runner.os == 'Linux' - run: > - sudo apt-get update && - sudo apt-get install --no-install-recommends - libgl1-mesa-dev - libegl1-mesa-dev - libgles2-mesa-dev - libgl1-mesa-dri - ninja-build - - uses: actions/setup-python@v2 - with: - python-version: 3.x - - run: | - python -m pip install --upgrade pip - pip3 install meson - - if: runner.os == 'macOS' - run: /bin/sh -c "CC=${{ matrix.compiler }} .travis/epoxy-ci-osx.sh ${{ matrix.build-opts }}" - - if: runner.os == 'Linux' - run: /bin/sh -c "CC=${{ matrix.compiler }} .travis/epoxy-ci-linux.sh ${{ matrix.build-opts }}" diff -Nru libepoxy-1.5.5/.github/workflows/linux.yml libepoxy-1.5.7/.github/workflows/linux.yml --- libepoxy-1.5.5/.github/workflows/linux.yml 1970-01-01 00:00:00.000000000 +0000 +++ libepoxy-1.5.7/.github/workflows/linux.yml 2021-04-30 11:56:41.000000000 +0000 @@ -0,0 +1,38 @@ +name: Ubuntu +on: + push: + branches-ignore: + - debian + - khronos-registry +jobs: + build: + strategy: + matrix: + os: + - ubuntu-18.04 + compiler: + - gcc + - clang + build-opts: + - '' + - '-Dglx=no' + - '-Degl=no' + - '-Dx11=false' + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - run: > + sudo apt-get update && + sudo apt-get install --no-install-recommends + libgl1-mesa-dev + libegl1-mesa-dev + libgles2-mesa-dev + libgl1-mesa-dri + ninja-build + - uses: actions/setup-python@v2 + with: + python-version: 3.x + - run: | + python -m pip install --upgrade pip + pip3 install meson + /bin/sh -c "CC=${{ matrix.compiler }} .github/scripts/epoxy-ci-linux.sh ${{ matrix.build-opts }}" diff -Nru libepoxy-1.5.5/.github/workflows/macos.yml libepoxy-1.5.7/.github/workflows/macos.yml --- libepoxy-1.5.5/.github/workflows/macos.yml 1970-01-01 00:00:00.000000000 +0000 +++ libepoxy-1.5.7/.github/workflows/macos.yml 2021-04-30 11:56:41.000000000 +0000 @@ -0,0 +1,26 @@ +name: macOS +on: + push: + branches-ignore: + - debian + - khronos-registry +jobs: + build: + strategy: + matrix: + build-opts: + - '' + - '-Dglx=no' + - '-Degl=no' + - '-Dx11=false' + runs-on: macos-10.15 + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.x + - run: | + brew install ninja + python -m pip install --upgrade pip + pip3 install meson + /bin/sh -c "CC=clang .github/scripts/epoxy-ci-osx.sh ${{ matrix.build-opts }}" diff -Nru libepoxy-1.5.5/.github/workflows/msvc-env.yml libepoxy-1.5.7/.github/workflows/msvc-env.yml --- libepoxy-1.5.5/.github/workflows/msvc-env.yml 1970-01-01 00:00:00.000000000 +0000 +++ libepoxy-1.5.7/.github/workflows/msvc-env.yml 2021-04-30 11:56:41.000000000 +0000 @@ -0,0 +1,23 @@ +name: MSVC Build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: windows-latest + env: + PYTHONIOENCODING: "utf-8" + steps: + - uses: actions/checkout@master + - uses: actions/setup-python@v1 + - uses: seanmiddleditch/gha-setup-vsdevenv@master + - uses: BSFishy/meson-build@v1.0.1 + with: + action: test + directory: _build + options: --verbose --fatal-meson-warnings + meson-version: 0.54.3 diff -Nru libepoxy-1.5.5/.github/workflows/msys2.yml libepoxy-1.5.7/.github/workflows/msys2.yml --- libepoxy-1.5.5/.github/workflows/msys2.yml 1970-01-01 00:00:00.000000000 +0000 +++ libepoxy-1.5.7/.github/workflows/msys2.yml 2021-04-30 11:56:41.000000000 +0000 @@ -0,0 +1,27 @@ +name: MSYS2 Build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: windows-latest + defaults: + run: + shell: msys2 {0} + env: + PYTHONIOENCODING: "utf-8" + steps: + - uses: actions/checkout@master + - uses: msys2/setup-msys2@v2 + with: + msystem: MINGW64 + update: true + install: base-devel git mingw-w64-x86_64-meson mingw-w64-x86_64-ninja mingw-w64-x86_64-pkg-config mingw-w64-x86_64-python3 mingw-w64-x86_64-python3-pip mingw-w64-x86_64-toolchain + - name: Build + run: | + meson setup _build + meson compile -C _build diff -Nru libepoxy-1.5.5/meson.build libepoxy-1.5.7/meson.build --- libepoxy-1.5.5/meson.build 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/meson.build 2021-04-30 11:56:41.000000000 +0000 @@ -1,11 +1,11 @@ -project('libepoxy', 'c', version: '1.5.5', +project('libepoxy', 'c', version: '1.5.7', default_options: [ 'buildtype=debugoptimized', 'c_std=gnu99', 'warning_level=1', ], license: 'MIT', - meson_version: '>= 0.48.0') + meson_version: '>= 0.54.0') epoxy_version = meson.project_version().split('.') epoxy_major_version = epoxy_version[0].to_int() diff -Nru libepoxy-1.5.5/README.md libepoxy-1.5.7/README.md --- libepoxy-1.5.5/README.md 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/README.md 2021-04-30 11:56:41.000000000 +0000 @@ -1,5 +1,8 @@ -[![Build Status](https://travis-ci.org/anholt/libepoxy.svg?branch=master)](https://travis-ci.org/anholt/libepoxy) -[![Build status](https://ci.appveyor.com/api/projects/status/xv6y5jurt5v5ngjx/branch/master?svg=true)](https://ci.appveyor.com/project/ebassi/libepoxy/branch/master) +![Ubuntu](https://github.com/anholt/libepoxy/workflows/Ubuntu/badge.svg) +![macOS](https://github.com/anholt/libepoxy/workflows/macOS/badge.svg) +![MSVC Build](https://github.com/anholt/libepoxy/workflows/MSVC%20Build/badge.svg) +![MSYS2 Build](https://github.com/anholt/libepoxy/workflows/MSYS2%20Build/badge.svg) +[![License: MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT) Epoxy is a library for handling OpenGL function pointer management for you. diff -Nru libepoxy-1.5.5/src/dispatch_common.c libepoxy-1.5.7/src/dispatch_common.c --- libepoxy-1.5.5/src/dispatch_common.c 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/src/dispatch_common.c 2021-04-30 11:56:41.000000000 +0000 @@ -674,9 +674,13 @@ if (!api.gl_handle) get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true); #endif - - get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true); - api.gl_handle = api.glx_handle; + if (!api.gl_handle) { + get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true); +#if PLATFORM_HAS_GLX + if (!api.glx_handle) + api.glx_handle = api.gl_handle; +#endif + } #endif } diff -Nru libepoxy-1.5.5/src/gen_dispatch.py libepoxy-1.5.7/src/gen_dispatch.py --- libepoxy-1.5.5/src/gen_dispatch.py 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/src/gen_dispatch.py 2021-04-30 11:56:41.000000000 +0000 @@ -467,6 +467,7 @@ func.args_decl)) def write_header_header(self, out_file): + self.close() self.out_file = open(out_file, 'w') self.outln('/* GL dispatch header.') @@ -515,9 +516,17 @@ self.outln('typedef uint32_t khronos_uint32_t;') self.outln('typedef uint64_t khronos_uint64_t;') self.outln('typedef float khronos_float_t;') - self.outln('typedef long khronos_intptr_t;') - self.outln('typedef long khronos_ssize_t;') - self.outln('typedef unsigned long khronos_usize_t;') + self.outln('#ifdef _WIN64') + self.outln('typedef signed long long int khronos_intptr_t;') + self.outln('typedef unsigned long long int khronos_uintptr_t;') + self.outln('typedef signed long long int khronos_ssize_t;') + self.outln('typedef unsigned long long int khronos_usize_t;') + self.outln('#else') + self.outln('typedef signed long int khronos_intptr_t;') + self.outln('typedef unsigned long int khronos_uintptr_t;') + self.outln('typedef signed long int khronos_ssize_t;') + self.outln('typedef unsigned long int khronos_usize_t;') + self.outln('#endif') self.outln('typedef uint64_t khronos_utime_nanoseconds_t;') self.outln('typedef int64_t khronos_stime_nanoseconds_t;') self.outln('#define KHRONOS_MAX_ENUM 0x7FFFFFFF') @@ -526,7 +535,6 @@ self.outln(' KHRONOS_TRUE = 1,') self.outln(' KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM') self.outln('} khronos_boolean_enum_t;') - self.outln('typedef uintptr_t khronos_uintptr_t;') if self.target == "glx": self.outln('#include ') @@ -757,6 +765,7 @@ self.outln('') def write_source(self, f): + self.close() self.out_file = open(f, 'w') self.outln('/* GL dispatch code.') @@ -849,6 +858,12 @@ for func in self.sorted_functions: self.write_function_pointer(func) + def close(self): + if self.out_file: + self.out_file.close() + self.out_file = None + + argparser = argparse.ArgumentParser(description='Generate GL dispatch wrappers.') argparser.add_argument('files', metavar='file.xml', nargs='+', help='GL API XML files to be parsed') argparser.add_argument('--outputdir', metavar='dir', required=False, help='Destination directory for files (default to current dir)') @@ -913,3 +928,5 @@ generator.write_header(os.path.join(includedir, name + '_generated.h')) if build_source: generator.write_source(os.path.join(srcdir, name + '_generated_dispatch.c')) + + generator.close() diff -Nru libepoxy-1.5.5/src/meson.build libepoxy-1.5.7/src/meson.build --- libepoxy-1.5.5/src/meson.build 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/src/meson.build 2021-04-30 11:56:41.000000000 +0000 @@ -72,17 +72,22 @@ link_args: common_ldflags, ) +epoxy_has_glx = build_glx ? '1' : '0' +epoxy_has_egl = build_egl ? '1' : '0' +epoxy_has_wgl = build_wgl ? '1' : '0' + libepoxy_dep = declare_dependency( link_with: libepoxy, include_directories: libepoxy_inc, dependencies: epoxy_deps, sources: epoxy_headers, + variables: { + 'epoxy_has_glx': epoxy_has_glx, + 'epoxy_has_egl': epoxy_has_egl, + 'epoxy_has_wgl': epoxy_has_wgl, + }, ) -epoxy_has_glx = build_glx ? '1' : '0' -epoxy_has_egl = build_egl ? '1' : '0' -epoxy_has_wgl = build_wgl ? '1' : '0' - # We don't want to add these dependencies to the library, as they are # not needed when building Epoxy; we do want to add them to the generated # pkg-config file, for consumers of Epoxy diff -Nru libepoxy-1.5.5/.travis/Dockerfile libepoxy-1.5.7/.travis/Dockerfile --- libepoxy-1.5.5/.travis/Dockerfile 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/.travis/Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -FROM debian:stretch-slim -MAINTAINER Emmanuele Bassi - -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 -Nru libepoxy-1.5.5/.travis/epoxy-ci-linux.sh libepoxy-1.5.7/.travis/epoxy-ci-linux.sh --- libepoxy-1.5.5/.travis/epoxy-ci-linux.sh 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/.travis/epoxy-ci-linux.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/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 -Nru libepoxy-1.5.5/.travis/epoxy-ci-osx.sh libepoxy-1.5.7/.travis/epoxy-ci-osx.sh --- libepoxy-1.5.5/.travis/epoxy-ci-osx.sh 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/.travis/epoxy-ci-osx.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#!/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 -Nru libepoxy-1.5.5/.travis/run-docker.sh libepoxy-1.5.7/.travis/run-docker.sh --- libepoxy-1.5.5/.travis/run-docker.sh 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/.travis/run-docker.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/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 -Nru libepoxy-1.5.5/.travis.yml libepoxy-1.5.7/.travis.yml --- libepoxy-1.5.5/.travis.yml 2020-07-21 23:48:22.000000000 +0000 +++ libepoxy-1.5.7/.travis.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -sudo: false - -branches: - except: - - debian - - khronos-registry - -os: - - linux - - osx - -compiler: - - gcc - - clang - -language: - - c - -services: - - docker - -matrix: - exclude: - - os: osx - compiler: gcc - -before_install: - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - brew update - brew unlink python@2 - 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 - 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 "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