From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- media-sound/strawberry/Manifest | 8 +- media-sound/strawberry/metadata.xml | 1 + media-sound/strawberry/strawberry-0.9.3.ebuild | 125 --------------------- media-sound/strawberry/strawberry-1.0.0-r2.ebuild | 127 ++++++++++++++++++++++ media-sound/strawberry/strawberry-1.0.0.ebuild | 126 --------------------- media-sound/strawberry/strawberry-9999.ebuild | 17 +-- 6 files changed, 140 insertions(+), 264 deletions(-) delete mode 100644 media-sound/strawberry/strawberry-0.9.3.ebuild create mode 100644 media-sound/strawberry/strawberry-1.0.0-r2.ebuild delete mode 100644 media-sound/strawberry/strawberry-1.0.0.ebuild (limited to 'media-sound/strawberry') diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest index 5457603aa19e..8fd87f7347f8 100644 --- a/media-sound/strawberry/Manifest +++ b/media-sound/strawberry/Manifest @@ -1,6 +1,4 @@ -DIST strawberry-0.9.3.tar.xz 10928116 BLAKE2B 3edb80065876d63b79292c6b75660aaaeaa6ea294bb84011124fa8aee3163717b8ab4f0e8d6e7aff321466d3cfbc214b5e8b987c9ae9b0823f8d3c681aae6e9e SHA512 d253ffaa6cf0412eb135bc792c31458816fc0a1ae7070d6885487da4fb4855ffeeeeddd285b853fd10220c797c3beb73a91059514d76b1b1638350fdff17107c DIST strawberry-1.0.0.tar.xz 11149316 BLAKE2B db500acb75c1e206c7eb2b5b668fc850444da8383ea98926e05d3eaee46a477f9b7c24017c75a1ea8d0ac8d89287a137aa65ef9098527b0449e3b5b14e37fa9e SHA512 e7f03eb068bd2de22b83b0bdd493dabbbe054bb0f7d3f4d237ff38955e382a13d7c42f60c9a257c906ded46567b6f4ca9139920291df8a7688fb4025cdfec488 -EBUILD strawberry-0.9.3.ebuild 2936 BLAKE2B 9fcac1154c3e5531cfd8ac2739c16034ddfa85336775cf1d6f18d49dd4d2f23b604e7224642349c7c2f88f78c596fdfb09ead197ad255cb60665c113d627b614 SHA512 ac75150dcb913b7f9c6ad3a34cb6362584268aadb890f89bf73fb432fcd7dd3b8c997c61c24afed01f76e37c2dc2eb53ae1b6157448bb0398de7ac1cbcb2363c -EBUILD strawberry-1.0.0.ebuild 2986 BLAKE2B 51c17f06060909737f468d1f3d94757a2c29dd3147f0c5146ba45354783eebb13d90f9dd271d0c8c7241b1a97e637dbbc9e9eeb8ef5f2d58e33590a45e3752e6 SHA512 acffcdd97fbf71b254918ee836653d0088c702138dcd71df4a88de0dc880308819aa1f62d9cb6dea2c449a7783e8756b5c508b689a94cb498861abe1f0251abe -EBUILD strawberry-9999.ebuild 2986 BLAKE2B 51c17f06060909737f468d1f3d94757a2c29dd3147f0c5146ba45354783eebb13d90f9dd271d0c8c7241b1a97e637dbbc9e9eeb8ef5f2d58e33590a45e3752e6 SHA512 acffcdd97fbf71b254918ee836653d0088c702138dcd71df4a88de0dc880308819aa1f62d9cb6dea2c449a7783e8756b5c508b689a94cb498861abe1f0251abe -MISC metadata.xml 532 BLAKE2B 92c28967a4c323a7fa04309336fb52f7625701cbf965828ace4359452801ed36683e4fc20e7fc6f691d0cdb56bc027fc5ff758233c3f8a7aac214f36c8565b70 SHA512 569814f4eee1fd43e75e5ddfd7935b7d503b6127a2d3c276237e5237d9de571b18037484893d05dc44c5ba95ae9ac2f95d6715c5280f0da37443f16972b4e627 +EBUILD strawberry-1.0.0-r2.ebuild 3158 BLAKE2B eb0105b01331c95f162ac0cc8ffdc3cec4fd2fa69e7fa7d912ca61471cdafb3025f836f8baa886740e9377f35ef53d967017ad56382e150af1437979c2f849b1 SHA512 e9fa7f4eb3e23aacb4c3d376d2725997b8d5aab614bc8b1b091b3eca1c8a52a303343de4e98b835dc2073b0f250daf65f31047275a4b5f34be998958ced86fd6 +EBUILD strawberry-9999.ebuild 3160 BLAKE2B 08afb3e7c4d0b32c675f9bfb400f947f71538a2eebdc27206552819dde7d1a17f0778446af994fe007ecda0ddc951acc5dd4d92366d41b12fc13cec4efa4c40a SHA512 81a3f1449f973492f757ebf8f0fe16743a7d5cba3793c2fbe7b56d819edf1b28868bc4307ac356b2f11ae9f5f6141745914c994567149364e69238e715f5f03d +MISC metadata.xml 585 BLAKE2B 1b52d815e1846552591795504e346af937c10cec32eb466c2d6ce64d541b94ce635fe30b268fd0b4180cc6b755086a3a9350ae319a3c11c9291351e419f5a363 SHA512 e3c610802ecf38062db532d7124f19bf555238359701627bcd0765ffad22aab6c8c8b457d45795a0784eef4beaa2e6764a15083dd203e2a3d3fa04d5de8208fa diff --git a/media-sound/strawberry/metadata.xml b/media-sound/strawberry/metadata.xml index ea30306662e5..1d06f286e255 100644 --- a/media-sound/strawberry/metadata.xml +++ b/media-sound/strawberry/metadata.xml @@ -11,6 +11,7 @@ Enable media-video/vlc backend + Enable moodbar support jonaski/strawberry diff --git a/media-sound/strawberry/strawberry-0.9.3.ebuild b/media-sound/strawberry/strawberry-0.9.3.ebuild deleted file mode 100644 index bcca27347c61..000000000000 --- a/media-sound/strawberry/strawberry-0.9.3.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic plocale virtualx xdg - -PLOCALES="cs de es fr hu id it ko nb pl ru sv" - -DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" -HOMEPAGE="https://www.strawbs.org/" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/jonaski/strawberry.git" - inherit git-r3 -else - SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc64 x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc" - -REQUIRED_USE=" - udisks? ( dbus ) -" - -BDEPEND=" - dev-qt/linguist-tools:5 - sys-devel/gettext - virtual/pkgconfig -" -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] - dev-db/sqlite:= - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/protobuf:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - media-libs/alsa-lib - media-libs/chromaprint:= - >=media-libs/libmygpo-qt-1.0.9[qt5(+)] - >=media-libs/taglib-1.11.1_p20181028 - sys-libs/zlib - virtual/glu - x11-libs/libX11 - cdda? ( dev-libs/libcdio:= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - ipod? ( >=media-libs/libgpod-0.8.0 ) - mtp? ( >=media-libs/libmtp-1.0.0 ) - pulseaudio? ( media-sound/pulseaudio ) - vlc? ( media-video/vlc ) -" -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; -RDEPEND="${COMMON_DEPEND} - gstreamer? ( - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-soup:1.0 - media-plugins/gst-plugins-taglib:1.0 - ) - mtp? ( gnome-base/gvfs[mtp] ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-cpp/gtest-1.8.0 - dev-libs/boost - dev-qt/qtopengl:5 - dev-qt/qttest:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 -" - -DOCS=( Changelog README.md ) - -REQUIRED_USE=" - || ( gstreamer vlc ) -" - -src_prepare() { - plocale_find_changes "src/translations" "" ".po" - - cmake_src_prepare -} - -src_configure() { - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - -DENABLE_GIO=ON - -DLINGUAS="$(plocale_get_locales)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_GSTREAMER="$(usex gstreamer)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_VLC="$(usex vlc)" - -DWITH_QT6=OFF - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - if use gstreamer ; then - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" - fi -} diff --git a/media-sound/strawberry/strawberry-1.0.0-r2.ebuild b/media-sound/strawberry/strawberry-1.0.0-r2.ebuild new file mode 100644 index 000000000000..7fb0814fa2d5 --- /dev/null +++ b/media-sound/strawberry/strawberry-1.0.0-r2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic plocale xdg + +PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN" + +DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" +HOMEPAGE="https://www.strawbs.org/" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/jonaski/strawberry.git" + inherit git-r3 +else + SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~ppc64 x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc" + +BDEPEND=" + dev-qt/linguist-tools:5 + sys-devel/gettext + virtual/pkgconfig +" +COMMON_DEPEND=" + app-crypt/qca:2[qt5(+)] + dev-db/sqlite:= + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/protobuf:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + media-libs/alsa-lib + >=media-libs/libmygpo-qt-1.0.9[qt5(+)] + >=media-libs/taglib-1.11.1_p20181028 + sys-libs/zlib + virtual/glu + x11-libs/libX11 + cdda? ( dev-libs/libcdio:= ) + gstreamer? ( + >=media-libs/chromaprint-1.4:= + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + ipod? ( >=media-libs/libgpod-0.8.0 ) + moodbar? ( sci-libs/fftw:3.0 ) + mtp? ( >=media-libs/libmtp-1.0.0 ) + pulseaudio? ( media-sound/pulseaudio ) + vlc? ( media-video/vlc ) +" +# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; +RDEPEND="${COMMON_DEPEND} + gstreamer? ( + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-soup:1.0 + media-plugins/gst-plugins-taglib:1.0 + ) + mtp? ( gnome-base/gvfs[mtp] ) + udisks? ( sys-fs/udisks:2 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-cpp/gtest-1.8.0 + dev-libs/boost + dev-qt/qtopengl:5 + dev-qt/qttest:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 +" + +DOCS=( Changelog README.md ) + +REQUIRED_USE=" + cdda? ( gstreamer ) + || ( gstreamer vlc ) +" + +src_prepare() { + plocale_find_changes "src/translations" "" ".po" + + cmake_src_prepare +} + +src_configure() { + # spotify is not in portage + local mycmakeargs=( + -DBUILD_WERROR=OFF + # avoid automagically enabling of ccache (bug #611010) + -DCCACHE_EXECUTABLE=OFF + -DENABLE_GIO=ON + -DLINGUAS="$(plocale_get_locales)" + -DENABLE_AUDIOCD="$(usex cdda)" + -DENABLE_GSTREAMER="$(usex gstreamer)" + -DENABLE_LIBGPOD="$(usex ipod)" + -DENABLE_LIBMTP="$(usex mtp)" + -DENABLE_LIBPULSE="$(usex pulseaudio)" + -DENABLE_MOODBAR="$(usex moodbar)" + -DENABLE_MUSICBRAINZ="$(usex gstreamer)" + -DENABLE_SONGFINGERPRINTING="$(usex gstreamer)" + -DENABLE_UDISKS2="$(usex udisks)" + -DENABLE_VLC="$(usex vlc)" + # Disable until we have qt6 in the tree + -DWITH_QT6=OFF + ) + + use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + if use gstreamer ; then + elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " + elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " + elog "depending on your preferences" + fi +} diff --git a/media-sound/strawberry/strawberry-1.0.0.ebuild b/media-sound/strawberry/strawberry-1.0.0.ebuild deleted file mode 100644 index b79659cf7e03..000000000000 --- a/media-sound/strawberry/strawberry-1.0.0.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic plocale virtualx xdg - -PLOCALES="cs de es fr hu id it ko nb pl ru sv" - -DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" -HOMEPAGE="https://www.strawbs.org/" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/jonaski/strawberry.git" - inherit git-r3 -else - SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc" - -REQUIRED_USE=" - udisks? ( dbus ) -" - -BDEPEND=" - dev-qt/linguist-tools:5 - sys-devel/gettext - virtual/pkgconfig -" -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] - dev-db/sqlite:= - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/protobuf:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - media-libs/alsa-lib - >=media-libs/chromaprint-1.4:= - >=media-libs/libmygpo-qt-1.0.9[qt5(+)] - >=media-libs/taglib-1.11.1_p20181028 - sys-libs/zlib - virtual/glu - x11-libs/libX11 - cdda? ( dev-libs/libcdio:= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - ipod? ( >=media-libs/libgpod-0.8.0 ) - mtp? ( >=media-libs/libmtp-1.0.0 ) - pulseaudio? ( media-sound/pulseaudio ) - vlc? ( media-video/vlc ) -" -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; -RDEPEND="${COMMON_DEPEND} - gstreamer? ( - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-soup:1.0 - media-plugins/gst-plugins-taglib:1.0 - ) - mtp? ( gnome-base/gvfs[mtp] ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-cpp/gtest-1.8.0 - dev-libs/boost - dev-qt/qtopengl:5 - dev-qt/qttest:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 -" - -DOCS=( Changelog README.md ) - -REQUIRED_USE=" - || ( gstreamer vlc ) -" - -src_prepare() { - plocale_find_changes "src/translations" "" ".po" - - cmake_src_prepare -} - -src_configure() { - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - -DENABLE_GIO=ON - -DLINGUAS="$(plocale_get_locales)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_GSTREAMER="$(usex gstreamer)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_VLC="$(usex vlc)" - # Disable until we have qt6 in the tree - -DWITH_QT6=OFF - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - if use gstreamer ; then - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" - fi -} diff --git a/media-sound/strawberry/strawberry-9999.ebuild b/media-sound/strawberry/strawberry-9999.ebuild index b79659cf7e03..83b0bbf5f703 100644 --- a/media-sound/strawberry/strawberry-9999.ebuild +++ b/media-sound/strawberry/strawberry-9999.ebuild @@ -3,9 +3,9 @@ EAPI=8 -inherit cmake flag-o-matic plocale virtualx xdg +inherit cmake flag-o-matic plocale xdg -PLOCALES="cs de es fr hu id it ko nb pl ru sv" +PLOCALES="ca cs de es fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN" DESCRIPTION="Modern music player and library organizer based on Clementine and Qt" HOMEPAGE="https://www.strawbs.org/" @@ -19,11 +19,7 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="cdda debug +gstreamer ipod mtp pulseaudio +udisks vlc" - -REQUIRED_USE=" - udisks? ( dbus ) -" +IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc" BDEPEND=" dev-qt/linguist-tools:5 @@ -44,7 +40,6 @@ COMMON_DEPEND=" dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib - >=media-libs/chromaprint-1.4:= >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib @@ -52,10 +47,12 @@ COMMON_DEPEND=" x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( + >=media-libs/chromaprint-1.4:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( >=media-libs/libgpod-0.8.0 ) + moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) @@ -82,6 +79,7 @@ DEPEND="${COMMON_DEPEND} DOCS=( Changelog README.md ) REQUIRED_USE=" + cdda? ( gstreamer ) || ( gstreamer vlc ) " @@ -104,6 +102,9 @@ src_configure() { -DENABLE_LIBGPOD="$(usex ipod)" -DENABLE_LIBMTP="$(usex mtp)" -DENABLE_LIBPULSE="$(usex pulseaudio)" + -DENABLE_MOODBAR="$(usex moodbar)" + -DENABLE_MUSICBRAINZ="$(usex gstreamer)" + -DENABLE_SONGFINGERPRINTING="$(usex gstreamer)" -DENABLE_UDISKS2="$(usex udisks)" -DENABLE_VLC="$(usex vlc)" # Disable until we have qt6 in the tree -- cgit v1.2.3