update upstream

3 files changed, 42 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1603f523ee26..78283ceb50f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,20 @@
 pkgbase = pulseaudio-equalizer-ladspa-git
 	pkgdesc = A 15-band equalizer for PulseAudio
-	pkgver = 2.7.1.r0.358553c
+	pkgver = 3.0.0.56.20fb09c
 	pkgrel = 1
-	url = https://github.com/FFY00/pulseaudio-equalizer-ladspa
+	url = https://github.com/pulseaudio-equalizer-ladspa
 	arch = any
 	license = GPL3
 	makedepends = git
-	depends = pygtk
+	makedepends = meson
+	depends = python-gobject
+	depends = gtk3
 	depends = swh-plugins
-	depends = gnome-icon-theme
 	depends = pulseaudio
 	depends = bc
-	depends = python2-gobject
-	provides = pulseaudio-equalizer-ladspa
-	conflicts = pulseaudio-equalizer-ladspa
-	source = git+https://github.com/FFY00/pulseaudio-equalizer-ladspa
-	source = ladspa_lib_path.sh
-	sha256sums = SKIP
-	sha256sums = cadad5c6257fdd3a91fa2d5caf88d23aa7e59e4cc19f25a39c3bc888994ed950
+	optdepends = python2-gobject: python2 support
+	source = git+https://github.com/pulseaudio-equalizer-ladspa/equalizer
+	sha512sums = SKIP
 
 pkgname = pulseaudio-equalizer-ladspa-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 09ffa6125b0a..ed8f02fe9d46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,46 @@
-# Maintainer: FFY00 <filipe.lains@gmail.com>
+# Maintainer: Filipe Laíns (FFY00) <lains@archlinux.org>
+
 pkgname=pulseaudio-equalizer-ladspa-git
-_pkgname=${pkgname%-git}
-pkgver=2.7.1.r0.358553c
+pkgver=3.0.0.56.20fb09c
 pkgrel=1
-pkgdesc="A 15-band equalizer for PulseAudio"
+pkgdesc='A 15-band equalizer for PulseAudio'
 arch=('any')
-url="https://github.com/FFY00/pulseaudio-equalizer-ladspa"
+url='https://github.com/pulseaudio-equalizer-ladspa'
 license=('GPL3')
-depends=('pygtk' 'swh-plugins' 'gnome-icon-theme' 'pulseaudio' 'bc' 'python2-gobject')
-makedepends=('git')
-provides=('pulseaudio-equalizer-ladspa')
-conflicts=('pulseaudio-equalizer-ladspa')
-source=("git+$url"
-	'ladspa_lib_path.sh')
-sha256sums=('SKIP'
-	    'cadad5c6257fdd3a91fa2d5caf88d23aa7e59e4cc19f25a39c3bc888994ed950')
+depends=('python-gobject' 'gtk3' 'swh-plugins' 'pulseaudio' 'bc')
+makedepends=('git' 'meson')
+optdepends=('python2-gobject: python2 support')
+source=("git+$url/equalizer")
+sha512sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir"/$_pkgname
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g;s/\.rc./rc/g'
+  cd equalizer
+
+
+  printf "%s.r%s.%s" \
+  	$(git tag | tail -n1 | sed 's|v||') \
+  	$(git rev-list --count HEAD | sed 's|r||') \
+  	$(git rev-parse --short HEAD)
+}
+
+build() {
+  mkdir -p equalizer/build
+  cd equalizer/build
+
+  arch-meson ..
+
+  ninja
 }
 
 package() {
-  install -Dm644 "$srcdir"/$_pkgname/equalizerrc "$pkgdir"/usr/equalizerrc
+  cd equalizer/build
 
-  cp -r "$srcdir"/$_pkgname/share "$pkgdir"/usr/
-  cp -r "$srcdir"/$_pkgname/bin "$pkgdir"/usr/
+  DESTDIR="$pkgdir" meson install
 
-  mkdir -p "$pkgdir"/etc/profile.d
-  cp "$srcdir"/ladspa_lib_path.sh "$pkgdir"/etc/profile.d/ladspa_lib_path.sh
+  python -m compileall -d /usr/lib "$pkgdir/usr/lib"
+  python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"
+
+  # It's GLP3 but has a specific copyright string
+  install -Dm 644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
+
diff --git a/ladspa_lib_path.sh b/ladspa_lib_path.sh
deleted file mode 100755
index f002a637c58a..000000000000
--- a/ladspa_lib_path.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ -z "$LADSPA_PATH" ]; then
-	export LADSPA_PATH=/usr/lib/ladspa
-else
-	export LADSPA_PATH=$LADSPA_PATH:/usr/lib/ladspa
-fi