fribidi.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. --- a/plex/CMakeModules/FindFriBiDi.cmake
  2. +++ b/plex/CMakeModules/FindFriBiDi.cmake
  3. @@ -10,43 +10,9 @@
  4. # FRIBIDI_LIBRARY, where to find the FriBiDi library.
  5. include(CheckSymbolExists)
  6. +include(FindPkgConfig)
  7. +pkg_check_modules(FRIBIDI fribidi)
  8. -SET(FRIBIDI_FOUND "NO")
  9. -
  10. -# Set variable in temp var, otherwise FIND_PATH might fail
  11. -# unset isn't present in the required version of cmake.
  12. -FIND_PATH(xFRIBIDI_INCLUDE_DIR fribidi.h
  13. - PATHS /usr/local/include
  14. - /usr/include
  15. - PATH_SUFFIXES fribidi
  16. - )
  17. -set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR})
  18. -
  19. -SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
  20. -FIND_LIBRARY(FRIBIDI_LIBRARY
  21. - NAMES ${FRIBIDI_NAMES}
  22. - PATHS /usr/lib /usr/local/lib
  23. - )
  24. -
  25. -IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
  26. - SET(CMAKE_REQUIRED_INCLUDES ${FRIBIDI_INCLUDE_DIR})
  27. - SET(CMAKE_REQUIRED_LIBRARIES ${FRIBIDI_LIBRARY})
  28. - CHECK_SYMBOL_EXISTS(fribidi_utf8_to_unicode fribidi.h FOUND_fribidi_utf8_to_unicode)
  29. - CHECK_SYMBOL_EXISTS(fribidi_charset_to_unicode fribidi.h FOUND_fribidi_charset_to_unicode)
  30. - if(FOUND_fribidi_charset_to_unicode)
  31. - SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
  32. - SET(FRIBIDI_FOUND "YES")
  33. - elseif(FOUND_fribidi_utf8_to_unicode)
  34. - SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
  35. - SET(FRIBIDI_FOUND "YES")
  36. - add_definitions(-DOLD_FRIBIDI)
  37. - MESSAGE(STATUS "Legacy FriBiDi: ${FRIBIDI_LIBRARY}")
  38. - else()
  39. - SET(FRIBIDI_LIBRARIES "NOTFOUND")
  40. - SET(FRIBIDI_INCLUDE_DIR "NOTFOUND")
  41. - SET(FRIBIDI_FOUND "NO")
  42. - endif()
  43. -ENDIF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)
  44. IF (FRIBIDI_FOUND)