[oe] [meta-oe][PATCH 4/6] libmikmod: Upgrade libmikmod_3.2.0.bb -> libmikmod_3.3.2.bb

[Khem Raj]

On Tuesday, October 15, 2013, Martin Jansa wrote:

> On Sun, Oct 13, 2013 at 01:43:53AM -0700, Khem Raj wrote:
> > Signed-off-by: Khem Raj <raj.khem at gmail.com>
> > ---
> >  .../mikmod/libmikmod/autofoo.patch                 |  16 --
> >  .../mikmod/libmikmod/ldflags.patch                 |  12 --
> >  .../recipes-multimedia/mikmod/libmikmod/m4.patch   | 197
> ---------------------
> >  .../libmikmod/obsolete_automake_macros.patch       |  15 --
> >  .../{libmikmod_3.2.0.bb => libmikmod_3.3.2.bb}     |   9 +-
> >  5 files changed, 2 insertions(+), 247 deletions(-)
> >  delete mode 100644
> meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch
> >  delete mode 100644
> meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
> >  delete mode 100644 meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch
> >  delete mode 100644
> meta-oe/recipes-multimedia/mikmod/libmikmod/obsolete_automake_macros.patch
> >  rename meta-oe/recipes-multimedia/mikmod/{libmikmod_3.2.0.bb =>
> libmikmod_3.3.2.bb} (68%)
> >
> > diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch
> b/meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch
> > deleted file mode 100644
> > index 22d8170..0000000
> > --- a/meta-oe/recipes-multimedia/mikmod/libmikmod/autofoo.patch
> > +++ /dev/null
> > @@ -1,16 +0,0 @@
> > -
> > -#
> > -# Patch managed by http://www.holgerschurig.de/patcher.html
> > -#
> > -
> > ---- libmikmod-3.2.0-beta2/configure.in~autofoo
> > -+++ libmikmod-3.2.0-beta2/configure.in
> > -@@ -415,8 +415,6 @@
> > -
> > - AC_CHECK_FUNCS(setenv snprintf srandom)
> > - AC_REPLACE_FUNCS(strcasecmp strdup strstr)
> > --# Change extension, as we use libtool
> > --LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`"
> > -
> > - AC_HEADER_EGREP(srandom,math.h,AC_DEFINE(SRANDOM_IN_MATH_H))
> > -
> > diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
> b/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
> > deleted file mode 100644
> > index de31139..0000000
> > --- a/meta-oe/recipes-multimedia/mikmod/libmikmod/ldflags.patch
> > +++ /dev/null
> > @@ -1,12 +0,0 @@
> > -diff -urN libmikmod-3.1.12.orig/libmikmod/Makefile.in
> libmikmod-3.1.12/libmikmod/Makefile.in
> > ---- libmikmod-3.1.12.orig/libmikmod/Makefile.in      2004-01-21
> 17:43:52.000000000 +0000
> > -+++ libmikmod-3.1.12/libmikmod/Makefile.in   2009-04-02
> 11:28:01.000000000 +0000
> > -@@ -72,7 +72,7 @@
> > -     rm -f Makefile
> > -
> > - $(LIB): $(OBJ)
> > --    $(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ)
> $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
> > -+    $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@
> $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
> > -
> > - dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \
> > -                     $(top_srcdir)/dlapi/dlfcn.h
> > diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch
> b/meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch
> > deleted file mode 100644
> > index ac7f2d7..0000000
> > --- a/meta-oe/recipes-multimedia/mikmod/libmikmod/m4.patch
> > +++ /dev/null
> > @@ -1,197 +0,0 @@
> > ---- /dev/null
> > -+++ libmikmod-3.2.0-beta2/m4/esd.m4
> > -@@ -0,0 +1,194 @@
> > -+# Configure paths for ESD
> > -+# Manish Singh    98-9-30
> > -+# stolen back from Frank Belew
> > -+# stolen from Manish Singh
> > -+# Shamelessly stolen from Owen Taylor
> > -+
> > -+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [,
> ACTION-IF-NOT-FOUND]]])
> > -+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
> > -+dnl
> > -+AC_DEFUN(AM_PATH_ESD,
> > -+[dnl
> > -+dnl Get the cflags and libraries from the esd-config script
> > -+dnl
> > -+AC_ARG_WITH(esd-prefiIt looks like 3.3.2 archive was removed today and
> there is only 3.3.3.
>
> Old is still available on proper SF mirror:
> http://sourceforge.net/projects/mikmod/files/libmikmod/3.3.2/


Hmm I will update it to 3.3.3 and resend

>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com <javascript:;>
>