[Pkg-ocaml-maint-commits] r5116 - in /trunk/packages/liquidsoap/trunk/debian: changelog control patches/ patches/ladspa_backport.patch patches/series rules
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Wed Feb 6 16:23:58 UTC 2008
Author: toots
Date: Wed Feb 6 16:23:58 2008
New Revision: 5116
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5116
Log:
Fixed 464378
Added:
trunk/packages/liquidsoap/trunk/debian/patches/
trunk/packages/liquidsoap/trunk/debian/patches/ladspa_backport.patch
trunk/packages/liquidsoap/trunk/debian/patches/series
Modified:
trunk/packages/liquidsoap/trunk/debian/changelog
trunk/packages/liquidsoap/trunk/debian/control
trunk/packages/liquidsoap/trunk/debian/rules
Modified: trunk/packages/liquidsoap/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/changelog?rev=5116&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/changelog (original)
+++ trunk/packages/liquidsoap/trunk/debian/changelog Wed Feb 6 16:23:58 2008
@@ -1,8 +1,13 @@
-liquidsoap (0.3.6-2) UNRELEASED; urgency=low
+liquidsoap (0.3.6-2) unstable; urgency=high
+ [ Stefano Zacchiroli ]
* fix vcs-svn field to point just above the debian/ dir
- -- Stefano Zacchiroli <zack at debian.org> Mon, 31 Dec 2007 16:50:01 +0100
+ [ Romain Beauxis ]
+ * Fixed ladspa unsafe opening: backported patch from svn.
+ Closes: #464378
+
+ -- Romain Beauxis <toots at rastageeks.org> Wed, 06 Feb 2008 17:19:16 +0100
liquidsoap (0.3.6-1) unstable; urgency=low
Modified: trunk/packages/liquidsoap/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/control?rev=5116&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/control (original)
+++ trunk/packages/liquidsoap/trunk/debian/control Wed Feb 6 16:23:58 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <savonet-debian at lists.sourceforge.net>
Uploaders: Romain Beauxis <toots at rastageeks.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
+Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Added: trunk/packages/liquidsoap/trunk/debian/patches/ladspa_backport.patch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/ladspa_backport.patch?rev=5116&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/ladspa_backport.patch (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/ladspa_backport.patch Wed Feb 6 16:23:58 2008
@@ -1,0 +1,82 @@
+--- liquidsoap/src/operators/ladspa_op.ml 2007-12-17 16:47:32.000000000 +0100
++++ liquidsoap/src/operators/ladspa_op.ml 2008-01-21 01:35:09.000000000 +0100
+@@ -22,9 +22,30 @@
+
+ open Source
+ open Ladspa
++open Dtools
+
+ type t = Float | Int | Bool
+
++let log = Log.make ["LADSPA extension"]
++
++let ladspa_enable =
++ try
++ let venv = Unix.getenv "LIQ_LADSPA" in
++ if venv = "1" || venv = "true" then true else false
++ with
++ | Not_found -> true
++
++let plugin_dirs =
++ try
++ let path = Unix.getenv "LIQ_LADSPA_PATH" in
++ let split_lines buf =
++ Pcre.split ~pat:":" buf
++ in
++ split_lines path
++ with
++ | Not_found -> ["/usr/lib/ladspa";"/usr/local/lib/ladspa"]
++
++
+ let port_t d p =
+ if Descriptor.port_is_boolean d p then Bool
+ else if Descriptor.port_is_integer d p then Int
+@@ -420,23 +441,33 @@
+ with
+ | Plugin.Not_a_plugin -> ()
+
+-let plugins_dir = "/usr/lib/ladspa"
+-
+-let () =
++let register_plugins () =
+ let plugins =
+ let ans = ref [] in
+- let dir = Unix.opendir plugins_dir in
+- (
+- try
+- while true do
+- let f = Unix.readdir dir in
+- if f <> "." && f <> ".." then
+- ans := (plugins_dir ^ "/" ^ f) :: !ans
+- done
+- with
+- | End_of_file -> ()
+- );
+- Unix.closedir dir;
++ let add plugins_dir =
++ try
++ let dir = Unix.opendir plugins_dir in
++ (
++ try
++ while true do
++ let f = Unix.readdir dir in
++ if f <> "." && f <> ".." then
++ ans := (plugins_dir ^ "/" ^ f) :: !ans
++ done
++ with
++ | End_of_file -> ()
++ );
++ Unix.closedir dir;
++ with
++ | Unix.Unix_error (e,_,_) -> log#f 4 "Error while loading directory %s: %s"
++ plugins_dir
++ (Unix.error_message e)
++ in
++ List.iter add plugin_dirs ;
+ List.rev !ans
+ in
+ List.iter register_plugin plugins
++
++let () =
++ if ladspa_enable then
++ register_plugins ()
Added: trunk/packages/liquidsoap/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/patches/series?rev=5116&op=file
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/patches/series (added)
+++ trunk/packages/liquidsoap/trunk/debian/patches/series Wed Feb 6 16:23:58 2008
@@ -1,0 +1,1 @@
+ladspa_backport.patch
Modified: trunk/packages/liquidsoap/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/debian/rules?rev=5116&op=diff
==============================================================================
--- trunk/packages/liquidsoap/trunk/debian/rules (original)
+++ trunk/packages/liquidsoap/trunk/debian/rules Wed Feb 6 16:23:58 2008
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# In order to regenerate 'debian/control' :
# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
More information about the Pkg-ocaml-maint-commits
mailing list