vrend: bump up libexpoxy requirement

v2: Modify CI dockerfile (@gerddie)

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
macos/master
Gurchetan Singh 5 years ago
parent f7129507b9
commit 256ef78980
  1. 15
      ci/Dockerfile
  2. 3
      configure.ac
  3. 2
      meson.build

@ -32,7 +32,6 @@ RUN apt-get update && \
clang-8 \
cmake \
dbus \
libepoxy-dev \
g++-8 \
gcc-8 \
gdb \
@ -78,6 +77,7 @@ RUN apt-get update && \
xvfb \
zlib1g-dev && \
apt-get -y build-dep --no-install-recommends \
libepoxy-dev \
libdrm \
mesa \
piglit \
@ -143,6 +143,19 @@ RUN git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/pi
rm -rf /piglit
WORKDIR /
ARG KNOWN_GOOD_EPOXY
ENV KNOWN_GOOD_EPOXY ${KNOWN_GOOD_EPOXY:-5d818164dd2ab87b0054641f1446bc552a602320}
WORKDIR /epoxy
RUN git clone --shallow-since="$GIT_DATE" https://github.com/anholt/libepoxy.git . && \
git checkout ${KNOWN_GOOD_EPOXY} && \
git log --oneline -n 1 && \
mkdir -p build && \
meson build/ && \
meson configure build/ -Dprefix=/usr/local -Dlibdir=lib && \
ninja -C build/ install >/dev/null && \
rm -rf /epoxy
WORKDIR /
ARG KNOWN_GOOD_DRM=libdrm-2.4.99
WORKDIR /drm
RUN git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/drm.git . && \

@ -144,7 +144,8 @@ if test "x$os_win32" = xno && test "x$enable_egl" != "xno"; then
PKG_CHECK_MODULES([GBM], [gbm >= $LIBGBM_REQUIRED])
fi
PKG_CHECK_MODULES([EPOXY], [epoxy])
LIBEPOXY_REQURED=1.5.4
PKG_CHECK_MODULES([EPOXY], [epoxy >= $LIBEPOXY_REQURED])
epoxy_has_egl=`$PKG_CONFIG --variable=epoxy_has_egl epoxy`
AS_IF([test "x$epoxy_has_egl" = "x1" && test "x$enable_egl" != "xno"], [
epoxy_has_egl=yes

@ -56,7 +56,7 @@ prog_python = import('python').find_installation('python3')
libdrm_dep = dependency('libdrm', version : '>=2.4.50')
thread_dep = dependency('threads')
epoxy_dep = dependency('epoxy')
epoxy_dep = dependency('epoxy', version: '>= 1.5.4')
m_dep = cc.find_library('m')
conf_data = configuration_data()

Loading…
Cancel
Save