ci: revert to using git for libepoxy

The packaged version is not new enough.

v2: Don't downgrade the libdrm version (Tomeu)

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>.
macos/master
Gert Wollny 4 years ago
parent 4835ffa488
commit 1dac420751
  1. 20
      ci/build-container.sh

@ -13,7 +13,7 @@ export CC="gcc-8"
export CXX="g++-8" export CXX="g++-8"
export CFLAGS="-g3" export CFLAGS="-g3"
export CXXFLAGS="-g3" export CXXFLAGS="-g3"
export GIT_DATE="2020-11-11" export GIT_DATE="2020-02-02"
export MESA_DEBUG=1 export MESA_DEBUG=1
echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft
@ -42,7 +42,6 @@ apt-get -y install --no-install-recommends \
golang-go \ golang-go \
kbd \ kbd \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libepoxy-dev \
libgbm-dev \ libgbm-dev \
libnss-systemd \ libnss-systemd \
libpng-dev \ libpng-dev \
@ -81,14 +80,27 @@ apt-get -y install --no-install-recommends \
xvfb \ xvfb \
zlib1g-dev zlib1g-dev
apt-get -y build-dep --no-install-recommends \ apt-get -y build-dep --no-install-recommends \
libepoxy-dev \
libdrm \ libdrm \
mesa \ mesa \
piglit \ piglit \
virglrenderer virglrenderer
apt-get -y remove valgrind apt-get -y remove valgrind libepoxy0
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
export KNOWN_GOOD_EPOXY=${KNOWN_GOOD_EPOXY:-1.5.4}
mkdir /epoxy
pushd /epoxy
git clone --shallow-since="$GIT_DATE" https://github.com/anholt/libepoxy.git . && \
git fetch --tags &&
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
popd
export BATTERY_VERSION=0.1.23 export BATTERY_VERSION=0.1.23
mkdir /battery mkdir /battery
pushd /battery pushd /battery

Loading…
Cancel
Save