0001-fix-matroska-build-without-js-taglib-or-atrailers.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From 0ac781b0b0deef5c02c32a70ac484f882c3f4dd0 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Tue, 24 Dec 2019 18:55:57 +0100
  4. Subject: [PATCH] fix matroska build without js, taglib or atrailers
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. i2i function is used in matroska_handler.cc but this function is defined
  9. only if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS)
  10. as a result compilation fails if HAVE_MATROSKA is set but HAVE_JS,
  11. HAVE_TAGLIG or ATRAILERS are not.
  12. Backported from: 0ac781b0b0deef5c02c32a70ac484f882c3f4dd0
  13. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  14. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
  15. ---
  16. src/string_converter.cc | 2 +-
  17. src/string_converter.h | 2 +-
  18. 2 files changed, 2 insertions(+), 2 deletions(-)
  19. diff --git a/src/string_converter.cc b/src/string_converter.cc
  20. index f669c661..7a3c55d7 100644
  21. --- a/src/string_converter.cc
  22. +++ b/src/string_converter.cc
  23. @@ -218,7 +218,7 @@ Ref<StringConverter> StringConverter::p2i()
  24. }
  25. #endif
  26. -#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS)
  27. +#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS) || defined(HAVE_MATROSKA)
  28. Ref<StringConverter> StringConverter::i2i()
  29. {
  30. diff --git a/src/string_converter.h b/src/string_converter.h
  31. index 58495430..f75bf833 100644
  32. --- a/src/string_converter.h
  33. +++ b/src/string_converter.h
  34. @@ -65,7 +65,7 @@ public:
  35. static zmm::Ref<StringConverter> p2i();
  36. #endif
  37. -#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS)
  38. +#if defined(HAVE_JS) || defined(HAVE_TAGLIB) || defined(ATRAILERS) || defined(HAVE_MATROSKA)
  39. /// \brief safeguard - internal to internal - needed to catch some
  40. /// scenarious where the user may have forgotten to add proper conversion
  41. /// in the script.
  42. --
  43. 2.26.1