Build update and package takeover

Add meson and cmake to makedepends
Change libsoup requirement to libsoup3
Update totem-plparser -> totem-pl-parser
Add check() function from official repo package
Build with added meson options from official repo

2 files changed, 76 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f4e87c3ab8f..8af2c1169707 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rhythmbox-git
 	pkgdesc = Music playback and management application
-	pkgver = 3.4.4+320+gba4a134a4
+	pkgver = 3.4.7+r17+gceeed5736
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Rhythmbox
 	arch = i686
@@ -8,43 +8,42 @@ pkgbase = rhythmbox-git
 	license = GPL
 	checkdepends = check
 	checkdepends = xorg-server-xvfb
-	makedepends = itstool
-	makedepends = intltool
 	makedepends = brasero
+	makedepends = git
 	makedepends = gobject-introspection
-	makedepends = vala
-	makedepends = grilo
+	makedepends = gtk-doc
 	makedepends = libdmapsharing
-	makedepends = lirc
 	makedepends = libgpod
 	makedepends = libmtp
-	makedepends = gtk-doc
+	makedepends = lirc
+	makedepends = meson
+	makedepends = vala
 	makedepends = yelp-tools
-	makedepends = git
+	makedepends = zeitgeist
 	depends = dconf
+	depends = grilo
 	depends = gst-plugins-base
 	depends = gst-plugins-good
-	depends = libsoup
 	depends = json-glib
+	depends = libgudev
 	depends = libnotify
 	depends = libpeas
+	depends = libsoup3
 	depends = media-player-info
-	depends = totem-plparser
-	depends = tdb
 	depends = python-gobject
-	depends = libgudev
-	depends = grilo
+	depends = tdb
+	depends = totem-pl-parser
 	optdepends = gst-plugins-ugly: Extra media codecs
 	optdepends = gst-plugins-bad: Extra media codecs
 	optdepends = gst-libav: Extra media codecs
 	optdepends = brasero: Audio CD Recorder plugin
-	optdepends = libdmapsharing: DAAP Music Sharing plugin
 	optdepends = grilo-plugins: Grilo media browser plugin
-	optdepends = lirc: LIRC plugin
+	optdepends = gvfs-mtp: Portable players - Android plugin
+	optdepends = libdmapsharing: DAAP Music Sharing plugin
 	optdepends = libgpod: Portable Players - iPod plugin
 	optdepends = libmtp: Portable Players - MTP plugin
-	optdepends = gvfs-mtp: Portable Players - Android plugin
-	provides = rhythmbox=3.4.4+320+gba4a134a4
+	optdepends = lirc: LRC plugin
+	provides = rhythmbox=3.4.7+r17+gceeed5736
 	conflicts = rhythmbox
 	options = !emptydirs
 	source = rhythmbox-git::git+https://gitlab.gnome.org/GNOME/rhythmbox
diff --git a/PKGBUILD b/PKGBUILD
index ea539316ba54..d0ce95c3cd51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer Adria Arrufat <swiftscythe@gmail.com>
+# Maintainer Kaleb Klein <apollyon156@proton.me>
+# Contributor Adria Arrufat <swiftscythe@gmail.com>
 # Contributor Limao Luo <luolimao+AUR@gmail.com>
 # Contributor Thomas Dziedzic <gostrc@gmail.com>
 # Contributor Jan de Groot <jgc@archlinux.org>
@@ -6,27 +7,54 @@
 
 _pkgname=rhythmbox
 pkgname=$_pkgname-git
-pkgver=3.4.4+320+gba4a134a4
+pkgver=3.4.7+r17+gceeed5736
 pkgrel=1
 pkgdesc="Music playback and management application"
 arch=(i686 x86_64)
 license=(GPL)
 url="https://wiki.gnome.org/Apps/Rhythmbox"
-depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas
-         media-player-info totem-plparser tdb python-gobject libgudev grilo)
-makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc libgpod
-             libmtp gtk-doc yelp-tools git)
+depends=(
+  dconf
+  grilo
+  gst-plugins-base
+  gst-plugins-good
+  json-glib
+  libgudev
+  libnotify
+  libpeas
+  libsoup3
+  media-player-info
+  python-gobject
+  tdb
+  totem-pl-parser
+)
+optdepends=(
+  'gst-plugins-ugly: Extra media codecs'
+  'gst-plugins-bad: Extra media codecs'
+  'gst-libav: Extra media codecs'
+  'brasero: Audio CD Recorder plugin'
+  'grilo-plugins: Grilo media browser plugin'
+  'gvfs-mtp: Portable players - Android plugin'
+  'libdmapsharing: DAAP Music Sharing plugin'
+  'libgpod: Portable Players - iPod plugin'
+  'libmtp: Portable Players - MTP plugin'
+  'lirc: LRC plugin'
+)
+makedepends=(
+  brasero
+  git
+  gobject-introspection
+  gtk-doc
+  libdmapsharing
+  libgpod
+  libmtp
+  lirc
+  meson
+  vala
+  yelp-tools
+  zeitgeist
+)
 checkdepends=(check xorg-server-xvfb)
-optdepends=('gst-plugins-ugly: Extra media codecs'
-            'gst-plugins-bad: Extra media codecs'
-            'gst-libav: Extra media codecs'
-            'brasero: Audio CD Recorder plugin'
-            'libdmapsharing: DAAP Music Sharing plugin'
-            'grilo-plugins: Grilo media browser plugin'
-            'lirc: LIRC plugin'
-            'libgpod: Portable Players - iPod plugin'
-            'libmtp: Portable Players - MTP plugin'
-            'gvfs-mtp: Portable Players - Android plugin')
 options=('!emptydirs')
 provides=($_pkgname=$pkgver)
 conflicts=($_pkgname)
@@ -35,22 +63,31 @@ sha256sums=('SKIP')
 
 pkgver() {
     cd $pkgname
-    git describe --tags | sed 's/^v//;s/-/+/g'
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/+/g'
 }
 
 prepare() {
   cd "$srcdir/$pkgname"
-  git submodule init
-  git config libgd.url "${srcdir}/libgd"
-  git config libglnx.url "${srcdir}/lbglnx"
-  git submodule update
 }
 
 build() {
-    arch-meson $pkgname build
-    meson compile -C build
+  local meson_options=(
+    -D daap=enabled
+    -D gtk_doc=true
+  )
+
+  arch-meson $pkgname build "${mesa_options[@]}"
+  meson compile -C build
+}
+
+check() {
+  xvfb-run -s '-nolisten local' \
+    meson test -C build --print-errorlogs -t 3
 }
 
 package() {
     meson install -C build --destdir "$pkgdir"
+
+    python -m compileall -d /usr/lib "$pkgdir/usr/lib"
+    python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
 }