liquidsoap: 1.3.4

3 files changed, 85 insertions, 182 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 147b7fac8bb1..1f51e77737be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = liquidsoap
 	pkgdesc = A swiss-army knife for multimedia streaming, notably used for netradios and webtvs
-	pkgver = 1.3.3
-	pkgrel = 4
+	pkgver = 1.3.4
+	pkgrel = 1
 	url = http://savonet.sourceforge.net/
 	install = liquidsoap.install
 	arch = i686
@@ -23,7 +23,6 @@ pkgbase = liquidsoap
 	depends = faad2
 	depends = ffmpeg
 	depends = fluidsynth
-	depends = frei0r-plugins
 	depends = gavl
 	depends = gd
 	depends = giflib
@@ -42,15 +41,44 @@ pkgbase = liquidsoap
 	depends = sdl_ttf
 	depends = soundtouch
 	depends = taglib
+	depends = ocaml-magic
+	depends = ocaml-inotify
+	depends = ocaml-cry
+	depends = ocaml-ao
+	depends = ocaml-pulseaudio
+	depends = ocaml-bjack
+	depends = ocaml-gstreamer
+	depends = ocaml-mad
+	depends = ocaml-taglib
+	depends = ocaml-lame
+	depends = ocaml-ogg
+	depends = ocaml-vorbis
+	depends = ocaml-speex
+	depends = ocaml-theora
+	depends = ocaml-opus
+	depends = ocaml-fdkaac
+	depends = ocaml-faad
+	depends = ocaml-flac
+	depends = ocaml-ladspa
+	depends = ocaml-soundtouch
+	depends = ocaml-samplerate
+	depends = ocaml-gavl
+	depends = ocaml-ffmpeg
+	depends = ocaml-dssi
+	depends = ocaml-xmlplaylist
+	depends = ocaml-lastfm
+	depends = ocaml-lo
+	depends = ocaml-dtools
+	depends = ocaml-duppy
+	depends = ocaml-mm
+	optdepends = curl
 	conflicts = liquidsoap-git
 	conflicts = liquidsoap-full
 	options = !makeflags
-	source = liquidsoap-1.3.3-full::git+https://github.com/savonet/liquidsoap-full
-	source = PACKAGES
+	source = https://github.com/savonet/liquidsoap/releases/download/1.3.4/liquidsoap-1.3.4.tar.bz2
 	source = liquidsoap.service
 	source = liquidsoap.tmpfilesd
-	md5sums = SKIP
-	md5sums = 4a7339a38bb220ed1c0dbf546e35f342
+	md5sums = 74ecab05dc1b872ae21206e4e29dc460
 	md5sums = 762d6607ff0889e34b8c874970b38bc9
 	md5sums = f9106e5c42cabc21c4c8464d9b1ad63e
 
diff --git a/PACKAGES b/PACKAGES
deleted file mode 100644
index 7428551955ec..000000000000
--- a/PACKAGES
+++ /dev/null
@@ -1,148 +0,0 @@
-# Edit this file by (un)commenting the libraries that you (don't) want to
-# build in order to get the corresponding features in liquidsoap.
-
-# The default file has every dependency enabled.
-# It is certain that you don't need everything.
-# If you don't know why you should have something, uncomment it,
-# especially if it does not build for some reason.
-
-# It is useless to add savonet packages that are not listed below,
-# like ocaml-fetch, ocaml-smbclient, etc. These are not dependencies of
-# liquidsoap.
-
-
-# ============================================================================
-# Input/output
-# ============================================================================
-
-# Cry is the lib for streaming to icecast and compatible servers.
-ocaml-cry
-
-# AO is portable and stable, but it does only output.
-ocaml-ao
-
-# Portaudio is a portable audio library with both input and output.
-#ocaml-portaudio
-
-# ALSA is only for LINUX, and is sometimes not working.
-#ocaml-alsa
-
-# PulseAudio is a cross-plateform audio sound server. It is intended to
-# be a single replacement for sound support under linux, windows or OSX.
-ocaml-pulseaudio
-
-# JACK is an audio connection kit, designed for low latency
-# and easy communication between audio applications.
-ocaml-bjack
-
-# Gstreamer is a library for constructing graphs of media-handling components.
-# It is currently used to provide audio and video encoding and decoding
-# as well as input and outputs such as V4l inputs.
-ocaml-gstreamer
-
-# ============================================================================
-# Codecs
-# ============================================================================
-
-# MAD is for MP3 decoding.
-ocaml-mad
-
-# TAGLIB is for MP3 ID3 tag reading
-ocaml-taglib
-
-# LAME is for MP3 encoding.
-ocaml-lame
-
-# SHINE is for fixed-point MP3 encoding.
-#ocaml-shine
-
-# OGG is for ogg/vorbis and ogg/theora encoding and decoding
-ocaml-ogg
-
-# VORBIS is for ogg/vorbis encoding and decoding.
-# you need ocaml-ogg to enable ocaml-vorbis.
-ocaml-vorbis
-
-# SPEEX is for ogg/speex encoding and decoding
-# you need ocaml-ogg to enable ocaml-speex
-ocaml-speex
-
-# THEORA is for ogg/theora encoding and decoding
-# you need ocaml-ogg to enable ocaml-theora
-ocaml-theora
-
-# OPUS is s a lossy audio compression format made especially
-# suitable for interactive real-time applications over the Internet.
-# you need ocaml-ogg to enable ocaml-opus
-ocaml-opus
-
-# FDK-AAC is for AAC and AAC+ encoding
-ocaml-fdkaac
-
-# FAAD for AAC decoding.
-ocaml-faad
-
-# FLAC is for flac, native and/or ogg (if using ocaml-ogg)
-# format decoding and encoding.
-ocaml-flac
-
-# ============================================================================
-# Sound processing
-# ============================================================================
-
-# LADSPA are audio plugins providing sound effects
-ocaml-ladspa
-
-# SoundTouch is for changing pitch and tempo of sound
-ocaml-soundtouch
-
-# Samplerate is for having better quality resampling
-ocaml-samplerate
-
-# ============================================================================
-# Video processing
-# ============================================================================
-
-# GAVL converts from and to many formats,
-# is very efficient and has a quality setting for
-# tweaking load vs. quality of the conversion.
-# It is the recommended module to use with video
-ocaml-gavl
-
-# FFMPEG is currently only used to convert from
-# and to many formats.
-ocaml-ffmpeg
-
-# Frei0r is a minimalistic plugin API for video sources and filters.
-ocaml-frei0r
-
-# ============================================================================
-# Sound synthesis
-# ============================================================================
-
-# DSSI is a standard for synthesizer plugins
-ocaml-dssi
-
-# ============================================================================
-# Various modules
-# ============================================================================
-
-# Xmlplaylist allow support for various xml format, such as rss, podcast, etc..
-ocaml-xmlplaylist
-
-# Lastfm allow support for lastfm radios and the audioscrobbler protocol
-# It should be listed *after* ocaml-xmlplaylist in this file
-ocaml-lastfm
-
-# A library supporting the OSC protocol to have external controls
-# such as faders
-ocaml-lo
-
-# ============================================================================
-# Finally, the mandatory lib dtools, duppy and liquidsoap...
-# ============================================================================
-
-ocaml-dtools
-ocaml-duppy
-ocaml-mm
-liquidsoap
diff --git a/PKGBUILD b/PKGBUILD
index f2ba7b5d6466..54bdbf9409d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,72 @@
 # Maintainer: robertfoster
 
 pkgname=liquidsoap
-pkgver=1.3.3
-pkgrel=4
+pkgver=1.3.4
+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=('dssi' 'faad2' 'ffmpeg' 'fluidsynth' 'frei0r-plugins' 'gavl' 'gd' 'giflib' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-ugly' 'libao' 'libfdk-aac' 'liblo' 'libmad' 'libxpm' 'ocaml-camomile' 'openssl' 'sdl_image' 'sdl_ttf' 'soundtouch' 'taglib')
+depends=('dssi' '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' 'sdl_image' 'sdl_ttf' 'soundtouch' 'taglib' 'ocaml-magic' 'ocaml-inotify'
+    'ocaml-cry'
+    'ocaml-ao'
+    'ocaml-pulseaudio'
+    'ocaml-bjack'
+    'ocaml-gstreamer'
+    'ocaml-mad'
+    'ocaml-taglib'
+    'ocaml-lame'
+    'ocaml-ogg'
+    'ocaml-vorbis'
+    'ocaml-speex'
+    'ocaml-theora'
+    'ocaml-opus'
+    'ocaml-fdkaac'
+    'ocaml-faad'
+    'ocaml-flac'
+    'ocaml-ladspa'
+    'ocaml-soundtouch'
+    'ocaml-samplerate'
+    'ocaml-gavl'
+    'ocaml-ffmpeg'
+    #'ocaml-frei0r'
+    'ocaml-dssi'
+    'ocaml-xmlplaylist'
+    'ocaml-lastfm'
+    'ocaml-lo'
+    'ocaml-dtools'
+    'ocaml-duppy'
+'ocaml-mm')
+
 makedepends=('camlp4' 'git' 'ladspa' 'libxml-perl' 'ocaml-findlib' 'ocaml-gd4o' 'ocaml-ocamlsdl' 'ocaml-pcre' 'ocaml-ssl' 'ocaml-xmlm' 'ocaml-yojson' 'perl-xml-dom')
-source=("$pkgname-$pkgver-full::git+https://github.com/savonet/liquidsoap-full"
-	PACKAGES
-	$pkgname.service
-	$pkgname.tmpfilesd
+optdepends=('curl')
+source=("https://github.com/savonet/liquidsoap/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2"
+    $pkgname.service
+    $pkgname.tmpfilesd
 )
 
 install=$pkgname.install
 options=(!makeflags)
 conflicts=('liquidsoap-git' 'liquidsoap-full')
 
-prepare() {
-	cd $srcdir/$pkgname-$pkgver-full
-	make init
-	make update
-	cp $srcdir/PACKAGES PACKAGES
-}
-
 build() {
-	cd $srcdir/$pkgname-$pkgver-full
+    cd $srcdir/$pkgname-$pkgver
 
-	./configure --prefix=/usr  --localstatedir=/var --sysconfdir=/etc --without-user --without-group --disable-oss --disable-portaudio
-	make all && make doc
+    ./configure --prefix=/usr  --localstatedir=/var --sysconfdir=/etc --without-user --without-group --disable-oss
+    make all && make doc
 }
 
 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
+    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
 
-	# 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
+    # 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=('SKIP'
-         '4a7339a38bb220ed1c0dbf546e35f342'
-         '762d6607ff0889e34b8c874970b38bc9'
-         'f9106e5c42cabc21c4c8464d9b1ad63e')
+md5sums=('74ecab05dc1b872ae21206e4e29dc460'
+    '762d6607ff0889e34b8c874970b38bc9'
+'f9106e5c42cabc21c4c8464d9b1ad63e')