Refactor package

2 files changed, 71 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef67bf87b685..b955e66ad097 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,48 +1,40 @@
 pkgbase = totem-git
 	pkgdesc = Movie player for the GNOME desktop based on GStreamer
-	pkgver = 3.34.0+105+g020c9dfd6
+	pkgver = 42.0+r69+g2c7772ef4
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Videos
 	arch = x86_64
+	arch = aarch64
 	license = GPL2
 	license = custom
-	makedepends = libnautilus-extension
-	makedepends = itstool
+	makedepends = appstream-glib
 	makedepends = docbook-xsl
-	makedepends = python-pylint
-	makedepends = gobject-introspection
 	makedepends = git
-	makedepends = appstream-glib
+	makedepends = gobject-introspection
 	makedepends = gtk-doc
-	makedepends = meson
 	makedepends = intltool
-	depends = totem-plparser
-	depends = iso-codes
-	depends = libpeas
-	depends = clutter-gtk
-	depends = clutter-gst
-	depends = grilo
-	depends = gsettings-desktop-schemas
-	depends = dconf
-	depends = python-gobject
-	depends = python-xdg
+	makedepends = itstool
+	makedepends = libnautilus-extension
+	makedepends = meson
+	makedepends = python-pylint
 	depends = gnome-desktop
+	depends = grilo
+	depends = gst-plugin-gtk
+	depends = gst-plugins-bad
 	depends = gst-plugins-base
 	depends = gst-plugins-good
-	depends = gst-plugins-bad
-	optdepends = gst-plugins-ugly: Extra media codecs
-	optdepends = gst-libav: Extra media codecs
+	depends = libhandy
+	depends = libpeas
+	depends = libportal-gtk3
+	depends = python-gobject
 	optdepends = grilo-plugins: Media discovery
-	optdepends = python-dbus: MPRIS plugin
+	optdepends = gst-libav: Extra media codecs
+	optdepends = gst-plugins-ugly: Extra media codecs
 	provides = totem
 	conflicts = totem
-	conflicts = totem-plugin
-	replaces = totem
-	replaces = totem-plugin
 	source = git+https://gitlab.gnome.org/GNOME/totem.git
 	source = git+https://gitlab.gnome.org/GNOME/libgd.git
-	sha512sums = SKIP
-	sha512sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
 
 pkgname = totem-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 9726b44f0846..88d910d8e587 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,68 @@
+# Maintainer: Philip Goto <philip.goto@gmail.com>
+
 pkgname=totem-git
-_pkgname=totem
-pkgver=3.34.0+105+g020c9dfd6
+pkgver=42.0+r69+g2c7772ef4
 pkgrel=1
-pkgdesc="Movie player for the GNOME desktop based on GStreamer"
-url="https://wiki.gnome.org/Apps/Videos"
-arch=(x86_64)
+pkgdesc='Movie player for the GNOME desktop based on GStreamer'
+url='https://wiki.gnome.org/Apps/Videos'
+arch=(x86_64 aarch64)
 license=(GPL2 custom)
-depends=('totem-plparser' 'iso-codes' 'libpeas' 'clutter-gtk' 'clutter-gst' 'grilo' 'gsettings-desktop-schemas'
-         'dconf' 'python-gobject' 'python-xdg' 'gnome-desktop' 'gst-plugins-base' 'gst-plugins-good'
-         'gst-plugins-bad')
-makedepends=('libnautilus-extension' 'itstool' 'docbook-xsl' 'python-pylint'
-             'gobject-introspection' 'git' 'appstream-glib' 'gtk-doc' 'meson' 'intltool')
-optdepends=('gst-plugins-ugly: Extra media codecs'
-            'gst-libav: Extra media codecs'
-            'grilo-plugins: Media discovery'
-            'python-dbus: MPRIS plugin')
-provides=('totem')
-conflicts=('totem' 'totem-plugin')
-replaces=('totem' 'totem-plugin')
-source=("git+https://gitlab.gnome.org/GNOME/totem.git"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git")
-sha512sums=('SKIP'
-            'SKIP')
+depends=(
+	gnome-desktop
+	grilo
+	gst-plugin-gtk
+	gst-plugins-bad
+	gst-plugins-base
+	gst-plugins-good
+	libhandy
+	libpeas
+	libportal-gtk3
+	python-gobject
+)
+makedepends=(
+	appstream-glib
+	docbook-xsl
+	git
+	gobject-introspection
+	gtk-doc
+	intltool
+	itstool
+	libnautilus-extension
+	meson
+	python-pylint
+)
+optdepends=(
+	'grilo-plugins: Media discovery'
+	'gst-libav: Extra media codecs'
+	'gst-plugins-ugly: Extra media codecs'
+)
+provides=(totem)
+conflicts=(totem)
+source=(
+	"git+https://gitlab.gnome.org/GNOME/totem.git"
+	"git+https://gitlab.gnome.org/GNOME/libgd.git"
+)
+b2sums=('SKIP' 'SKIP')
 
 pkgver() {
-  cd $_pkgname
-  git describe --tags | sed 's/^V_//;s/_/./g;s/-/+/g'
+	cd totem
+	git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
-  cd $_pkgname
+	cd totem
 
-  git submodule init
-  git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
-  git submodule update
+	git submodule init
+	git submodule set-url subprojects/libgd "$srcdir/libgd"
+	git submodule update
 }
 
 build() {
-  arch-meson $_pkgname build -D enable-gtk-doc=true
-  ninja -C build
+	arch-meson totem build -D enable-gtk-doc=true
+	meson compile -C build
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
-  install -Dt "$pkgdir/usr/share/licenses/$_pkgname" -m644 $_pkgname/COPYING
+	meson install -C build --destdir "$pkgdir"
+	install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 totem/COPYING
 }