0003-cmake-FindMatroska-fix-static-linking.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Tue, 24 Dec 2019 22:57:18 +0100
  4. Subject: [PATCH] cmake/FindMatroska: fix static linking
  5. Fix static linking with libmatrasoka by adding PC_EBM_LIBRARIES to
  6. EBML_LIBRARIES and PC_MAT_LIBRARIES to MATROSKA_LIBRARIES
  7. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  8. [Retrieved from:
  9. https://github.com/gerbera/gerbera/commit/aab2eacbaad10759294f4fd74bbb5ecef3cf3a8d]
  10. ---
  11. cmake/FindMatroska.cmake | 4 ++--
  12. 1 file changed, 2 insertions(+), 2 deletions(-)
  13. diff --git a/cmake/FindMatroska.cmake b/cmake/FindMatroska.cmake
  14. index 4b09a5ec..12ca593d 100644
  15. --- a/cmake/FindMatroska.cmake
  16. +++ b/cmake/FindMatroska.cmake
  17. @@ -23,7 +23,7 @@ FIND_LIBRARY(EBML_LIBRARY ebml
  18. FIND_PACKAGE_HANDLE_STANDARD_ARGS(EBML
  19. REQUIRED_VARS EBML_LIBRARY EBML_INCLUDE_DIR)
  20. if (EBML_FOUND)
  21. - set (EBML_LIBRARIES ${EBML_LIBRARY})
  22. + set (EBML_LIBRARIES ${EBML_LIBRARY} ${PC_EBM_LIBRARIES})
  23. set (EBML_INCLUDE_DIRS ${EBML_INCLUDE_DIR} )
  24. endif ()
  25. MARK_AS_ADVANCED(
  26. @@ -41,7 +41,7 @@ find_library(MATROSKA_LIBRARY matroska
  27. FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATROSKA
  28. REQUIRED_VARS MATROSKA_LIBRARY MATROSKA_INCLUDE_DIR)
  29. if (MATROSKA_FOUND)
  30. - set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY})
  31. + set (MATROSKA_LIBRARIES ${MATROSKA_LIBRARY} ${PC_MAT_LIBRARIES})
  32. set (MATROSKA_INCLUDE_DIRS ${MATROSKA_INCLUDE_DIR} )
  33. endif ()
  34. MARK_AS_ADVANCED(