diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-06-26 22:32:52 +0400 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-06-26 22:32:52 +0400 |
| commit | c91a54aef8a39e7cbb2571574f56f2cf12104ff1 (patch) | |
| tree | e68102d093c111affd9208b78df9c18aa837c3b8 /recipes/musicpd | |
| parent | 323edc5ef4c3d8572ee0b4fd185ca6e3166d6b45 (diff) | |
| parent | 84efca2e2ad21d3d7cea68c0327f91aaf773eb67 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Conflicts:
recipes/musicpd/mpd_0.14.2.bb
Diffstat (limited to 'recipes/musicpd')
| -rw-r--r-- | recipes/musicpd/mpd-alsa_0.14.2.bb | 19 | ||||
| -rw-r--r-- | recipes/musicpd/mpd_0.14.2.bb | 5 |
2 files changed, 14 insertions, 10 deletions
diff --git a/recipes/musicpd/mpd-alsa_0.14.2.bb b/recipes/musicpd/mpd-alsa_0.14.2.bb index 87b59a1bcf..b3cdaf4208 100644 --- a/recipes/musicpd/mpd-alsa_0.14.2.bb +++ b/recipes/musicpd/mpd-alsa_0.14.2.bb @@ -24,8 +24,8 @@ INITSCRIPT_NAME = "mpd" EXTRA_OECONF = "\ --enable-ogg \ --enable-oggvorbis \ ---disable-oggflac \ ---enable-flac \ +--disable-oggflac \ +--enable-flac \ --enable-faad \ --with-ao-libraries=${STAGING_LIBDIR} \ --with-ao-includes=${STAGING_INCDIR} \ @@ -41,14 +41,15 @@ EXTRA_OECONF = "\ --with-ogg-includes=${STAGING_INCDIR} \ --with-vorbis-libraries=${STAGING_LIBDIR} \ --with-vorbis-includes=${STAGING_INCDIR} \ ---disable-aotest \ ---disable-alsatest \ ---disable-oggtest \ ---disable-vorbistest \ ---disable-libFLACtest \ ---disable-libOggFLACtest \ ---disable-audiofiletest \ +--disable-aotest \ +--disable-alsatest \ +--disable-oggtest \ +--disable-vorbistest \ +--disable-libFLACtest \ +--disable-libOggFLACtest \ +--disable-audiofiletest \ --disable-libmikmodtest \ +--with-lame-includes=${STAGING_INCDIR} \ " do_configure_append() { diff --git a/recipes/musicpd/mpd_0.14.2.bb b/recipes/musicpd/mpd_0.14.2.bb index 97792365b9..261858d444 100644 --- a/recipes/musicpd/mpd_0.14.2.bb +++ b/recipes/musicpd/mpd_0.14.2.bb @@ -27,10 +27,13 @@ EXTRA_OECONF = "\ --with-mad-includes=${STAGING_INCDIR} \ --with-faad-libraries=${STAGING_LIBDIR} \ --with-faad-includes=${STAGING_INCDIR} \ + --disable-curl \ + --disable-ffmpeg \ --disable-jack \ --enable-pulse \ --enable-mod \ - --disable-oggflac" + --disable-oggflac \ + --with-lame-includes=${STAGING_INCDIR}" do_compile_prepend() { find -name Makefile | xargs sed -i 's~-I/usr/include~-I${STAGING_INCDIR}~g' |