From b639d303decfed485bbc5166dd7db6738820b9da Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Sat, 26 Jun 2010 17:43:55 +0800 Subject: 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 --- meta/packages/lame/lame-3.98.4/no-gtk1.patch | 18 ++++++++++++++++++ meta/packages/lame/lame/Makefile-lm.patch | 22 ---------------------- meta/packages/lame/lame/no-gtk1.patch | 16 ---------------- meta/packages/lame/lame_3.96.1.bb | 25 ------------------------- meta/packages/lame/lame_3.98.4.bb | 24 ++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 63 deletions(-) create mode 100644 meta/packages/lame/lame-3.98.4/no-gtk1.patch delete mode 100644 meta/packages/lame/lame/Makefile-lm.patch delete mode 100644 meta/packages/lame/lame/no-gtk1.patch delete mode 100644 meta/packages/lame/lame_3.96.1.bb create mode 100644 meta/packages/lame/lame_3.98.4.bb (limited to 'meta/packages/lame') diff --git a/meta/packages/lame/lame-3.98.4/no-gtk1.patch b/meta/packages/lame/lame-3.98.4/no-gtk1.patch new file mode 100644 index 0000000000..8669d3b43b --- /dev/null +++ b/meta/packages/lame/lame-3.98.4/no-gtk1.patch @@ -0,0 +1,18 @@ +# 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/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/no-gtk1.patch b/meta/packages/lame/lame/no-gtk1.patch deleted file mode 100644 index 4f1a522186..0000000000 --- a/meta/packages/lame/lame/no-gtk1.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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) - if test "${HAVE_GTK}" = "yes"; then - AC_DEFINE(HAVE_GTK, 1, have working GTK) - fi diff --git a/meta/packages/lame/lame_3.96.1.bb b/meta/packages/lame/lame_3.96.1.bb deleted file mode 100644 index ce691bc1bb..0000000000 --- a/meta/packages/lame/lame_3.96.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SECTION = "console/utils" -DESCRIPTION = "Not an MP3 encoder" -LICENSE = "LGPL" -PR = "r4" - -SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ - file://no-gtk1.patch;patch=1 \ - file://Makefile-lm.patch;patch=1" - -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/packages/lame/lame_3.98.4.bb b/meta/packages/lame/lame_3.98.4.bb new file mode 100644 index 0000000000..a783dd554a --- /dev/null +++ b/meta/packages/lame/lame_3.98.4.bb @@ -0,0 +1,24 @@ +SECTION = "console/utils" +DESCRIPTION = "Not an MP3 encoder" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ + file://no-gtk1.patch;patch=1" + +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