From 1d8e077dc1e5166c9c6251c6a596a24785921a21 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Tue, 8 Nov 2011 17:15:15 -0800
Subject: lame: update to 3.99.1

Updated lame.h checksum due to change of LGPL Lessor -> Library

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../lame/lame-3.98.4/no-gtk1.patch                 | 20 --------------
 meta/recipes-multimedia/lame/lame/no-gtk1.patch    | 20 ++++++++++++++
 meta/recipes-multimedia/lame/lame_3.98.4.bb        | 31 ----------------------
 meta/recipes-multimedia/lame/lame_3.99.1.bb        | 31 ++++++++++++++++++++++
 4 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
 create mode 100644 meta/recipes-multimedia/lame/lame/no-gtk1.patch
 delete mode 100644 meta/recipes-multimedia/lame/lame_3.98.4.bb
 create mode 100644 meta/recipes-multimedia/lame/lame_3.99.1.bb

(limited to 'meta/recipes-multimedia')

diff --git a/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch b/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
deleted file mode 100644
index e88d7f1bb..000000000
--- a/meta/recipes-multimedia/lame/lame-3.98.4/no-gtk1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-# 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 @@
- 
- dnl configure use of features
- 
--AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
-+#AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
-+HAVE_GTK="no"
-+GTK_CFLAGS=""
-+GTK_LIBS=""
-+AC_SUBST(GTK_CFLAGS)
-+AC_SUBST(GTK_LIBS)
-
- dnl ElectricFence malloc debugging
- AC_MSG_CHECKING(use of ElectricFence malloc debugging)
diff --git a/meta/recipes-multimedia/lame/lame/no-gtk1.patch b/meta/recipes-multimedia/lame/lame/no-gtk1.patch
new file mode 100644
index 000000000..e88d7f1bb
--- /dev/null
+++ b/meta/recipes-multimedia/lame/lame/no-gtk1.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [configuration]
+
+# 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 @@
+ 
+ dnl configure use of features
+ 
+-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++#AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
++HAVE_GTK="no"
++GTK_CFLAGS=""
++GTK_LIBS=""
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBS)
+
+ dnl ElectricFence malloc debugging
+ AC_MSG_CHECKING(use of ElectricFence malloc debugging)
diff --git a/meta/recipes-multimedia/lame/lame_3.98.4.bb b/meta/recipes-multimedia/lame/lame_3.98.4.bb
deleted file mode 100644
index 680ea48b0..000000000
--- a/meta/recipes-multimedia/lame/lame_3.98.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "LAME is an educational tool to be used for learning about MP3 encoding."
-HOMEPAGE = "http://sourceforge.net/projects/lame/files/lame/"
-BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290"
-SECTION = "console/utils"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
-                    file://include/lame.h;beginline=1;endline=20;md5=d3ff8cae3e79c4e9da7169c7928dc3a2"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
-           file://no-gtk1.patch"
-
-SRC_URI[md5sum] = "8e9866ad6b570c6c95c8cba48060473f"
-SRC_URI[sha256sum] = "ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8"
-
-inherit autotools
-
-PACKAGES += "libmp3lame libmp3lame-dev"
-FILES_${PN} = "${bindir}/lame"
-FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
-FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
-FILES_${PN}-dev = ""
-
-do_configure() {
-	# no autoreconf please
-	aclocal
-	autoconf
-	libtoolize --force
-	gnu-configize --force
-	oe_runconf
-}
diff --git a/meta/recipes-multimedia/lame/lame_3.99.1.bb b/meta/recipes-multimedia/lame/lame_3.99.1.bb
new file mode 100644
index 000000000..31766fd92
--- /dev/null
+++ b/meta/recipes-multimedia/lame/lame_3.99.1.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "LAME is an educational tool to be used for learning about MP3 encoding."
+HOMEPAGE = "http://sourceforge.net/projects/lame/files/lame/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290"
+SECTION = "console/utils"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
+                    file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
+           file://no-gtk1.patch"
+
+SRC_URI[md5sum] = "2576a7368b5c90a87adc9de6b9f0628c"
+SRC_URI[sha256sum] = "1eedcbe238f81cdef822f367f104a8ff918062727b61f0c62b24e9f79d941cf0"
+
+inherit autotools
+
+PACKAGES += "libmp3lame libmp3lame-dev"
+FILES_${PN} = "${bindir}/lame"
+FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
+FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
+FILES_${PN}-dev = ""
+
+do_configure() {
+	# no autoreconf please
+	aclocal
+	autoconf
+	libtoolize --force
+	gnu-configize --force
+	oe_runconf
+}
-- 
cgit v1.2.3