Upstream transitioning to gitlab.gnome.org

2 files changed, 34 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3adf903702b..e54af4136080 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lollypop-git
 	pkgdesc = Lollypop is a new GNOME music playing application.
-	pkgver = 0.9.244.r67.ga77dff23
+	pkgver = 0.9.304.r34.g917656fd
 	pkgrel = 1
 	url = https://gnumdk.github.io/lollypop-web/
 	arch = i686
@@ -23,14 +23,21 @@ pkgbase = lollypop-git
 	optdepends = easytag: tag editing
 	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 = kid3-qt: Store covers in tags
 	optdepends = libsecret: Last.FM support
 	optdepends = python-wikipedia: Wikipedia support
 	optdepends = youtube-dl: YouTube playback
 	provides = lollypop
 	conflicts = lollypop
-	source = git://github.com/gnumdk/lollypop.git
-	source = git://github.com/gnumdk/lollypop-portal.git
+	source = git+https://gitlab.gnome.org/gnumdk/lollypop.git
+	source = git+https://gitlab.gnome.org/gnumdk/lollypop-po.git
+	source = git+https://gitlab.gnome.org/gnumdk/lollypop-portal.git
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 228662ab042c..59c04df7ab6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: Frederic Bezies < fredbezies at gmail dot com>
 # Contributor: Ian Brunelli (brunelli) <ian@brunelli.me>
 
-pkgname=lollypop-git
-_gitname=lollypop
+pkgname='lollypop-git'
+_gitname="${pkgname/-git}"
 pkgdesc='Lollypop is a new GNOME music playing application.'
-pkgver=0.9.244.r67.ga77dff23
+pkgver=0.9.304.r34.g917656fd
 pkgrel=1
 url='https://gnumdk.github.io/lollypop-web/'
 arch=('i686' 'x86_64')
@@ -20,6 +20,11 @@ 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-wikipedia: Wikipedia support'
@@ -28,17 +33,14 @@ optdepends=(
 conflicts=("${_gitname}")
 provides=("${_gitname}")
 source=(
-  "git://github.com/gnumdk/${_gitname}.git"
-  "git://github.com/gnumdk/${_gitname}-help.git"
-  "git://github.com/gnumdk/${_gitname}-po.git"
-  "git://github.com/gnumdk/${_gitname}-portal.git"
-  
+  "git+https://gitlab.gnome.org/gnumdk/${_gitname}.git"
+  "git+https://gitlab.gnome.org/gnumdk/${_gitname}-po.git"
+  "git+https://gitlab.gnome.org/gnumdk/${_gitname}-portal.git" 
 )
 sha256sums=(
   'SKIP'
   'SKIP'
   'SKIP'
-  'SKIP'
 )
 
 pkgver() {
@@ -49,10 +51,9 @@ pkgver() {
 }
 
 prepare() {
-  cd "${srcdir}/${_gitname}"
+  cd "${_gitname}"
 
-  local submodules=(
-  'lollypop-help'
+  local -r submodules=(
   'lollypop-po'
   )
 
@@ -62,8 +63,9 @@ prepare() {
     git config "submodule.${submodule}.url" "${srcdir}/${module}"
     git submodule update "${submodule}"
   done
-  
-  cd "${srcdir}/${_gitname}"
+
+  cd ..
+  cd "${_gitname}"
 
   if [[ -d build ]]; then
     # This should be removed when 'meson [OPTIONS] ..' can be run
@@ -71,7 +73,8 @@ prepare() {
     rm -rf build
   fi
 
-  cd "${srcdir}/${_gitname}-portal"
+  cd ..
+  cd "${_gitname}-portal"
 
   if [[ -d build ]]; then
     # This should be removed when 'meson [OPTIONS] ..' can be run
@@ -81,21 +84,23 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_gitname}"
+  cd "${_gitname}"
 
   meson build --prefix=/usr
   
-  cd "${srcdir}/${_gitname}-portal"
+  cd ..
+  cd "${_gitname}-portal"
 
   meson build --prefix=/usr
 }
 
 package() {
-  cd "${srcdir}/${_gitname}"
+  cd "${_gitname}"
 
 	DESTDIR="$pkgdir" ninja -C build install
 	
-  cd "${srcdir}/${_gitname}-portal"
+  cd ..
+  cd "${_gitname}-portal"
 
 	DESTDIR="$pkgdir" ninja -C build install
 }