From b639d303decfed485bbc5166dd7db6738820b9da Mon Sep 17 00:00:00 2001
From: Dongxiao Xu <dongxiao.xu@intel.com>
Date: Sat, 26 Jun 2010 17:43:55 +0800
Subject: [PATCH] lame: Upgraded to 3.98.4

Removed Makefile-lm.patch since the code is not contained in latest version
Rebased no-gtk1.patch and commented for it
Change the local file directory name to ${PN}-${PV}

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 .../lame/{lame => lame-3.98.4}/no-gtk1.patch  |  8 ++++---
 meta/packages/lame/lame/Makefile-lm.patch     | 22 -------------------
 .../lame/{lame_3.96.1.bb => lame_3.98.4.bb}   |  5 ++---
 3 files changed, 7 insertions(+), 28 deletions(-)
 rename meta/packages/lame/{lame => lame-3.98.4}/no-gtk1.patch (75%)
 delete mode 100644 meta/packages/lame/lame/Makefile-lm.patch
 rename meta/packages/lame/{lame_3.96.1.bb => lame_3.98.4.bb} (85%)

diff --git a/meta/packages/lame/lame/no-gtk1.patch b/meta/packages/lame/lame-3.98.4/no-gtk1.patch
similarity index 75%
rename from meta/packages/lame/lame/no-gtk1.patch
rename to meta/packages/lame/lame-3.98.4/no-gtk1.patch
index 4f1a522186..8669d3b43b 100644
--- a/meta/packages/lame/lame/no-gtk1.patch
+++ b/meta/packages/lame/lame-3.98.4/no-gtk1.patch
@@ -1,3 +1,5 @@
+# Acquired from OpenEmbedded
+
 --- lame-3.96.1/configure.in~no-gtk1.patch	2004-07-25 15:52:12.000000000 +0100
 +++ lame-3.96.1/configure.in	2004-09-10 15:54:39.000000000 +0100
 @@ -363,7 +363,12 @@
@@ -11,6 +13,6 @@
 +GTK_LIBS=""
 +AC_SUBST(GTK_CFLAGS)
 +AC_SUBST(GTK_LIBS)
- if test "${HAVE_GTK}" = "yes"; then
- 	AC_DEFINE(HAVE_GTK, 1, have working GTK)
- fi
+
+ dnl ElectricFence malloc debugging
+ AC_MSG_CHECKING(use of ElectricFence malloc debugging)
diff --git a/meta/packages/lame/lame/Makefile-lm.patch b/meta/packages/lame/lame/Makefile-lm.patch
deleted file mode 100644
index cbbb1706ce..0000000000
--- a/meta/packages/lame/lame/Makefile-lm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lame-3.96.1/libmp3lame/Makefile.am.old	2007-01-16 13:41:48.000000000 +0000
-+++ lame-3.96.1/libmp3lame/Makefile.am	2007-01-16 13:41:53.000000000 +0000
-@@ -18,7 +18,7 @@
- decoder_ldadd =
- endif
- 
--libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
-+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
- libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
- 			-no-undefined
- 
---- lame-3.96.1/libmp3lame/Makefile.in.old	2007-01-16 13:47:17.000000000 +0000
-+++ lame-3.96.1/libmp3lame/Makefile.in	2007-01-16 13:47:29.000000000 +0000
-@@ -177,7 +177,7 @@
- @LIB_WITH_DECODER_TRUE@decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
- @LIB_WITH_DECODER_FALSE@decoder_ldadd = 
- 
--libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
-+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
- libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
- 			-no-undefined
- 
diff --git a/meta/packages/lame/lame_3.96.1.bb b/meta/packages/lame/lame_3.98.4.bb
similarity index 85%
rename from meta/packages/lame/lame_3.96.1.bb
rename to meta/packages/lame/lame_3.98.4.bb
index ce691bc1bb..a783dd554a 100644
--- a/meta/packages/lame/lame_3.96.1.bb
+++ b/meta/packages/lame/lame_3.98.4.bb
@@ -1,11 +1,10 @@
 SECTION = "console/utils"
 DESCRIPTION = "Not an MP3 encoder"
 LICENSE = "LGPL"
-PR = "r4"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
-	file://no-gtk1.patch;patch=1 \
-	file://Makefile-lm.patch;patch=1"
+	file://no-gtk1.patch;patch=1"
 
 inherit autotools
 
-- 
2.40.1