commit: 45043b28b873cc050360aa4bff16b810b73d790d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 20 11:54:31 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 20 12:29:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45043b28
media-sound/cmus: 2.8.0 version bump, add MPRIS support MPRIS support is enabled via USE elogind or systemd, whichever is in effect. These flags are mutually exclusive globally, so no one should trip up on the ensuing REQUIRED_USE. Thanks-to: Shiba <shibotto <AT> gmx.com> Bug: https://bugs.gentoo.org/679222 Closes: https://bugs.gentoo.org/673426 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/cmus/Manifest | 1 + .../cmus/{cmus-9999.ebuild => cmus-2.8.0.ebuild} | 16 +++++++++-- media-sound/cmus/cmus-9999.ebuild | 14 ++++++++-- media-sound/cmus/files/cmus-2.8.0-elogind.patch | 22 +++++++++++++++ media-sound/cmus/metadata.xml | 32 ++++++++++++---------- 5 files changed, 66 insertions(+), 19 deletions(-) diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest index e4eb7b4d2ea..c42c882cfae 100644 --- a/media-sound/cmus/Manifest +++ b/media-sound/cmus/Manifest @@ -1 +1,2 @@ +DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869 diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild similarity index 88% copy from media-sound/cmus/cmus-9999.ebuild copy to media-sound/cmus/cmus-2.8.0.ebuild index a418e774226..27052411479 100644 --- a/media-sound/cmus/cmus-9999.ebuild +++ b/media-sound/cmus/cmus-2.8.0.ebuild @@ -18,10 +18,12 @@ HOMEPAGE="https://cmus.github.io/"; LICENSE="GPL-2" SLOT="0" -IUSE="aac alsa ao cddb cdio cue debug discid examples ffmpeg +flac jack libsamplerate - +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode +IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate + +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack" +REQUIRED_USE="?? ( elogind systemd )" + BDEPEND=" virtual/pkgconfig " @@ -34,6 +36,7 @@ DEPEND=" cdio? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) + elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) @@ -45,6 +48,7 @@ DEPEND=" musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) + systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) @@ -62,6 +66,8 @@ REQUIRED_USE="tremor? ( vorbis ) DOCS=( AUTHORS README.md ) +PATCHES=( "${FILESDIR}/${P}-elogind.patch" ) + S="${WORKDIR}/${P/_/-}" my_config() { @@ -98,6 +104,12 @@ src_configure() { my_config ao CONFIG_AO my_config oss CONFIG_OSS + if use elogind || use systemd; then + myconf="${myconf} CONFIG_MPRIS=a" + else + myconf="${myconf} CONFIG_MPRIS=n" + fi + ./configure prefix="${EPREFIX}"/usr ${myconf} \ exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \ libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild index a418e774226..0b1b04b727c 100644 --- a/media-sound/cmus/cmus-9999.ebuild +++ b/media-sound/cmus/cmus-9999.ebuild @@ -18,10 +18,12 @@ HOMEPAGE="https://cmus.github.io/"; LICENSE="GPL-2" SLOT="0" -IUSE="aac alsa ao cddb cdio cue debug discid examples ffmpeg +flac jack libsamplerate - +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode +IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate + +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack" +REQUIRED_USE="?? ( elogind systemd )" + BDEPEND=" virtual/pkgconfig " @@ -34,6 +36,7 @@ DEPEND=" cdio? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) + elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) @@ -45,6 +48,7 @@ DEPEND=" musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) + systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) @@ -98,6 +102,12 @@ src_configure() { my_config ao CONFIG_AO my_config oss CONFIG_OSS + if use elogind || use systemd; then + myconf="${myconf} CONFIG_MPRIS=a" + else + myconf="${myconf} CONFIG_MPRIS=n" + fi + ./configure prefix="${EPREFIX}"/usr ${myconf} \ exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \ libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die diff --git a/media-sound/cmus/files/cmus-2.8.0-elogind.patch b/media-sound/cmus/files/cmus-2.8.0-elogind.patch new file mode 100644 index 00000000000..e1309c78911 --- /dev/null +++ b/media-sound/cmus/files/cmus-2.8.0-elogind.patch @@ -0,0 +1,22 @@ +From 483d1862ed023c3e00f2c8c4e71da40022af2f78 Mon Sep 17 00:00:00 2001 +From: Shiba <[email protected]> +Date: Tue, 12 Feb 2019 15:29:43 +0100 +Subject: [PATCH] Add support for elogind (#846) + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 1f46c30a..4627126e 100755 +--- a/configure ++++ b/configure +@@ -289,7 +289,7 @@ check_vorbis() + + check_libsystemd() + { +- pkg_config LIBSYSTEMD "libsystemd" ++ pkg_config LIBSYSTEMD "libsystemd" || pkg_config LIBSYSTEMD "libelogind >= 239.3" + return $? + } + diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml index f64fa63b73f..f19bd0670b1 100644 --- a/media-sound/cmus/metadata.xml +++ b/media-sound/cmus/metadata.xml @@ -1,19 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Sound project</name> - </maintainer> - <use> - <flag name="cdio">use libcdio for CD support </flag> - <flag name="cue">enable CUE sheet parsing</flag> - <flag name="discid">enable reading the ID of the inserted CD</flag> - <flag name="pidgin">install support script for <pkg>net-im/pidgin</pkg></flag> - <flag name="tremor">use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag> - </use> - <upstream> - <remote-id type="github">cmus/cmus</remote-id> - <remote-id type="sourceforge">cmus</remote-id> - </upstream> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Sound project</name> + </maintainer> + <use> + <flag name="cdio">Use libcdio for CD support </flag> + <flag name="cue">Enable CUE sheet parsing</flag> + <flag name="discid">Enable reading the ID of the inserted CD</flag> + <flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag> + <flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag> + <flag name="systemd">Enable MPRIS support via <pkg>sys-apps/systemd</pkg></flag> + <flag name="tremor">Use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag> + </use> + <upstream> + <remote-id type="github">cmus/cmus</remote-id> + <remote-id type="sourceforge">cmus</remote-id> + </upstream> </pkgmetadata>
