[SCM] lame/master: remove or refresh the Debian patch set

fabian at users.alioth.debian.org fabian at users.alioth.debian.org
Fri Oct 20 18:10:25 UTC 2017 

The following commit has been merged in the master branch:
commit f93bc86fd24777799cd0a3196b9060a0e9a11c3a
Author: Fabian Greffrath <fabian at debian.org>
Date:   Mon Oct 16 17:36:15 2017 +0200

    remove or refresh the Debian patch set
    
    07-field-width-fix.patch - refreshed
    parallel-builds-fix.patch - removed, applied upstream
    ansi2knr2devnull.patch - removed, does not apply anymore
    privacy-breach.patch - refreshed
    msse.patch - refreshed
    force_align_arg_pointer.patch - removed, does not apply anymore
    0001-Add-check-for-invalid-input-sample-rate.patch - removed, fixed upstream
    bits_per_sample.patch - removed, fixed upstream
    int_resample_ratio.patch - removed, applied upstream

diff --git a/debian/patches/0001-Add-check-for-invalid-input-sample-rate.patch b/debian/patches/0001-Add-check-for-invalid-input-sample-rate.patch
deleted file mode 100644
index 26b9b24..0000000
--- a/debian/patches/0001-Add-check-for-invalid-input-sample-rate.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1ea4eac3e7d57dbad42fb067a32ac1600a0397a0 Mon Sep 17 00:00:00 2001
-From: Maks Naumov <maksqwe1 at ukr.net>
-Date: Thu, 22 Jan 2015 16:20:40 +0200
-Subject: [PATCH] Add check for invalid input sample rate
-
-Signed-off-by: Maks Naumov <maksqwe1 at ukr.net>
----
- libmp3lame/lame.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/libmp3lame/lame.c
-+++ b/libmp3lame/lame.c
-@@ -822,6 +822,12 @@ lame_init_params(lame_global_flags * gfp
-     }
- #endif
- 
-+    if (gfp->samplerate_in < 0 || gfp->num_channels < 0) {
-+        freegfc(gfc);
-+        gfp->internal_flags = NULL;
-+        return -1;
-+    }
-+
-     cfg->disable_reservoir = gfp->disable_reservoir;
-     cfg->lowpassfreq = gfp->lowpassfreq;
-     cfg->highpassfreq = gfp->highpassfreq;
diff --git a/debian/patches/07-field-width-fix.patch b/debian/patches/07-field-width-fix.patch
index 8812966..2fde09e 100644
--- a/debian/patches/07-field-width-fix.patch
+++ b/debian/patches/07-field-width-fix.patch
@@ -6,7 +6,7 @@ Applied-Upstream: commit:1.282
 
 --- a/frontend/parse.c
 +++ b/frontend/parse.c
-@@ -372,11 +372,11 @@
+@@ -402,11 +402,11 @@ lame_version_print(FILE * const fp)
      const char *b = get_lame_os_bitness();
      const char *v = get_lame_version();
      const char *u = get_lame_url();
diff --git a/debian/patches/ansi2knr2devnull.patch b/debian/patches/ansi2knr2devnull.patch
deleted file mode 100644
index c427345..0000000
--- a/debian/patches/ansi2knr2devnull.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Patch out remaining ansi2knr.
-Author: Dimitri John Ledkov <xnox at ubuntu.com>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111
---- a/configure.in
-+++ b/configure.in
-@@ -78,7 +78,6 @@
- fi
- 
- dnl more automake stuff
--AM_C_PROTOTYPES
- 
- AC_CHECK_HEADER(dmalloc.h)
- if test "${ac_cv_header_dmalloc_h}" = "yes"; then
---- a/doc/man/Makefile.am
-+++ b/doc/man/Makefile.am
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
- 
--AUTOMAKE_OPTIONS = foreign ansi2knr
-+AUTOMAKE_OPTIONS = foreign
- 
- man_MANS = lame.1
- EXTRA_DIST = ${man_MANS}
---- a/libmp3lame/i386/Makefile.am
-+++ b/libmp3lame/i386/Makefile.am
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
- 
--AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
-+AUTOMAKE_OPTIONS = foreign
- 
- DEFS = @DEFS@ @CONFIG_DEFS@
- 
---- a/doc/html/Makefile.am
-+++ b/doc/html/Makefile.am
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
- 
--AUTOMAKE_OPTIONS = foreign ansi2knr
-+AUTOMAKE_OPTIONS = foreign
- 
- docdir = $(datadir)/doc
- pkgdocdir = $(docdir)/$(PACKAGE)
diff --git a/debian/patches/bits_per_sample.patch b/debian/patches/bits_per_sample.patch
deleted file mode 100644
index 214ca45..0000000
--- a/debian/patches/bits_per_sample.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Avoid malformed wav causing floating point exception (integer divide by zero) 
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Bug-Debian: https://bugs.debian.org/777159
-
---- a/frontend/get_audio.c
-+++ b/frontend/get_audio.c
-@@ -1448,6 +1448,10 @@ parse_wave_header(lame_global_flags * gf
-         else {
-             (void) lame_set_in_samplerate(gfp, global_reader.input_samplerate);
-         }
-+        /* avoid division by zero */
-+        if (bits_per_sample < 1)
-+            return -1;
-+
-         global. pcmbitwidth = bits_per_sample;
-         global. pcm_is_unsigned_8bit = 1;
-         global. pcm_is_ieee_float = (format_tag == WAVE_FORMAT_IEEE_FLOAT ? 1 : 0);
diff --git a/debian/patches/force_align_arg_pointer.patch b/debian/patches/force_align_arg_pointer.patch
deleted file mode 100644
index e90293a..0000000
--- a/debian/patches/force_align_arg_pointer.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Author: Fabian Greffrath <fabian at debian.org>
-Subject: Enable functions with SSE instructions to maintain their own properly aligned stack
- Operands in SSE instructions must be aligned on 16-byte boundaries. In the
- init_xrpow_core_sse() function these operands are variables on the stack.
- However, when the code is called from the ocaml bindings, the stack is
- allocated by ocaml which does not adhere to the 16-byte boundary rule and thus
- causes the code to crash with a general protection error.
- What is needed is a means enable functions calling SSE instructions to
- maintain their own properly aligned stack. The "force_align_arg_pointer"
- attribute does exactly this, see
- <https://gcc.gnu.org/onlinedocs/gcc/x86-Function-Attributes.html>.
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786438
-Forwarded: https://sourceforge.net/p/lame/bugs/449/
-Last-Update: 2015-06-10
-
---- a/libmp3lame/vector/xmm_quantize_sub.c
-+++ b/libmp3lame/vector/xmm_quantize_sub.c
-@@ -51,8 +51,14 @@ static const FLOAT costab[TRI_SIZE * 2]
- };
- 
- 
-+/* make sure functions with SSE instructions maintain their own properly aligned stack */
-+#if defined (__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)))
-+#define SSE_FUNCTION __attribute__((force_align_arg_pointer))
-+#else
-+#define SSE_FUNCTION
-+#endif
- 
--void
-+SSE_FUNCTION void
- init_xrpow_core_sse(gr_info * const cod_info, FLOAT xrpow[576], int upper, FLOAT * sum)
- {
-     int     i;
-@@ -113,7 +119,8 @@ init_xrpow_core_sse(gr_info * const cod_
- }
- 
- 
--static void store4(__m128 v, float* f0, float* f1, float* f2, float* f3)
-+SSE_FUNCTION static void
-+store4(__m128 v, float* f0, float* f1, float* f2, float* f3)
- {
-     vecfloat_union r;
-     r._m128 = v;
-@@ -124,7 +131,7 @@ static void store4(__m128 v, float* f0,
- }
- 
- 
--void
-+SSE_FUNCTION void
- fht_SSE2(FLOAT * fz, int n)
- {
-     const FLOAT *tri = costab;
diff --git a/debian/patches/int_resample_ratio.patch b/debian/patches/int_resample_ratio.patch
deleted file mode 100644
index ba0064d..0000000
--- a/debian/patches/int_resample_ratio.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Subject: Fix decision if sample rate ratio is an integer value or not
- If the sample rate of the input file is sufficiently close to an
- integer multiple of the output sample rate, the value of the intratio
- variable is calculated incorrectly. This leads to further values
- being miscalculated up to the joff variable which is used as an index
- to dereference the esv->blackfilt array. This leads top an overflow
- and causes a segmentation fault.
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Bug-Debian: https://bugs.debian.org/778529
-
---- a/libmp3lame/util.c
-+++ b/libmp3lame/util.c
-@@ -26,6 +26,7 @@
- # include <config.h>
- #endif
- 
-+#include <float.h>
- #include "lame.h"
- #include "machine.h"
- #include "encoder.h"
-@@ -544,7 +545,7 @@ fill_buffer_resample(lame_internal_flags
-     if (bpc > BPC)
-         bpc = BPC;
- 
--    intratio = (fabs(resample_ratio - floor(.5 + resample_ratio)) < .0001);
-+    intratio = (fabs(resample_ratio - floor(.5 + resample_ratio)) < FLT_EPSILON);
-     fcn = 1.00 / resample_ratio;
-     if (fcn > 1.00)
-         fcn = 1.00;
diff --git a/debian/patches/msse.patch b/debian/patches/msse.patch
index 4b71a2e..d3feade 100644
--- a/debian/patches/msse.patch
+++ b/debian/patches/msse.patch
@@ -5,8 +5,8 @@ Bug-Debian: https://bugs.debian.org/760047
 Forwarded: http://sourceforge.net/p/lame/bugs/443/
 Last-Update: 2014-08-31
 
---- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am
-+++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am
+--- a/libmp3lame/vector/Makefile.am
++++ b/libmp3lame/vector/Makefile.am
 @@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c
  
  if WITH_XMM
diff --git a/debian/patches/parallel-builds-fix.patch b/debian/patches/parallel-builds-fix.patch
deleted file mode 100644
index 76b0a82..0000000
--- a/debian/patches/parallel-builds-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix race condition causing build failures on i386.
-Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches/parallel-builds-fix.patch
-Forwarded: yes
-Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/libmp3lame/i386/Makefile.am?revision=1.27
-
---- a/libmp3lame/i386/Makefile.am
-+++ b/libmp3lame/i386/Makefile.am
-@@ -15,6 +15,7 @@
- if HAVE_NASM
- noinst_LTLIBRARIES = liblameasmroutines.la
- liblameasmroutines_la_SOURCES = $(nasm_sources)
-+liblameasmroutines_la_DEPENDENCIES = $(nasm_sources:.nas.lo)
- am_liblameasmroutines_la_OBJECTS = \
- 	choose_table$U.lo \
- 	cpu_feat$U.lo \
-@@ -53,11 +54,10 @@
- 	$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
- 
- .nas.lo: $< nasm.h
--	mkdir -p .libs
- 	$(ECHO) '# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)' >$@
--	$(ECHO) "pic_object='.libs/$*.o'" >>$@
--	$(ECHO) "non_pic_object='.libs/$*.o'" >>$@
--	$(NASM) $(NASMFLAGS) $< -o .libs/$*.o -l $@.lst
-+	$(ECHO) "pic_object='$*.o'" >>$@
-+	$(ECHO) "non_pic_object='$*.o'" >>$@
-+	$(NASM) $(NASMFLAGS) $< -o $*.o -l $@.lst
- 
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/debian/patches/privacy-breach.patch b/debian/patches/privacy-breach.patch
index c490428..26c6a02 100644
--- a/debian/patches/privacy-breach.patch
+++ b/debian/patches/privacy-breach.patch
@@ -2,8 +2,8 @@ Description: Fix privacy-breach lintian error
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-08-30
 
---- lame-3.99.5+repack1.orig/doc/html/about.html
-+++ lame-3.99.5+repack1/doc/html/about.html
+--- a/doc/html/about.html
++++ b/doc/html/about.html
 @@ -116,9 +116,9 @@ MPEG2 sample rates are 16Khz, 22.05Khz a
  </div>
  <div id="footer">
@@ -17,8 +17,8 @@ Last-Update: 2014-08-30
  
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/abr.html
-+++ lame-3.99.5+repack1/doc/html/abr.html
+--- a/doc/html/abr.html
++++ b/doc/html/abr.html
 @@ -90,9 +90,9 @@ than that of CBR for the target bitrate.
  </div>
  <div id="footer">
@@ -39,8 +39,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/cbr.html
-+++ lame-3.99.5+repack1/doc/html/cbr.html
+--- a/doc/html/cbr.html
++++ b/doc/html/cbr.html
 @@ -82,9 +82,9 @@ without scanning and partially decoding
  </div>
  <div id="footer">
@@ -61,8 +61,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/contact.html
-+++ lame-3.99.5+repack1/doc/html/contact.html
+--- a/doc/html/contact.html
++++ b/doc/html/contact.html
 @@ -104,9 +104,9 @@
  </div>
  <div id="footer">
@@ -83,8 +83,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/contributors.html
-+++ lame-3.99.5+repack1/doc/html/contributors.html
+--- a/doc/html/contributors.html
++++ b/doc/html/contributors.html
 @@ -169,9 +169,9 @@
  </div>
  <div id="footer">
@@ -105,9 +105,9 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/detailed.html
-+++ lame-3.99.5+repack1/doc/html/detailed.html
-@@ -1259,9 +1259,9 @@ so using it shouldn't cause harm.
+--- a/doc/html/detailed.html
++++ b/doc/html/detailed.html
+@@ -1286,9 +1286,9 @@ so using this switch shouldn't cause har
  </div>
  <div id="footer">
  
@@ -120,9 +120,9 @@ Last-Update: 2014-08-30
  
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/history.html
-+++ lame-3.99.5+repack1/doc/html/history.html
-@@ -3450,8 +3450,7 @@ the exe. Thanks to <b>Lars Magne Ingebri
+--- a/doc/html/history.html
++++ b/doc/html/history.html
+@@ -3522,8 +3522,7 @@ the exe. Thanks to <b>Lars Magne Ingebri
  <center>
  <p>
    <a href="http://validator.w3.org/check?uri=referer">
@@ -132,8 +132,8 @@ Last-Update: 2014-08-30
    </a>
  </p>
  </center>
---- lame-3.99.5+repack1.orig/doc/html/index.html
-+++ lame-3.99.5+repack1/doc/html/index.html
+--- a/doc/html/index.html
++++ b/doc/html/index.html
 @@ -51,9 +51,9 @@
  </div>
  <div id="footer">
@@ -147,8 +147,8 @@ Last-Update: 2014-08-30
  
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/introduction.html
-+++ lame-3.99.5+repack1/doc/html/introduction.html
+--- a/doc/html/introduction.html
++++ b/doc/html/introduction.html
 @@ -163,9 +163,9 @@ transparency all of the time. This is th
  </div>
  <div id="footer">
@@ -162,9 +162,9 @@ Last-Update: 2014-08-30
  
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/links.html
-+++ lame-3.99.5+repack1/doc/html/links.html
-@@ -914,9 +914,9 @@ tests:</i></a></h3>
+--- a/doc/html/links.html
++++ b/doc/html/links.html
+@@ -951,9 +951,9 @@ tests:</i></a></h3>
  </div>
  <div id="footer">
  
@@ -177,15 +177,15 @@ Last-Update: 2014-08-30
  
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
-@@ -933,4 +933,4 @@ href="http://www.brightercreative.co.uk"
+@@ -970,4 +970,4 @@ href="http://www.brightercreative.co.uk"
  </div>
  
  </body>
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/list.html
-+++ lame-3.99.5+repack1/doc/html/list.html
+--- a/doc/html/list.html
++++ b/doc/html/list.html
 @@ -47,9 +47,9 @@
  </div>
  <div id="footer">
@@ -206,8 +206,8 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/ms_stereo.html
-+++ lame-3.99.5+repack1/doc/html/ms_stereo.html
+--- a/doc/html/ms_stereo.html
++++ b/doc/html/ms_stereo.html
 @@ -104,9 +104,9 @@ href="http://en.wikipedia.org/wiki/Joint
  </div>
  <div id="footer">
@@ -228,9 +228,9 @@ Last-Update: 2014-08-30
 -</html>
 \ No newline at end of file
 +</html>
---- lame-3.99.5+repack1.orig/doc/html/usage.html
-+++ lame-3.99.5+repack1/doc/html/usage.html
-@@ -116,9 +116,9 @@ sounds transparent. Use lossless codecs
+--- a/doc/html/usage.html
++++ b/doc/html/usage.html
+@@ -118,9 +118,9 @@ sounds transparent. Use lossless codecs
  </div>
  <div id="footer">
  
@@ -243,8 +243,8 @@ Last-Update: 2014-08-30
  
  <a href="http://validator.w3.org/#validate_by_upload"><img src="images/valid-xhtml10.png"
   alt="Valid XHTML 1.0 Transitional" border="0" height="31" width="88" /></a>
---- lame-3.99.5+repack1.orig/doc/html/vbr.html
-+++ lame-3.99.5+repack1/doc/html/vbr.html
+--- a/doc/html/vbr.html
++++ b/doc/html/vbr.html
 @@ -61,9 +61,9 @@ file size is quite unpredictable, and ca
  </div>
  <div id="footer">
diff --git a/debian/patches/series b/debian/patches/series
index 6fc5e03..e3f95e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
 07-field-width-fix.patch
-parallel-builds-fix.patch
-ansi2knr2devnull.patch
 privacy-breach.patch
 msse.patch
-force_align_arg_pointer.patch
-0001-Add-check-for-invalid-input-sample-rate.patch
-bits_per_sample.patch
-int_resample_ratio.patch

-- 
lame packaging

More information about the pkg-multimedia-commits mailing list