gogglesmm 1.2.0

2 files changed, 80 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 984c77d757c4..78bfd4ccec6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,40 @@
-pkgbase = gogglesmm-git
-	pkgdesc = Goggles Music Manager
-	pkgver = 592
+pkgbase = gogglesmm
+	pkgdesc = Music Manager and Player
+	pkgver = 1.2.0
 	pkgrel = 1
-	url = http://gogglesmm.github.io
-	arch = i686
+	url = https://gogglesmm.github.io
 	arch = x86_64
-	arch = arm
 	license = GPL3
-	makedepends = git
+	makedepends = cmake
 	makedepends = pkgconfig
-	makedepends = libpulse
 	makedepends = alsa-lib
-	makedepends = glproto
-	makedepends = dri2proto
-	depends = fox-devel>=1.7.46
-	depends = libogg
+	makedepends = libpulse
+	depends = libepoxy
+	depends = glu
+	depends = libsm
+	depends = libxcursor
+	depends = libxrandr
+	depends = libxi
+	depends = libxft
 	depends = libvorbis
-	depends = flac
+	depends = libwebp
+	depends = libjpeg-turbo
+	depends = openssl
 	depends = libmad
+	depends = flac
 	depends = faad2
-	depends = expat
 	depends = opus
-	depends = dbus-core
 	depends = taglib>=1.9.0
-	depends = sqlite3
-	depends = libgcrypt
-	depends = glew
-	depends = glu
+	depends = sqlite
+	depends = dbus
+	depends = hicolor-icon-theme
+	optdepends = python2: import utilities
 	optdepends = libpulse: PulseAudio Output
-	optdepends = alsa-lib: Alsa Output
-	conflicts = gogglesmm
-	conflicts = gogglesmm-hg
-	source = gogglesmm-git::git://github.com/gogglesmm/gogglesmm.git
+	optdepends = alsa-lib: ALSA Output
+	conflicts = musicmanager
+	replaces = musicmanager
+	source = gogglesmm::git+https://github.com/gogglesmm/gogglesmm.git
 	md5sums = SKIP
 
-pkgname = gogglesmm-git
+pkgname = gogglesmm
 
diff --git a/PKGBUILD b/PKGBUILD
index 22b5652b6857..9b8a39e39271 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,69 @@
-# Maintainer: Sander Jansen <s.jansen@gmail.com>
-pkgname=gogglesmm-git
-pkgver=592
+pkgname=gogglesmm
+pkgver=1.2.0
 pkgrel=1
-pkgdesc="Goggles Music Manager"
-arch=('i686' 'x86_64' 'arm')
-url="http://gogglesmm.github.io"
+pkgdesc="Music Manager and Player"
+url="https://gogglesmm.github.io"
 license=('GPL3')
-conflicts=('gogglesmm' 'gogglesmm-hg')
-depends=('fox-devel>=1.7.46' 'libogg' 'libvorbis' 'flac' 'libmad' 'faad2' 'expat' 'opus' 'dbus-core' 'taglib>=1.9.0' 'sqlite3' 'libgcrypt' 'glew' 'glu')
-makedepends=('git' 'pkgconfig' 'libpulse' 'alsa-lib' 'glproto' 'dri2proto' )
-optdepends=('libpulse: PulseAudio Output' 'alsa-lib: Alsa Output')
+arch=('x86_64')
+depends=('libepoxy'
+         'glu'
+         'libsm'
+         'libxcursor'
+         'libxrandr'
+         'libxi'
+         'libxft'
+         'libvorbis'
+         'libwebp'
+         'libjpeg-turbo'
+         'openssl'
+         'libmad'
+         'flac'
+         'faad2'
+         'opus'
+         'taglib>=1.9.0'
+         'sqlite'
+         'dbus'
+         'hicolor-icon-theme')
+
+# Dependencies:
+# expat => dbus
+# libogg => libvorbis
+# libxfixes => libxcursor
+# libtiff => libwebp
+#
+# dbus => libpulse
+# flac => libsndfile => libpulse
+# openssl => libpulse
+
+
+optdepends=('python2: import utilities'
+            'libpulse: PulseAudio Output'
+            'alsa-lib: ALSA Output')
+
+makedepends=('cmake'
+             'pkgconfig'
+             'alsa-lib'
+             'libpulse')
+
+conflicts=('musicmanager')
+replaces=('musicmanager')
+
 md5sums=('SKIP')
-source=("$pkgname"::'git://github.com/gogglesmm/gogglesmm.git')
+source=("$pkgname"::'git+https://github.com/gogglesmm/gogglesmm.git')
 
 pkgver() {
   cd "$pkgname"
-  git rev-list --count HEAD
-}
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  }
 
 build() {
   cd "$pkgname"
-  export RESWRAP=/usr/bin/reswrap-1.7
-  ./configure
+  cmake .
   make
-}
+  }
 
 package() {
   cd "$pkgname"
   make DESTDIR="$pkgdir" install
-}
-
+  }
 
-# vim:set ts=2 sw=2 et: