On Fri, 2018-11-16 at 13:59 +0000, Emil Velikov wrote: > From: Emil Velikov <emil.veli...@collabora.com> > > The only place where the package is needed is for building the DRI > based libGL library. >
This caused a conflict when applied to 18.2 branch. Resolved the (trivial) conflict as https://gitlab.freedesktop.org/mesa/mesa/commit/6ceeb848d5be06464cfaaf6735c38c6d167d0352 J.A. > Cc: mesa-sta...@lists.freedesktop.org > Signed-off-by: Emil Velikov <emil.veli...@collabora.com> > --- > .travis.yml | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index 8d6ddb2f201..81ac7696050 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -120,7 +120,6 @@ matrix: > - llvm-6.0-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -150,7 +149,6 @@ matrix: > - llvm-6.0-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -183,7 +181,6 @@ matrix: > - llvm-3.9-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -222,7 +219,6 @@ matrix: > - libclang-3.9-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -258,7 +254,6 @@ matrix: > - libclang-4.0-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -294,7 +289,6 @@ matrix: > - libclang-5.0-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -327,7 +321,6 @@ matrix: > - libclang-6.0-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -361,7 +354,6 @@ matrix: > - libclang-7-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -397,7 +389,6 @@ matrix: > - libedit-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev > @@ -427,7 +418,6 @@ matrix: > - llvm-6.0-dev > # Common > - xz-utils > - - x11proto-xf86vidmode-dev > - libexpat1-dev > - libx11-xcb-dev > - libelf-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
