diff options
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | recipes/lame/lame-3.98.2/ldflags-qa.patch | 43 | ||||
| -rw-r--r-- | recipes/lame/lame-3.98.2/no-gtk1.patch | 18 | ||||
| -rw-r--r-- | recipes/lame/lame_3.98.2.bb | 26 |
4 files changed, 91 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 811a9752c5..5a9b1e7a89 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13078,6 +13078,10 @@ sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5 md5=e1206c46a5e276feca11a7149e2fc6ac sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5 +[http://downloads.sourceforge.net/lame/lame-398-2.tar.gz] +md5=719dae0ee675d0c16e0e89952930ed35 +sha256=a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32 + [http://lasertraq.googlecode.com/files/lasertraq-0.8-r213.tar.bz2] md5=c24cc9ba196b32134186843324bfe784 sha256=7a2162c783f98a2de9658a217cd0409a7bd16d40040c34a6077df376a2135aea diff --git a/recipes/lame/lame-3.98.2/ldflags-qa.patch b/recipes/lame/lame-3.98.2/ldflags-qa.patch new file mode 100644 index 0000000000..c4df610bb2 --- /dev/null +++ b/recipes/lame/lame-3.98.2/ldflags-qa.patch @@ -0,0 +1,43 @@ +https://sourceforge.net/tracker/?func=detail&aid=2892273&group_id=290&atid=300290 + +Depending on configure arguments libmp3lame may be built only as a +shared library. But lame frntends link command using this library +has -static. + +Such clash may cause ugly libtool behavior. + +In context of lame, linking should probably respect configure flags +and link frontend dynamically if shared linking is enabled. + +As a consequence of bug in libtool, this combination +with --disable-static may create incorrect binary. For more see: +http://lists.gnu.org/archive/html/bug-libtool/2009-11/msg00004.html + +Signed-off-by: Stanislav Brabec <utx@penguin.cz> + +Index: lame-398-2/frontend/Makefile.am +=================================================================== +--- lame-398-2.orig/frontend/Makefile.am ++++ lame-398-2/frontend/Makefile.am +@@ -52,7 +52,7 @@ mp3x_SOURCES = mp3x.c gtkanal.c gpkplott + endif + + CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ + + INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) + +Index: lame-398-2/frontend/Makefile.in +=================================================================== +--- lame-398-2.orig/frontend/Makefile.in ++++ lame-398-2/frontend/Makefile.in +@@ -152,7 +152,7 @@ LDADD = @LDADD@ \ + $(top_builddir)/libmp3lame/libmp3lame.la \ + @FRONTEND_LDADD@ + +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/recipes/lame/lame-3.98.2/no-gtk1.patch b/recipes/lame/lame-3.98.2/no-gtk1.patch new file mode 100644 index 0000000000..3cc06308f5 --- /dev/null +++ b/recipes/lame/lame-3.98.2/no-gtk1.patch @@ -0,0 +1,18 @@ +Index: lame-398-2/configure.in +=================================================================== +--- lame-398-2.orig/configure.in ++++ lame-398-2/configure.in +@@ -385,7 +385,12 @@ CONFIG_MATH_LIB="${USE_LIBM}" + + dnl configure use of features + +-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") ++dnl 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/recipes/lame/lame_3.98.2.bb b/recipes/lame/lame_3.98.2.bb new file mode 100644 index 0000000000..f279857810 --- /dev/null +++ b/recipes/lame/lame_3.98.2.bb @@ -0,0 +1,26 @@ +SECTION = "console/utils" +DESCRIPTION = "Not an MP3 encoder" +LICENSE = "LGPL" +PR = "r0" + +S = "${WORKDIR}/${PN}-398-2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-398-2.tar.gz \ + file://no-gtk1.patch;patch=1 \ + file://ldflags-qa.patch;patch=1" + +inherit autotools_stage + +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 +} |