mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent ea710f44e1 676d353bc5
commit fb776aa040
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -134,6 +134,11 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
if test "$BOXTYPE" = "armbox"; then
TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
fi
if test "$BOXTYPE" = "coolstream"; then if test "$BOXTYPE" = "coolstream"; then
TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray) TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
fi fi

4
src/Makefile.am
View File

@@ -194,6 +194,10 @@ neutrino_LDADD += \
@AVUTIL_LIBS@ \ @AVUTIL_LIBS@ \
@AVCODEC_LIBS@ @AVCODEC_LIBS@
if BOXTYPE_ARMBOX
neutrino_LDADD += @SWSCALE_LIBS@
endif
if BOXMODEL_RASPI if BOXMODEL_RASPI
neutrino_LDADD += \ neutrino_LDADD += \
-L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -L/opt/vc/lib/ -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt