[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.2-2-2-gf029f6a

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 08d0021c4140008737e2dd6046c9769fccada6a4
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Apr 12 04:18:53 2010 +0200

    Prepared new upload

diff --git a/debian/changelog b/debian/changelog
index 78e02ec..d35a2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+liquidsoap (0.9.2-3) unstable; urgency=low
+
+  * Fixed ogg theora default parameters.
+  Closes: #577076 
+  * Fixed input.lastfm
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 12 Apr 2010 04:06:59 +0200
+
 liquidsoap (0.9.2-2) unstable; urgency=low
 
   * Patched liquidsoap to build against ocaml-theora 0.2.0~svn6618
diff --git a/debian/patches/fix_lastfm_input.patch b/debian/patches/fix_lastfm_input.patch
new file mode 100644
index 0000000..7a68beb
--- /dev/null
+++ b/debian/patches/fix_lastfm_input.patch
@@ -0,0 +1,15 @@
+Index: liquidsoap/src/sources/lastfm_input.ml
+===================================================================
+--- liquidsoap.orig/src/sources/lastfm_input.ml	2010-04-12 04:14:38.000000000 +0200
++++ liquidsoap/src/sources/lastfm_input.ml	2010-04-12 04:17:03.000000000 +0200
+@@ -164,8 +164,8 @@
+              | s -> Some s
+          in
+          let user_agent = Lang.to_string (List.assoc "user_agent" p) in
+-         let submit_host = Lang.to_string (List.assoc "host" p) in
+-         let submit_port = Lang.to_int (List.assoc "port" p) in
++         let submit_host = Lang.to_string (List.assoc "submit_host" p) in
++         let submit_port = Lang.to_int (List.assoc "submit_port" p) in
+          let audioscrobbler_host = (submit_host,submit_port) in
+          let bufferize = Lang.to_float (List.assoc "buffer" p) in
+ 	 let timeout = Lang.to_float (List.assoc "timeout" p) in
diff --git a/debian/patches/series b/debian/patches/series
index e2e9b3a..4c468ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_sdl_output.patch
 theora_0.2.0_fix.patch
 move_portaudio_low_in_in.patch
 replay_gain_quiet_mode.patch
+fix_lastfm_input.patch
diff --git a/debian/patches/theora_0.2.0_fix.patch b/debian/patches/theora_0.2.0_fix.patch
index 27f8ee6..4289b9d 100644
--- a/debian/patches/theora_0.2.0_fix.patch
+++ b/debian/patches/theora_0.2.0_fix.patch
@@ -1,7 +1,7 @@
 Index: liquidsoap/src/ogg_formats/theora_format.ml
 ===================================================================
---- liquidsoap.orig/src/ogg_formats/theora_format.ml	2009-10-30 15:35:23.000000000 -0500
-+++ liquidsoap/src/ogg_formats/theora_format.ml	2010-03-25 11:49:51.000000000 -0500
+--- liquidsoap.orig/src/ogg_formats/theora_format.ml	2010-04-12 04:06:20.000000000 +0200
++++ liquidsoap/src/ogg_formats/theora_format.ml	2010-04-12 04:06:51.000000000 +0200
 @@ -23,45 +23,27 @@
  let check = Theora.Decoder.check
  
@@ -91,7 +91,8 @@ Index: liquidsoap/src/ogg_formats/theora_format.ml
 -  let video_y = ((frame_y + 15) lsr 4) lsl 4 in
 -  let frame_x_offset = ((video_x - frame_x) / 2) land (lnot 1) in
 -  let frame_y_offset = ((video_y - frame_y) / 2) land (lnot 1) in
-   let video_r = 800 in
+-  let video_r = 800 in
++  let video_r = 0 in
    (* TODO: variable FPS *)
    let fps = Fmt.video_frames_of_seconds 1. in
 +  let version_major,version_minor,version_subminor = Theora.version_number in

-- 
liquidsoap packaging