rebuilt with dune 3.12.2 and ocaml-menhir-devel 20231231 [release 2.2.3-2mamba;Wed Jan 10 2024]

This commit is contained in:
Silvan Calarco 2024-01-11 17:29:56 +01:00
parent ecadb47851
commit d1bf7f7007
2 changed files with 6 additions and 51 deletions

View File

@ -1,48 +0,0 @@
From 8bb250fe2d2575e2eb8926b491849f47dd68e174 Mon Sep 17 00:00:00 2001
From: Romain Beauxis <toots@rastageeks.org>
Date: Tue, 4 Jul 2023 12:04:11 -0500
Subject: [PATCH] Adapt to new flac decoder API.
---
src/core/decoder/ogg_flac_duration.ml | 4 ++--
tests/streams/dune | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/core/decoder/ogg_flac_duration.ml b/src/core/decoder/ogg_flac_duration.ml
index 196456c676..36293a70c4 100644
--- a/src/core/decoder/ogg_flac_duration.ml
+++ b/src/core/decoder/ogg_flac_duration.ml
@@ -44,8 +44,8 @@ let duration ~metadata:_ file =
let page = Ogg.Sync.read sync in
if Ogg.Page.serialno page = serial then Ogg.Stream.put_page os page
in
- let callbacks = Flac_ogg.Decoder.get_callbacks (fun _ -> ()) in
- let dec = Flac_ogg.Decoder.create packet os in
+ let callbacks = Flac_ogg.Decoder.get_callbacks os (fun _ -> ()) in
+ let dec = Flac.Decoder.create callbacks in
let rec info () =
try Flac.Decoder.init dec callbacks
with Ogg.Not_enough_data ->
diff --git a/tests/streams/dune b/tests/streams/dune
index 250c9158dc..95b518a68a 100644
--- a/tests/streams/dune
+++ b/tests/streams/dune
@@ -173,6 +173,10 @@
(rule
(alias citest)
(target playlist)
+ (deps
+ ./file1.mp3
+ ./file2.mp3
+ ./file3.mp3)
(action
(with-stdout-to
%{target}
@@ -181,6 +185,7 @@
(rule
(alias citest)
(target huge_playlist)
+ (deps ./file1.mp3)
(action
(with-stdout-to
%{target}

View File

@ -1,7 +1,7 @@
%define majver %(echo %version | cut -d. -f1-2) %define majver %(echo %version | cut -d. -f1-2)
Name: liquidsoap Name: liquidsoap
Version: 2.2.3 Version: 2.2.3
Release: 1mamba Release: 2mamba
Summary: Audio toolkit for streaming, aiming at complex Internet radio systems Summary: Audio toolkit for streaming, aiming at complex Internet radio systems
Group: Applications/Multimedia Group: Applications/Multimedia
Vendor: openmamba Vendor: openmamba
@ -11,7 +11,6 @@ URL: https://savonet.sourceforge.net/
Source0: https://github.com/savonet/liquidsoap.git/v%{version}/liquidsoap-%{version}.tar.bz2 Source0: https://github.com/savonet/liquidsoap.git/v%{version}/liquidsoap-%{version}.tar.bz2
Source1: liquidsoap.service Source1: liquidsoap.service
Source2: liquidsoap.tmpfilesd Source2: liquidsoap.tmpfilesd
Patch0: liquidsoap-2.2.0-ocaml-flac-0.4.0.patch
License: GPL, LGPL License: GPL, LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: dune BuildRequires: dune
@ -67,6 +66,8 @@ BuildRequires: ocaml-seq-devel
BuildRequires: ghc-pandoc BuildRequires: ghc-pandoc
%endif %endif
BuildRequires: camlidl BuildRequires: camlidl
BuildRequires: ocaml-menhir-devel >= 20231231
BuildRequires: dune >= 3.12.2
BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml >= 4.00.1
BuildRequires: ocaml-bjack-devel BuildRequires: ocaml-bjack-devel
BuildRequires: ocaml-curl-devel BuildRequires: ocaml-curl-devel
@ -209,7 +210,6 @@ This package contains documentation in HTML format.
%setup -q %setup -q
#-D -T #-D -T
#:<< _EOF #:<< _EOF
#%patch 0 -p1 -R -b .ocaml-flac-0.4.0
# Build error with old pandoc # Build error with old pandoc
rm -rf doc rm -rf doc
@ -290,6 +290,9 @@ fi
%doc COPYING %doc COPYING
%changelog %changelog
* Wed Jan 10 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.3-2mamba
- rebuilt with dune 3.12.2 and ocaml-menhir-devel 20231231
* Tue Dec 19 2023 Automatic Build System <autodist@mambasoft.it> 2.2.3-1mamba * Tue Dec 19 2023 Automatic Build System <autodist@mambasoft.it> 2.2.3-1mamba
- automatic version update by autodist - automatic version update by autodist