lollypop-git: adopted and updated

2 files changed, 64 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fa3dc5d208a..3c49ca8259fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,38 @@
 pkgbase = lollypop-git
-	pkgdesc = Lollypop music player
-	pkgver = 0.9.521.r10.g0a37c47f
+	pkgdesc = Music player for GNOME
+	pkgver = 0.9.923.r101.g621df9b7
 	pkgrel = 1
-	url = https://wiki.gnome.org/Apps/Lollypop
-	arch = x86_64
-	license = GPL3
+	url = https://gitlab.gnome.org/gnumdk/lollypop
+	arch = any
+	license = GPL
 	makedepends = git
+	makedepends = gobject-introspection
+	makedepends = intltool
+	makedepends = itstool
 	makedepends = meson
-	makedepends = ninja
-	depends = appstream-glib
-	depends = desktop-file-utils
-	depends = gobject-introspection
-	depends = gst-python
-	depends = gstreamer
+	depends = gst-plugins-base-libs
 	depends = gtk3
-	depends = itstool
+	depends = python-beautifulsoup4
 	depends = python-cairo
 	depends = python-dbus
 	depends = python-gobject
-	depends = python-pylast
+	depends = python-pillow
 	depends = totem-plparser
-	optdepends = easytag: tag editing
+	optdepends = easytag: Modify tags
 	optdepends = flatpak: Flatpak Portal
 	optdepends = gst-libav: FFmpeg plugin for GStreamer
-	optdepends = gst-plugins-bad: GStreamer Multimedia Framework Bad Plugins
-	optdepends = gst-plugins-base: GStreamer Multimedia Framework Base Plugins
-	optdepends = gst-plugins-base-libs: GStreamer Multimedia Framework Base Plugin libraries
-	optdepends = gst-plugins-good: GStreamer Multimedia Framework Good Plugins
-	optdepends = gst-plugins-ugly: GStreamer Multimedia Framework Ugly Plugins
+	optdepends = gst-plugins-bad: "Bad" plugin libraries
+	optdepends = gst-plugins-base: "Base" plugin libraries
+	optdepends = gst-plugins-good: "Good" plugin libraries
+	optdepends = gst-plugins-ugly: "Ugly" plugin libraries
 	optdepends = kid3-qt: Store covers in tags
 	optdepends = libsecret: Last.FM support
-	optdepends = python-pylast: Last.fm integration
+	optdepends = python-pylast: Last.FM support
 	optdepends = python-wikipedia: Wikipedia support
-	optdepends = youtube-dl: YouTube playback
 	provides = lollypop
 	conflicts = lollypop
-	source = git+https://gitlab.gnome.org/World/lollypop.git
-	source = git+https://gitlab.gnome.org/gnumdk/lollypop-po.git
-	sha256sums = SKIP
-	sha256sums = SKIP
+	source = git+https://gitlab.gnome.org/World/lollypop
+	md5sums = SKIP
 
 pkgname = lollypop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 30b39f5b94dd..489334965255 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,64 @@
-# Maintainer: Dan Beste <dan.ray.beste@gmail.com>
+# Maintainer: robertfoster
+# Contributor: Dan Beste <dan.ray.beste@gmail.com>
 # Contributor: Frederic Bezies < fredbezies at gmail dot com>
 # Contributor: Ian Brunelli (brunelli) <ian@brunelli.me>
 
-pkgname='lollypop-git'
-_gitname="${pkgname/-git}"
-pkgdesc='Lollypop music player'
-pkgver=0.9.521.r10.g0a37c47f
+pkgname=lollypop-git
+pkgver=0.9.923.r101.g621df9b7
 pkgrel=1
-url='https://wiki.gnome.org/Apps/Lollypop'
-arch=('x86_64')
-license=('GPL3')
-makedepends=('git' 'meson' 'ninja')
+pkgdesc='Music player for GNOME'
+arch=(any)
+url=https://gitlab.gnome.org/gnumdk/lollypop
+license=(GPL)
 depends=(
-  'appstream-glib' 'desktop-file-utils' 'gobject-introspection' 'gst-python'
-  'gstreamer' 'gtk3' 'itstool' 'python-cairo' 'python-dbus' 'python-gobject'
-  'python-pylast' 'totem-plparser'
+	gst-plugins-base-libs
+	gtk3
+	python-beautifulsoup4
+	python-cairo
+	python-dbus
+	python-gobject
+	python-pillow
+	totem-plparser
 )
-optdepends=(
-  'easytag: tag editing'
-  'flatpak: Flatpak Portal'
-  'gst-libav: FFmpeg plugin for GStreamer'
-  'gst-plugins-bad: GStreamer Multimedia Framework Bad Plugins'
-  'gst-plugins-base: GStreamer Multimedia Framework Base Plugins'
-  'gst-plugins-base-libs: GStreamer Multimedia Framework Base Plugin libraries'
-  'gst-plugins-good: GStreamer Multimedia Framework Good Plugins'
-  'gst-plugins-ugly: GStreamer Multimedia Framework Ugly Plugins'
-  'kid3-qt: Store covers in tags'
-  'libsecret: Last.FM support'
-  'python-pylast: Last.fm integration'
-  'python-wikipedia: Wikipedia support'
-  'youtube-dl: YouTube playback'
-)
-conflicts=("${_gitname}")
-provides=("${_gitname}")
-source=(
-  "git+https://gitlab.gnome.org/World/${_gitname}.git"
-  "git+https://gitlab.gnome.org/gnumdk/${_gitname}-po.git"
+makedepends=(
+	git
+	gobject-introspection
+	intltool
+	itstool
+	meson
 )
-sha256sums=(
-  'SKIP'
-  'SKIP'
+optdepends=(
+	'easytag: Modify tags'
+	'flatpak: Flatpak Portal'
+	'gst-libav: FFmpeg plugin for GStreamer'
+	'gst-plugins-bad: "Bad" plugin libraries'
+	'gst-plugins-base: "Base" plugin libraries'
+	'gst-plugins-good: "Good" plugin libraries'
+	'gst-plugins-ugly: "Ugly" plugin libraries'
+	'kid3-qt: Store covers in tags'
+	'libsecret: Last.FM support'
+	'python-pylast: Last.FM support'
+	'python-wikipedia: Wikipedia support'
 )
+conflicts=("${pkgname%-git}")
+provides=("${pkgname%-git}")
+source=("git+https://gitlab.gnome.org/World/${pkgname%-git}")
 
 pkgver() {
-  cd "${_gitname}"
+	cd "$srcdir/${pkgname%-git}"
 
-  git describe --tags \
-    | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd "${_gitname}"
-
-  local -r submodules=(
-    'lollypop-po'
-  )
-
-  for module in "${submodules[@]}"; do
-    local submodule="subprojects/${module/lollypop-/}"
-    git submodule init "${submodule}"
-    git config "submodule.${submodule}.url" "${srcdir}/${module}"
-    git submodule update "${submodule}"
-  done
+	git describe --tags \
+	| sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "${_gitname}"
-
-  meson build --prefix=/usr
+	arch-meson lollypop build \
+	--libexecdir='lib/lollypop'
+	ninja -C build
 }
 
 package() {
-  cd "${_gitname}"
-
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="${pkgdir}" ninja -C build install
 }
 
-# vim: ts=2 sw=2 et:
+md5sums=('SKIP')