mpd: sort PACKAGECONFIGs again
PATCH 1/7 mpd: sort PACKAGECONFIGs again
From: Max Kellermann <[email protected]>
The new ones I added were not sorted.
--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb +3 -3
@@ -45,13 +45,13 @@ PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" PACKAGECONFIG[libsamplerate] = "--enable-lsr,--disable-lsr,libsamplerate0" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[mms] = "--enable-mms,--disable-mms,libmms" -PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" -PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
Signature · 1 line
2.19.0
PATCH 2/7 mpd: fix the sqlite dependency
From: Max Kellermann <[email protected]>
"sqlite" is sqlite 2.x, but MPD requires 3.x.
--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb +1 -1
@@ -7,7 +7,7 @@ inherit autotools useradd systemd pkgconfig DEPENDS += " \ curl \ - sqlite \ + sqlite3 \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ tcp-wrappers \ yajl \
Signature · 1 line
2.19.0
PATCH 3/7 mpd: build from git
In reply to Max KellermannFrom: Max Kellermann <[email protected]>
--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb +3 -3
@@ -18,11 +18,11 @@ DEPENDS += " \ " SRC_URI = " \ - http://www.musicpd.org/download/${BPN}/0.20/${BP}.tar.xz \ + git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \ file://mpd.conf.in \ " -SRC_URI[md5sum] = "d93c3c86f5e0fc56cc2e1020f80f8b66" -SRC_URI[sha256sum] = "8322764dc265c20f05c8c8fdfdd578b0722e74626bef56fcd8eebfb01acc58dc" +SRCREV = "98afae2520fbe5a322f803335b3142612fda4762" +S = "${WORKDIR}/git" EXTRA_OECONF = "enable_bzip2=yes" EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
Signature · 1 line
2.19.0
PATCH 4/7 mpd: make more plugins optional
In reply to Max KellermannFrom: Max Kellermann <[email protected]>
--- .../recipes-multimedia/musicpd/mpd_0.20.21.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb +7 -2
@@ -9,7 +9,6 @@ DEPENDS += " \ curl \ sqlite3 \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ - tcp-wrappers \ yajl \ boost \ icu \
@@ -27,7 +26,7 @@ S = "${WORKDIR}/git" EXTRA_OECONF = "enable_bzip2=yes" EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" -PACKAGECONFIG ??= "aac alsa ao bzip2 ffmpeg flac fluidsynth iso9660 jack libsamplerate mms mpg123 modplug sndfile upnp openal opus vorbis wavpack zlib" +PACKAGECONFIG ??= "aac alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib" PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
@@ -35,20 +34,26 @@ PACKAGECONFIG[ao] = "--enable-ao,--disable-ao,libao" PACKAGECONFIG[audiofile] = "--enable-audiofile,--disable-audiofile,audiofile" PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" PACKAGECONFIG[cdioparanoia] = "--enable-cdio-paranoia,--disable-cdio-paranoia,libcdio-paranoia" +PACKAGECONFIG[daemon] = "--enable-daemon,--disable-daemon" PACKAGECONFIG[ffmpeg] = "--enable-ffmpeg,--disable-ffmpeg,ffmpeg" +PACKAGECONFIG[fifo] = "--enable-fifo,--disable-fifo" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" +PACKAGECONFIG[httpd] = "--enable-httpd-output,--disable-httpd-output" PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" PACKAGECONFIG[iso9660] = "--enable-iso9660,--disable-iso9660,libcdio" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" PACKAGECONFIG[libsamplerate] = "--enable-lsr,--disable-lsr,libsamplerate0" +PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[mms] = "--enable-mms,--disable-mms,libmms" PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" +PACKAGECONFIG[oss] = "--enable-oss,--disable-oss," +PACKAGECONFIG[recorder] = "--enable-recorder-output,--disable-recorder-output" PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp"
Signature · 1 line
2.19.0
PATCH 5/7 mpd: eliminate `chmod`/`chown` calls by using `install`
In reply to Max KellermannFrom: Max Kellermann <[email protected]>
--- .../recipes-multimedia/musicpd/mpd_0.20.21.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb +5 -5
@@ -66,11 +66,11 @@ do_configure_prepend() { } do_install_append() { - install -d ${D}/${localstatedir}/lib/mpd/music - chmod 775 ${D}/${localstatedir}/lib/mpd/music - install -d ${D}/${localstatedir}/lib/mpd/playlists - chown -R mpd ${D}/${localstatedir}/lib/mpd - chown mpd:mpd ${D}/${localstatedir}/lib/mpd/music + install -o mpd -d \ + ${D}/${localstatedir}/lib/mpd \ + ${D}/${localstatedir}/lib/mpd/playlists + install -m775 -o mpd -g mpd -d \ + ${D}/${localstatedir}/lib/mpd/music install -d ${D}/${sysconfdir} install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf
Signature · 1 line
2.19.0
PATCH 6/7 fluidsynth: drop extra dash from `-Denable-pulseaudio=OFF`
In reply to Max KellermannFrom: Max Kellermann <[email protected]>
This caused a build failure:
CMake Error: The source directory ".../tmp-glibc/work/aarch64-oe-linux/fluidsynth/1.1.11-r0/build/--Denable-pulseaudio=OFF" does not exist.
--- .../recipes-multimedia/fluidsynth/fluidsynth_1.1.11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.11.bb +1 -1
@@ -20,5 +20,5 @@ EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace( PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" PACKAGECONFIG[sndfile] = "-Denable-libsndfile-support=ON,-Denable-libsndfile-support=OFF,libsndfile1" PACKAGECONFIG[jack] = "-Denable-jack-support=ON,-Denable-jack-support=OFF,jack" -PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,--Denable-pulseaudio=OFF,pulseaudio" +PACKAGECONFIG[pulseaudio] = "-Denable-pulseaudio=ON,-Denable-pulseaudio=OFF,pulseaudio" PACKAGECONFIG[portaudio] = "-Denable-portaudio=ON,-Denable-portaudio=OFF,portaudio-v19"
Signature · 1 line
2.19.0
PATCH 7/7 libmms: drop obsolete "Requires:glib-2.0" from pkg-config file
In reply to Max KellermannFrom: Max Kellermann <[email protected]>
--- meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb +8 -0
@@ -10,3 +10,11 @@ SRC_URI[md5sum] = "d6b665b335a6360e000976e770da7691" SRC_URI[sha256sum] = "3c05e05aebcbfcc044d9e8c2d4646cd8359be39a3f0ba8ce4e72a9094bee704f" inherit autotools pkgconfig + +do_install_append() { + # The GLib dependency was removed in libmms 0.6.3, but the + # "Requires" was not removed from the pkg-config file. Since we + # don't have (and don't want) the RDEPENDS on GLib, we should + # remove the "Requires" line. + sed -i '/^Requires: glib-2\.0$/d' ${D}${libdir}/pkgconfig/libmms.pc +}
Signature · 1 line
2.19.0
Hi Max
Please reabse this on top of current master, some of these patches are already in
Quoted 39 lines · Max Kellermann
From: Max Kellermann <[email protected]>
The new ones I added were not sorted.
Signed-off-by Max Kellermann <[email protected]>--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.21.bb +3
-4@@ -45,13 +45,13 @@ PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" PACKAGECONFIG[libsamplerate] = "--enable-lsr,--disable-lsr,libsamplerate0" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[mms] = "--enable-mms,--disable-mms,libmms" -PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" -PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" --2.19.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Ok then I will take a look
Quoted 8 lines · Max Kellermann
Quoted 2 lines · Khem Raj
Please reabse this on top of current master, some of these patches are already in
I know, thanks for merging - but this new patch set is already based on current master (i.e.
23d794b58661).