From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../musicpd/libmpdclient_2.16.bb | 22 +++++ .../recipes-multimedia/musicpd/mpc_0.31.bb | 16 ++++ .../recipes-multimedia/musicpd/mpd_0.20.18.bb | 100 --------------------- .../recipes-multimedia/musicpd/mpd_0.20.22.bb | 99 ++++++++++++++++++++ .../recipes-multimedia/musicpd/ncmpc_0.33.bb | 37 ++++++++ 5 files changed, 174 insertions(+), 100 deletions(-) create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/musicpd') diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb new file mode 100644 index 000000000..455e76fcb --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb @@ -0,0 +1,22 @@ +SUMMARY = "C client library for the Music Player Daemon" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" +HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" + +inherit meson + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/libmpdclient \ +" +SRCREV = "4e8d990eb5239566ee948f1cd79b7248e008620a" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "tcp" +PACKAGECONFIG[tcp] = "-Dtcp=true,-Dtcp=false" + +do_install_append() { + # libmpdclient's Vala bindings are outdated and unmaintained; it + # is likely that nobody will ever use them, so let's not install + # them + rm -rf ${D}${datadir}/vala +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb new file mode 100644 index 000000000..41abe7108 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb @@ -0,0 +1,16 @@ +SUMMARY = "A minimalist command line interface to the Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/mpc/" + +inherit meson + +DEPENDS += " \ + libmpdclient \ +" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/mpc \ +" +SRCREV = "59875acdf34e5f0eac0c11453c49daef54f78413" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb deleted file mode 100644 index 6754f347e..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb +++ /dev/null @@ -1,100 +0,0 @@ -SUMMARY = "Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -HOMEPAGE ="http://www.musicpd.org" - -inherit autotools useradd systemd pkgconfig - -DEPENDS += " \ - alsa-lib \ - libsamplerate0 \ - libsndfile1 \ - libvorbis \ - libogg \ - faad2 \ - ffmpeg \ - curl \ - sqlite \ - bzip2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ - tcp-wrappers \ - openal-soft \ - yajl \ - jack \ - faad2 \ - flac \ - libao \ - fluidsynth \ - libcdio \ - wavpack \ - libopus \ - mpg123 \ - libmms \ - libmodplug \ - boost \ - icu \ - dbus \ - expat \ - zlib \ - libupnp \ -" - -# While this item does not require it, it depends on mpg123 which does -LICENSE_FLAGS = "commercial" - -SRC_URI = " \ - http://www.musicpd.org/download/${BPN}/0.20/${BP}.tar.xz \ - file://mpd.conf.in \ -" -SRC_URI[md5sum] = "8dc87ba95473fd738f2aff9bd69cc212" -SRC_URI[sha256sum] = "6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434" - -EXTRA_OECONF = "enable_bzip2=yes" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -PACKAGECONFIG[audiofile] = "--enable-audiofile,--disable-audiofile,audiofile" -PACKAGECONFIG[cdioparanoia] = "--enable-cdio-paranoia,--disable-cdio-paranoia,libcdio-paranoia" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" -PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" -PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" - -do_configure_prepend() { - sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac -} - -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 -d ${D}/${sysconfdir} - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf - sed -i \ - -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ - -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ - -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ - -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ - -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ - ${D}/${sysconfdir}/mpd.conf - - if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then - sed -i \ - 's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \ - ${D}/${systemd_unitdir}/system/mpd.service - fi -} - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "mpd.socket" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = " \ - --system --no-create-home \ - --home ${localstatedir}/lib/mpd \ - --groups audio \ - --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb new file mode 100644 index 000000000..6c6ad4237 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb @@ -0,0 +1,99 @@ +SUMMARY = "Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE ="http://www.musicpd.org" + +inherit autotools useradd systemd pkgconfig + +DEPENDS += " \ + curl \ + sqlite3 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ + yajl \ + boost \ + icu \ + dbus \ + expat \ +" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \ + file://mpd.conf.in \ +" +SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d" +S = "${WORKDIR}/git" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" + +PACKAGECONFIG ??= "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 += "${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'aac', '', d)}" + +PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +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" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" +PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" + +do_configure_prepend() { + sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac +} + +do_install_append() { + 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 + sed -i \ + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ + ${D}/${sysconfdir}/mpd.conf + + # we don't need the icon + rm -rf ${D}${datadir}/icons +} + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "mpd.socket" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = " \ + --system --no-create-home \ + --home ${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb new file mode 100644 index 000000000..8468d125d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.33.bb @@ -0,0 +1,37 @@ +SUMMARY = "A curses client for the Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" + +inherit meson + +DEPENDS += " \ + boost \ + ncurses \ + libmpdclient \ +" + +PACKAGECONFIG ??= "colors locale mouse nls regex help_screen artist_screen search_screen song_screen key_screen lyrics_screen outputs_screen" + +PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" +PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" +PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" +PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" +PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" +PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" +PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" + +PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" +PACKAGECONFIG[artist_screen] = "-Dartist_screen=true,-Dartist_screen=false" +PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" +PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" +PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" +PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" +PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" +PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/ncmpc \ +" +SRCREV = "8e98f89ff07b140e6357dab2a9a9f6432ae0e521" +S = "${WORKDIR}/git" -- cgit v1.2.3