adding ocaml-vorbis.patch

3 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe4f38ee7a52..5711769ec244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Mon Nov 27 15:43:16 UTC 2017
 pkgbase = liquidsoap
 	pkgdesc = A swiss-army knife for multimedia streaming, notably used for netradios and webtvs
 	pkgver = 1.3.3
@@ -49,10 +47,12 @@ pkgbase = liquidsoap
 	source = PACKAGES
 	source = liquidsoap.service
 	source = liquidsoap.tmpfilesd
+	source = ocaml-vorbis.patch
 	md5sums = 9b24051b3662fb9d6cff8fcf22baf21c
 	md5sums = f2e0f1966f3258f737300947e729edb6
 	md5sums = 762d6607ff0889e34b8c874970b38bc9
 	md5sums = f9106e5c42cabc21c4c8464d9b1ad63e
+	md5sums = 970f0668541f5f67e4ddfd7cb62cad4e
 
 pkgname = liquidsoap
 
diff --git a/PKGBUILD b/PKGBUILD
index 09ab9e95fc3a..13ed6c0398f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,13 +12,19 @@ makedepends=('dssi' 'frei0r-plugins' 'ladspa' 'libxml-perl' 'ocaml-gd4o' 'ocaml-
 source=(https://github.com/savonet/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-full.tar.gz
 	PACKAGES
 	$pkgname.service
-	$pkgname.tmpfilesd)
+	$pkgname.tmpfilesd
+	ocaml-vorbis.patch
+)
+	
 install=$pkgname.install
 options=(!makeflags)
 conflicts=('liquidsoap-git' 'liquidsoap-full')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver-full
+  # Patches
+  patch -Np1 -i ../ocaml-vorbis.patch 
+
   cp $srcdir/PACKAGES PACKAGES
 }
 
@@ -42,4 +48,5 @@ package() {
 md5sums=('9b24051b3662fb9d6cff8fcf22baf21c'
          'f2e0f1966f3258f737300947e729edb6'
          '762d6607ff0889e34b8c874970b38bc9'
-         'f9106e5c42cabc21c4c8464d9b1ad63e')
+         'f9106e5c42cabc21c4c8464d9b1ad63e'
+         '970f0668541f5f67e4ddfd7cb62cad4e')
diff --git a/ocaml-vorbis.patch b/ocaml-vorbis.patch
new file mode 100644
index 000000000000..3d2dff71a027
--- /dev/null
+++ b/ocaml-vorbis.patch
@@ -0,0 +1,11 @@
+--- a/ocaml-vorbis-0.7.0/src/vorbis.ml	2017-05-28 11:43:38.000000000 +0200
++++ b/ocaml-vorbis-0.7.0/src/vorbis.ml	2018-04-21 23:09:44.404442683 +0200
+@@ -219,7 +219,7 @@
+          (fun n ->
+             let buf = Bytes.create n in
+             let r = Unix.read fd buf 0 n in
+-            buf, r)
++            Bytes.to_string buf, r)
+          (fun n cmd -> Unix.lseek fd n cmd)
+          (fun () -> Unix.lseek fd 0 Unix.SEEK_CUR)
+       with