revision + use gcc8

3 files changed, 83 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5f222b6ef85..6e9af934c721 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,47 @@
 pkgbase = aqualung
 	pkgdesc = High quality music player w/ gapless support
 	pkgver = 1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://aqualung.jeremyevans.net/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = make
+	makedepends = gcc8
+	makedepends = ladspa
+	makedepends = libcddb
+	makedepends = speex
+	makedepends = lame
+	makedepends = libmodplug
 	depends = gtk2
 	depends = libxml2
-	optdepends = liblrdf: LADSPA filters
-	optdepends = libcdio-paranoia: Audio CD playback
+	depends = alsa-lib
+	depends = sndio
+	depends = jack
+	depends = libpulse
+	depends = liboggz
+	depends = libusb-compat
+	depends = libifp
+	depends = ffmpeg
+	depends = libvorbis
+	depends = libsndfile
+	depends = lua52
+	depends = wavpack
+	depends = libcdio-paranoia
+	depends = libmad
+	depends = flac
+	depends = liblrdf
+	depends = libmpcdec
+	depends = libsamplerate
 	optdepends = libcddb: CDDB / FreeDB support
-	optdepends = libsamplerate: high quality Sample Rate Conversion
-	optdepends = libifp: iRiver's iFP support
-	optdepends = lua: Scripting support
-	optdepends = libsndfile: Uncompressed audio decode & WAV output
-	optdepends = flac: FLAC support (play & encode)
-	optdepends = libvorbis: Vorbis support (play & encode)
-	optdepends = liboggz: Oggz speex support (playback)
 	optdepends = speex: Oggz speex support (playback)
-	optdepends = libmad: MPEG audio support (playback)
 	optdepends = lame: MP3 audio support (encode)
 	optdepends = libmodplug: MOD files support (playback .mod .s3m .xm .it ...)
-	optdepends = libmpcdec: Musepack support (playback)
-	optdepends = wavpack: WavPpack support (playback)
-	optdepends = ffmpeg: generic A/V support
-	optdepends = sndio: outputs via sndio
-	optdepends = alsa-lib: outputs via ALSA
-	optdepends = jack: outputs via JACK
-	optdepends = libpulse: outputs via PulseAudio
-	source = http://downloads.sourceforge.net/aqualung/aqualung-1.0.tar.gz
-	md5sums = 3fa6d580cf39726b8335031ca3420240
+	source = https://github.com/jeremyevans/aqualung/releases/download/1.0/aqualung-1.0.tar.gz
+	source = aqualung-libavcodec-API-55.diff::https://github.com/jeremyevans/aqualung/commit/3f60efe3dbab8e9d2c07a7b183fd009b3c999d60.diff
+	source = aqualung.desktop
+	sha256sums = c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347
+	sha256sums = 9bd0cc8059d28e1e0c2c162c975f98833078df81c50b4a8184989ee93bfb51c3
+	sha256sums = 4d2aba2924b7c0bacbd377a6975f1cdbf09dc67a5d61c36bf2d52bddbab1b3b9
 
 pkgname = aqualung
 
diff --git a/PKGBUILD b/PKGBUILD
index 7012491646a8..b7e11974d4eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,55 @@
-# Maintainer: Fabien Devaux <fdev31@gmail.com>
+# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Fabien Devaux <fdev31@gmail.com>
+
 pkgname=aqualung
 pkgver=1.0
-pkgrel=3
-epoch=
+pkgrel=4
 pkgdesc="High quality music player w/ gapless support"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://aqualung.jeremyevans.net/"
-license=('GPL')
-groups=()
-depends=('gtk2' 'libxml2')
-makedepends=('make')
-checkdepends=()
-optdepends=('liblrdf: LADSPA filters'
-    'libcdio-paranoia: Audio CD playback'
-    'libcddb: CDDB / FreeDB support'
-    'libsamplerate: high quality Sample Rate Conversion'
-    "libifp: iRiver's iFP support"
-    "lua: Scripting support"
-    "libsndfile: Uncompressed audio decode & WAV output"
-    "flac: FLAC support (play & encode)"
-    "libvorbis: Vorbis support (play & encode)"
-    "liboggz: Oggz speex support (playback)"
-    "speex: Oggz speex support (playback)"
-    "libmad: MPEG audio support (playback)"
-    "lame: MP3 audio support (encode)"
-    "libmodplug: MOD files support (playback .mod .s3m .xm .it ...)"
-    "libmpcdec: Musepack support (playback)"
-    "wavpack: WavPpack support (playback)"
-    "ffmpeg: generic A/V support"
-    "sndio: outputs via sndio"
-    "alsa-lib: outputs via ALSA"
-    "jack: outputs via JACK"
-    "libpulse: outputs via PulseAudio"
-)
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=("http://downloads.sourceforge.net/aqualung/${pkgname}-${pkgver}.tar.gz")
-noextract=()
-md5sums=("3fa6d580cf39726b8335031ca3420240")
-validpgpkeys=()
+license=(GPL)
+depends=(gtk2 libxml2 alsa-lib sndio jack libpulse liboggz libusb-compat
+         libifp ffmpeg libvorbis libsndfile lua52 wavpack libcdio-paranoia
+         libmad flac liblrdf libmpcdec libsamplerate)
+makedepends=(gcc8 ladspa libcddb speex lame libmodplug)
+optdepends=('libcddb: CDDB / FreeDB support'
+            'speex: Oggz speex support (playback)'
+            'lame: MP3 audio support (encode)'
+            'libmodplug: MOD files support (playback .mod .s3m .xm .it ...)')
+source=("https://github.com/jeremyevans/aqualung/releases/download/1.0/${pkgname}-${pkgver}.tar.gz"
+        "aqualung-libavcodec-API-55.diff::https://github.com/jeremyevans/aqualung/commit/3f60efe3dbab8e9d2c07a7b183fd009b3c999d60.diff"
+        aqualung.desktop)
+sha256sums=('c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347'
+            '9bd0cc8059d28e1e0c2c162c975f98833078df81c50b4a8184989ee93bfb51c3'
+            '4d2aba2924b7c0bacbd377a6975f1cdbf09dc67a5d61c36bf2d52bddbab1b3b9')
+
+export CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8
 
 prepare() {
-	cd "$pkgname-$pkgver"
+  cd "${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../aqualung-libavcodec-API-55.diff
 }
 
 build() {
-	cd "$pkgname-$pkgver"
-	./configure --prefix=/usr --without-mac
-	make
+  cd "${pkgname}-${pkgver}"
+  ./configure \
+    --prefix=/usr
+  make
 }
 
 check() {
-	cd "$pkgname-$pkgver"
-	make -k check
+  cd "${pkgname}-${pkgver}"
+  make -k check
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 "src/img/icon_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${_pkgname}.png"
+  install -Dm644 "src/img/icon_24.png" "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${_pkgname}.png"
+  install -Dm644 "src/img/icon_32.png" "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${_pkgname}.png"
+  install -Dm644 "src/img/icon_48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${_pkgname}.png"
+  install -Dm644 "src/img/icon_64.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${_pkgname}.png"
+  install -Dm644 "${srcdir}/aqualung.desktop" "${pkgdir}/usr/share/applications/aqualung.desktop"
 }
diff --git a/aqualung.desktop b/aqualung.desktop
new file mode 100644
index 000000000000..471183467d4a
--- /dev/null
+++ b/aqualung.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Aqualung
+GenericName=Gapless Music Player
+Comment=Advanced music player featuring gapless playback
+Icon=aqualung
+Categories=AudioVideo;Audio;Player;GTK;
+Exec=aqualung %U
+TryExec=aqualung
+Terminal=false
+MimeType=audio/aac;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-flac;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-oggflac;audio/x-speex;audio/x-vorbis;audio/x-wav;
+