Import ABI slotted libmikmod.so.2 wrt #307893.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

8 files changed, 294 insertions, 123 deletions

diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch
deleted file mode 100644
index 1f14fc27f5d1..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur libmikmod-3.1.11.orig/configure.in libmikmod-3.1.11/configure.in
---- libmikmod-3.1.11.orig/configure.in	2004-01-22 02:43:52.000000000 +0900
-+++ libmikmod-3.1.11/configure.in	2007-01-14 11:32:35.000000000 +0900
-@@ -6,7 +6,7 @@
- 
- LIBMIKMOD_MAJOR_VERSION=3
- LIBMIKMOD_MINOR_VERSION=1
--LIBMIKMOD_MICRO_VERSION=10
-+LIBMIKMOD_MICRO_VERSION=11
- 
- BETA=
- 
-@@ -257,10 +257,10 @@
- if test "`uname`" = "Linux" && test $libmikmod_driver_alsa = yes
- then
- 	libmikmod_driver_alsa=no
--	AC_CHECK_HEADERS(sys/asoundlib.h)
--	if test $ac_cv_header_sys_asoundlib_h = yes
-+	AC_CHECK_HEADERS(alsa/asoundlib.h)
-+	if test $ac_cv_header_alsa_asoundlib_h = yes
- 	then
--		AC_CHECK_LIB(asound,snd_cards,libmikmod_driver_alsa=yes)
-+		AC_CHECK_LIB(asound,snd_card_load,libmikmod_driver_alsa=yes)
- 	fi
- else
- 	libmikmod_driver_alsa=no
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch
deleted file mode 100644
index b66af05b0ae0..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libmikmod-3.1.11-old/include/mikmod.h.in libmikmod-3.1.11/include/mikmod.h.in
---- libmikmod-3.1.11-old/include/mikmod.h.in	2004-05-21 13:26:08.824106896 -0500
-+++ libmikmod-3.1.11/include/mikmod.h.in	2004-05-21 13:26:39.024515736 -0500
-@@ -85,7 +85,7 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-ppc64-archdef.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-ppc64-archdef.patch
deleted file mode 100644
index 3947a55cd15b..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-ppc64-archdef.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libmikmod-3.1.11-old/include/mikmod.h.in libmikmod-3.1.11/include/mikmod.h.in
---- libmikmod-3.1.11-old/include/mikmod.h.in	2004-05-21 13:26:08.824106896 -0500
-+++ libmikmod-3.1.11/include/mikmod.h.in	2004-05-21 13:26:39.024515736 -0500
-@@ -85,7 +85,7 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-doubleRegister.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-doubleRegister.patch
deleted file mode 100644
index 7a384fb74a65..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-doubleRegister.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- playercode/mdriver.c.old	2007-10-07 10:15:38.000000000 +0200
-+++ playercode/mdriver.c	2007-10-07 10:21:23.000000000 +0200
-@@ -202,7 +202,13 @@
- 	/* don't register a MISSING() driver */
- 	if ((drv->Name) && (drv->Version)) {
- 		if (cruise) {
--			while (cruise->next) cruise = cruise->next;
-+			// Check if the drv is already there.
-+			// Discard it in that case
-+			if (cruise==drv) return;
-+			while (cruise->next) {
-+				cruise = cruise->next;
-+				if (cruise==drv) return;
-+			}
- 			cruise->next = drv;
- 		} else
- 			firstdriver = drv; 
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-m4.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-m4.patch
deleted file mode 100644
index c4a1c100e385..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/libmikmod.m4:11: warning: underquoted definition of AM_PATH_LIBMIKMOD
---- libmikmod-3.1.11/libmikmod.m4
-+++ libmikmod-3.1.11/libmikmod.m4
-@@ -10,3 +10,3 @@
- dnl
--AC_DEFUN(AM_PATH_LIBMIKMOD,
-+AC_DEFUN([AM_PATH_LIBMIKMOD],
- [dnl 
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch
deleted file mode 100644
index f8238b757fbb..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: libmikmod-3.1.11/configure.in
-===================================================================
---- libmikmod-3.1.11.orig/configure.in
-+++ libmikmod-3.1.11/configure.in
-@@ -616,14 +616,11 @@ int main()
- 	libmikmod_cv_gcc_inline_safe=yes,
- 	libmikmod_cv_gcc_inline_safe=no,
- 	libmikmod_cv_gcc_inline_safe=no))
--	if test $libmikmod_cv_gcc_inline_safe = yes
-+	if test x$libmikmod_cv_gcc_inline_safe != xyes
- 	then
--		CFLAGS="$CFLAGS -finline-functions"
--	else
- 		CFLAGS="$CFLAGS -fno-strength-reduce"
- 	fi
--	CFLAGS="$CFLAGS -funroll-loops -ffast-math"
--	if test $libmikmod_debug = yes
-+	if test x$libmikmod_debug = xyes
- 	then
- 		CFLAGS="$CFLAGS -Wall -Werror"
- 	else
-Index: libmikmod-3.1.11/libmikmod-config.in
-===================================================================
---- libmikmod-3.1.11.orig/libmikmod-config.in
-+++ libmikmod-3.1.11/libmikmod-config.in
-@@ -50,7 +50,7 @@ while test $# -gt 0 ; do
- 	;;
- 	--libs)
- 		libdir=-L${exec_prefix}/lib
--		echo $libdir -lmikmod @LIBRARY_LIB@
-+		echo $libdir -lmikmod
- 	;;
- 	*)
- 		echo "${usage}" 1>&2
-Index: libmikmod-3.1.11/libmikmod/Makefile.in
-===================================================================
---- libmikmod-3.1.11.orig/libmikmod/Makefile.in
-+++ libmikmod-3.1.11/libmikmod/Makefile.in
-@@ -72,7 +72,7 @@ distclean:	clean
- 	rm -f Makefile
- 
- $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4: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/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch b/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch
new file mode 100644
index 000000000000..fdc8bad616c9
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch
@@ -0,0 +1,26 @@
+diff -ur libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in
+--- libmikmod-3.1.12.orig/include/mikmod.h.in	2007-12-15 11:24:19.000000000 +0200
++++ libmikmod-3.1.12/include/mikmod.h.in	2010-03-06 20:42:09.000000000 +0200
+@@ -85,7 +85,8 @@
+ 
+ @DOES_NOT_HAVE_SIGNED@
+ 
+-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
++#include <stdint.h>
++#if __WORDSIZE == 64
+ /* 64 bit architectures */
+ 
+ typedef signed char     SBYTE;      /* 1 byte, signed */
+diff -ur libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h
+--- libmikmod-3.1.12.orig/include/mikmod_internals.h	2007-12-15 14:24:51.000000000 +0200
++++ libmikmod-3.1.12/include/mikmod_internals.h	2010-03-06 20:42:42.000000000 +0200
+@@ -50,7 +50,8 @@
+ /*========== More type definitions */
+ 
+ /* SLONGLONG: 64bit, signed */
+-#if defined (__arch64__) || defined(__alpha)
++#include <stdint.h>
++#if __WORDSIZE == 64
+ typedef long		SLONGLONG;
+ #define NATIVE_64BIT_INT
+ #elif defined(__WATCOMC__)
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.12-autotools.patch b/media-libs/libmikmod/files/libmikmod-3.1.12-autotools.patch
new file mode 100644
index 000000000000..f516324a918e
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.1.12-autotools.patch
@@ -0,0 +1,268 @@
+diff -ruN libmikmod-3.1.12.orig/configure.in libmikmod-3.1.12/configure.in
+--- libmikmod-3.1.12.orig/configure.in	2007-12-15 11:22:57.000000000 +0200
++++ libmikmod-3.1.12/configure.in	2010-03-06 21:06:09.000000000 +0200
+@@ -257,10 +257,10 @@
+ if test "`uname`" = "Linux" && test $libmikmod_driver_alsa = yes
+ then
+ 	libmikmod_driver_alsa=no
+-	AC_CHECK_HEADERS(sys/asoundlib.h)
+-	if test $ac_cv_header_sys_asoundlib_h = yes
++	AC_CHECK_HEADERS(alsa/asoundlib.h)
++	if test $ac_cv_header_alsa_asoundlib_h = yes
+ 	then
+-		AC_CHECK_LIB(asound,snd_cards,libmikmod_driver_alsa=yes)
++		AC_CHECK_LIB(asound,snd_card_load,libmikmod_driver_alsa=yes)
+ 	fi
+ else
+ 	libmikmod_driver_alsa=no
+@@ -616,16 +616,16 @@
+ 	libmikmod_cv_gcc_inline_safe=yes,
+ 	libmikmod_cv_gcc_inline_safe=no,
+ 	libmikmod_cv_gcc_inline_safe=no))
+-	if test $libmikmod_cv_gcc_inline_safe = yes
++	if test x$libmikmod_cv_gcc_inline_safe != xyes
+ 	then
+ 		CFLAGS="$CFLAGS -finline-functions"
+ 	else
+ 		CFLAGS="$CFLAGS -fno-strength-reduce"
+ 	fi
+ 	CFLAGS="$CFLAGS -funroll-loops -ffast-math"
+-	if test $libmikmod_debug = yes
++	if test x$libmikmod_debug = xyes
+ 	then
+-		CFLAGS="$CFLAGS -Wall -Werror"
++		CFLAGS="$CFLAGS -Wall -g"
+ 	else
+ 		CFLAGS="$CFLAGS -Wall"
+ 	fi
+@@ -663,7 +663,7 @@
+ 	if test $libmikmod_cv_gcc_pthread = yes
+ 	then
+ 		REENTRANT="-pthread $REENTRANT"
+-		LIB_LDADD="-pthread"
++		LIB_LDADD="-pthread -lm"
+ 	fi
+ fi
+ 		
+diff -ruN libmikmod-3.1.12.orig/esd.m4 libmikmod-3.1.12/esd.m4
+--- libmikmod-3.1.12.orig/esd.m4	1970-01-01 02:00:00.000000000 +0200
++++ libmikmod-3.1.12/esd.m4	2010-03-06 21:01:17.000000000 +0200
+@@ -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-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
++            esd_prefix="$withval", esd_prefix="")
++AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
++            esd_exec_prefix="$withval", esd_exec_prefix="")
++AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
++		    , enable_esdtest=yes)
++
++  if test x$esd_exec_prefix != x ; then
++     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
++     if test x${ESD_CONFIG+set} != xset ; then
++        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
++     fi
++  fi
++  if test x$esd_prefix != x ; then
++     esd_args="$esd_args --prefix=$esd_prefix"
++     if test x${ESD_CONFIG+set} != xset ; then
++        ESD_CONFIG=$esd_prefix/bin/esd-config
++     fi
++  fi
++
++  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
++  min_esd_version=ifelse([$1], ,0.2.7,$1)
++  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
++  no_esd=""
++  if test "$ESD_CONFIG" = "no" ; then
++    no_esd=yes
++  else
++    AC_LANG_SAVE
++    AC_LANG_C
++    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
++    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
++
++    esd_major_version=`$ESD_CONFIG $esd_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_esdtest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $ESD_CFLAGS"
++      LIBS="$LIBS $ESD_LIBS"
++dnl
++dnl Now check if the installed ESD is sufficiently new. (Also sanity
++dnl checks the results of esd-config to some extent
++dnl
++      rm -f conf.esdtest
++      AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <esd.h>
++
++char*
++my_strdup (char *str)
++{
++  char *new_str;
++  
++  if (str)
++    {
++      new_str = malloc ((strlen (str) + 1) * sizeof(char));
++      strcpy (new_str, str);
++    }
++  else
++    new_str = NULL;
++  
++  return new_str;
++}
++
++int main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  system ("touch conf.esdtest");
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = my_strdup("$min_esd_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_esd_version");
++     exit(1);
++   }
++
++   if (($esd_major_version > major) ||
++      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
++      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
++    {
++      return 0;
++    }
++  else
++    {
++      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
++      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
++      printf("*** best to upgrade to the required version.\n");
++      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
++      printf("*** to point to the correct copy of esd-config, and remove the file\n");
++      printf("*** config.cache before re-running configure\n");
++      return 1;
++    }
++}
++
++],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++       AC_LANG_RESTORE
++     fi
++  fi
++  if test "x$no_esd" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$ESD_CONFIG" = "no" ; then
++       echo "*** The esd-config script installed by ESD could not be found"
++       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the ESD_CONFIG environment variable to the"
++       echo "*** full path to esd-config."
++     else
++       if test -f conf.esdtest ; then
++        :
++       else
++          echo "*** Could not run ESD test program, checking why..."
++          CFLAGS="$CFLAGS $ESD_CFLAGS"
++          LIBS="$LIBS $ESD_LIBS"
++          AC_LANG_SAVE
++          AC_LANG_C
++          AC_TRY_LINK([
++#include <stdio.h>
++#include <esd.h>
++],      [ return 0; ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding ESD or finding the wrong"
++          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
++          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
++          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++          AC_LANG_RESTORE
++       fi
++     fi
++     ESD_CFLAGS=""
++     ESD_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(ESD_CFLAGS)
++  AC_SUBST(ESD_LIBS)
++  rm -f conf.esdtest
++])
++
++dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
++dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
++dnl
++AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
++[dnl
++  AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
++  ac_save_ESD_CFLAGS="$ESD_CFLAGS"
++  ac_save_ESD_LIBS="$ESD_LIBS"
++  AM_PATH_ESD(0.2.21,
++    ifelse([$1], , [
++      AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
++      AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
++	[Define if you have esound with support of multiple recording clients.])],
++    [$1]),
++    ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
++    if test "x$ac_save_ESD_CFLAGS" != x ; then
++       ESD_CFLAGS="$ac_save_ESD_CFLAGS"
++    fi
++    if test "x$ac_save_ESD_LIBS" != x ; then
++       ESD_LIBS="$ac_save_ESD_LIBS"
++    fi
++  )
++])
+diff -ruN 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 19:43:52.000000000 +0200
++++ libmikmod-3.1.12/libmikmod/Makefile.in	2010-03-06 21:02:44.000000000 +0200
+@@ -72,7 +72,7 @@
+ 	rm -f Makefile
+ 
+ $(LIB): $(OBJ)
+-	$(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
+ 
+ dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
+ 			$(top_srcdir)/dlapi/dlfcn.h
+diff -ruN libmikmod-3.1.12.orig/libmikmod-config.in libmikmod-3.1.12/libmikmod-config.in
+--- libmikmod-3.1.12.orig/libmikmod-config.in	2004-01-21 19:43:52.000000000 +0200
++++ libmikmod-3.1.12/libmikmod-config.in	2010-03-06 21:03:10.000000000 +0200
+@@ -50,7 +50,7 @@
+ 	;;
+ 	--libs)
+ 		libdir=-L${exec_prefix}/lib
+-		echo $libdir -lmikmod @LIBRARY_LIB@
++		echo $libdir -lmikmod
+ 	;;
+ 	*)
+ 		echo "${usage}" 1>&2