[Piglit] [PATCH] CMake: Don't turn on dma-buf tests for intel without libdrm >= 2.4.68

[Dylan Baker]

Quoting Vinson Lee (2016-09-28 11:21:12)
> On Tue, Sep 27, 2016 at 3:17 PM, Dylan Baker <dylan at pnwbakers.com> wrote:
> > Quoting Dylan Baker (2016-09-27 15:14:18)
> >> This version of libdrm was the first to privde DRM_FORMAT_R8,
> >> DRM_FORMAT_GR88 and DRM_FORMAT_RG88, which are needed for dma-buf tests
> >> since commit 0222f5db00fd47fb745402514a6d8cf2747f8434.
> >>
> >> bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97951
> >> cc: Vinson Lee <vlee at freedesktop.org>
> >> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> >> ---
> >>  CMakeLists.txt | 6 +++---
> >>  1 file changed, 3 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/CMakeLists.txt b/CMakeLists.txt
> >> index 4002fe9..084ccf0 100644
> >> --- a/CMakeLists.txt
> >> +++ b/CMakeLists.txt
> >> @@ -178,11 +178,11 @@ ENDIF()
> >>  # The presence of libdrm is not sufficient. At least one libdrm_${hardware}
> >>  # library is also needed.
> >>  #
> >> -# When building for Intel, libdrm_intel>=2.4.38 is required because support for
> >> -# drm-prime arrived in that version.
> >> +# When building for Intel, libdrm_intel>=2.4.68 is required because support
> >> +# DRM_FORMAT_R8 and friends arrived in that commit.
> >>  #
> >>  if(LIBDRM_FOUND AND XCB_DRI2_FOUND AND
> >> -   ((LIBDRM_INTEL_VERSION VERSION_GREATER "2.4.37") OR
> >> +   ((LIBDRM_INTEL_VERSION VERSION_GREATER "2.4.68") OR
> >
> > And cmake, stupidity, this should be VERSION_GREATER "2.4.67"
> >
> > I've changed it locally.
> >
> >>       PIGLIT_HAS_GBM_BO_MAP))
> >>         set(PIGLIT_BUILD_DMA_BUF_TESTS_IS_VALID true)
> >>  else()
> >> --
> >> 2.10.0
> >>
> 
> I get this error with this patch on Ubuntu 16.04.
> 
> CMake Error at CMakeLists.txt:201 (message):
>   PIGLIT_BUILD_DMA_BUF_TESTS require libdrm, libdrm_intel>=2.4.38, and
>   xcb-dri2
> 
> Is this expected behavior or should it continue building without build
> the dma-buf tests?
> 
> Vinson

No, the check is still wrong. Let me think about it a bit more and spin a v2.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 455 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/piglit/attachments/20160928/cc994539/attachment.sig>