From 2a0335d272a18288ed5b63c154a9fb6a84137c65 Mon Sep 17 00:00:00 2001 From: Wyatt Date: Thu, 30 May 2019 22:07:28 -0400 Subject: [PATCH 1/4] Add ebuild for amarok --- media-sound/amarok/Manifest | 1 + media-sound/amarok/amarok-3.5.13.2.ebuild | 77 +++++++++++++++++++ .../files/amarok-3.5.13.2-gcc6-fix.patch | 33 ++++++++ 3 files changed, 111 insertions(+) create mode 100644 media-sound/amarok/Manifest create mode 100644 media-sound/amarok/amarok-3.5.13.2.ebuild create mode 100644 media-sound/amarok/files/amarok-3.5.13.2-gcc6-fix.patch diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest new file mode 100644 index 0000000..f4c8898 --- /dev/null +++ b/media-sound/amarok/Manifest @@ -0,0 +1 @@ +DIST amarok-trinity-3.5.13.2.tar.xz 10147044 BLAKE2B 4d672a0b836e28adb1879db892ba9932a90736c9e80221898b5cef54169423cb158f5709b79dc9c90d19176f90163b3c1dc74c1270866e0a9f578d4eaf06f1f2 SHA512 e43e5a5ae29966cba312c0bfc5c6dfef289cd0de11e7e1f410366698cb34e79b94bb9fccc6ae1c7f27bc5d37bc429cb36c00478e23036f5c81e225e56816a1f6 diff --git a/media-sound/amarok/amarok-3.5.13.2.ebuild b/media-sound/amarok/amarok-3.5.13.2.ebuild new file mode 100644 index 0000000..e01d220 --- /dev/null +++ b/media-sound/amarok/amarok-3.5.13.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI="5" +TRINITY_MODULE_TYPE="applications" +TRINITY_MODULE_VER="3.5.13.2" + +ARTS_REQUIRED="never" + +TRINITY_EXTRAGEAR_PACKAGING="yes" +TRINITY_HANDBOOK="optional" + +TRINITY_LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi +fr ga gl he hi hu id is it ja ka km ko ku lo lt mk ms nb nds ne nl nn pa +pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz uz@cyrillic +zh_CN zh_TW" + +TRINITY_DOC_LANGS="da de es et fr it nl pl pt pt_BR ru sv" + +inherit trinity-base + +DESCRIPTION="Advanced audio player based on KDE framework." +HOMEPAGE="http://trinitydesktop.org/" +LICENSE="GPL-2" +KEYWORDS="amd64 x86" + +need-trinity 3.5.13 + +SLOT="${TRINITY_VER}" +IUSE="mp4" +#IUSE="mp4 mysql +amazon opengl postgres +#visualization ipod ifp real njb mtp musicbrainz daap +#python" +# kde: enables compilation of the konqueror sidebar plugin + +DEPEND=" + !=dev-lang/ruby-1.8 + >=media-libs/taglib-1.4 + mp4? ( media-libs/libmp4v2 ) +" + #>=media-libs/xine-lib-1.1.2_pre20060328-r8 + #ifp? ( media-libs/libifp ) + #ipod? ( >=media-libs/libgpod-0.5.2 ) + #mp4? ( media-libs/libmp4v2 ) + #mtp? ( >=media-libs/libmtp-0.3.0 ) + #musicbrainz? ( media-libs/tunepimp ) + #mysql? ( >=virtual/mysql-4.0 ) + #njb? ( >=media-libs/libnjb-2.2.4 ) + #opengl? ( virtual/opengl ) + #postgres? ( dev-db/postgresql-base ) + #real? ( + #media-libs/alsa-lib + #media-video/realplayer + #) + #visualization? ( + #media-libs/libsdl + #=media-plugins/libvisual-plugins-0.4* + #) +#" + +RDEPEND="${DEPEND} + app-arch/unzip +" + #daap? ( www-servers/mongrel ) + #python? ( dev-python/PyQt ) + +PATCHES=( + "${FILESDIR}/${PN}-${TRINITY_MODULE_VER}-gcc6-fix.patch" + ) + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with mp4 MP4V2) + ) + + trinity-base_src_configure +} diff --git a/media-sound/amarok/files/amarok-3.5.13.2-gcc6-fix.patch b/media-sound/amarok/files/amarok-3.5.13.2-gcc6-fix.patch new file mode 100644 index 0000000..b0b7c1c --- /dev/null +++ b/media-sound/amarok/files/amarok-3.5.13.2-gcc6-fix.patch @@ -0,0 +1,33 @@ +--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp ++++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp +@@ -167,7 +167,7 @@ void MagnatuneAlbumDownloader::coverDownloadAborted( ) + m_albumDownloadJob = 0; + debug() << "Aborted cover download" << endl; + +- emit( coverDownloadComplete( false ) ); ++ emit( coverDownloadComplete( 0 ) ); + } + + void MagnatuneAlbumDownloader::coverAddComplete(TDEIO::Job * downloadJob) +--- a/amarok/src/contextbrowser.cpp ++++ b/amarok/src/contextbrowser.cpp +@@ -466,7 +466,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) + // Konqueror sidebar needs these + if (url.path() == "context") { m_dirtyCurrentTrackPage=true; showContext( KURL( "current://track" ) ); saveHtmlData(); } + if (url.path() == "wiki") { m_dirtyWikiPage=true; showWikipedia(); saveHtmlData(); } +- if (url.path() == "lyrics") { m_dirtyLyricsPage=true; m_wikiJob=false; showLyrics(); saveHtmlData(); } ++ if (url.path() == "lyrics") { m_dirtyLyricsPage=true; m_wikiJob=0; showLyrics(); saveHtmlData(); } + } + + else if ( url.protocol() == "runscript" ) +--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp ++++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp +@@ -440,7 +440,7 @@ GenericMediaDevice::renameItem( TQListViewItem *item ) // SLOT + debug() << "Renaming: " << src << " to: " << dst << endl; + + //do we want a progress dialog? If so, set last false to true +- if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, false ) ) ++ if( KIO::NetAccess::file_move( KURL::fromPathOrURL(src), KURL::fromPathOrURL(dst), -1, false, false, 0 ) ) + { + m_mfm.erase( m_mim[item]->getFullName() ); + m_mim[item]->setNamesFromBase( item->text(0) ); From 1d3c2606930d7126504d8acc16852eee0fe6af0c Mon Sep 17 00:00:00 2001 From: Wyatt Date: Fri, 31 May 2019 16:52:23 -0400 Subject: [PATCH 2/4] Reenable xine support There needs to be at least one engine to play sound. Also, realplayer isn't even in the tree anymore. May as well not pretend it's an option. --- media-sound/amarok/amarok-3.5.13.2.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/media-sound/amarok/amarok-3.5.13.2.ebuild b/media-sound/amarok/amarok-3.5.13.2.ebuild index e01d220..56a6280 100644 --- a/media-sound/amarok/amarok-3.5.13.2.ebuild +++ b/media-sound/amarok/amarok-3.5.13.2.ebuild @@ -26,7 +26,7 @@ KEYWORDS="amd64 x86" need-trinity 3.5.13 SLOT="${TRINITY_VER}" -IUSE="mp4" +IUSE="mp4 +xine" #IUSE="mp4 mysql +amazon opengl postgres #visualization ipod ifp real njb mtp musicbrainz daap #python" @@ -37,8 +37,8 @@ DEPEND=" >=dev-lang/ruby-1.8 >=media-libs/taglib-1.4 mp4? ( media-libs/libmp4v2 ) + >=media-libs/xine-lib-1.1.2_pre20060328-r8 " - #>=media-libs/xine-lib-1.1.2_pre20060328-r8 #ifp? ( media-libs/libifp ) #ipod? ( >=media-libs/libgpod-0.5.2 ) #mp4? ( media-libs/libmp4v2 ) @@ -48,10 +48,6 @@ DEPEND=" #njb? ( >=media-libs/libnjb-2.2.4 ) #opengl? ( virtual/opengl ) #postgres? ( dev-db/postgresql-base ) - #real? ( - #media-libs/alsa-lib - #media-video/realplayer - #) #visualization? ( #media-libs/libsdl #=media-plugins/libvisual-plugins-0.4* @@ -71,6 +67,7 @@ PATCHES=( src_configure() { mycmakeargs=( $(cmake-utils_use_with mp4 MP4V2) + $(cmake-utils_use_with xine XINE) ) trinity-base_src_configure From e1335cdce7d2c85e240ea9d0b7025b33f9fa2193 Mon Sep 17 00:00:00 2001 From: Wyatt Date: Fri, 31 May 2019 19:13:20 -0400 Subject: [PATCH 3/4] Reenabled some flags and made notes about the rest I'm very keen to get moodbar and musicbrainz back in order, for sure. --- media-sound/amarok/amarok-3.5.13.2.ebuild | 54 ++++++++++++++++------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/media-sound/amarok/amarok-3.5.13.2.ebuild b/media-sound/amarok/amarok-3.5.13.2.ebuild index 56a6280..abeb597 100644 --- a/media-sound/amarok/amarok-3.5.13.2.ebuild +++ b/media-sound/amarok/amarok-3.5.13.2.ebuild @@ -26,38 +26,56 @@ KEYWORDS="amd64 x86" need-trinity 3.5.13 SLOT="${TRINITY_VER}" -IUSE="mp4 +xine" -#IUSE="mp4 mysql +amazon opengl postgres -#visualization ipod ifp real njb mtp musicbrainz daap +# Notes on flags: +# - This version supports three engines: xine, yauap, and akode. The only one +# in the tree at the moment is xine. Akode is still maintained by trinity, so +# it's a possibility, but yauap seems pretty dead. +# - After several years of the mysql hegemony in Amarok 2.x, the KF5 port is +# apparently moving back to sqlite exclusively. Trinity Amarok beat them to +# the punch by about a decade. +# - This version supports Rio Karma but there's no lib for it in the tree? +# - The daap flag depended on mongrel in old amarok. Mongrel 2 is keyworded +# and it's not clear if any external deps are even needed. Certainly doesn't +# seem to configure properly! +# - amazon isn't a flag anymore. Is it even in there anymore? The code is... +# - musicbrainz relied on the old tunepimp lib and it's not an option in their +# CMakeLists.txt. I'm pretty sure it's ALL changed at this point anyway. +# Will look into libmusicbrainz later. +# - Can't see any way to enable/disable opengl in the CMake system +# - Didn't see any options for Python. Unsupported? +# - UNTESTED FLAGS: ifp njb ipod mtp +#option( WITH_LIBVISUAL "Enable libvisual support" OFF ) + +IUSE="kde +xine ipod ifp njb mtp mp4 inotify" + +#visualization #python" -# kde: enables compilation of the konqueror sidebar plugin DEPEND=" !=dev-lang/ruby-1.8 >=media-libs/taglib-1.4 - mp4? ( media-libs/libmp4v2 ) >=media-libs/xine-lib-1.1.2_pre20060328-r8 + mp4? ( media-libs/libmp4v2 ) + ipod? ( >=media-libs/libgpod-0.5.2 ) + ifp? ( media-libs/libifp ) + njb? ( >=media-libs/libnjb-2.2.4 ) + mtp? ( >=media-libs/libmtp-0.3.0 ) " - #ifp? ( media-libs/libifp ) - #ipod? ( >=media-libs/libgpod-0.5.2 ) - #mp4? ( media-libs/libmp4v2 ) - #mtp? ( >=media-libs/libmtp-0.3.0 ) + #daap? ( www-servers/mongrel ) #musicbrainz? ( media-libs/tunepimp ) - #mysql? ( >=virtual/mysql-4.0 ) - #njb? ( >=media-libs/libnjb-2.2.4 ) #opengl? ( virtual/opengl ) - #postgres? ( dev-db/postgresql-base ) #visualization? ( #media-libs/libsdl #=media-plugins/libvisual-plugins-0.4* #) -#" + + #postgres? ( dev-db/postgresql ) + #mysql? ( >=virtual/mysql-4.0 ) RDEPEND="${DEPEND} app-arch/unzip " - #daap? ( www-servers/mongrel ) #python? ( dev-python/PyQt ) PATCHES=( @@ -66,8 +84,14 @@ PATCHES=( src_configure() { mycmakeargs=( - $(cmake-utils_use_with mp4 MP4V2) + $(cmake-utils_use_with kde KONQSIDEBAR) $(cmake-utils_use_with xine XINE) + $(cmake-utils_use_with ipod IPOD) + $(cmake-utils_use_with ifp IFP) + $(cmake-utils_use_with njb NJB) + $(cmake-utils_use_with mtp MTP) + $(cmake-utils_use_with mp4 MP4V2) + $(cmake-utils_use_with inotify INOTIFY) ) trinity-base_src_configure From 2bea04603d25fc7af20b178dac37dcb722ed9c0a Mon Sep 17 00:00:00 2001 From: Wyatt Date: Tue, 4 Jun 2019 10:13:21 -0400 Subject: [PATCH 4/4] Add moodbar ebuild This is for the stable release of the GStreamer-1.x compatible version of moodbar, so it'll build without a fuss on modern systems. Any ebuild for a version newer than this will have to get an EAPI bump because they dropped autotools for meson. --- media-sound/moodbar/Manifest | 1 + media-sound/moodbar/moodbar-0.1.4.ebuild | 34 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 media-sound/moodbar/Manifest create mode 100644 media-sound/moodbar/moodbar-0.1.4.ebuild diff --git a/media-sound/moodbar/Manifest b/media-sound/moodbar/Manifest new file mode 100644 index 0000000..8b0db37 --- /dev/null +++ b/media-sound/moodbar/Manifest @@ -0,0 +1 @@ +DIST v0.1.4.tar.gz 70137 BLAKE2B 80c11c026dec6d2d674778c61fe517bb9ee28020b3270ce5dc28cc5d5676b5ec9c8b03ab028d97328e1228e45f0ebc14d3ab2cf301837ca7d59a6a39792f16a9 SHA512 fe507f7538109a617db434c7e0c8ded69d47d3a27f13bfbda0a5bd72f54633812ee1a5e92bfda0d942f8a816b7a283d7d211fe221ca80d18a1870623ad36458d diff --git a/media-sound/moodbar/moodbar-0.1.4.ebuild b/media-sound/moodbar/moodbar-0.1.4.ebuild new file mode 100644 index 0000000..9dc47be --- /dev/null +++ b/media-sound/moodbar/moodbar-0.1.4.ebuild @@ -0,0 +1,34 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils autotools + +DESCRIPTION="The moodbar tool and gstreamer plugin for Amarok" +HOMEPAGE="https://amarok.kde.org/wiki/Moodbar" +#SRC_URI="http://pwsp.net/~qbob/moodbar-${PV}.tar.gz" +SRC_URI="https://github.com/Mazhoon/moodbar/archive/v${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="mp3 ogg vorbis flac" + +RDEPEND="media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-plugins/gst-plugins-meta:1.0 + sci-libs/fftw:3.0" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + default + AT_M4DIR="m4" eautoreconf + #eautomake + #epatch "${FILESDIR}"/${P}-gthread_init.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} +