[Pkg-ocaml-maint-commits] r5787 - in /trunk/packages/liquidsoap/trunk/debian: ./ patches/
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Sun Jun 22 10:55:49 UTC 2008
Author: toots
Date: Sun Jun 22 10:55:48 2008
New Revision: 5787
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5787
Log:
Added more patches..
Added:
trunk/packages/liquidsoap/trunk/debian/patches/fix_array_length_in_next.patch
trunk/packages/liquidsoap/trunk/debian/patches/fix_interthread_mutex_lock.patch
trunk/packages/liquidsoap/trunk/debian/patches/fix_task_leak_in_request_source.patch
trunk/packages/liquidsoap/trunk/debian/patches/fix_timeout_delay_propagation.patch
Modified:
trunk/packages/liquidsoap/trunk/debian/changelog
trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch
trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch
trunk/packages/liquidsoap/trunk/debian/patches/series
Modified: trunk/packages/liquidsoap/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/changelog?rev=5787&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/changelog (original)
+++ trunk/packages/liquidsoap/trunk/debian/changelog Sun Jun 22 10:55:48 2008
@@ -6,6 +6,10 @@
* Backported several fixes from upstream:
+ Fix vorbis mono output
+ Fix parameter order in documentation
+ + Fix add_timeout delay propagation
+ + Fix inter-thread mutex lock in playlist.ml
+ + Fix task leak in request_source.ml
+ + Fix array length in playlist.next
* Enabled ocaml-bjack support
-- Romain Beauxis <toots at rastageeks.org> Thu, 12 Jun 2008 13:47:16 +0200
Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_array_length_in_next.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_array_length_in_next.patch?rev=5787&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_array_length_in_next.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_array_length_in_next.patch Sun Jun 22 10:55:48 2008
@@ -1,0 +1,15 @@
+Index: liquidsoap-0.3.7/src/sources/playlist.ml
+===================================================================
+--- liquidsoap-0.3.7.orig/src/sources/playlist.ml 2008-06-03 01:41:02.000000000 +0200
++++ liquidsoap-0.3.7/src/sources/playlist.ml 2008-06-22 12:53:06.000000000 +0200
+@@ -341,8 +341,9 @@
+ n
+ (fun i -> !playlist.((index_played+i+1) mod (Array.length !playlist)))
+ | Randomize ->
++ let l = Array.length !playlist in
+ Array.init
+- (min n (Array.length !playlist)-index_played-1)
++ (min n (l-index_played-1 mod l))
+ (fun i -> !playlist.(index_played+i+1))
+ | Random -> [||])
+
Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_interthread_mutex_lock.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_interthread_mutex_lock.patch?rev=5787&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_interthread_mutex_lock.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_interthread_mutex_lock.patch Sun Jun 22 10:55:48 2008
@@ -1,0 +1,26 @@
+Index: liquidsoap-0.3.7/src/sources/playlist.ml
+===================================================================
+--- liquidsoap-0.3.7.orig/src/sources/playlist.ml 2008-06-22 12:52:28.000000000 +0200
++++ liquidsoap-0.3.7/src/sources/playlist.ml 2008-06-22 12:52:28.000000000 +0200
+@@ -201,14 +201,16 @@
+
+ (* [reloading] avoids two reloadings being prepared at the same time. *)
+ method reload_playlist ?new_reload ?new_random ?new_playlist_uri () =
+- if Mutex.try_lock reloading then
+ Duppy.Task.add Tutils.scheduler
+ { Duppy.Task.priority = Tutils.Maybe_blocking ;
+ Duppy.Task.events = [`Delay 0.] ;
+- Duppy.Task.handler = (fun _ ->
+- self#reload_playlist_internal
+- new_reload new_random new_playlist_uri ;
+- Mutex.unlock reloading ;
++ Duppy.Task.handler = (fun _ ->
++ if Mutex.try_lock reloading then
++ begin
++ self#reload_playlist_internal
++ new_reload new_random new_playlist_uri ;
++ Mutex.unlock reloading
++ end ;
+ []) }
+
+ method reload_playlist_nobg ?new_reload ?new_random ?new_playlist_uri () =
Modified: trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch?rev=5787&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch (original)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_parameter_doc.patch Sun Jun 22 10:55:48 2008
@@ -1,21 +1,25 @@
-Index: trunk/liquidsoap/src/lang/lang_pp.ml
-===================================================================
---- liquidsoap/src/lang/lang_pp.ml (revision 5147)
-+++ liquidsoap/src/lang/lang_pp.ml (revision 5734)
-@@ -191,7 +191,5 @@
-
- (* Glue the documenting comments to the corresponding PP_DEF (read pre-DEF)
-- * and strip out other comments.
-- * TODO: The parsing of comments is done at lexing, whether the comment is in
-- * documenting position or not. This could be enhanced. *)
-+ * and strip out other comments. *)
-
- let parse_comments tokenizer =
-@@ -232,5 +230,6 @@
- doc
- in
-- let main = String.concat "\n" (List.rev main) in
-+ let main = List.rev main and params = List.rev params in
-+ let main = String.concat "\n" main in
- let doc =
- let sort = false in
+Index: liquidsoap-0.3.7/src/lang/lang_pp.ml
+===================================================================
+--- liquidsoap-0.3.7.orig/src/lang/lang_pp.ml 2008-06-03 01:41:02.000000000 +0200
++++ liquidsoap-0.3.7/src/lang/lang_pp.ml 2008-06-22 12:52:28.000000000 +0200
+@@ -190,9 +190,7 @@
+ token
+
+ (* Glue the documenting comments to the corresponding PP_DEF (read pre-DEF)
+- * and strip out other comments.
+- * TODO: The parsing of comments is done at lexing, whether the comment is in
+- * documenting position or not. This could be enhanced. *)
++ * and strip out other comments. *)
+
+ let parse_comments tokenizer =
+ let documented_def doc =
+@@ -231,7 +229,8 @@
+ ([],[],[])
+ doc
+ in
+- let main = String.concat "\n" (List.rev main) in
++ let main = List.rev main and params = List.rev params in
++ let main = String.concat "\n" main in
+ let doc =
+ let sort = false in
+ if main = "" then Doc.none ~sort () else Doc.trivial ~sort main
Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_task_leak_in_request_source.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_task_leak_in_request_source.patch?rev=5787&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_task_leak_in_request_source.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_task_leak_in_request_source.patch Sun Jun 22 10:55:48 2008
@@ -1,0 +1,15 @@
+Index: liquidsoap-0.3.7/src/sources/request_source.ml
+===================================================================
+--- liquidsoap-0.3.7.orig/src/sources/request_source.ml 2008-06-03 01:41:02.000000000 +0200
++++ liquidsoap-0.3.7/src/sources/request_source.ml 2008-06-22 12:52:28.000000000 +0200
+@@ -207,6 +207,10 @@
+ Request.destroy req
+ done
+ with e -> Mutex.unlock qlock ; if e <> Queue.Empty then raise e end ;
++ (* Notify new request before closing the pipe..
++ * This avoids that the task got stuck waiting on a
++ * pipe we forgot.. *)
++ self#notify_new_request ;
+ out_pipe <- Unix.stdout ; in_pipe <- Unix.stdin
+
+ (** This method should be called whenever the feeding task has a new
Added: trunk/packages/liquidsoap/trunk/debian/patches/fix_timeout_delay_propagation.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_timeout_delay_propagation.patch?rev=5787&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_timeout_delay_propagation.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_timeout_delay_propagation.patch Sun Jun 22 10:55:48 2008
@@ -1,0 +1,24 @@
+Index: liquidsoap-0.3.7/src/lang/lang_builtins.ml
+===================================================================
+--- liquidsoap-0.3.7.orig/src/lang/lang_builtins.ml 2008-06-03 01:41:02.000000000 +0200
++++ liquidsoap-0.3.7/src/lang/lang_builtins.ml 2008-06-22 12:52:28.000000000 +0200
+@@ -684,15 +684,16 @@
+ else
+ Tutils.Blocking
+ in
+- let rec t =
++ let rec t d =
+ { Duppy.Task.
+ priority = priority ;
+ events = [`Delay d] ;
+ handler =
+ fun _ ->
+- if Lang.to_float (Lang.apply f []) >= 0. then [t] else [] }
++ let d = Lang.to_float (Lang.apply f []) in
++ if d >= 0. then [t d] else [] }
+ in
+- Duppy.Task.add Tutils.scheduler t ;
++ Duppy.Task.add Tutils.scheduler (t d);
+ Lang.unit)
+
+ let () =
Modified: trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch?rev=5787&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch (original)
+++ trunk/packages/liquidsoap/trunk/debian/patches/fix_vorbis_mono_output.patch Sun Jun 22 10:55:48 2008
@@ -1,7 +1,7 @@
Index: liquidsoap-0.3.7/src/outputs/vorbis_encoded.ml
===================================================================
---- liquidsoap-0.3.7.orig/src/outputs/vorbis_encoded.ml 2008-06-15 14:46:33.000000000 +0200
-+++ liquidsoap-0.3.7/src/outputs/vorbis_encoded.ml 2008-06-15 14:47:07.000000000 +0200
+--- liquidsoap-0.3.7.orig/src/outputs/vorbis_encoded.ml 2008-06-03 01:41:02.000000000 +0200
++++ liquidsoap-0.3.7/src/outputs/vorbis_encoded.ml 2008-06-22 12:52:28.000000000 +0200
@@ -77,7 +77,7 @@
| None -> self#new_os e ;
Utils.get_some _os
@@ -64,8 +64,8 @@
method output_stop =
Index: liquidsoap-0.3.7/src/outputs/vorbis_encoded_shout.ml
===================================================================
---- liquidsoap-0.3.7.orig/src/outputs/vorbis_encoded_shout.ml 2008-06-15 14:46:33.000000000 +0200
-+++ liquidsoap-0.3.7/src/outputs/vorbis_encoded_shout.ml 2008-06-15 14:47:07.000000000 +0200
+--- liquidsoap-0.3.7.orig/src/outputs/vorbis_encoded_shout.ml 2008-06-03 01:41:02.000000000 +0200
++++ liquidsoap-0.3.7/src/outputs/vorbis_encoded_shout.ml 2008-06-22 12:52:28.000000000 +0200
@@ -96,20 +96,22 @@
~bitrate:ibitrate ~mount ~name ~source p as super
inherit base freq stereo as base
Modified: trunk/packages/liquidsoap/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/series?rev=5787&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/series (original)
+++ trunk/packages/liquidsoap/trunk/debian/patches/series Sun Jun 22 10:55:48 2008
@@ -1,2 +1,6 @@
+fix_task_leak_in_request_source.patch
+fix_array_length_in_next.patch
+fix_interthread_mutex_lock.patch
+fix_timeout_delay_propagation.patch
fix_parameter_doc.patch
fix_vorbis_mono_output.patch
More information about the Pkg-ocaml-maint-commits
mailing list