From 676d353bc5356f24224f4850ed26e1c35984aea2 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 for armbox Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/541edc751432278efaa50be422f1769ea838913d Author: Jacek Jendrzej Date: 2017-11-17 (Fri, 17 Nov 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 5 +++++ src/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index e3b5e1d34..b476e1633 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,11 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) + +if test "$BOXTYPE" = "armbox"; then +TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale) +fi + if test "$BOXTYPE" = "coolstream"; then TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray) fi diff --git a/src/Makefile.am b/src/Makefile.am index 7a96ccf5a..f29ffed37 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -194,6 +194,10 @@ neutrino_LDADD += \ @AVUTIL_LIBS@ \ @AVCODEC_LIBS@ +if BOXTYPE_ARMBOX +neutrino_LDADD += @SWSCALE_LIBS@ +endif + if BOXMODEL_RASPI neutrino_LDADD += \ -L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt