[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.3-1-11-g11ee47e

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 11ee47eccdd498a1f02a06bf7a4dd72259c83c37
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Thu Apr 14 14:05:45 2011 -0500

    Prepared upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index b183fb8..369f9d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-liquidsoap (0.9.3-3) UNRELEASED; urgency=low
+liquidsoap (0.9.3-3) unstable; urgency=low
 
-  * Add patch to fix FTBFS due to change in DSO Linking (Closes: #615536)
+  * Upload to unstable.
+  * Enabled faad support now that is is in unstable!
+  * Droped patch to add -lstdc++: should be fixed in each
+    corresponding binding.
+  * Added patch to support new ocaml-faad API.
 
- -- Stéphane Glondu <glondu at debian.org>  Sun, 27 Feb 2011 11:06:40 +0100
+ -- Romain Beauxis <toots at rastageeks.org>  Thu, 14 Apr 2011 13:56:17 -0500
 
 liquidsoap (0.9.3-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 54857bf..d328568 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
 Build-Depends:
- cdbs (>= 0.4.85~),
+ cdbs (>= 0.4.53),
  debhelper (>= 7.0.1),
  dh-buildinfo,
  ocaml-nox,
@@ -39,7 +39,8 @@ Build-Depends:
  libxmlplaylist-ocaml-dev (>= 0.1.2),
  libmagic-ocaml-dev (>= 0.3.6),
  libbjack-ocaml-dev (>= 0.1.3),
- libsdl-ocaml-dev
+ libsdl-ocaml-dev,
+ libfaad-ocaml-dev
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/liquidsoap.git
diff --git a/debian/control.in b/debian/control.in
index d56d3ab..61d7196 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -35,7 +35,8 @@ Build-Depends:
  libxmlplaylist-ocaml-dev (>= 0.1.2),
  libmagic-ocaml-dev (>= 0.3.6),
  libbjack-ocaml-dev (>= 0.1.3),
- libsdl-ocaml-dev
+ libsdl-ocaml-dev,
+ libfaad-ocaml-dev
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/liquidsoap.git
diff --git a/debian/patches/0002-Fix-FTBFS-due-to-change-in-DSO-Linking-Closes-615536.patch b/debian/patches/0002-Fix-FTBFS-due-to-change-in-DSO-Linking-Closes-615536.patch
deleted file mode 100644
index e474caa..0000000
--- a/debian/patches/0002-Fix-FTBFS-due-to-change-in-DSO-Linking-Closes-615536.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 27 Feb 2011 11:00:10 +0100
-Subject: [PATCH] Fix FTBFS due to change in DSO Linking (Closes: #615536)
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615536
----
- configure    |    2 +-
- configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 7512e87..3b503fa 100755
---- a/configure
-+++ b/configure
-@@ -2375,7 +2375,7 @@ if test "x$prefix" = "xNONE" ; then
- else
-   # Add passed prefix to compilation variables.
-   CFLAGS="$CFLAGS -I$prefix/include"
--  LDFLAGS="$LDFLAGS -L$prefix/lib"
-+  LDFLAGS="$LDFLAGS -L$prefix/lib -lstdc++"
-   CPPFLAGS="$CPPFLAGS -I$prefix/include"
- fi
- 
-diff --git a/configure.ac b/configure.ac
-index 1466c41..a3d119c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,7 +62,7 @@ if test "x$prefix" = "xNONE" ; then
- else
-   # Add passed prefix to compilation variables.
-   CFLAGS="$CFLAGS -I$prefix/include"
--  LDFLAGS="$LDFLAGS -L$prefix/lib"
-+  LDFLAGS="$LDFLAGS -L$prefix/lib -lstdc++"
-   CPPFLAGS="$CPPFLAGS -I$prefix/include"
- fi
- 
--- 
diff --git a/debian/patches/0002-Update-faad-decoder.patch b/debian/patches/0002-Update-faad-decoder.patch
new file mode 100644
index 0000000..06e2d6f
--- /dev/null
+++ b/debian/patches/0002-Update-faad-decoder.patch
@@ -0,0 +1,40 @@
+Index: liquidsoap/src/formats/aacformat.ml
+===================================================================
+--- liquidsoap.orig/src/formats/aacformat.ml	2011-04-14 13:53:36.000000000 -0500
++++ liquidsoap/src/formats/aacformat.ml	2011-04-14 13:53:56.000000000 -0500
+@@ -66,7 +66,6 @@
+       | e -> Unix.close fd; raise e
+   in
+   let close (dec,fd,_,_,_,_,_) =
+-    Faad.close dec;
+     Unix.close fd
+   in
+   let decode (dec,_,aacbuf,fill_aacbuf,aacbufpos,sample_freq,pos) abg = 
+@@ -112,7 +111,6 @@
+       | e -> Unix.close fd; raise e
+   in
+   let close (dec,fd,_,_,_,_,_) =
+-    Faad.close dec;
+     Unix.close fd
+   in
+   let decode (dec,fd,track,mp4,sample,samples,sample_freq) abg = 
+Index: liquidsoap/src/sources/http_aac.ml
+===================================================================
+--- liquidsoap.orig/src/sources/http_aac.ml	2011-04-14 13:54:16.000000000 -0500
++++ liquidsoap/src/sources/http_aac.ml	2011-04-14 13:54:31.000000000 -0500
+@@ -47,7 +47,6 @@
+         Faad.find_frame !buf
+       with Not_found ->
+         sink.Http_source.close ();
+-        Faad.close dec;
+         raise Frame_not_found
+     in
+       buf := String.sub !buf n (String.length !buf - n);
+@@ -65,7 +64,6 @@
+       | Faad.Error n as e ->
+           aac_stream_log#f 2 "Faad error: %s" (Faad.error_message n);
+           sink.Http_source.close ();
+-          Faad.close dec;
+           raise e
+ 
+ let () =
diff --git a/debian/patches/series b/debian/patches/series
index fd061f1..231aacc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Enabled-non-custom-build-for-bytecode-compilation.patch
-0002-Fix-FTBFS-due-to-change-in-DSO-Linking-Closes-615536.patch
+0002-Update-faad-decoder.patch

-- 
liquidsoap packaging