0004-build-use-pkg-config-to-get-tremor-libs.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From fb257e1e204c30436b3509ea3fa9f7c5fe131dc1 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Tue, 16 Oct 2018 14:25:20 +0200
  4. Subject: [PATCH] build: use pkg-config to get tremor libs
  5. Use PKG_ENABLE_MODULES_VLC to enable tremor based on availability of
  6. ogg and vorbisidec
  7. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  8. ---
  9. configure.ac | 9 +--------
  10. modules/codec/Makefile.am | 2 +-
  11. 2 files changed, 2 insertions(+), 9 deletions(-)
  12. diff --git a/configure.ac b/configure.ac
  13. index 0d3222e00f..b506d735f2 100644
  14. --- a/configure.ac
  15. +++ b/configure.ac
  16. @@ -2710,14 +2710,7 @@ PKG_ENABLE_MODULES_VLC([VORBIS], [], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorb
  17. dnl
  18. dnl Tremor plugin
  19. dnl
  20. -AC_ARG_ENABLE(tremor,
  21. - [ --enable-tremor Tremor decoder support (default disabled)])
  22. -if test "${enable_tremor}" = "yes"
  23. -then
  24. - AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [
  25. - VLC_ADD_PLUGIN([tremor])
  26. - ],[])
  27. -fi
  28. +PKG_ENABLE_MODULES_VLC([TREMOR], [], [vorbisidec ogg], [Tremor decoder support], [disabled])
  29. dnl
  30. dnl Speex plugins
  31. diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
  32. index 075ee2a0e9..637b1d45a6 100644
  33. --- a/modules/codec/Makefile.am
  34. +++ b/modules/codec/Makefile.am
  35. @@ -318,7 +318,7 @@ codec_LTLIBRARIES += $(LTLIBdaala)
  36. libtremor_plugin_la_SOURCES = codec/vorbis.c
  37. libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
  38. libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
  39. -libtremor_plugin_la_LIBADD = -lvorbisdec -logg
  40. +libtremor_plugin_la_LIBADD = $(TREMOR_LIBS)
  41. EXTRA_LTLIBRARIES += libtremor_plugin.la
  42. codec_LTLIBRARIES += $(LTLIBtremor)
  43. --
  44. 2.17.1