1.3.1

3 files changed, 13 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4c290914de4..fe344a91fea2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jan 12 15:58:08 UTC 2017
+# Sun Jun  4 10:02:51 UTC 2017
 pkgbase = liquidsoap
 	pkgdesc = A swiss-army knife for multimedia streaming, notably used for netradios and webtvs
-	pkgver = 1.2.1
-	pkgrel = 6
+	pkgver = 1.3.1
+	pkgrel = 1
 	url = http://savonet.sourceforge.net/
 	install = liquidsoap.install
 	arch = i686
@@ -45,16 +45,14 @@ pkgbase = liquidsoap
 	conflicts = liquidsoap-git
 	conflicts = liquidsoap-full
 	options = !makeflags
-	source = https://github.com/savonet/liquidsoap/releases/download/1.2.1/liquidsoap-1.2.1-full.tar.gz
+	source = https://github.com/savonet/liquidsoap/releases/download/1.3.1/liquidsoap-1.3.1-full.tar.bz2
 	source = PACKAGES
 	source = liquidsoap.service
 	source = liquidsoap.tmpfilesd
-	source = ocaml-alsa.patch
-	md5sums = a665fda35f2cf7395cf46970a8ff3ff6
+	md5sums = 8ddd8e35a1f614ed79e5917486da1271
 	md5sums = 21d7e17ac7114edfd0a944c7773aa5af
 	md5sums = 762d6607ff0889e34b8c874970b38bc9
 	md5sums = f9106e5c42cabc21c4c8464d9b1ad63e
-	md5sums = 81769723888a75306c51323d86774c34
 
 pkgname = liquidsoap
 
diff --git a/PKGBUILD b/PKGBUILD
index 1bf7599711fb..ce2290fcbe04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
 # Maintainer: Leonard de Ruijter <dev@systeemdenker.nl>
 
 pkgname=liquidsoap
-pkgver=1.2.1
-pkgrel=6
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="A swiss-army knife for multimedia streaming, notably used for netradios and webtvs"
 arch=('i686' 'x86_64')
 url="http://savonet.sourceforge.net/"
 license=('GPL')
 depends=('faad2' 'ffmpeg' 'fluidsynth' 'gavl' 'gd' 'giflib' 'gst-plugins-bad'  'gst-plugins-base'  'gst-plugins-good'  'gst-plugins-ugly' 'libao' 'libfdk-aac' 'liblo' 'libmad' 'libxpm' 'ocaml-camomile' 'openssl' 'portaudio' 'sdl_image' 'sdl_ttf' 'soundtouch' 'taglib')
 makedepends=('dssi' 'frei0r-plugins' 'ladspa' 'libxml-perl' 'ocaml-gd4o' 'ocaml-ocamlsdl' 'ocaml-pcre' 'ocaml-ssl' 'ocaml-xmlm' 'ocaml-yojson' 'perl-xml-dom')
-source=(https://github.com/savonet/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-full.tar.gz
+source=(https://github.com/savonet/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-full.tar.bz2
 	PACKAGES
 	$pkgname.service
-	$pkgname.tmpfilesd
-	ocaml-alsa.patch)
+	$pkgname.tmpfilesd)
 install=$pkgname.install
 options=(!makeflags)
 conflicts=('liquidsoap-git' 'liquidsoap-full')
@@ -25,7 +24,7 @@ prepare() {
 
 build() {
   cd $srcdir/$pkgname-$pkgver-full
-  patch -Np1 -i ../ocaml-alsa.patch
+
   ./configure --prefix=/usr  --localstatedir=/var --sysconfdir=/etc --without-user --without-group
   make all && make doc
 }
@@ -34,14 +33,13 @@ package() {
   cd $srcdir/$pkgname-$pkgver-full 
   make DESTDIR="$pkgdir/" datadir="$pkgdir/usr/share/" mandir="$pkgdir/usr/share/man/"  localstatedir="$pkgdir/var"  bindir="$pkgdir/usr/bin/"  libdir="$pkgdir/usr/lib/" sysconfdir="$pkgdir/etc/" install
 
- # install systemd unit
+# Install systemd unit
   install -Dm0644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/liquidsoap@.service"
 # Install the tmpfilesd file
   install -Dm0644 $srcdir/$pkgname.tmpfilesd $pkgdir/usr/lib/tmpfiles.d/liquidsoap.conf
 }
 
-md5sums=('a665fda35f2cf7395cf46970a8ff3ff6'
+md5sums=('8ddd8e35a1f614ed79e5917486da1271'
          '21d7e17ac7114edfd0a944c7773aa5af'
          '762d6607ff0889e34b8c874970b38bc9'
-         'f9106e5c42cabc21c4c8464d9b1ad63e'
-         '81769723888a75306c51323d86774c34')
+         'f9106e5c42cabc21c4c8464d9b1ad63e')
diff --git a/ocaml-alsa.patch b/ocaml-alsa.patch
deleted file mode 100644
index fb3b7574487b..000000000000
--- a/ocaml-alsa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ocaml-alsa-0.2.2/src/alsa_stubs.c 2015-07-29 23:28:18.000000000 +0200
-+++ b/ocaml-alsa-0.2.2/src/alsa_stubs.c 2016-11-17 20:12:42.925962121 +0100
-@@ -228,7 +228,7 @@
-
- static value create_hw_params()
- {
--  CAMLlocal1(ans);
-+  value ans;
-   snd_pcm_hw_params_t *params;
-
-   check_for_err(snd_pcm_hw_params_malloc(&params));