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