diff options
Diffstat (limited to 'meta/packages/lame')
-rw-r--r-- | meta/packages/lame/lame-3.98.4/no-gtk1.patch (renamed from meta/packages/lame/lame/no-gtk1.patch) | 8 | ||||
-rw-r--r-- | meta/packages/lame/lame/Makefile-lm.patch | 22 | ||||
-rw-r--r-- | meta/packages/lame/lame_3.98.4.bb (renamed from meta/packages/lame/lame_3.96.1.bb) | 5 |
3 files changed, 7 insertions, 28 deletions
diff --git a/meta/packages/lame/lame/no-gtk1.patch b/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 @@ | |||
1 | # Acquired from OpenEmbedded | ||
2 | |||
1 | --- lame-3.96.1/configure.in~no-gtk1.patch 2004-07-25 15:52:12.000000000 +0100 | 3 | --- lame-3.96.1/configure.in~no-gtk1.patch 2004-07-25 15:52:12.000000000 +0100 |
2 | +++ lame-3.96.1/configure.in 2004-09-10 15:54:39.000000000 +0100 | 4 | +++ lame-3.96.1/configure.in 2004-09-10 15:54:39.000000000 +0100 |
3 | @@ -363,7 +363,12 @@ | 5 | @@ -363,7 +363,12 @@ |
@@ -11,6 +13,6 @@ | |||
11 | +GTK_LIBS="" | 13 | +GTK_LIBS="" |
12 | +AC_SUBST(GTK_CFLAGS) | 14 | +AC_SUBST(GTK_CFLAGS) |
13 | +AC_SUBST(GTK_LIBS) | 15 | +AC_SUBST(GTK_LIBS) |
14 | if test "${HAVE_GTK}" = "yes"; then | 16 | |
15 | AC_DEFINE(HAVE_GTK, 1, have working GTK) | 17 | dnl ElectricFence malloc debugging |
16 | fi | 18 | 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 @@ | |||
1 | --- lame-3.96.1/libmp3lame/Makefile.am.old 2007-01-16 13:41:48.000000000 +0000 | ||
2 | +++ lame-3.96.1/libmp3lame/Makefile.am 2007-01-16 13:41:53.000000000 +0000 | ||
3 | @@ -18,7 +18,7 @@ | ||
4 | decoder_ldadd = | ||
5 | endif | ||
6 | |||
7 | -libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) | ||
8 | +libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm | ||
9 | libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \ | ||
10 | -no-undefined | ||
11 | |||
12 | --- lame-3.96.1/libmp3lame/Makefile.in.old 2007-01-16 13:47:17.000000000 +0000 | ||
13 | +++ lame-3.96.1/libmp3lame/Makefile.in 2007-01-16 13:47:29.000000000 +0000 | ||
14 | @@ -177,7 +177,7 @@ | ||
15 | @LIB_WITH_DECODER_TRUE@decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la | ||
16 | @LIB_WITH_DECODER_FALSE@decoder_ldadd = | ||
17 | |||
18 | -libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) | ||
19 | +libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm | ||
20 | libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \ | ||
21 | -no-undefined | ||
22 | |||
diff --git a/meta/packages/lame/lame_3.96.1.bb b/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 @@ | |||
1 | SECTION = "console/utils" | 1 | SECTION = "console/utils" |
2 | DESCRIPTION = "Not an MP3 encoder" | 2 | DESCRIPTION = "Not an MP3 encoder" |
3 | LICENSE = "LGPL" | 3 | LICENSE = "LGPL" |
4 | PR = "r4" | 4 | PR = "r0" |
5 | 5 | ||
6 | SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ | 6 | SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ |
7 | file://no-gtk1.patch;patch=1 \ | 7 | file://no-gtk1.patch;patch=1" |
8 | file://Makefile-lm.patch;patch=1" | ||
9 | 8 | ||
10 | inherit autotools | 9 | inherit autotools |
11 | 10 | ||