Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/libmikmod/patches/libmikmod-3.1.11-a.diff

    Annotation of /trunk/libmikmod/patches/libmikmod-3.1.11-a.diff

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 144 - (hide annotations) (download)
    Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
    File size: 69186 byte(s) 
    -import
    1 niro 144 diff --recursive --unified libmikmod-3.1.11/NEWS libmikmod-3.1.11-a/NEWS
    2     --- libmikmod-3.1.11/NEWS 2004-01-21 12:43:52.000000000 -0500
    3     +++ libmikmod-3.1.11-a/NEWS 2004-06-04 08:24:26.000000000 -0400
    4     @@ -1,3 +1,17 @@
    5     +Summary of changes between libmikmod 3.1.11 and libmikmod 3.1.11-a
    6     +========================================================================
    7     +libmikmod-3.1.11-a was released on 05/03/2004
    8     +
    9     +Most of my work and attention goes on the 3.2.x series, but I still receive
    10     +occasional bug reports and patchs for the 3.1.11 version. There are not enough
    11     +changes to make a full release, but many people may find this patch useful.
    12     +
    13     +BUGFIXES
    14     +- libmikmod playback now works correcly on amd64 (type size problem)
    15     +- fixed warning issued by automake >= 1.8
    16     +- config.sub and config.guess updated
    17     +
    18     +
    19     Summary of changes between libmikmod 3.1.10 and libmikmod 3.1.11 (Thiers):
    20     ==========================================================================
    21    
    22     diff --recursive --unified libmikmod-3.1.11/config.guess libmikmod-3.1.11-a/config.guess
    23     --- libmikmod-3.1.11/config.guess 2004-01-21 12:43:53.000000000 -0500
    24     +++ libmikmod-3.1.11-a/config.guess 2004-06-04 08:24:26.000000000 -0400
    25     @@ -1,9 +1,9 @@
    26     #! /bin/sh
    27     # Attempt to guess a canonical system name.
    28     # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    29     -# 2000, 2001, 2002 Free Software Foundation, Inc.
    30     +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    31    
    32     -timestamp='2002-01-02'
    33     +timestamp='2004-03-03'
    34    
    35     # This file is free software; you can redistribute it and/or modify it
    36     # under the terms of the GNU General Public License as published by
    37     @@ -24,7 +24,7 @@
    38     # configuration script generated by Autoconf, you may include it under
    39     # the same distribution terms that you use for the rest of that program.
    40    
    41     -# Originally written by Per Bothner <bothner@cygnus.com>.
    42     +# Originally written by Per Bothner <per@bothner.com>.
    43     # Please send patches to <config-patches@gnu.org>. Submit a context
    44     # diff and a properly formatted ChangeLog entry.
    45     #
    46     @@ -88,30 +88,42 @@
    47     exit 1
    48     fi
    49    
    50     +trap 'exit 1' 1 2 15
    51    
    52     -dummy=dummy-$$
    53     -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
    54     +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
    55     +# compiler to aid in system detection is discouraged as it requires
    56     +# temporary files to be created and, as you can see below, it is a
    57     +# headache to deal with in a portable fashion.
    58    
    59     -# CC_FOR_BUILD -- compiler used by this script.
    60     # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
    61     # use `HOST_CC' if defined, but it is deprecated.
    62    
    63     -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
    64     - ,,) echo "int dummy(){}" > $dummy.c ;
    65     - for c in cc gcc c89 ; do
    66     - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
    67     - if test $? = 0 ; then
    68     +# Portable tmp directory creation inspired by the Autoconf team.
    69     +
    70     +set_cc_for_build='
    71     +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
    72     +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
    73     +: ${TMPDIR=/tmp} ;
    74     + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    75     + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
    76     + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
    77     + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
    78     +dummy=$tmp/dummy ;
    79     +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
    80     +case $CC_FOR_BUILD,$HOST_CC,$CC in
    81     + ,,) echo "int x;" > $dummy.c ;
    82     + for c in cc gcc c89 c99 ; do
    83     + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
    84     CC_FOR_BUILD="$c"; break ;
    85     fi ;
    86     done ;
    87     - rm -f $dummy.c $dummy.o $dummy.rel ;
    88     if test x"$CC_FOR_BUILD" = x ; then
    89     CC_FOR_BUILD=no_compiler_found ;
    90     fi
    91     ;;
    92     ,,*) CC_FOR_BUILD=$CC ;;
    93     ,*,*) CC_FOR_BUILD=$HOST_CC ;;
    94     -esac'
    95     +esac ;'
    96    
    97     # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
    98     # (ghazi@noc.rutgers.edu 1994-08-24)
    99     @@ -138,9 +150,11 @@
    100     #
    101     # Note: NetBSD doesn't particularly care about the vendor
    102     # portion of the name. We always set it to "unknown".
    103     - UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
    104     - UNAME_MACHINE_ARCH=unknown
    105     + sysctl="sysctl -n hw.machine_arch"
    106     + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
    107     + /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
    108     case "${UNAME_MACHINE_ARCH}" in
    109     + armeb) machine=armeb-unknown ;;
    110     arm*) machine=arm-unknown ;;
    111     sh3el) machine=shl-unknown ;;
    112     sh3eb) machine=sh-unknown ;;
    113     @@ -166,18 +180,35 @@
    114     ;;
    115     esac
    116     # The OS release
    117     - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
    118     + # Debian GNU/NetBSD machines have a different userland, and
    119     + # thus, need a distinct triplet. However, they do not need
    120     + # kernel version information, so it can be replaced with a
    121     + # suitable tag, in the style of linux-gnu.
    122     + case "${UNAME_VERSION}" in
    123     + Debian*)
    124     + release='-gnu'
    125     + ;;
    126     + *)
    127     + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
    128     + ;;
    129     + esac
    130     # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
    131     # contains redundant information, the shorter form:
    132     # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
    133     echo "${machine}-${os}${release}"
    134     exit 0 ;;
    135     + amd64:OpenBSD:*:*)
    136     + echo x86_64-unknown-openbsd${UNAME_RELEASE}
    137     + exit 0 ;;
    138     amiga:OpenBSD:*:*)
    139     echo m68k-unknown-openbsd${UNAME_RELEASE}
    140     exit 0 ;;
    141     arc:OpenBSD:*:*)
    142     echo mipsel-unknown-openbsd${UNAME_RELEASE}
    143     exit 0 ;;
    144     + cats:OpenBSD:*:*)
    145     + echo arm-unknown-openbsd${UNAME_RELEASE}
    146     + exit 0 ;;
    147     hp300:OpenBSD:*:*)
    148     echo m68k-unknown-openbsd${UNAME_RELEASE}
    149     exit 0 ;;
    150     @@ -196,6 +227,9 @@
    151     mvmeppc:OpenBSD:*:*)
    152     echo powerpc-unknown-openbsd${UNAME_RELEASE}
    153     exit 0 ;;
    154     + pegasos:OpenBSD:*:*)
    155     + echo powerpc-unknown-openbsd${UNAME_RELEASE}
    156     + exit 0 ;;
    157     pmax:OpenBSD:*:*)
    158     echo mipsel-unknown-openbsd${UNAME_RELEASE}
    159     exit 0 ;;
    160     @@ -211,68 +245,70 @@
    161     *:OpenBSD:*:*)
    162     echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
    163     exit 0 ;;
    164     + *:ekkoBSD:*:*)
    165     + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
    166     + exit 0 ;;
    167     + macppc:MirBSD:*:*)
    168     + echo powerppc-unknown-mirbsd${UNAME_RELEASE}
    169     + exit 0 ;;
    170     + *:MirBSD:*:*)
    171     + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
    172     + exit 0 ;;
    173     alpha:OSF1:*:*)
    174     - if test $UNAME_RELEASE = "V4.0"; then
    175     + case $UNAME_RELEASE in
    176     + *4.0)
    177     UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
    178     - fi
    179     + ;;
    180     + *5.*)
    181     + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
    182     + ;;
    183     + esac
    184     + # According to Compaq, /usr/sbin/psrinfo has been available on
    185     + # OSF/1 and Tru64 systems produced since 1995. I hope that
    186     + # covers most systems running today. This code pipes the CPU
    187     + # types through head -n 1, so we only detect the type of CPU 0.
    188     + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
    189     + case "$ALPHA_CPU_TYPE" in
    190     + "EV4 (21064)")
    191     + UNAME_MACHINE="alpha" ;;
    192     + "EV4.5 (21064)")
    193     + UNAME_MACHINE="alpha" ;;
    194     + "LCA4 (21066/21068)")
    195     + UNAME_MACHINE="alpha" ;;
    196     + "EV5 (21164)")
    197     + UNAME_MACHINE="alphaev5" ;;
    198     + "EV5.6 (21164A)")
    199     + UNAME_MACHINE="alphaev56" ;;
    200     + "EV5.6 (21164PC)")
    201     + UNAME_MACHINE="alphapca56" ;;
    202     + "EV5.7 (21164PC)")
    203     + UNAME_MACHINE="alphapca57" ;;
    204     + "EV6 (21264)")
    205     + UNAME_MACHINE="alphaev6" ;;
    206     + "EV6.7 (21264A)")
    207     + UNAME_MACHINE="alphaev67" ;;
    208     + "EV6.8CB (21264C)")
    209     + UNAME_MACHINE="alphaev68" ;;
    210     + "EV6.8AL (21264B)")
    211     + UNAME_MACHINE="alphaev68" ;;
    212     + "EV6.8CX (21264D)")
    213     + UNAME_MACHINE="alphaev68" ;;
    214     + "EV6.9A (21264/EV69A)")
    215     + UNAME_MACHINE="alphaev69" ;;
    216     + "EV7 (21364)")
    217     + UNAME_MACHINE="alphaev7" ;;
    218     + "EV7.9 (21364A)")
    219     + UNAME_MACHINE="alphaev79" ;;
    220     + esac
    221     + # A Pn.n version is a patched version.
    222     # A Vn.n version is a released version.
    223     # A Tn.n version is a released field test version.
    224     # A Xn.n version is an unreleased experimental baselevel.
    225     # 1.2 uses "1.2" for uname -r.
    226     - cat <<EOF >$dummy.s
    227     - .data
    228     -\$Lformat:
    229     - .byte 37,100,45,37,120,10,0 # "%d-%x\n"
    230     -
    231     - .text
    232     - .globl main
    233     - .align 4
    234     - .ent main
    235     -main:
    236     - .frame \$30,16,\$26,0
    237     - ldgp \$29,0(\$27)
    238     - .prologue 1
    239     - .long 0x47e03d80 # implver \$0
    240     - lda \$2,-1
    241     - .long 0x47e20c21 # amask \$2,\$1
    242     - lda \$16,\$Lformat
    243     - mov \$0,\$17
    244     - not \$1,\$18
    245     - jsr \$26,printf
    246     - ldgp \$29,0(\$26)
    247     - mov 0,\$16
    248     - jsr \$26,exit
    249     - .end main
    250     -EOF
    251     - eval $set_cc_for_build
    252     - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
    253     - if test "$?" = 0 ; then
    254     - case `./$dummy` in
    255     - 0-0)
    256     - UNAME_MACHINE="alpha"
    257     - ;;
    258     - 1-0)
    259     - UNAME_MACHINE="alphaev5"
    260     - ;;
    261     - 1-1)
    262     - UNAME_MACHINE="alphaev56"
    263     - ;;
    264     - 1-101)
    265     - UNAME_MACHINE="alphapca56"
    266     - ;;
    267     - 2-303)
    268     - UNAME_MACHINE="alphaev6"
    269     - ;;
    270     - 2-307)
    271     - UNAME_MACHINE="alphaev67"
    272     - ;;
    273     - 2-1307)
    274     - UNAME_MACHINE="alphaev68"
    275     - ;;
    276     - esac
    277     - fi
    278     - rm -f $dummy.s $dummy
    279     - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    280     + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    281     + exit 0 ;;
    282     + Alpha*:OpenVMS:*:*)
    283     + echo alpha-hp-vms
    284     exit 0 ;;
    285     Alpha\ *:Windows_NT*:*)
    286     # How do we know it's Interix rather than the generic POSIX subsystem?
    287     @@ -295,6 +331,9 @@
    288     *:OS/390:*:*)
    289     echo i370-ibm-openedition
    290     exit 0 ;;
    291     + *:OS400:*:*)
    292     + echo powerpc-ibm-os400
    293     + exit 0 ;;
    294     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
    295     echo arm-acorn-riscix${UNAME_RELEASE}
    296     exit 0;;
    297     @@ -312,6 +351,13 @@
    298     NILE*:*:*:dcosx)
    299     echo pyramid-pyramid-svr4
    300     exit 0 ;;
    301     + DRS?6000:unix:4.0:6*)
    302     + echo sparc-icl-nx6
    303     + exit 0 ;;
    304     + DRS?6000:UNIX_SV:4.2*:7*)
    305     + case `/usr/bin/uname -p` in
    306     + sparc) echo sparc-icl-nx7 && exit 0 ;;
    307     + esac ;;
    308     sun4H:SunOS:5.*:*)
    309     echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    310     exit 0 ;;
    311     @@ -340,7 +386,7 @@
    312     echo m68k-sun-sunos${UNAME_RELEASE}
    313     exit 0 ;;
    314     sun*:*:4.2BSD:*)
    315     - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
    316     + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
    317     test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
    318     case "`/bin/arch`" in
    319     sun3)
    320     @@ -380,6 +426,9 @@
    321     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
    322     echo m68k-unknown-mint${UNAME_RELEASE}
    323     exit 0 ;;
    324     + m68k:machten:*:*)
    325     + echo m68k-apple-machten${UNAME_RELEASE}
    326     + exit 0 ;;
    327     powerpc:machten:*:*)
    328     echo powerpc-apple-machten${UNAME_RELEASE}
    329     exit 0 ;;
    330     @@ -418,15 +467,20 @@
    331     exit (-1);
    332     }
    333     EOF
    334     - $CC_FOR_BUILD $dummy.c -o $dummy \
    335     - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
    336     - && rm -f $dummy.c $dummy && exit 0
    337     - rm -f $dummy.c $dummy
    338     + $CC_FOR_BUILD -o $dummy $dummy.c \
    339     + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
    340     + && exit 0
    341     echo mips-mips-riscos${UNAME_RELEASE}
    342     exit 0 ;;
    343     Motorola:PowerMAX_OS:*:*)
    344     echo powerpc-motorola-powermax
    345     exit 0 ;;
    346     + Motorola:*:4.3:PL8-*)
    347     + echo powerpc-harris-powermax
    348     + exit 0 ;;
    349     + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
    350     + echo powerpc-harris-powermax
    351     + exit 0 ;;
    352     Night_Hawk:Power_UNIX:*:*)
    353     echo powerpc-harris-powerunix
    354     exit 0 ;;
    355     @@ -499,8 +553,7 @@
    356     exit(0);
    357     }
    358     EOF
    359     - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
    360     - rm -f $dummy.c $dummy
    361     + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
    362     echo rs6000-ibm-aix3.2.5
    363     elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
    364     echo rs6000-ibm-aix3.2.4
    365     @@ -509,7 +562,7 @@
    366     fi
    367     exit 0 ;;
    368     *:AIX:*:[45])
    369     - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
    370     + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
    371     if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
    372     IBM_ARCH=rs6000
    373     else
    374     @@ -598,11 +651,21 @@
    375     exit (0);
    376     }
    377     EOF
    378     - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
    379     - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
    380     - rm -f $dummy.c $dummy
    381     + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
    382     + test -z "$HP_ARCH" && HP_ARCH=hppa
    383     fi ;;
    384     esac
    385     + if [ ${HP_ARCH} = "hppa2.0w" ]
    386     + then
    387     + # avoid double evaluation of $set_cc_for_build
    388     + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
    389     + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
    390     + then
    391     + HP_ARCH="hppa2.0w"
    392     + else
    393     + HP_ARCH="hppa64"
    394     + fi
    395     + fi
    396     echo ${HP_ARCH}-hp-hpux${HPUX_REV}
    397     exit 0 ;;
    398     ia64:HP-UX:*:*)
    399     @@ -636,8 +699,7 @@
    400     exit (0);
    401     }
    402     EOF
    403     - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
    404     - rm -f $dummy.c $dummy
    405     + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
    406     echo unknown-hitachi-hiuxwe2
    407     exit 0 ;;
    408     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
    409     @@ -683,9 +745,6 @@
    410     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
    411     echo c4-convex-bsd
    412     exit 0 ;;
    413     - CRAY*X-MP:*:*:*)
    414     - echo xmp-cray-unicos
    415     - exit 0 ;;
    416     CRAY*Y-MP:*:*:*)
    417     echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    418     exit 0 ;;
    419     @@ -698,24 +757,26 @@
    420     CRAY*TS:*:*:*)
    421     echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    422     exit 0 ;;
    423     - CRAY*T3D:*:*:*)
    424     - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    425     - exit 0 ;;
    426     CRAY*T3E:*:*:*)
    427     echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    428     exit 0 ;;
    429     CRAY*SV1:*:*:*)
    430     echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    431     exit 0 ;;
    432     - CRAY-2:*:*:*)
    433     - echo cray2-cray-unicos
    434     - exit 0 ;;
    435     + *:UNICOS/mp:*:*)
    436     + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    437     + exit 0 ;;
    438     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    439     FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    440     FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    441     FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
    442     echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    443     exit 0 ;;
    444     + 5000:UNIX_System_V:4.*:*)
    445     + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    446     + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
    447     + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    448     + exit 0 ;;
    449     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
    450     echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
    451     exit 0 ;;
    452     @@ -726,7 +787,21 @@
    453     echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
    454     exit 0 ;;
    455     *:FreeBSD:*:*)
    456     - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    457     + # Determine whether the default compiler uses glibc.
    458     + eval $set_cc_for_build
    459     + sed 's/^ //' << EOF >$dummy.c
    460     + #include <features.h>
    461     + #if __GLIBC__ >= 2
    462     + LIBC=gnu
    463     + #else
    464     + LIBC=
    465     + #endif
    466     +EOF
    467     + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    468     + # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
    469     + # FreeBSD's kernel, but not the complete OS.
    470     + case ${LIBC} in gnu) kernel_only='k' ;; esac
    471     + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
    472     exit 0 ;;
    473     i*:CYGWIN*:*)
    474     echo ${UNAME_MACHINE}-pc-cygwin
    475     @@ -737,14 +812,17 @@
    476     i*:PW*:*)
    477     echo ${UNAME_MACHINE}-pc-pw32
    478     exit 0 ;;
    479     - x86:Interix*:3*)
    480     - echo i386-pc-interix3
    481     + x86:Interix*:[34]*)
    482     + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
    483     + exit 0 ;;
    484     + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    485     + echo i${UNAME_MACHINE}-pc-mks
    486     exit 0 ;;
    487     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
    488     # How do we know it's Interix rather than the generic POSIX subsystem?
    489     # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
    490     # UNAME_MACHINE based on the output of uname instead of i386?
    491     - echo i386-pc-interix
    492     + echo i586-pc-interix
    493     exit 0 ;;
    494     i*:UWIN*:*)
    495     echo ${UNAME_MACHINE}-pc-uwin
    496     @@ -756,16 +834,24 @@
    497     echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    498     exit 0 ;;
    499     *:GNU:*:*)
    500     + # the GNU system
    501     echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
    502     exit 0 ;;
    503     + *:GNU/*:*:*)
    504     + # other systems with GNU libc and userland
    505     + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
    506     + exit 0 ;;
    507     i*86:Minix:*:*)
    508     echo ${UNAME_MACHINE}-pc-minix
    509     exit 0 ;;
    510     arm*:Linux:*:*)
    511     echo ${UNAME_MACHINE}-unknown-linux-gnu
    512     exit 0 ;;
    513     + cris:Linux:*:*)
    514     + echo cris-axis-linux-gnu
    515     + exit 0 ;;
    516     ia64:Linux:*:*)
    517     - echo ${UNAME_MACHINE}-unknown-linux
    518     + echo ${UNAME_MACHINE}-unknown-linux-gnu
    519     exit 0 ;;
    520     m68*:Linux:*:*)
    521     echo ${UNAME_MACHINE}-unknown-linux-gnu
    522     @@ -776,19 +862,37 @@
    523     #undef CPU
    524     #undef mips
    525     #undef mipsel
    526     - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    527     - CPU=mipsel
    528     + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    529     + CPU=mipsel
    530     #else
    531     - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    532     + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    533     CPU=mips
    534     #else
    535     CPU=
    536     #endif
    537     - #endif
    538     + #endif
    539     +EOF
    540     + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    541     + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
    542     + ;;
    543     + mips64:Linux:*:*)
    544     + eval $set_cc_for_build
    545     + sed 's/^ //' << EOF >$dummy.c
    546     + #undef CPU
    547     + #undef mips64
    548     + #undef mips64el
    549     + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    550     + CPU=mips64el
    551     + #else
    552     + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    553     + CPU=mips64
    554     + #else
    555     + CPU=
    556     + #endif
    557     + #endif
    558     EOF
    559     eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    560     - rm -f $dummy.c
    561     - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
    562     + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
    563     ;;
    564     ppc:Linux:*:*)
    565     echo powerpc-unknown-linux-gnu
    566     @@ -824,6 +928,9 @@
    567     s390:Linux:*:* | s390x:Linux:*:*)
    568     echo ${UNAME_MACHINE}-ibm-linux
    569     exit 0 ;;
    570     + sh64*:Linux:*:*)
    571     + echo ${UNAME_MACHINE}-unknown-linux-gnu
    572     + exit 0 ;;
    573     sh*:Linux:*:*)
    574     echo ${UNAME_MACHINE}-unknown-linux-gnu
    575     exit 0 ;;
    576     @@ -837,7 +944,8 @@
    577     # The BFD linker knows what the default object file format is, so
    578     # first see if it will tell us. cd to the root directory to prevent
    579     # problems with other programs or directories called `ld' in the path.
    580     - ld_supported_targets=`cd /; ld --help 2>&1 \
    581     + # Set LC_ALL=C to ensure ld outputs messages in English.
    582     + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
    583     | sed -ne '/supported targets:/!d
    584     s/[ ][ ]*/ /g
    585     s/.*supported targets: *//
    586     @@ -849,7 +957,7 @@
    587     ;;
    588     a.out-i386-linux)
    589     echo "${UNAME_MACHINE}-pc-linux-gnuaout"
    590     - exit 0 ;;
    591     + exit 0 ;;
    592     coff-i386)
    593     echo "${UNAME_MACHINE}-pc-linux-gnucoff"
    594     exit 0 ;;
    595     @@ -874,11 +982,17 @@
    596     LIBC=gnulibc1
    597     # endif
    598     #else
    599     + #ifdef __INTEL_COMPILER
    600     + LIBC=gnu
    601     + #else
    602     LIBC=gnuaout
    603     #endif
    604     + #endif
    605     + #ifdef __dietlibc__
    606     + LIBC=dietlibc
    607     + #endif
    608     EOF
    609     eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    610     - rm -f $dummy.c
    611     test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
    612     test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
    613     ;;
    614     @@ -896,6 +1010,26 @@
    615     # Use sysv4.2uw... so that sysv4* matches it.
    616     echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
    617     exit 0 ;;
    618     + i*86:OS/2:*:*)
    619     + # If we were able to find `uname', then EMX Unix compatibility
    620     + # is probably installed.
    621     + echo ${UNAME_MACHINE}-pc-os2-emx
    622     + exit 0 ;;
    623     + i*86:XTS-300:*:STOP)
    624     + echo ${UNAME_MACHINE}-unknown-stop
    625     + exit 0 ;;
    626     + i*86:atheos:*:*)
    627     + echo ${UNAME_MACHINE}-unknown-atheos
    628     + exit 0 ;;
    629     + i*86:syllable:*:*)
    630     + echo ${UNAME_MACHINE}-pc-syllable
    631     + exit 0 ;;
    632     + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
    633     + echo i386-unknown-lynxos${UNAME_RELEASE}
    634     + exit 0 ;;
    635     + i*86:*DOS:*:*)
    636     + echo ${UNAME_MACHINE}-pc-msdosdjgpp
    637     + exit 0 ;;
    638     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
    639     UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
    640     if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
    641     @@ -917,22 +1051,19 @@
    642     UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
    643     echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
    644     elif /bin/uname -X 2>/dev/null >/dev/null ; then
    645     - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
    646     - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
    647     - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
    648     + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
    649     + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
    650     + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
    651     && UNAME_MACHINE=i586
    652     - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
    653     + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
    654     && UNAME_MACHINE=i686
    655     - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
    656     + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
    657     && UNAME_MACHINE=i686
    658     echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
    659     else
    660     echo ${UNAME_MACHINE}-pc-sysv32
    661     fi
    662     exit 0 ;;
    663     - i*86:*DOS:*:*)
    664     - echo ${UNAME_MACHINE}-pc-msdosdjgpp
    665     - exit 0 ;;
    666     pc:*:*:*)
    667     # Left here for compatibility:
    668     # uname -m prints for DJGPP always 'pc', but it prints nothing about
    669     @@ -956,9 +1087,15 @@
    670     # "miniframe"
    671     echo m68010-convergent-sysv
    672     exit 0 ;;
    673     + mc68k:UNIX:SYSTEM5:3.51m)
    674     + echo m68k-convergent-sysv
    675     + exit 0 ;;
    676     + M680?0:D-NIX:5.3:*)
    677     + echo m68k-diab-dnix
    678     + exit 0 ;;
    679     M68*:*:R3V[567]*:*)
    680     test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
    681     - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
    682     + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
    683     OS_REL=''
    684     test -r /etc/.relid \
    685     && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
    686     @@ -975,9 +1112,6 @@
    687     mc68030:UNIX_System_V:4.*:*)
    688     echo m68k-atari-sysv4
    689     exit 0 ;;
    690     - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
    691     - echo i386-unknown-lynxos${UNAME_RELEASE}
    692     - exit 0 ;;
    693     TSUNAMI:LynxOS:2.*:*)
    694     echo sparc-unknown-lynxos${UNAME_RELEASE}
    695     exit 0 ;;
    696     @@ -1049,6 +1183,9 @@
    697     SX-5:SUPER-UX:*:*)
    698     echo sx5-nec-superux${UNAME_RELEASE}
    699     exit 0 ;;
    700     + SX-6:SUPER-UX:*:*)
    701     + echo sx6-nec-superux${UNAME_RELEASE}
    702     + exit 0 ;;
    703     Power*:Rhapsody:*:*)
    704     echo powerpc-apple-rhapsody${UNAME_RELEASE}
    705     exit 0 ;;
    706     @@ -1056,18 +1193,24 @@
    707     echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
    708     exit 0 ;;
    709     *:Darwin:*:*)
    710     - echo `uname -p`-apple-darwin${UNAME_RELEASE}
    711     + case `uname -p` in
    712     + *86) UNAME_PROCESSOR=i686 ;;
    713     + powerpc) UNAME_PROCESSOR=powerpc ;;
    714     + esac
    715     + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    716     exit 0 ;;
    717     *:procnto*:*:* | *:QNX:[0123456789]*:*)
    718     - if test "${UNAME_MACHINE}" = "x86pc"; then
    719     + UNAME_PROCESSOR=`uname -p`
    720     + if test "$UNAME_PROCESSOR" = "x86"; then
    721     + UNAME_PROCESSOR=i386
    722     UNAME_MACHINE=pc
    723     fi
    724     - echo `uname -p`-${UNAME_MACHINE}-nto-qnx
    725     + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
    726     exit 0 ;;
    727     *:QNX:*:4*)
    728     echo i386-pc-qnx
    729     exit 0 ;;
    730     - NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
    731     + NSR-?:NONSTOP_KERNEL:*:*)
    732     echo nsr-tandem-nsk${UNAME_RELEASE}
    733     exit 0 ;;
    734     *:NonStop-UX:*:*)
    735     @@ -1090,11 +1233,6 @@
    736     fi
    737     echo ${UNAME_MACHINE}-unknown-plan9
    738     exit 0 ;;
    739     - i*86:OS/2:*:*)
    740     - # If we were able to find `uname', then EMX Unix compatibility
    741     - # is probably installed.
    742     - echo ${UNAME_MACHINE}-pc-os2-emx
    743     - exit 0 ;;
    744     *:TOPS-10:*:*)
    745     echo pdp10-unknown-tops10
    746     exit 0 ;;
    747     @@ -1113,11 +1251,11 @@
    748     *:ITS:*:*)
    749     echo pdp10-unknown-its
    750     exit 0 ;;
    751     - i*86:XTS-300:*:STOP)
    752     - echo ${UNAME_MACHINE}-unknown-stop
    753     + SEI:*:*:SEIUX)
    754     + echo mips-sei-seiux${UNAME_RELEASE}
    755     exit 0 ;;
    756     - i*86:atheos:*:*)
    757     - echo ${UNAME_MACHINE}-unknown-atheos
    758     + *:DragonFly:*:*)
    759     + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    760     exit 0 ;;
    761     esac
    762    
    763     @@ -1239,8 +1377,7 @@
    764     }
    765     EOF
    766    
    767     -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
    768     -rm -f $dummy.c $dummy
    769     +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
    770    
    771     # Apollos put the system type in the environment.
    772    
    773     diff --recursive --unified libmikmod-3.1.11/config.sub libmikmod-3.1.11-a/config.sub
    774     --- libmikmod-3.1.11/config.sub 2004-01-21 12:43:53.000000000 -0500
    775     +++ libmikmod-3.1.11-a/config.sub 2004-06-04 08:24:26.000000000 -0400
    776     @@ -3,7 +3,7 @@
    777     # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    778     # 2000, 2001, 2002 Free Software Foundation, Inc.
    779    
    780     -timestamp='2002-01-02'
    781     +timestamp='2002-07-03'
    782    
    783     # This file is (in principle) common to ALL GNU software.
    784     # The presence of a machine in this file suggests that SOME GNU software
    785     @@ -118,7 +118,7 @@
    786     # Here we must recognize all the valid KERNEL-OS combinations.
    787     maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    788     case $maybe_os in
    789     - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
    790     + nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
    791     os=-$maybe_os
    792     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    793     ;;
    794     @@ -230,24 +230,32 @@
    795     | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
    796     | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
    797     | c4x | clipper \
    798     - | d10v | d30v | dsp16xx \
    799     - | fr30 \
    800     + | d10v | d30v | dlx | dsp16xx \
    801     + | fr30 | frv \
    802     | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    803     | i370 | i860 | i960 | ia64 \
    804     + | ip2k \
    805     | m32r | m68000 | m68k | m88k | mcore \
    806     - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
    807     - | mips64vr4100 | mips64vr4100el | mips64vr4300 \
    808     - | mips64vr4300el | mips64vr5000 | mips64vr5000el \
    809     - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
    810     - | mipsisa32 \
    811     + | mips | mipsbe | mipseb | mipsel | mipsle \
    812     + | mips16 \
    813     + | mips64 | mips64el \
    814     + | mips64orion | mips64orionel \
    815     + | mips64vr4100 | mips64vr4100el \
    816     + | mips64vr4300 | mips64vr4300el \
    817     + | mips64vr5000 | mips64vr5000el \
    818     + | mipsisa32 | mipsisa32el \
    819     + | mipsisa64 | mipsisa64el \
    820     + | mipsisa64sb1 | mipsisa64sb1el \
    821     + | mipstx39 | mipstx39el \
    822     | mn10200 | mn10300 \
    823     | ns16k | ns32k \
    824     - | openrisc \
    825     + | openrisc | or32 \
    826     | pdp10 | pdp11 | pj | pjl \
    827     | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
    828     | pyramid \
    829     - | sh | sh[34] | sh[34]eb | shbe | shle \
    830     - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
    831     + | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
    832     + | sh64 | sh64le \
    833     + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
    834     | strongarm \
    835     | tahoe | thumb | tic80 | tron \
    836     | v850 | v850e \
    837     @@ -281,37 +289,46 @@
    838     | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
    839     | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
    840     | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
    841     - | arm-* | armbe-* | armle-* | armv*-* \
    842     + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
    843     | avr-* \
    844     | bs2000-* \
    845     | c[123]* | c30-* | [cjt]90-* | c54x-* \
    846     - | clipper-* | cray2-* | cydra-* \
    847     - | d10v-* | d30v-* \
    848     + | clipper-* | cydra-* \
    849     + | d10v-* | d30v-* | dlx-* \
    850     | elxsi-* \
    851     - | f30[01]-* | f700-* | fr30-* | fx80-* \
    852     + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
    853     | h8300-* | h8500-* \
    854     | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
    855     | i*86-* | i860-* | i960-* | ia64-* \
    856     + | ip2k-* \
    857     | m32r-* \
    858     - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
    859     + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
    860     | m88110-* | m88k-* | mcore-* \
    861     - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
    862     - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
    863     - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
    864     - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
    865     + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
    866     + | mips16-* \
    867     + | mips64-* | mips64el-* \
    868     + | mips64orion-* | mips64orionel-* \
    869     + | mips64vr4100-* | mips64vr4100el-* \
    870     + | mips64vr4300-* | mips64vr4300el-* \
    871     + | mips64vr5000-* | mips64vr5000el-* \
    872     + | mipsisa32-* | mipsisa32el-* \
    873     + | mipsisa64-* | mipsisa64el-* \
    874     + | mipsisa64sb1-* | mipsisa64sb1el-* \
    875     + | mipstx39 | mipstx39el \
    876     | none-* | np1-* | ns16k-* | ns32k-* \
    877     | orion-* \
    878     | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    879     | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
    880     | pyramid-* \
    881     | romp-* | rs6000-* \
    882     - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
    883     - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
    884     - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
    885     - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
    886     + | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
    887     + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    888     + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
    889     + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
    890     + | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
    891     | v850-* | v850e-* | vax-* \
    892     | we32k-* \
    893     - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
    894     + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
    895     | xtensa-* \
    896     | ymp-* \
    897     | z8k-*)
    898     @@ -377,6 +394,10 @@
    899     basic_machine=ns32k-sequent
    900     os=-dynix
    901     ;;
    902     + c90)
    903     + basic_machine=c90-cray
    904     + os=-unicos
    905     + ;;
    906     convex-c1)
    907     basic_machine=c1-convex
    908     os=-bsd
    909     @@ -397,16 +418,8 @@
    910     basic_machine=c38-convex
    911     os=-bsd
    912     ;;
    913     - cray | ymp)
    914     - basic_machine=ymp-cray
    915     - os=-unicos
    916     - ;;
    917     - cray2)
    918     - basic_machine=cray2-cray
    919     - os=-unicos
    920     - ;;
    921     - [cjt]90)
    922     - basic_machine=${basic_machine}-cray
    923     + cray | j90)
    924     + basic_machine=j90-cray
    925     os=-unicos
    926     ;;
    927     crds | unos)
    928     @@ -609,14 +622,6 @@
    929     basic_machine=m68k-atari
    930     os=-mint
    931     ;;
    932     - mipsel*-linux*)
    933     - basic_machine=mipsel-unknown
    934     - os=-linux-gnu
    935     - ;;
    936     - mips*-linux*)
    937     - basic_machine=mips-unknown
    938     - os=-linux-gnu
    939     - ;;
    940     mips3*-*)
    941     basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
    942     ;;
    943     @@ -714,6 +719,10 @@
    944     basic_machine=hppa1.1-oki
    945     os=-proelf
    946     ;;
    947     + or32 | or32-*)
    948     + basic_machine=or32-unknown
    949     + os=-coff
    950     + ;;
    951     OSE68000 | ose68000)
    952     basic_machine=m68000-ericsson
    953     os=-ose
    954     @@ -874,7 +883,7 @@
    955     sun386 | sun386i | roadrunner)
    956     basic_machine=i386-sun
    957     ;;
    958     - sv1)
    959     + sv1)
    960     basic_machine=sv1-cray
    961     os=-unicos
    962     ;;
    963     @@ -882,8 +891,16 @@
    964     basic_machine=i386-sequent
    965     os=-dynix
    966     ;;
    967     + t3d)
    968     + basic_machine=alpha-cray
    969     + os=-unicos
    970     + ;;
    971     t3e)
    972     - basic_machine=t3e-cray
    973     + basic_machine=alphaev5-cray
    974     + os=-unicos
    975     + ;;
    976     + t90)
    977     + basic_machine=t90-cray
    978     os=-unicos
    979     ;;
    980     tic54x | c54x*)
    981     @@ -950,13 +967,13 @@
    982     basic_machine=i386-pc
    983     os=-windows32-msvcrt
    984     ;;
    985     - xmp)
    986     - basic_machine=xmp-cray
    987     - os=-unicos
    988     - ;;
    989     xps | xps100)
    990     basic_machine=xps100-honeywell
    991     ;;
    992     + ymp)
    993     + basic_machine=ymp-cray
    994     + os=-unicos
    995     + ;;
    996     z8k-*-coff)
    997     basic_machine=z8k-unknown
    998     os=-sim
    999     @@ -977,13 +994,6 @@
    1000     op60c)
    1001     basic_machine=hppa1.1-oki
    1002     ;;
    1003     - mips)
    1004     - if [ x$os = x-linux-gnu ]; then
    1005     - basic_machine=mips-unknown
    1006     - else
    1007     - basic_machine=mips-mips
    1008     - fi
    1009     - ;;
    1010     romp)
    1011     basic_machine=romp-ibm
    1012     ;;
    1013     @@ -1003,9 +1013,12 @@
    1014     we32k)
    1015     basic_machine=we32k-att
    1016     ;;
    1017     - sh3 | sh4 | sh3eb | sh4eb)
    1018     + sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
    1019     basic_machine=sh-unknown
    1020     ;;
    1021     + sh64)
    1022     + basic_machine=sh64-unknown
    1023     + ;;
    1024     sparc | sparcv9 | sparcv9b)
    1025     basic_machine=sparc-sun
    1026     ;;
    1027     @@ -1093,7 +1106,8 @@
    1028     | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
    1029     | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
    1030     | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
    1031     - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
    1032     + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
    1033     + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
    1034     # Remember, each alternative MUST END IN *, to match a version number.
    1035     ;;
    1036     -qnx*)
    1037     @@ -1154,6 +1168,9 @@
    1038     -ctix* | -uts*)
    1039     os=-sysv
    1040     ;;
    1041     + -nova*)
    1042     + os=-rtmk-nova
    1043     + ;;
    1044     -ns2 )
    1045     os=-nextstep2
    1046     ;;
    1047     @@ -1259,6 +1276,9 @@
    1048     mips*-*)
    1049     os=-elf
    1050     ;;
    1051     + or32-*)
    1052     + os=-coff
    1053     + ;;
    1054     *-tti) # must be before sparc entry or we get the wrong os.
    1055     os=-sysv3
    1056     ;;
    1057     @@ -1406,7 +1426,7 @@
    1058     -ptx*)
    1059     vendor=sequent
    1060     ;;
    1061     - -vxsim* | -vxworks*)
    1062     + -vxsim* | -vxworks* | -windiss*)
    1063     vendor=wrs
    1064     ;;
    1065     -aux*)
    1066     diff --recursive --unified libmikmod-3.1.11/configure.in libmikmod-3.1.11-a/configure.in
    1067     --- libmikmod-3.1.11/configure.in 2004-01-21 12:43:52.000000000 -0500
    1068     +++ libmikmod-3.1.11-a/configure.in 2004-06-04 08:24:26.000000000 -0400
    1069     @@ -1,6 +1,6 @@
    1070     dnl Process this file with autoconf to produce a configure script.
    1071     dnl
    1072     -dnl $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1073     +dnl $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1074    
    1075     AC_INIT(include/mikmod.h.in)
    1076    
    1077     diff --recursive --unified libmikmod-3.1.11/dlapi/dl_hpux.c libmikmod-3.1.11-a/dlapi/dl_hpux.c
    1078     --- libmikmod-3.1.11/dlapi/dl_hpux.c 2004-01-21 12:43:52.000000000 -0500
    1079     +++ libmikmod-3.1.11-a/dlapi/dl_hpux.c 2004-06-04 08:24:26.000000000 -0400
    1080     @@ -1,6 +1,6 @@
    1081     /*==============================================================================
    1082    
    1083     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1084     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1085    
    1086     simple dlopen()-like implementation above HP-UX shl_xxx() API
    1087    
    1088     diff --recursive --unified libmikmod-3.1.11/docs/mikmod.texi libmikmod-3.1.11-a/docs/mikmod.texi
    1089     --- libmikmod-3.1.11/docs/mikmod.texi 2004-01-21 12:43:52.000000000 -0500
    1090     +++ libmikmod-3.1.11-a/docs/mikmod.texi 2004-06-04 08:24:26.000000000 -0400
    1091     @@ -7,7 +7,7 @@
    1092    
    1093     MikMod Sound Library Documentation
    1094    
    1095     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1096     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1097    
    1098     @end ignore
    1099     @c comment this during modifications
    1100     diff --recursive --unified libmikmod-3.1.11/drivers/drv_AF.c libmikmod-3.1.11-a/drivers/drv_AF.c
    1101     --- libmikmod-3.1.11/drivers/drv_AF.c 2004-01-21 12:43:52.000000000 -0500
    1102     +++ libmikmod-3.1.11-a/drivers/drv_AF.c 2004-06-04 08:24:26.000000000 -0400
    1103     @@ -20,7 +20,7 @@
    1104    
    1105     /*==============================================================================
    1106    
    1107     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1108     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1109    
    1110     Driver for output on AF audio server.
    1111    
    1112     diff --recursive --unified libmikmod-3.1.11/drivers/drv_aix.c libmikmod-3.1.11-a/drivers/drv_aix.c
    1113     --- libmikmod-3.1.11/drivers/drv_aix.c 2004-01-21 12:43:52.000000000 -0500
    1114     +++ libmikmod-3.1.11-a/drivers/drv_aix.c 2004-06-04 08:24:26.000000000 -0400
    1115     @@ -20,7 +20,7 @@
    1116    
    1117     /*==============================================================================
    1118    
    1119     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1120     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1121    
    1122     Driver for output to AIX series audio device
    1123    
    1124     diff --recursive --unified libmikmod-3.1.11/drivers/drv_alsa.c libmikmod-3.1.11-a/drivers/drv_alsa.c
    1125     --- libmikmod-3.1.11/drivers/drv_alsa.c 2004-01-21 12:43:52.000000000 -0500
    1126     +++ libmikmod-3.1.11-a/drivers/drv_alsa.c 2004-06-04 08:24:26.000000000 -0400
    1127     @@ -20,7 +20,7 @@
    1128    
    1129     /*==============================================================================
    1130    
    1131     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1132     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1133    
    1134     Driver for Advanced Linux Sound Architecture (ALSA)
    1135    
    1136     diff --recursive --unified libmikmod-3.1.11/drivers/drv_dart.c libmikmod-3.1.11-a/drivers/drv_dart.c
    1137     --- libmikmod-3.1.11/drivers/drv_dart.c 2004-01-21 12:43:52.000000000 -0500
    1138     +++ libmikmod-3.1.11-a/drivers/drv_dart.c 2004-06-04 08:24:26.000000000 -0400
    1139     @@ -20,7 +20,7 @@
    1140    
    1141     /*==============================================================================
    1142    
    1143     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1144     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1145    
    1146     Driver for output on OS/2 MMPM/2 using direct audio (DART)
    1147    
    1148     diff --recursive --unified libmikmod-3.1.11/drivers/drv_ds.c libmikmod-3.1.11-a/drivers/drv_ds.c
    1149     --- libmikmod-3.1.11/drivers/drv_ds.c 2004-01-21 12:43:52.000000000 -0500
    1150     +++ libmikmod-3.1.11-a/drivers/drv_ds.c 2004-06-04 08:24:26.000000000 -0400
    1151     @@ -20,7 +20,7 @@
    1152    
    1153     /*==============================================================================
    1154    
    1155     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1156     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1157    
    1158     Driver for output on win32 platforms using DirectSound
    1159    
    1160     diff --recursive --unified libmikmod-3.1.11/drivers/drv_esd.c libmikmod-3.1.11-a/drivers/drv_esd.c
    1161     --- libmikmod-3.1.11/drivers/drv_esd.c 2004-01-21 12:43:52.000000000 -0500
    1162     +++ libmikmod-3.1.11-a/drivers/drv_esd.c 2004-06-04 08:24:26.000000000 -0400
    1163     @@ -20,7 +20,7 @@
    1164    
    1165     /*==============================================================================
    1166    
    1167     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1168     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1169    
    1170     Driver for the Enlightened sound daemon (EsounD)
    1171    
    1172     diff --recursive --unified libmikmod-3.1.11/drivers/drv_hp.c libmikmod-3.1.11-a/drivers/drv_hp.c
    1173     --- libmikmod-3.1.11/drivers/drv_hp.c 2004-01-21 12:43:52.000000000 -0500
    1174     +++ libmikmod-3.1.11-a/drivers/drv_hp.c 2004-06-04 08:24:26.000000000 -0400
    1175     @@ -20,7 +20,7 @@
    1176    
    1177     /*==============================================================================
    1178    
    1179     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1180     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1181    
    1182     Driver for output to HP 9000 series /dev/audio
    1183    
    1184     diff --recursive --unified libmikmod-3.1.11/drivers/drv_mac.c libmikmod-3.1.11-a/drivers/drv_mac.c
    1185     --- libmikmod-3.1.11/drivers/drv_mac.c 2004-01-21 12:43:52.000000000 -0500
    1186     +++ libmikmod-3.1.11-a/drivers/drv_mac.c 2004-06-04 08:24:26.000000000 -0400
    1187     @@ -20,7 +20,7 @@
    1188    
    1189     /*==============================================================================
    1190    
    1191     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1192     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1193    
    1194     Driver for output to the Macintosh Sound Manager
    1195    
    1196     diff --recursive --unified libmikmod-3.1.11/drivers/drv_nos.c libmikmod-3.1.11-a/drivers/drv_nos.c
    1197     --- libmikmod-3.1.11/drivers/drv_nos.c 2004-01-21 12:43:52.000000000 -0500
    1198     +++ libmikmod-3.1.11-a/drivers/drv_nos.c 2004-06-04 08:24:26.000000000 -0400
    1199     @@ -20,7 +20,7 @@
    1200    
    1201     /*==============================================================================
    1202    
    1203     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1204     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1205    
    1206     Driver for no output
    1207    
    1208     diff --recursive --unified libmikmod-3.1.11/drivers/drv_os2.c libmikmod-3.1.11-a/drivers/drv_os2.c
    1209     --- libmikmod-3.1.11/drivers/drv_os2.c 2004-01-21 12:43:52.000000000 -0500
    1210     +++ libmikmod-3.1.11-a/drivers/drv_os2.c 2004-06-04 08:24:26.000000000 -0400
    1211     @@ -20,7 +20,7 @@
    1212    
    1213     /*==============================================================================
    1214    
    1215     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1216     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1217    
    1218     Driver for output on OS/2 using MMPM/2 MCI interface
    1219    
    1220     diff --recursive --unified libmikmod-3.1.11/drivers/drv_oss.c libmikmod-3.1.11-a/drivers/drv_oss.c
    1221     --- libmikmod-3.1.11/drivers/drv_oss.c 2004-01-21 12:43:52.000000000 -0500
    1222     +++ libmikmod-3.1.11-a/drivers/drv_oss.c 2004-06-04 08:24:26.000000000 -0400
    1223     @@ -20,7 +20,7 @@
    1224    
    1225     /*==============================================================================
    1226    
    1227     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1228     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1229    
    1230     Driver for output on Linux and FreeBSD Open Sound System (OSS) (/dev/dsp)
    1231    
    1232     diff --recursive --unified libmikmod-3.1.11/drivers/drv_pipe.c libmikmod-3.1.11-a/drivers/drv_pipe.c
    1233     --- libmikmod-3.1.11/drivers/drv_pipe.c 2004-01-21 12:43:52.000000000 -0500
    1234     +++ libmikmod-3.1.11-a/drivers/drv_pipe.c 2004-06-04 08:24:26.000000000 -0400
    1235     @@ -20,7 +20,7 @@
    1236    
    1237     /*==============================================================================
    1238    
    1239     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1240     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1241    
    1242     Driver for output via a pipe to another command
    1243    
    1244     diff --recursive --unified libmikmod-3.1.11/drivers/drv_raw.c libmikmod-3.1.11-a/drivers/drv_raw.c
    1245     --- libmikmod-3.1.11/drivers/drv_raw.c 2004-01-21 12:43:52.000000000 -0500
    1246     +++ libmikmod-3.1.11-a/drivers/drv_raw.c 2004-06-04 08:24:26.000000000 -0400
    1247     @@ -20,7 +20,7 @@
    1248    
    1249     /*==============================================================================
    1250    
    1251     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1252     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1253    
    1254     Driver for output to a file called MUSIC.RAW
    1255    
    1256     diff --recursive --unified libmikmod-3.1.11/drivers/drv_sam9407.c libmikmod-3.1.11-a/drivers/drv_sam9407.c
    1257     --- libmikmod-3.1.11/drivers/drv_sam9407.c 2004-01-21 12:43:52.000000000 -0500
    1258     +++ libmikmod-3.1.11-a/drivers/drv_sam9407.c 2004-06-04 08:24:26.000000000 -0400
    1259     @@ -20,7 +20,7 @@
    1260    
    1261     /*==============================================================================
    1262    
    1263     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1264     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1265    
    1266     Driver for the Linux sam9407 driver
    1267    
    1268     diff --recursive --unified libmikmod-3.1.11/drivers/drv_sgi.c libmikmod-3.1.11-a/drivers/drv_sgi.c
    1269     --- libmikmod-3.1.11/drivers/drv_sgi.c 2004-01-21 12:43:52.000000000 -0500
    1270     +++ libmikmod-3.1.11-a/drivers/drv_sgi.c 2004-06-04 08:24:26.000000000 -0400
    1271     @@ -20,7 +20,7 @@
    1272    
    1273     /*==============================================================================
    1274    
    1275     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1276     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1277    
    1278     Driver for output on SGI audio system (needs libaudio from the dmedia
    1279     package).
    1280     diff --recursive --unified libmikmod-3.1.11/drivers/drv_stdout.c libmikmod-3.1.11-a/drivers/drv_stdout.c
    1281     --- libmikmod-3.1.11/drivers/drv_stdout.c 2004-01-21 12:43:52.000000000 -0500
    1282     +++ libmikmod-3.1.11-a/drivers/drv_stdout.c 2004-06-04 08:24:26.000000000 -0400
    1283     @@ -20,7 +20,7 @@
    1284    
    1285     /*==============================================================================
    1286    
    1287     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1288     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1289    
    1290     Output data to stdout
    1291    
    1292     diff --recursive --unified libmikmod-3.1.11/drivers/drv_sun.c libmikmod-3.1.11-a/drivers/drv_sun.c
    1293     --- libmikmod-3.1.11/drivers/drv_sun.c 2004-01-21 12:43:52.000000000 -0500
    1294     +++ libmikmod-3.1.11-a/drivers/drv_sun.c 2004-06-04 08:24:26.000000000 -0400
    1295     @@ -20,7 +20,7 @@
    1296    
    1297     /*==============================================================================
    1298    
    1299     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1300     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1301    
    1302     Driver for output on the Sun audio device (/dev/audio).
    1303     Also works under NetBSD and OpenBSD
    1304     diff --recursive --unified libmikmod-3.1.11/drivers/drv_ultra.c libmikmod-3.1.11-a/drivers/drv_ultra.c
    1305     --- libmikmod-3.1.11/drivers/drv_ultra.c 2004-01-21 12:43:52.000000000 -0500
    1306     +++ libmikmod-3.1.11-a/drivers/drv_ultra.c 2004-06-04 08:24:26.000000000 -0400
    1307     @@ -20,7 +20,7 @@
    1308    
    1309     /*==============================================================================
    1310    
    1311     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1312     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1313    
    1314     Driver for the Linux Ultrasound driver
    1315    
    1316     diff --recursive --unified libmikmod-3.1.11/drivers/drv_wav.c libmikmod-3.1.11-a/drivers/drv_wav.c
    1317     --- libmikmod-3.1.11/drivers/drv_wav.c 2004-01-21 12:43:52.000000000 -0500
    1318     +++ libmikmod-3.1.11-a/drivers/drv_wav.c 2004-06-04 08:24:26.000000000 -0400
    1319     @@ -20,7 +20,7 @@
    1320    
    1321     /*==============================================================================
    1322    
    1323     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1324     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1325    
    1326     Driver for output to a file called MUSIC.WAV
    1327    
    1328     diff --recursive --unified libmikmod-3.1.11/drivers/drv_win.c libmikmod-3.1.11-a/drivers/drv_win.c
    1329     --- libmikmod-3.1.11/drivers/drv_win.c 2004-01-21 12:43:52.000000000 -0500
    1330     +++ libmikmod-3.1.11-a/drivers/drv_win.c 2004-06-04 08:24:26.000000000 -0400
    1331     @@ -20,7 +20,7 @@
    1332    
    1333     /*==============================================================================
    1334    
    1335     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1336     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1337    
    1338     Driver for output on win32 platforms using the multimedia API
    1339    
    1340     diff --recursive --unified libmikmod-3.1.11/include/mikmod.h.in libmikmod-3.1.11-a/include/mikmod.h.in
    1341     --- libmikmod-3.1.11/include/mikmod.h.in 2004-01-21 12:43:53.000000000 -0500
    1342     +++ libmikmod-3.1.11-a/include/mikmod.h.in 2004-06-04 08:24:26.000000000 -0400
    1343     @@ -20,7 +20,7 @@
    1344    
    1345     /*==============================================================================
    1346    
    1347     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1348     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1349    
    1350     MikMod sound library include file
    1351    
    1352     @@ -85,7 +85,7 @@
    1353    
    1354     @DOES_NOT_HAVE_SIGNED@
    1355    
    1356     -#if defined(__arch64__) || defined(__alpha)
    1357     +#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
    1358     /* 64 bit architectures */
    1359    
    1360     typedef signed char SBYTE; /* 1 byte, signed */
    1361     diff --recursive --unified libmikmod-3.1.11/include/mikmod_internals.h libmikmod-3.1.11-a/include/mikmod_internals.h
    1362     --- libmikmod-3.1.11/include/mikmod_internals.h 2004-01-21 12:43:53.000000000 -0500
    1363     +++ libmikmod-3.1.11-a/include/mikmod_internals.h 2004-06-04 08:24:26.000000000 -0400
    1364     @@ -20,7 +20,7 @@
    1365    
    1366     /*==============================================================================
    1367    
    1368     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1369     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1370    
    1371     MikMod sound library internal definitions
    1372    
    1373     diff --recursive --unified libmikmod-3.1.11/libmikmod.m4 libmikmod-3.1.11-a/libmikmod.m4
    1374     --- libmikmod-3.1.11/libmikmod.m4 2004-01-21 12:43:53.000000000 -0500
    1375     +++ libmikmod-3.1.11-a/libmikmod.m4 2004-06-04 08:24:26.000000000 -0400
    1376     @@ -8,7 +8,7 @@
    1377     dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
    1378     dnl LIBMIKMOD_LDADD
    1379     dnl
    1380     -AC_DEFUN(AM_PATH_LIBMIKMOD,
    1381     +AC_DEFUN([AM_PATH_LIBMIKMOD],
    1382     [dnl
    1383     dnl Get the cflags and libraries from the libmikmod-config script
    1384     dnl
    1385     diff --recursive --unified libmikmod-3.1.11/loaders/load_669.c libmikmod-3.1.11-a/loaders/load_669.c
    1386     --- libmikmod-3.1.11/loaders/load_669.c 2004-01-21 12:43:53.000000000 -0500
    1387     +++ libmikmod-3.1.11-a/loaders/load_669.c 2004-06-04 08:24:27.000000000 -0400
    1388     @@ -20,7 +20,7 @@
    1389    
    1390     /*==============================================================================
    1391    
    1392     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1393     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1394    
    1395     Composer 669 module loader
    1396    
    1397     diff --recursive --unified libmikmod-3.1.11/loaders/load_amf.c libmikmod-3.1.11-a/loaders/load_amf.c
    1398     --- libmikmod-3.1.11/loaders/load_amf.c 2004-01-21 12:43:53.000000000 -0500
    1399     +++ libmikmod-3.1.11-a/loaders/load_amf.c 2004-06-04 08:24:27.000000000 -0400
    1400     @@ -20,7 +20,7 @@
    1401    
    1402     /*==============================================================================
    1403    
    1404     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1405     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1406    
    1407     DMP Advanced Module Format loader
    1408    
    1409     diff --recursive --unified libmikmod-3.1.11/loaders/load_dsm.c libmikmod-3.1.11-a/loaders/load_dsm.c
    1410     --- libmikmod-3.1.11/loaders/load_dsm.c 2004-01-21 12:43:53.000000000 -0500
    1411     +++ libmikmod-3.1.11-a/loaders/load_dsm.c 2004-06-04 08:24:27.000000000 -0400
    1412     @@ -20,7 +20,7 @@
    1413    
    1414     /*==============================================================================
    1415    
    1416     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1417     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1418    
    1419     DSIK internal format (DSM) module loader
    1420    
    1421     diff --recursive --unified libmikmod-3.1.11/loaders/load_far.c libmikmod-3.1.11-a/loaders/load_far.c
    1422     --- libmikmod-3.1.11/loaders/load_far.c 2004-01-21 12:43:53.000000000 -0500
    1423     +++ libmikmod-3.1.11-a/loaders/load_far.c 2004-06-04 08:24:27.000000000 -0400
    1424     @@ -20,7 +20,7 @@
    1425    
    1426     /*==============================================================================
    1427    
    1428     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1429     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1430    
    1431     Farandole (FAR) module loader
    1432    
    1433     diff --recursive --unified libmikmod-3.1.11/loaders/load_gdm.c libmikmod-3.1.11-a/loaders/load_gdm.c
    1434     --- libmikmod-3.1.11/loaders/load_gdm.c 2004-01-21 12:43:53.000000000 -0500
    1435     +++ libmikmod-3.1.11-a/loaders/load_gdm.c 2004-06-04 08:24:27.000000000 -0400
    1436     @@ -20,7 +20,7 @@
    1437    
    1438     /*==============================================================================
    1439    
    1440     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1441     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1442    
    1443     General DigiMusic (GDM) module loader
    1444    
    1445     diff --recursive --unified libmikmod-3.1.11/loaders/load_imf.c libmikmod-3.1.11-a/loaders/load_imf.c
    1446     --- libmikmod-3.1.11/loaders/load_imf.c 2004-01-21 12:43:53.000000000 -0500
    1447     +++ libmikmod-3.1.11-a/loaders/load_imf.c 2004-06-04 08:24:27.000000000 -0400
    1448     @@ -20,7 +20,7 @@
    1449    
    1450     /*==============================================================================
    1451    
    1452     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1453     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1454    
    1455     Imago Orpheus (IMF) module loader
    1456    
    1457     diff --recursive --unified libmikmod-3.1.11/loaders/load_it.c libmikmod-3.1.11-a/loaders/load_it.c
    1458     --- libmikmod-3.1.11/loaders/load_it.c 2004-01-21 12:43:52.000000000 -0500
    1459     +++ libmikmod-3.1.11-a/loaders/load_it.c 2004-06-04 08:24:27.000000000 -0400
    1460     @@ -20,7 +20,7 @@
    1461    
    1462     /*==============================================================================
    1463    
    1464     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1465     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1466    
    1467     Impulse tracker (IT) module loader
    1468    
    1469     diff --recursive --unified libmikmod-3.1.11/loaders/load_m15.c libmikmod-3.1.11-a/loaders/load_m15.c
    1470     --- libmikmod-3.1.11/loaders/load_m15.c 2004-01-21 12:43:53.000000000 -0500
    1471     +++ libmikmod-3.1.11-a/loaders/load_m15.c 2004-06-04 08:24:27.000000000 -0400
    1472     @@ -20,7 +20,7 @@
    1473    
    1474     /*==============================================================================
    1475    
    1476     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1477     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1478    
    1479     15 instrument MOD loader
    1480     Also supports Ultimate Sound Tracker (old M15 format)
    1481     diff --recursive --unified libmikmod-3.1.11/loaders/load_med.c libmikmod-3.1.11-a/loaders/load_med.c
    1482     --- libmikmod-3.1.11/loaders/load_med.c 2004-01-21 12:43:53.000000000 -0500
    1483     +++ libmikmod-3.1.11-a/loaders/load_med.c 2004-06-04 08:24:27.000000000 -0400
    1484     @@ -20,7 +20,7 @@
    1485    
    1486     /*==============================================================================
    1487    
    1488     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1489     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1490    
    1491     Amiga MED module loader
    1492    
    1493     diff --recursive --unified libmikmod-3.1.11/loaders/load_mod.c libmikmod-3.1.11-a/loaders/load_mod.c
    1494     --- libmikmod-3.1.11/loaders/load_mod.c 2004-01-21 12:43:53.000000000 -0500
    1495     +++ libmikmod-3.1.11-a/loaders/load_mod.c 2004-06-04 08:24:27.000000000 -0400
    1496     @@ -20,7 +20,7 @@
    1497    
    1498     /*==============================================================================
    1499    
    1500     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1501     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1502    
    1503     Generic MOD loader (Protracker, StarTracker, FastTracker, etc)
    1504    
    1505     diff --recursive --unified libmikmod-3.1.11/loaders/load_mtm.c libmikmod-3.1.11-a/loaders/load_mtm.c
    1506     --- libmikmod-3.1.11/loaders/load_mtm.c 2004-01-21 12:43:53.000000000 -0500
    1507     +++ libmikmod-3.1.11-a/loaders/load_mtm.c 2004-06-04 08:24:27.000000000 -0400
    1508     @@ -20,7 +20,7 @@
    1509    
    1510     /*==============================================================================
    1511    
    1512     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1513     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1514    
    1515     MTM module loader
    1516    
    1517     diff --recursive --unified libmikmod-3.1.11/loaders/load_okt.c libmikmod-3.1.11-a/loaders/load_okt.c
    1518     --- libmikmod-3.1.11/loaders/load_okt.c 2004-01-21 12:43:53.000000000 -0500
    1519     +++ libmikmod-3.1.11-a/loaders/load_okt.c 2004-06-04 08:24:27.000000000 -0400
    1520     @@ -20,7 +20,7 @@
    1521    
    1522     /*==============================================================================
    1523    
    1524     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1525     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1526    
    1527     Oktalyzer (OKT) module loader
    1528    
    1529     diff --recursive --unified libmikmod-3.1.11/loaders/load_s3m.c libmikmod-3.1.11-a/loaders/load_s3m.c
    1530     --- libmikmod-3.1.11/loaders/load_s3m.c 2004-01-21 12:43:53.000000000 -0500
    1531     +++ libmikmod-3.1.11-a/loaders/load_s3m.c 2004-06-04 08:24:27.000000000 -0400
    1532     @@ -20,7 +20,7 @@
    1533    
    1534     /*==============================================================================
    1535    
    1536     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1537     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1538    
    1539     Screamtracker (S3M) module loader
    1540    
    1541     diff --recursive --unified libmikmod-3.1.11/loaders/load_stm.c libmikmod-3.1.11-a/loaders/load_stm.c
    1542     --- libmikmod-3.1.11/loaders/load_stm.c 2004-01-21 12:43:53.000000000 -0500
    1543     +++ libmikmod-3.1.11-a/loaders/load_stm.c 2004-06-04 08:24:27.000000000 -0400
    1544     @@ -20,7 +20,7 @@
    1545    
    1546     /*==============================================================================
    1547    
    1548     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1549     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1550    
    1551     Screamtracker 2 (STM) module loader
    1552    
    1553     diff --recursive --unified libmikmod-3.1.11/loaders/load_stx.c libmikmod-3.1.11-a/loaders/load_stx.c
    1554     --- libmikmod-3.1.11/loaders/load_stx.c 2004-01-21 12:43:53.000000000 -0500
    1555     +++ libmikmod-3.1.11-a/loaders/load_stx.c 2004-06-04 08:24:27.000000000 -0400
    1556     @@ -20,7 +20,7 @@
    1557    
    1558     /*==============================================================================
    1559    
    1560     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1561     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1562    
    1563     STMIK 0.2 (STX) module loader
    1564    
    1565     diff --recursive --unified libmikmod-3.1.11/loaders/load_ult.c libmikmod-3.1.11-a/loaders/load_ult.c
    1566     --- libmikmod-3.1.11/loaders/load_ult.c 2004-01-21 12:43:53.000000000 -0500
    1567     +++ libmikmod-3.1.11-a/loaders/load_ult.c 2004-06-04 08:24:27.000000000 -0400
    1568     @@ -20,7 +20,7 @@
    1569    
    1570     /*==============================================================================
    1571    
    1572     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1573     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1574    
    1575     Ultratracker (ULT) module loader
    1576    
    1577     diff --recursive --unified libmikmod-3.1.11/loaders/load_uni.c libmikmod-3.1.11-a/loaders/load_uni.c
    1578     --- libmikmod-3.1.11/loaders/load_uni.c 2004-01-21 12:43:53.000000000 -0500
    1579     +++ libmikmod-3.1.11-a/loaders/load_uni.c 2004-06-04 08:24:27.000000000 -0400
    1580     @@ -20,7 +20,7 @@
    1581    
    1582     /*==============================================================================
    1583    
    1584     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1585     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1586    
    1587     UNIMOD (libmikmod's and APlayer's internal module format) loader
    1588    
    1589     diff --recursive --unified libmikmod-3.1.11/loaders/load_xm.c libmikmod-3.1.11-a/loaders/load_xm.c
    1590     --- libmikmod-3.1.11/loaders/load_xm.c 2004-01-21 12:43:53.000000000 -0500
    1591     +++ libmikmod-3.1.11-a/loaders/load_xm.c 2004-06-04 08:24:27.000000000 -0400
    1592     @@ -20,7 +20,7 @@
    1593    
    1594     /*==============================================================================
    1595    
    1596     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1597     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1598    
    1599     Fasttracker (XM) module loader
    1600    
    1601     diff --recursive --unified libmikmod-3.1.11/macintosh/mikmod.h libmikmod-3.1.11-a/macintosh/mikmod.h
    1602     --- libmikmod-3.1.11/macintosh/mikmod.h 2004-01-21 12:43:53.000000000 -0500
    1603     +++ libmikmod-3.1.11-a/macintosh/mikmod.h 2004-06-04 08:24:27.000000000 -0400
    1604     @@ -20,7 +20,7 @@
    1605    
    1606     /*==============================================================================
    1607    
    1608     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1609     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1610    
    1611     MikMod sound library include file
    1612    
    1613     diff --recursive --unified libmikmod-3.1.11/mkinstalldirs libmikmod-3.1.11-a/mkinstalldirs
    1614     --- libmikmod-3.1.11/mkinstalldirs 2004-01-21 12:43:53.000000000 -0500
    1615     +++ libmikmod-3.1.11-a/mkinstalldirs 2004-06-04 08:24:26.000000000 -0400
    1616     @@ -4,7 +4,7 @@
    1617     # Created: 1993-05-16
    1618     # Public domain
    1619    
    1620     -# $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1621     +# $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1622    
    1623     errstatus=0
    1624    
    1625     diff --recursive --unified libmikmod-3.1.11/mmio/mmalloc.c libmikmod-3.1.11-a/mmio/mmalloc.c
    1626     --- libmikmod-3.1.11/mmio/mmalloc.c 2004-01-21 12:43:52.000000000 -0500
    1627     +++ libmikmod-3.1.11-a/mmio/mmalloc.c 2004-06-04 08:24:27.000000000 -0400
    1628     @@ -20,7 +20,7 @@
    1629    
    1630     /*==============================================================================
    1631    
    1632     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1633     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1634    
    1635     Dynamic memory routines
    1636    
    1637     diff --recursive --unified libmikmod-3.1.11/mmio/mmerror.c libmikmod-3.1.11-a/mmio/mmerror.c
    1638     --- libmikmod-3.1.11/mmio/mmerror.c 2004-01-21 12:43:52.000000000 -0500
    1639     +++ libmikmod-3.1.11-a/mmio/mmerror.c 2004-06-04 08:24:27.000000000 -0400
    1640     @@ -20,7 +20,7 @@
    1641    
    1642     /*==============================================================================
    1643    
    1644     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1645     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1646    
    1647     Error handling functions.
    1648     Register an error handler with _mm_RegisterErrorHandler() and you're all set.
    1649     diff --recursive --unified libmikmod-3.1.11/mmio/mmio.c libmikmod-3.1.11-a/mmio/mmio.c
    1650     --- libmikmod-3.1.11/mmio/mmio.c 2004-01-21 12:43:52.000000000 -0500
    1651     +++ libmikmod-3.1.11-a/mmio/mmio.c 2004-06-04 08:24:27.000000000 -0400
    1652     @@ -20,7 +20,7 @@
    1653    
    1654     /*==============================================================================
    1655    
    1656     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1657     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1658    
    1659     Portable file I/O routines
    1660    
    1661     diff --recursive --unified libmikmod-3.1.11/os2/configure.cmd libmikmod-3.1.11-a/os2/configure.cmd
    1662     --- libmikmod-3.1.11/os2/configure.cmd 2004-01-21 12:43:52.000000000 -0500
    1663     +++ libmikmod-3.1.11-a/os2/configure.cmd 2004-06-04 08:24:27.000000000 -0400
    1664     @@ -22,7 +22,7 @@
    1665    
    1666     /*==============================================================================
    1667    
    1668     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1669     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1670    
    1671     Configuration script for libmikmod under OS/2
    1672    
    1673     diff --recursive --unified libmikmod-3.1.11/playercode/mdreg.c libmikmod-3.1.11-a/playercode/mdreg.c
    1674     --- libmikmod-3.1.11/playercode/mdreg.c 2004-01-21 12:43:53.000000000 -0500
    1675     +++ libmikmod-3.1.11-a/playercode/mdreg.c 2004-06-04 08:24:27.000000000 -0400
    1676     @@ -20,7 +20,7 @@
    1677    
    1678     /*==============================================================================
    1679    
    1680     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1681     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1682    
    1683     Routine for registering all drivers in libmikmod for the current platform.
    1684    
    1685     diff --recursive --unified libmikmod-3.1.11/playercode/mdriver.c libmikmod-3.1.11-a/playercode/mdriver.c
    1686     --- libmikmod-3.1.11/playercode/mdriver.c 2004-01-21 12:43:53.000000000 -0500
    1687     +++ libmikmod-3.1.11-a/playercode/mdriver.c 2004-06-04 08:24:27.000000000 -0400
    1688     @@ -20,7 +20,7 @@
    1689    
    1690     /*==============================================================================
    1691    
    1692     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1693     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1694    
    1695     These routines are used to access the available soundcard drivers.
    1696    
    1697     diff --recursive --unified libmikmod-3.1.11/playercode/mdulaw.c libmikmod-3.1.11-a/playercode/mdulaw.c
    1698     --- libmikmod-3.1.11/playercode/mdulaw.c 2004-01-21 12:43:53.000000000 -0500
    1699     +++ libmikmod-3.1.11-a/playercode/mdulaw.c 2004-06-04 08:24:27.000000000 -0400
    1700     @@ -20,7 +20,7 @@
    1701    
    1702     /*==============================================================================
    1703    
    1704     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1705     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1706    
    1707     Mu-law routines
    1708    
    1709     diff --recursive --unified libmikmod-3.1.11/playercode/mloader.c libmikmod-3.1.11-a/playercode/mloader.c
    1710     --- libmikmod-3.1.11/playercode/mloader.c 2004-01-21 12:43:53.000000000 -0500
    1711     +++ libmikmod-3.1.11-a/playercode/mloader.c 2004-06-04 08:24:27.000000000 -0400
    1712     @@ -20,7 +20,7 @@
    1713    
    1714     /*==============================================================================
    1715    
    1716     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1717     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1718    
    1719     These routines are used to access the available module loaders
    1720    
    1721     diff --recursive --unified libmikmod-3.1.11/playercode/mlreg.c libmikmod-3.1.11-a/playercode/mlreg.c
    1722     --- libmikmod-3.1.11/playercode/mlreg.c 2004-01-21 12:43:53.000000000 -0500
    1723     +++ libmikmod-3.1.11-a/playercode/mlreg.c 2004-06-04 08:24:27.000000000 -0400
    1724     @@ -20,7 +20,7 @@
    1725    
    1726     /*==============================================================================
    1727    
    1728     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1729     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1730    
    1731     Routine for registering all loaders in libmikmod for the current platform.
    1732    
    1733     diff --recursive --unified libmikmod-3.1.11/playercode/mlutil.c libmikmod-3.1.11-a/playercode/mlutil.c
    1734     --- libmikmod-3.1.11/playercode/mlutil.c 2004-01-21 12:43:53.000000000 -0500
    1735     +++ libmikmod-3.1.11-a/playercode/mlutil.c 2004-06-04 08:24:27.000000000 -0400
    1736     @@ -20,7 +20,7 @@
    1737    
    1738     /*==============================================================================
    1739    
    1740     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1741     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1742    
    1743     Utility functions for the module loader
    1744    
    1745     diff --recursive --unified libmikmod-3.1.11/playercode/mplayer.c libmikmod-3.1.11-a/playercode/mplayer.c
    1746     --- libmikmod-3.1.11/playercode/mplayer.c 2004-01-21 12:43:53.000000000 -0500
    1747     +++ libmikmod-3.1.11-a/playercode/mplayer.c 2004-06-04 08:24:27.000000000 -0400
    1748     @@ -20,7 +20,7 @@
    1749    
    1750     /*==============================================================================
    1751    
    1752     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1753     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1754    
    1755     The Protracker Player Driver
    1756    
    1757     diff --recursive --unified libmikmod-3.1.11/playercode/munitrk.c libmikmod-3.1.11-a/playercode/munitrk.c
    1758     --- libmikmod-3.1.11/playercode/munitrk.c 2004-01-21 12:43:53.000000000 -0500
    1759     +++ libmikmod-3.1.11-a/playercode/munitrk.c 2004-06-04 08:24:27.000000000 -0400
    1760     @@ -20,7 +20,7 @@
    1761    
    1762     /*==============================================================================
    1763    
    1764     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1765     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1766    
    1767     All routines dealing with the manipulation of UNITRK streams
    1768    
    1769     diff --recursive --unified libmikmod-3.1.11/playercode/mwav.c libmikmod-3.1.11-a/playercode/mwav.c
    1770     --- libmikmod-3.1.11/playercode/mwav.c 2004-01-21 12:43:53.000000000 -0500
    1771     +++ libmikmod-3.1.11-a/playercode/mwav.c 2004-06-04 08:24:27.000000000 -0400
    1772     @@ -20,7 +20,7 @@
    1773    
    1774     /*==============================================================================
    1775    
    1776     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1777     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1778    
    1779     WAV sample loader
    1780    
    1781     diff --recursive --unified libmikmod-3.1.11/playercode/npertab.c libmikmod-3.1.11-a/playercode/npertab.c
    1782     --- libmikmod-3.1.11/playercode/npertab.c 2004-01-21 12:43:53.000000000 -0500
    1783     +++ libmikmod-3.1.11-a/playercode/npertab.c 2004-06-04 08:24:27.000000000 -0400
    1784     @@ -20,7 +20,7 @@
    1785    
    1786     /*==============================================================================
    1787    
    1788     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1789     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1790    
    1791     MOD format period table. Used by both the MOD and M15 (15-inst mod) Loaders.
    1792    
    1793     diff --recursive --unified libmikmod-3.1.11/playercode/sloader.c libmikmod-3.1.11-a/playercode/sloader.c
    1794     --- libmikmod-3.1.11/playercode/sloader.c 2004-01-21 12:43:53.000000000 -0500
    1795     +++ libmikmod-3.1.11-a/playercode/sloader.c 2004-06-04 08:24:27.000000000 -0400
    1796     @@ -20,7 +20,7 @@
    1797    
    1798     /*==============================================================================
    1799    
    1800     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1801     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1802    
    1803     Routines for loading samples. The sample loader utilizes the routines
    1804     provided by the "registered" sample loader.
    1805     diff --recursive --unified libmikmod-3.1.11/playercode/virtch.c libmikmod-3.1.11-a/playercode/virtch.c
    1806     --- libmikmod-3.1.11/playercode/virtch.c 2004-01-21 12:43:53.000000000 -0500
    1807     +++ libmikmod-3.1.11-a/playercode/virtch.c 2004-06-04 08:24:27.000000000 -0400
    1808     @@ -20,7 +20,7 @@
    1809    
    1810     /*==============================================================================
    1811    
    1812     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1813     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1814    
    1815     Sample mixing routines, using a 32 bits mixing buffer.
    1816    
    1817     diff --recursive --unified libmikmod-3.1.11/playercode/virtch2.c libmikmod-3.1.11-a/playercode/virtch2.c
    1818     --- libmikmod-3.1.11/playercode/virtch2.c 2004-01-21 12:43:53.000000000 -0500
    1819     +++ libmikmod-3.1.11-a/playercode/virtch2.c 2004-06-04 08:24:27.000000000 -0400
    1820     @@ -20,7 +20,7 @@
    1821    
    1822     /*==============================================================================
    1823    
    1824     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1825     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1826    
    1827     High-quality sample mixing routines, using a 32 bits mixing buffer,
    1828     interpolation, and sample smoothing to improve sound quality and remove
    1829     diff --recursive --unified libmikmod-3.1.11/playercode/virtch_common.c libmikmod-3.1.11-a/playercode/virtch_common.c
    1830     --- libmikmod-3.1.11/playercode/virtch_common.c 2004-01-21 12:43:53.000000000 -0500
    1831     +++ libmikmod-3.1.11-a/playercode/virtch_common.c 2004-06-04 08:24:27.000000000 -0400
    1832     @@ -20,7 +20,7 @@
    1833    
    1834     /*==============================================================================
    1835    
    1836     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1837     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1838    
    1839     Common source parts between the two software mixers.
    1840     This file is probably the ugliest part of libmikmod...
    1841     diff --recursive --unified libmikmod-3.1.11/win32/mikmod_build.h libmikmod-3.1.11-a/win32/mikmod_build.h
    1842     --- libmikmod-3.1.11/win32/mikmod_build.h 2004-01-21 12:43:52.000000000 -0500
    1843     +++ libmikmod-3.1.11-a/win32/mikmod_build.h 2004-06-04 08:24:27.000000000 -0400
    1844     @@ -20,7 +20,7 @@
    1845    
    1846     /*==============================================================================
    1847    
    1848     - $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1849     + $Id: libmikmod-3.1.11-a.diff,v 1.1 2007-05-08 19:56:51 niro Exp $
    1850    
    1851     MikMod sound library include file
    1852