Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 255927207b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-17 15:23:30 +01:00
2 changed files with 9 additions and 0 deletions

View File

@@ -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