[SCM] lame/master: Fix up patches to be DEP3 compliant. Also refresh patches to use changes as they exist upstream.

Sat May 7 16:22:13 UTC 2011

The following commit has been merged in the master branch:
commit 7632cd3c3049b848b47a5c65159d266a96020708
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 7 12:21:04 2011 -0400

    Fix up patches to be DEP3 compliant.
    Also refresh patches to use changes as they exist upstream.

diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index fbd6d72..1ea9dda 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -1,4 +1,6 @@
-Rebuilt upstream tarball without debian/ directory.
+Description: Rebuilt upstream tarball without debian/ directory.
+Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches/01-debian-directory.patch
+Forwarded: not-needed
 
 --- a/Makefile.am
 +++ b/Makefile.am
diff --git a/debian/patches/02-dynamic-frontends.patch b/debian/patches/02-dynamic-frontends.patch
index 224133e..878fe5f 100644
--- a/debian/patches/02-dynamic-frontends.patch
+++ b/debian/patches/02-dynamic-frontends.patch
@@ -1,4 +1,6 @@
-Link the frontends against shared libraries.
+Description: Link the frontends against shared libraries.
+Origin: commit:1.30
+Applied-Upstream: commit:1.30
 
 --- a/frontend/Makefile.am
 +++ b/frontend/Makefile.am
diff --git a/debian/patches/04-exec-stac.patch b/debian/patches/04-exec-stac.patch
index 05deeb8..4b9a364 100644
--- a/debian/patches/04-exec-stac.patch
+++ b/debian/patches/04-exec-stac.patch
@@ -1,9 +1,8 @@
-From: Russell Coker
-Subject: disable executable stack.
-
-Found in the marillat package. Original message:
-
-New patch from Russell Coker to disable executable stack.
+Description: New patch from Russell Coker to disable executable stack.
+ This patch is from Marillat's package.
+Origin: other
+Forwarded: commit:1.6
+Applied-Upstream: commit:1.6
 
 --- a/libmp3lame/i386/nasm.h
 +++ b/libmp3lame/i386/nasm.h
diff --git a/debian/patches/05-armel-no-finite-math-only.patch b/debian/patches/05-armel-no-finite-math-only.patch
index 517cad7..b18fd8c 100644
--- a/debian/patches/05-armel-no-finite-math-only.patch
+++ b/debian/patches/05-armel-no-finite-math-only.patch
@@ -1,24 +1,25 @@
-A bug present in gcc-4.[123] up to 4.3.3 makes a buggy optimization for
-single-precision floats when -ffinite-math-only (enabled by -ffast-math)
-
-Symptom: lame -V0 produces silent output files.
-Refs:
-https://sourceforge.net/tracker/index.php?func=detail&aid=2681646&group_id=290&atid=100290
-https://trac.xiph.org/ticket/1526
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39501
-
-	Martin Guy <martinwguy at yahoo.it> 19 March 2009
+Description: A bug present in gcc-4.[123] up to 4.3.3 makes a buggy optimization
+ for single-precision floats when -ffinite-math-only (enabled by -ffast-math)
+ Refer to the following.
+ https://sourceforge.net/tracker/index.php?func=detail&aid=2681646&group_id=290&atid=100290
+ https://trac.xiph.org/ticket/1526
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39501
+Author: Andres Mejia <mcitadel at gmail.com>
+Origin: commit:1.140
+Applied-Upstream: commit:1.140
 
 --- a/configure.in
 +++ b/configure.in
-@@ -918,6 +918,11 @@
+@@ -918,6 +918,13 @@
  				OPTIMIZATION="${OPTIMIZATION} -march=generic \
  					-mtune=native"
  				;;
 +			arm*-gnueabi)
-+				# Work round buggy softfloat optimization in ARM EABI compilers
-+				# -gnueabi in only gcc-4.1 onwards
-+				OPTIMIZATION="${OPTIMIZATION} -fno-finite-math-only"
++				if [ -z "$(echo ${GCC_version} | awk '/4\.0/')" ]; then
++					# Work round buggy softfloat optimization in ARM EABI compilers
++					# -gnueabi in only gcc-4.1 onwards
++					OPTIMIZATION="${OPTIMIZATION} -fno-finite-math-only"
++				fi
 +				;;
  			esac
  			;;
diff --git a/debian/patches/07-field-width-fix.patch b/debian/patches/07-field-width-fix.patch
index 8bb96a0..9c4b3e3 100644
--- a/debian/patches/07-field-width-fix.patch
+++ b/debian/patches/07-field-width-fix.patch
@@ -1,5 +1,9 @@
-Fix warning on 64 bit machines. Explicitely set variables as unsigned ints.
-==========================================================================
+Description: Fix warning on 64 bit machines. Explicitely set variables as
+ unsigned ints.
+Origin: http://git.debian.org/?p=pkg-multimedia/lame.git;a=blob;f=debian/patches/07-field-width-fix.patch
+Forwarded: commit:1.282
+Applied-Upstream: commit1.282
+
 --- a/frontend/parse.c
 +++ b/frontend/parse.c
 @@ -500,11 +500,11 @@
diff --git a/debian/patches/08-disable-am-gtk-patch-check.patch b/debian/patches/08-disable-am-gtk-patch-check.patch
index fe724df..9b66619 100644
--- a/debian/patches/08-disable-am-gtk-patch-check.patch
+++ b/debian/patches/08-disable-am-gtk-patch-check.patch
@@ -1,4 +1,5 @@
 Description: Temporarily disable use of GTK feature.
+Origin: Debian
 Forwarded: not-needed
 
 --- a/configure.in
diff --git a/debian/patches/09-autoreconf.patch b/debian/patches/09-autoreconf.patch
index afd9246..2e7be64 100644
--- a/debian/patches/09-autoreconf.patch
+++ b/debian/patches/09-autoreconf.patch
@@ -76505,7 +76505,7 @@ Forwarded: not-needed
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -29455,2666 +15227,2937 @@
+@@ -29455,2666 +15227,2939 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -76788,9 +76788,11 @@ Forwarded: not-needed
 +					-mtune=native"
 +				;;
 +			arm*-gnueabi)
-+				# Work round buggy softfloat optimization in ARM EABI compilers
-+				# -gnueabi in only gcc-4.1 onwards
-+				OPTIMIZATION="${OPTIMIZATION} -fno-finite-math-only"
++				if  -z "$(echo ${GCC_version} | awk '/4\.0/')" ; then
++					# Work round buggy softfloat optimization in ARM EABI compilers
++					# -gnueabi in only gcc-4.1 onwards
++					OPTIMIZATION="${OPTIMIZATION} -fno-finite-math-only"
++				fi
 +				;;
 +			esac
 +			;;
@@ -81735,7 +81737,7 @@ Forwarded: not-needed
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -32134,6 +18177,10 @@
+@@ -32134,6 +18179,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.

-- 
lame packaging

