Changeset View
Changeset View
Standalone View
Standalone View
head/audio/mythplugin-mythmusic/files/patch-configure
| --- configure.orig 2015-06-16 16:03:30 UTC | --- configure.orig 2018-02-01 11:15:37 UTC | ||||
| +++ configure | +++ configure | ||||
| @@ -227,6 +227,10 @@ add_cxxflags(){ | @@ -227,6 +227,10 @@ add_cxxflags(){ | ||||
| append ECXXFLAGS "$@" | append ECXXFLAGS "$@" | ||||
| } | } | ||||
| +add_cppflags(){ | +add_cppflags(){ | ||||
| + append CPPFLAGS "$@" | + append CPPFLAGS "$@" | ||||
| +} | +} | ||||
| + | + | ||||
| check_cxx(){ | check_cxx(){ | ||||
| log check_cxx "$@" | log check_cxx "$@" | ||||
| cat > $TMPCXX | cat > $TMPCXX | ||||
| @@ -561,6 +565,10 @@ OPENGLV=$(cat mythconfig.mak | grep -e " | @@ -559,6 +563,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=} | ||||
| EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=") | OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes") | ||||
| EXTRALIBS=${EXTRALIBS#EXTRALIBS=} | OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes") | ||||
| +add_cppflags "-I${prefix}/include" | +add_cppflags "-I${prefix}/include" | ||||
| +add_cxxflags "-I${prefix}/include" | +add_cxxflags "-I${prefix}/include" | ||||
| +add_ldflags "-L${prefix}/lib" | +add_ldflags "-L${prefix}/lib" | ||||
| + | + | ||||
| if is_qmake4 $qmake || is_qmake4 qmake-qt4; then | EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=") | ||||
| if is_qmake4 qmake-qt4; then | EXTRALIBS=${EXTRALIBS#EXTRALIBS=} | ||||
| qmake=qmake-qt4 | |||||
| @@ -657,6 +665,7 @@ if enabled music ; then | @@ -689,8 +697,10 @@ if enabled music ; then | ||||
| echo "MythMusic requires FLAC." | echo "MythMusic requires FLAC." | ||||
| fi | fi | ||||
| + enable cdio | - if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then | ||||
| if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then | - disable cdio | ||||
| disable cdio | + if enabled cdio; then | ||||
| + if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then | |||||
| + disable cdio | |||||
| + fi | |||||
| fi | fi | ||||
| if ! check_lib lame/lame.h lame_init -lmp3lame ; then | |||||