diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-09-17 21:55:13 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 15:39:46 +0200 |
| commit | 335d425c99466656f86769d53ca61f28f8018f1d (patch) | |
| tree | 0341de53bb2520e32833965bbd116a166f30cd30 /meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.1.bb | |
| parent | 0cfc1d337db53585f3e6f4dc54e8684e1145f42c (diff) | |
| download | meta-openembedded-335d425c99466656f86769d53ca61f28f8018f1d.tar.gz | |
mpd: update on 0.19.10 to fix build with gcc 5
0.19.1 failed with
<...>/src/db/plugins/simple/SimpleDatabasePlugin.cxx:448:10: error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive]
return nullptr;
^
<...>/src/db/plugins/simple/SimpleDatabasePlugin.cxx:454:10: error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive]
return nullptr;
^
<...>/src/db/plugins/simple/SimpleDatabasePlugin.cxx: In member function 'bool SimpleDatabase::Mount(const char*, const char*, Error&)':
<...>/src/db/plugins/simple/SimpleDatabasePlugin.cxx:481:10: error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive]
return nullptr;
^
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.1.bb')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.1.bb | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.1.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.1.bb deleted file mode 100644 index a5cd557e43..0000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.1.bb +++ /dev/null | |||
| @@ -1,59 +0,0 @@ | |||
| 1 | SUMMARY = "Music Player Daemon" | ||
| 2 | LICENSE = "GPLv2" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
| 4 | HOMEPAGE ="http://www.musicpd.org" | ||
| 5 | |||
| 6 | DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio tcp-wrappers openal-soft yajl jack faad2 flac libao fluidsynth libcdio wavpack libopus mpg123 libmms libmodplug boost icu dbus expat zlib" | ||
| 7 | |||
| 8 | SRC_URI = " \ | ||
| 9 | http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \ | ||
| 10 | file://mpd.conf.in \ | ||
| 11 | " | ||
| 12 | SRC_URI[md5sum] = "d235f6e53e5442b6926c49946a303f8d" | ||
| 13 | SRC_URI[sha256sum] = "8b3afcd440181c9bd18b229b5974e529d59648344dd371370d6f7d62ec2847c5" | ||
| 14 | |||
| 15 | inherit autotools useradd systemd | ||
| 16 | |||
| 17 | EXTRA_OECONF = "enable_bzip2=yes" | ||
| 18 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" | ||
| 19 | |||
| 20 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | ||
| 21 | PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" | ||
| 22 | PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" | ||
| 23 | PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" | ||
| 24 | |||
| 25 | do_install_append() { | ||
| 26 | install -d ${D}/${localstatedir}/lib/mpd/music | ||
| 27 | chmod 775 ${D}/${localstatedir}/lib/mpd/music | ||
| 28 | install -d ${D}/${localstatedir}/lib/mpd/playlists | ||
| 29 | chown -R mpd ${D}/${localstatedir}/lib/mpd | ||
| 30 | chown mpd:mpd ${D}/${localstatedir}/lib/mpd/music | ||
| 31 | |||
| 32 | install -d ${D}/${sysconfdir} | ||
| 33 | install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf | ||
| 34 | sed -i \ | ||
| 35 | -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ | ||
| 36 | -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ | ||
| 37 | -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ | ||
| 38 | -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ | ||
| 39 | -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ | ||
| 40 | ${D}/${sysconfdir}/mpd.conf | ||
| 41 | |||
| 42 | if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then | ||
| 43 | sed -i \ | ||
| 44 | 's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \ | ||
| 45 | ${D}/${systemd_unitdir}/system/mpd.service | ||
| 46 | fi | ||
| 47 | } | ||
| 48 | |||
| 49 | RPROVIDES_${PN} += "${PN}-systemd" | ||
| 50 | RREPLACES_${PN} += "${PN}-systemd" | ||
| 51 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
| 52 | SYSTEMD_SERVICE_${PN} = "mpd.service mpd.socket" | ||
| 53 | |||
| 54 | USERADD_PACKAGES = "${PN}" | ||
| 55 | USERADD_PARAM_${PN} = " \ | ||
| 56 | --system --no-create-home \ | ||
| 57 | --home ${localstatedir}/lib/mpd \ | ||
| 58 | --groups audio \ | ||
| 59 | --user-group mpd" | ||
