[SCM] lame packaging branch, master, updated. debian/3.98.4-0ubuntu1-15-g8684165

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Fri Aug 6 09:08:09 UTC 2010


The following commit has been merged in the master branch:
commit 868416573bf09e4cc55861be42b0915ec151af8d
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Aug 6 11:00:37 2010 +0200

    debian/patches/06-sndfile-stdin.patch: New patch from Gentoo to support reading from stdin with sndfile.

diff --git a/debian/patches/06-sndfile-stdin.patch b/debian/patches/06-sndfile-stdin.patch
new file mode 100644
index 0000000..ca841dd
--- /dev/null
+++ b/debian/patches/06-sndfile-stdin.patch
@@ -0,0 +1,31 @@
+Description: Support reading from stdin with sndfile
+Author: Naohiro Aota <naota at elisp.net>
+Acked-by: Jérôme Poulin <jeromepoulin at gmail.com>
+Origin: http://bugs.gentoo.org/attachment.cgi?id=194905&action=view
+Bug: http://bugs.gentoo.org/show_bug.cgi?id=274255
+Forwarded: not-needed,
+ this code has been removed from current upstream CVS as per revision 1.146
+
+--- lame.orig/frontend/get_audio.c
++++ lame/frontend/get_audio.c
+@@ -606,12 +606,17 @@ OpenSndFile(lame_global_flags * gfp, cha
+         }
+ #endif
+ #ifdef HAVE_MPGLIB
+-        if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
++       if (!strcmp(lpszFileName, "-")) {
++         lame_set_stream_binary_mode(musicin = stdin); /* Read from standard input. */
++       }
++       else {
++         if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
+             if (silent < 10) {
+-                error_printf("Could not find \"%s\".\n", lpszFileName);
++             error_printf("Could not find \"%s\".\n", lpszFileName);
+             }
+             exit(1);
+-        }
++         }
++       }
+         if (-1 == lame_decode_initfile(musicin, &mp3input_data, enc_delay, enc_padding)) {
+             if (silent < 10) {
+                 error_printf("Error reading headers in mp3 input file %s.\n", lpszFileName);
diff --git a/debian/patches/series b/debian/patches/series
index 2c72597..16b6d03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-dynamic-frontends.patch
 04-exec-stac.patch
 05-armel-no-finite-math-only.patch
+06-sndfile-stdin.patch

-- 
lame packaging



More information about the pkg-multimedia-commits mailing list