summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/musicpd/mpd-alsa_0.11.5.bb13
-rw-r--r--packages/musicpd/mpd_0.11.5.bb13
2 files changed, 20 insertions, 6 deletions
diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb
index 5acc6071d3..ceb491a192 100644
--- a/packages/musicpd/mpd-alsa_0.11.5.bb
+++ b/packages/musicpd/mpd-alsa_0.11.5.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
SECTION = "console/multimedia"
DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
RDEPENDS = "libao-alsa"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
@@ -19,8 +19,15 @@ INITSCRIPT_NAME = "mpd"
# in staging - remove the --with and replace with --enable to use the local
# versions.
-EXTRA_OECONF = "--prefix=${D} \
- --enable-ogg \
+EXTRA_OECONF = "--enable-ogg \
+ --with-iconv-libraries=${STAGING_LIBDIR} \
+ --with-iconv-includes=${STAGING_INCDIR} \
+ --with-vorbis-libraries=${STAGING_LIBDIR} \
+ --with-vorbis-includes=${STAGING_INCDIR} \
+ --with-ogg-libraries=${STAGING_LIBDIR} \
+ --with-ogg-includes=${STAGING_INCDIR} \
+ --with-ao-libraries=${STAGING_LIBDIR} \
+ --with-ao-includes=${STAGING_INCDIR} \
--with-id3tag-libraries=${STAGING_LIBDIR} \
--with-id3tag-includes=${STAGING_INCDIR} \
--with-mad-libraries=${STAGING_LIBDIR} \
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
index 0d41cf3e0a..95fe05cf41 100644
--- a/packages/musicpd/mpd_0.11.5.bb
+++ b/packages/musicpd/mpd_0.11.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
SECTION = "console/multimedia"
DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv"
-PR = "r6"
+PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
file://save-volume-state.patch;patch=1"
@@ -16,8 +16,15 @@ inherit autotools
# in staging - remove the --with and replace with --enable to use the local
# versions.
-EXTRA_OECONF = "--prefix=${D} \
- --enable-ogg \
+EXTRA_OECONF = "--enable-ogg \
+ --with-iconv-libraries=${STAGING_LIBDIR} \
+ --with-iconv-includes=${STAGING_INCDIR} \
+ --with-vorbis-libraries=${STAGING_LIBDIR} \
+ --with-vorbis-includes=${STAGING_INCDIR} \
+ --with-ogg-libraries=${STAGING_LIBDIR} \
+ --with-ogg-includes=${STAGING_INCDIR} \
+ --with-ao-libraries=${STAGING_LIBDIR} \
+ --with-ao-includes=${STAGING_INCDIR} \
--with-id3tag-libraries=${STAGING_LIBDIR} \
--with-id3tag-includes=${STAGING_INCDIR} \
--with-mad-libraries=${STAGING_LIBDIR} \