liquidsoap: 2.2.1

2 files changed, 8 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c67cdafa1b1..cc5d11814012 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = liquidsoap
 	pkgdesc = A swiss-army knife for multimedia streaming, notably used for netradios and webtvs
-	pkgver = 2.1.4
+	pkgver = 2.2.1
 	pkgrel = 1
 	url = https://www.liquidsoap.info
 	install = liquidsoap.install
@@ -61,10 +61,10 @@ pkgbase = liquidsoap
 	conflicts = liquidsoap-git
 	conflicts = liquidsoap-full
 	options = !makeflags
-	source = https://github.com/savonet/liquidsoap/releases/download/v2.1.4/liquidsoap-2.1.4.tar.bz2
+	source = https://github.com/savonet/liquidsoap/archive/refs/tags/v2.2.1.tar.gz
 	source = liquidsoap.service
 	source = liquidsoap.tmpfilesd
-	sha256sums = 0e5895b53d340c9849d9c69ef9713aec8642cfe794c32fc76fe0bc1f30dd4c03
+	sha256sums = 3a8234aefb3051036d178c7d9508155333fff3d903a50b52903a4e7dbe153cd9
 	sha256sums = df6d2cec1be47a57a02ed04a1f527c0349221fad39d8d152aca13734d3808661
 	sha256sums = 9f286958af0c751c2a43d74614cdd1c4629c0583d619875385c09417a5383675
 
diff --git a/PKGBUILD b/PKGBUILD
index 30a3b037d6b7..142e6cd25a39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: robertfoster
 
 pkgname=liquidsoap
-pkgver=2.1.4
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="A swiss-army knife for multimedia streaming, notably used for netradios and webtvs"
 arch=('i686' 'x86_64')
@@ -51,7 +51,7 @@ depends=('fluidsynth' 'giflib' 'gst-plugins-good' 'gst-plugins-ugly'
 makedepends=('camlp4' 'libxml-perl' 'ocaml-findlib' 'ocaml-menhir' 'ocaml-pcre' 'ocaml-sedlex' 'perl-xml-dom')
 optdepends=('curl')
 options=('!makeflags')
-source=("https://github.com/savonet/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+source=("https://github.com/savonet/${pkgname}/archive/refs/tags/v${pkgver}.tar.gz"
   ${pkgname}.service
   ${pkgname}.tmpfilesd
 )
@@ -59,35 +59,15 @@ source=("https://github.com/savonet/${pkgname}/releases/download/v${pkgver}/${pk
 install="${pkgname}.install"
 conflicts=('liquidsoap-git' 'liquidsoap-full')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -name "*.in" -type f -exec sed -i "s/@version@/${pkgver}/ig" {} +
-  find . -type f -exec sed -i "s/liq_libs_dir_version=\".*\"/liq_libs_dir_version=\"${pkgver}\"/" {} +
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./bootstrap
-  ./configure --prefix="${pkgdir}/usr" \
-    --with-bash-completion-dir="${pkgdir}/usr/share/bash-completion/completions" \
-    --localstatedir=/var \
-    --sysconfdir=/etc \
-    --without-user --without-group \
-    --disable-oss
-  make all
+  dune build
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  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
+  DESTDIR="${pkgdir}" dune install --prefix "/usr" --libdir "lib/ocaml"
 
   # Install systemd unit
   install -Dm644 "${srcdir}/${pkgname}.service" \
@@ -97,6 +77,6 @@ package() {
     "${pkgdir}/usr/lib/tmpfiles.d/liquidsoap.conf"
 }
 
-sha256sums=('0e5895b53d340c9849d9c69ef9713aec8642cfe794c32fc76fe0bc1f30dd4c03'
+sha256sums=('3a8234aefb3051036d178c7d9508155333fff3d903a50b52903a4e7dbe153cd9'
             'df6d2cec1be47a57a02ed04a1f527c0349221fad39d8d152aca13734d3808661'
             '9f286958af0c751c2a43d74614cdd1c4629c0583d619875385c09417a5383675')