D10041: Decode full monitor vendor name from EDID using hwdata

[Christophe Giboudeaux]

cgiboudeaux added a comment.


  In D10041#619075 <https://phabricator.kde.org/D10041#619075>, @ngraham wrote:
  
  > This causes a build failure for me:
  >
  >   /home/nate/kde/src/kwin/plugins/platforms/drm/edid.cpp:149:19: error: expected primary-expression before ‘enum’
  >     149 |     QFile pnpFile(QStringLiteral(HWDATA_PNPIDS_FILE));
  >         |                   ^~~~~~~~~~~~~~
  >
  
  
  Same thing here:
  
    [ 94%] Building CXX object plugins/platforms/drm/CMakeFiles/KWinWaylandDrmBackend.dir/edid.cpp.o
    /data/kde/src/kwin/plugins/platforms/drm/edid.cpp:149:34: error: expected ')'
        QFile pnpFile(QStringLiteral(HWDATA_PNPIDS_FILE));
                                     ^

INLINE COMMENTS

> Findhwdata.cmake:37
> +    find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS /usr/share)
> +    if (hwdata_DIR-NOTFOUND OR hwdata_PNPIDS_FILE-NOTFOUND)
> +        set(hwdata_FOUND FALSE)

The correct syntax is `if NOT hwdata_DIR_NAMES OR NOT hwdata_PNPIDS_FILE)`

-NOTFOUND evaluates to FALSE [1]

[1] https://cmake.org/cmake/help/latest/command/if.html

> config-kwin.h.cmake:47
> +#if HAVE_HWDATA
> +#cmakedefine HWDATA_PNPIDS_FILE "@hwdata_PNPIDS_FILE@"
> +#endif

This produces:

  #if HAVE_HWDATA
  /* #undef HWDATA_PNPIDS_FILE */
  #endif

REPOSITORY
  R108 KWin

REVISION DETAIL
  https://phabricator.kde.org/D10041

To: dvratil, graesslin, davidedmundson, #plasma
Cc: cgiboudeaux, apol, feverfew, ngraham, davidedmundson, mart, kwin, sebas, Orage, LeGast00n, The-Feren-OS-Dev, cblack, jraleigh, zachus, fbampaloukas, GB_2, mkulinski, ragreen, jackyalcine, iodelay, crozbo, bwowk, ZrenBot, alexeymin, himcesjf, lesliezhai, ali-mohamed, hardening, romangg, jensreuterberg, abetts, ahiemstra
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kwin/attachments/20200228/3874f5bd/attachment-0001.html>