[Pkg-ocaml-maint-commits] [liquidsoap] 01/01: Refresh patches.
Romain Beauxis
toots at moszumanska.debian.org
Sun Aug 17 21:38:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
toots pushed a commit to branch master
in repository liquidsoap.
commit b90915a0a80ee3a70985ec50d9c9bfb2f5b758bc
Author: Romain Beauxis <toots at rastageeks.org>
Date: Mon Aug 11 20:25:25 2014 -0500
Refresh patches.
---
debian/patches/fdkaad-dynlink.patch | 78 ++++++++++++++++++-------------------
debian/patches/shine_abi_3 | 4 +-
src/encoder/shine_encoder.ml | 2 +-
3 files changed, 40 insertions(+), 44 deletions(-)
diff --git a/debian/patches/fdkaad-dynlink.patch b/debian/patches/fdkaad-dynlink.patch
index 02c54b1..77469ae 100644
--- a/debian/patches/fdkaad-dynlink.patch
+++ b/debian/patches/fdkaad-dynlink.patch
@@ -1,8 +1,8 @@
-diff --git a/Makefile.defs.in b/Makefile.defs.in
-index 9135d41..f221ad0 100644
---- a/Makefile.defs.in
-+++ b/Makefile.defs.in
-@@ -79,6 +79,7 @@ W_AACPLUS=@W_AACPLUS@
+Index: liquidsoap/Makefile.defs.in
+===================================================================
+--- liquidsoap.orig/Makefile.defs.in 2014-08-11 20:25:00.054875908 -0500
++++ liquidsoap/Makefile.defs.in 2014-08-11 20:25:00.014869874 -0500
+@@ -79,6 +79,7 @@
W_AACPLUS_DYN=@W_AACPLUS_DYN@
W_VOAACENC=@W_VOAACENC@
W_FDKAAC=@W_FDKAAC@
@@ -10,11 +10,11 @@ index 9135d41..f221ad0 100644
W_ALSA=@W_ALSA@
W_BJACK=@W_BJACK@
W_AO=@W_AO@
-diff --git a/configure.ac b/configure.ac
-index 9a2ba66..09e6cc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -484,6 +484,15 @@ AC_CHECK_OCAML_BINDING([voaacenc],[0.1.0])
+Index: liquidsoap/configure.ac
+===================================================================
+--- liquidsoap.orig/configure.ac 2014-08-11 20:25:00.054875908 -0500
++++ liquidsoap/configure.ac 2014-08-11 20:25:00.014869874 -0500
+@@ -484,6 +484,15 @@
#
AC_CHECK_OCAML_BINDING([fdkaac],[0.1.0])
@@ -30,11 +30,11 @@ index 9a2ba66..09e6cc6 100644
#
# Theora
-diff --git a/src/Makefile b/src/Makefile
-index b6851fb..e9af43d 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -156,9 +156,11 @@ analyze = analyze/analyze_rms.ml
+Index: liquidsoap/src/Makefile
+===================================================================
+--- liquidsoap.orig/src/Makefile 2014-08-11 20:25:00.054875908 -0500
++++ liquidsoap/src/Makefile 2014-08-11 20:25:00.014869874 -0500
+@@ -156,9 +156,11 @@
encoders = \
encoder/wav_encoder.ml \
encoder/lame_encoder.ml \
@@ -46,7 +46,7 @@ index b6851fb..e9af43d 100644
$(if $(W_AACPLUS_DYN),encoder/aacplus_encoder_dynlink.ml)
$(call conditional_compilation,encoders,$(W_SHINE),encoder/shine_encoder.ml)
-@@ -166,7 +168,7 @@ $(call conditional_compilation,encoders,$(W_LAME),encoder/lame_encoder_builtin.m
+@@ -166,7 +168,7 @@
$(call conditional_compilation,encoders,$(W_FLAC),encoder/flac_encoder.ml)
$(call conditional_compilation,encoders,$(W_AACPLUS),encoder/aacplus_encoder_builtin.ml)
$(call conditional_compilation,encoders,$(W_VOAACENC),encoder/voaacenc_encoder.ml)
@@ -55,7 +55,7 @@ index b6851fb..e9af43d 100644
$(call conditional_compilation,encoders,$(W_TAGLIB),encoder/taglib_id3v2.ml)
outputs = outputs/output.ml \
-@@ -188,6 +190,7 @@ tools = tools/stdlib.ml tools/doc.ml tools/plug.ml tools/utils.ml \
+@@ -188,6 +190,7 @@
$(if $(W_DYNLINK),tools/dyntools.ml) \
tools/rqueue.ml \
$(if $(W_LAME_DYN),tools/lame_dynlink.ml) \
@@ -63,10 +63,10 @@ index b6851fb..e9af43d 100644
$(if $(W_AACPLUS_DYN),tools/aacplus_dynlink.ml) \
tools/wav.ml tools/tutils.ml \
tools/file_watcher.ml tools/file_watcher_mtime.ml \
-diff --git a/src/encoder/fdkaac_encoder.ml b/src/encoder/fdkaac_encoder.ml
-index 11b6363..8580906 100644
---- a/src/encoder/fdkaac_encoder.ml
-+++ b/src/encoder/fdkaac_encoder.ml
+Index: liquidsoap/src/encoder/fdkaac_encoder.ml
+===================================================================
+--- liquidsoap.orig/src/encoder/fdkaac_encoder.ml 2014-08-11 20:25:00.054875908 -0500
++++ liquidsoap/src/encoder/fdkaac_encoder.ml 2014-08-11 20:25:00.018870477 -0500
@@ -1,106 +1,156 @@
(*****************************************************************************
-
@@ -309,11 +309,10 @@ index 11b6363..8580906 100644
+ | Encoder.FdkAacEnc m -> Some (fun _ _ -> encoder m)
+ | _ -> None)
+end
-diff --git a/src/encoder/fdkaac_encoder_builtin.ml b/src/encoder/fdkaac_encoder_builtin.ml
-new file mode 100644
-index 0000000..62fa319
---- /dev/null
-+++ b/src/encoder/fdkaac_encoder_builtin.ml
+Index: liquidsoap/src/encoder/fdkaac_encoder_builtin.ml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ liquidsoap/src/encoder/fdkaac_encoder_builtin.ml 2014-08-11 20:25:00.018870477 -0500
@@ -0,0 +1,28 @@
+(*****************************************************************************
+
@@ -343,11 +342,10 @@ index 0000000..62fa319
+
+let () =
+ Register.register_encoder "AAC/fdkaac/builtin"
-diff --git a/src/encoder/fdkaac_encoder_dynlink.ml b/src/encoder/fdkaac_encoder_dynlink.ml
-new file mode 100644
-index 0000000..f979afd
---- /dev/null
-+++ b/src/encoder/fdkaac_encoder_dynlink.ml
+Index: liquidsoap/src/encoder/fdkaac_encoder_dynlink.ml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ liquidsoap/src/encoder/fdkaac_encoder_dynlink.ml 2014-08-11 20:25:00.018870477 -0500
@@ -0,0 +1,50 @@
+(*****************************************************************************
+
@@ -399,11 +397,10 @@ index 0000000..f979afd
+ path = path;
+ files = ["fdkaac";"fdkaac_loader"];
+ load = load }
-diff --git a/src/tools/fdkaac_dynlink.ml b/src/tools/fdkaac_dynlink.ml
-new file mode 100644
-index 0000000..d1b9078
---- /dev/null
-+++ b/src/tools/fdkaac_dynlink.ml
+Index: liquidsoap/src/tools/fdkaac_dynlink.ml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ liquidsoap/src/tools/fdkaac_dynlink.ml 2014-08-11 20:25:00.018870477 -0500
@@ -0,0 +1,50 @@
+module type Fdkaac_t =
+sig
@@ -455,11 +452,10 @@ index 0000000..d1b9078
+type handler = { mutable fdkaac_module : (module Fdkaac_t) option }
+
+let handler = {fdkaac_module = None }
-diff --git a/src/tools/fdkaac_dynlink.mli b/src/tools/fdkaac_dynlink.mli
-new file mode 100644
-index 0000000..a4aa46d
---- /dev/null
-+++ b/src/tools/fdkaac_dynlink.mli
+Index: liquidsoap/src/tools/fdkaac_dynlink.mli
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ liquidsoap/src/tools/fdkaac_dynlink.mli 2014-08-11 20:25:00.018870477 -0500
@@ -0,0 +1,48 @@
+module type Fdkaac_t =
+ sig
diff --git a/debian/patches/shine_abi_3 b/debian/patches/shine_abi_3
index 69c933c..967b27e 100644
--- a/debian/patches/shine_abi_3
+++ b/debian/patches/shine_abi_3
@@ -1,7 +1,7 @@
Index: liquidsoap/src/encoder/shine_encoder.ml
===================================================================
---- liquidsoap.orig/src/encoder/shine_encoder.ml 2013-03-27 12:42:12.133673540 -0500
-+++ liquidsoap/src/encoder/shine_encoder.ml 2014-08-11 20:06:59.063843307 -0500
+--- liquidsoap.orig/src/encoder/shine_encoder.ml 2014-08-11 20:25:08.328123669 -0500
++++ liquidsoap/src/encoder/shine_encoder.ml 2014-08-11 20:25:08.300119445 -0500
@@ -45,7 +45,7 @@
let src_freq = float (Frame.audio_of_seconds 1.) in
let dst_freq = float samplerate in
diff --git a/src/encoder/shine_encoder.ml b/src/encoder/shine_encoder.ml
index 56c414f..b3499db 100644
--- a/src/encoder/shine_encoder.ml
+++ b/src/encoder/shine_encoder.ml
@@ -45,7 +45,7 @@ let encoder shine =
let src_freq = float (Frame.audio_of_seconds 1.) in
let dst_freq = float samplerate in
(* Shine accepts data of a fixed length.. *)
- let samples = Shine.samples_per_frame in
+ let samples = Shine.samples_per_pass enc in
let data = Audio.create channels samples in
let buf = G.create () in
let encoded = Buffer.create 1024 in
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/liquidsoap.git
More information about the Pkg-ocaml-maint-commits
mailing list