From cb47e9926cfeb14c88b455d17113b235f9f80b5e Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Fri, 17 Nov 2017 14:42:39 +0100 Subject: [PATCH] add dependency to libswscale --- configure.ac | 1 + src/Makefile.am | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index f073eeaa9..60006a834 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample) TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale) + if test "$BOXTYPE" = "coolstream"; then TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray) fi diff --git a/src/Makefile.am b/src/Makefile.am index a19263939..3ec8d7488 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -121,6 +121,7 @@ neutrino_LDADD = \ @AVFORMAT_LIBS@ \ @AVUTIL_LIBS@ \ @AVCODEC_LIBS@ \ + @SWSCALE_LIBS@ \ $(ADEC_LIBS) \ @SIGC_LIBS@ \ $(PUGIXML_LIBS) \ @@ -194,15 +195,6 @@ neutrino_LDADD += \ $(top_builddir)/src/lcddisplay/liblcddisplay.a endif -neutrino_LDADD += \ - @AVFORMAT_LIBS@ \ - @AVUTIL_LIBS@ \ - @AVCODEC_LIBS@ - -if BOXTYPE_ARMBOX - @SWSCALE_LIBS@ -endif - if BOXMODEL_RASPI neutrino_LDADD += \ -L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt