PKGBUILD cleanup

remove install scripts that are now handled by alpm hooks

add missing licenses

move autogen/configure to build step instead of prepare step

add missing optional cdparanoia and mpg123 dependencies

3 files changed, 18 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b0982f79e5..14018f15f6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = deadbeef-git
 	pkgdesc = A GTK+ audio player for GNU/Linux (devel branch)
-	pkgver = r9352.447108249
-	pkgrel = 2
+	pkgver = r9369.67ff9f22c
+	pkgrel = 1
 	url = https://deadbeef.sourceforge.io/
-	install = deadbeef.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	license = LGPL2.1
+	license = ZLIB
 	makedepends = curl
 	makedepends = faad2
 	makedepends = flac
@@ -27,7 +28,6 @@ pkgbase = deadbeef-git
 	makedepends = gtk2
 	makedepends = gtk3
 	depends = alsa-lib
-	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = jansson
 	optdepends = gtk2: for the GTK2 interface
@@ -47,6 +47,7 @@ pkgbase = deadbeef-git
 	optdepends = libsndfile: for sndfile plugin
 	optdepends = libcdio: for cd audio plugin
 	optdepends = libcddb: for cd audio plugin
+	optdepends = cdparanoia: for cd audio plugin
 	optdepends = faad2: for AAC plugin
 	optdepends = dbus: for notification daemon support (OSD current song notifications)
 	optdepends = pulseaudio: for PulseAudio output plugin
@@ -57,6 +58,7 @@ pkgbase = deadbeef-git
 	optdepends = libzip: for vfs_zip plugin
 	optdepends = ffmpeg: for ffmpeg plugin
 	optdepends = opusfile: for opus plugin
+	optdepends = mpg123: for MP1/MP2/MP3 playback
 	provides = deadbeef
 	conflicts = deadbeef
 	options = !libtool
diff --git a/PKGBUILD b/PKGBUILD
index a50112766cf..5f2392a29ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,15 @@
 # Contributor: Soukyuu <chrno-sphered at hotmail dot com>
 # Contributor: archtux <antonio dot arias99999 at gmail dot com>
 pkgname=deadbeef-git
-pkgver=r9352.447108249
-pkgrel=2
+pkgver=r9369.67ff9f22c
+pkgrel=1
 pkgdesc="A GTK+ audio player for GNU/Linux (devel branch)"
 url="https://deadbeef.sourceforge.io/"
 arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' 'jansson')
+license=('GPL2'
+         'LGPL2.1'
+         'ZLIB')
+depends=('alsa-lib' 'hicolor-icon-theme' 'jansson')
 makedepends=('curl' 'faad2' 'flac' 'git' 'intltool' 'imlib2' 'libcddb' 'libcdio' 'libmad' 'libpulse' 
              'libsamplerate' 'libvorbis' 'libx11' 'libzip' 'wavpack' 'yasm'
              'ffmpeg' 'gtk2' 'gtk3')
@@ -29,6 +31,7 @@ optdepends=('gtk2: for the GTK2 interface'
             'libsndfile: for sndfile plugin'
             'libcdio: for cd audio plugin'
             'libcddb: for cd audio plugin'
+            'cdparanoia: for cd audio plugin'
             'faad2: for AAC plugin'
             'dbus: for notification daemon support (OSD current song notifications)'
             'pulseaudio: for PulseAudio output plugin'
@@ -38,8 +41,8 @@ optdepends=('gtk2: for the GTK2 interface'
             'yasm: required to build assembly portions of ffap plugin'
             'libzip: for vfs_zip plugin'
             'ffmpeg: for ffmpeg plugin'
-            'opusfile: for opus plugin')
-install='deadbeef.install'
+            'opusfile: for opus plugin'
+            'mpg123: for MP1/MP2/MP3 playback')
 options=('!libtool')
 conflicts=('deadbeef')
 provides=('deadbeef')
@@ -50,14 +53,13 @@ prepare() {
   cd "$srcdir/deadbeef"
   # skip osx/deps submodule
   git -c submodule."osx/deps".update=none submodule update --init --recursive
-
-  ./autogen.sh
-  ./configure --prefix=/usr
 }
 
 build() {
   cd "$srcdir/deadbeef"
 
+  ./autogen.sh
+  ./configure --prefix=/usr
   make
 }
 
@@ -65,6 +67,7 @@ package() {
   cd "$srcdir/deadbeef"
 
   make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 pkgver() {
diff --git a/deadbeef.install b/deadbeef.install
deleted file mode 100644
index eaf1b9a6981..00000000000
--- a/deadbeef.install
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgname=deadbeef
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}