diff options
| -rw-r--r-- | media/libs/libmikmod/Manifest | 25 | ||||
| -rw-r--r-- | media/libs/libmikmod/libmikmod-3.1.11.diff | 471 | ||||
| -rwxr-xr-x | media/libs/libmikmod/libmikmod.SlackBuild | 133 |
3 files changed, 389 insertions, 240 deletions
diff --git a/media/libs/libmikmod/Manifest b/media/libs/libmikmod/Manifest new file mode 100644 index 00000000..5b99053b --- /dev/null +++ b/media/libs/libmikmod/Manifest @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST libmikmod-3.1.11.tar.gz 611590 MD5 705106da305e8de191549f1e7393185c RMD160 79b144cce51340b4c9abe09d1110dba2333d7bfb SHA1 ca18fff19348d3bcf3550aa920b129b082c5069a SHA256 2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929 SHA512 0b037263cfc3dc6d53069f3400903b5355384985c1fad480fdd584fe618c5bc77529016e35539b2f15876c85a7b7699da0e0ce545135881a273e042b8d239a54 +DIST libmikmod-3.2.0-beta2.tar.bz2 546881 MD5 5b05f3b1167eba7855b8e38bde2b8070 RMD160 587d1c1ea24f3d52bf76407ee327b8fa8143b277 SHA1 f16fc09ee643af295a8642f578bda97a81aaf744 SHA256 febb7f280dfce7c509fa95de1f8751802bf08e821addae35b75a0fa573b52d11 SHA512 1b6f072ad88480b2d74874eec5ba4fb0d9deabcb568d2bad733668d59d5454ac3082770a508dd880ee7fd41b2ebb7e1131194ae5c32ae992d9193dea18f1c29b +MKBUILD libmikmod.mkbuild 3027 MD5 619a3cd1893221b99d6db43b54ab663c RMD160 a8eef28fa8aaa860e3b5de072ec04a3aaf2c1c9c SHA1 de39b06ba5574de0cd58d8d65a7f6b3e1ec89b43 SHA256 0a18973a4bfb429e81f195cc5f45cf1d72b89dff451c2c9a4042c4a7116c66a8 SHA512 6a7132ca70f7eac311dc4d148f342b97e69541a113c0c5632fe140fabb51e411a4d567823cd13e248ba4dbde59e502ed8a117133ea62d101b6b4e97365b10021 +PATCH libmikmod-3.1.11.diff 69091 MD5 b198269e44799fcdfa4c8b94de90155a RMD160 fb89fea605219a7de7c07501ee31f6e4214093f1 SHA1 a7febc0c5251af49063f61defca2e270792226d4 SHA256 f00b133dcb53cc168492d5b43779c5d3e5ac8755b18fcf7ad402ddcb5f4c88eb SHA512 a8ae38f28fb28ac062de209f57e8602e7c4b2eff70e2fe1b0bff5dca38d64320b5f1cfbe5f085c63aacfe5713175a9b65ffae1e0912329a401909edfcd194a9a +SLACKBUILD libmikmod.SlackBuild 8144 MD5 82a9fe8d022f605c0c17e6ff7c268322 RMD160 2355cb506f89a9f9c55eb4d0843cf4f0f911f033 SHA1 55b2fa1d8c0174f04082656b42484d7ba6da5e96 SHA256 0f95a86685e4fa1db0ddcbed979e48e4e0dce627523e9ad06961aa1dcaa399e7 SHA512 044492c8a79a040ba25a72dfa8f825362227948ad20726ffe17a67bbff9feaf4b3183865c15e3cad037cafa50c26662fdf98b9b85edc8faa83249ffe91753b0b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBCAAGBQJK32WpAAoJEEHL93ESzgeinqAP/19ZB28o8jLUuYDnsES3hQ/7 +QSITiWKf0n8C+bw01WyQzZlbhj9G1ITgrFdFsKkWfAJi5KPoC4/+eMiVJ2NeZEeX +mOn5I+88A61KskH8euUVrnNljSnjWHsTZIVpD5thhRcgc3drxP47ywlUG6ndilq5 +WXQp0T0wzrC6Gz08usTj6lAPYKpyIdWagU5KPcQ5OtFMtVGJKamyq4zhHP4QQ+fI +pcZcfiLn+cIWq0KBYi/rQx7BoywN3MgjeIuKgRwbfz6UxjlWQyWehqJzKJbiaBiA +h7EsTyj8/5+8/axzcKJnQo05B334F7ZlOOiOOxlycv0aNRv7NmZeOQjYOONCgbwZ +4emmRKUL5k1G5Hmz5BRr1Zt38+5pj7R2k9aQh352QR2XXIH+mUUcjCiG+SwKM+Iy +Eaa+hgWu11U+LGtPvDF3Nu5Rr4olCGgy2B2QZbutdgrBJInEcRqgQZ6zQBMM8JCp +yHXZzAy6Fo+k7KKjgJ3TpaD1Qp4QQ703KD20/T9ty63ZgNWrLIRdHb346VSNSOax +w0dHaNIbkbRKjKZsLSFZeTogC6/0UKs+E/GZjryMqEWkYx2pN0jbppPS3SXa+sZr +WZ/aDaW8bZAq9ngNMqw+Huln+01MsWQK/iAqIhOopAIff+5ismiLby67mgG+2AR8 +NEj4yP8sOMO4u+OUjdsv +=Zgbe +-----END PGP SIGNATURE----- diff --git a/media/libs/libmikmod/libmikmod-3.1.11.diff b/media/libs/libmikmod/libmikmod-3.1.11.diff index 4c0bb24f..3f47a1d2 100644 --- a/media/libs/libmikmod/libmikmod-3.1.11.diff +++ b/media/libs/libmikmod/libmikmod-3.1.11.diff @@ -1,6 +1,6 @@ -diff --recursive --unified libmikmod-3.1.11/NEWS libmikmod-3.1.11-a/NEWS ---- libmikmod-3.1.11/NEWS 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/NEWS 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/NEWS libmikmod-3.1.11/NEWS +--- libmikmod-3.1.11.orig/NEWS 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/NEWS 2009-10-21 17:41:26.000000000 -0200 @@ -1,3 +1,17 @@ +Summary of changes between libmikmod 3.1.11 and libmikmod 3.1.11-a +======================================================================== @@ -19,9 +19,9 @@ diff --recursive --unified libmikmod-3.1.11/NEWS libmikmod-3.1.11-a/NEWS Summary of changes between libmikmod 3.1.10 and libmikmod 3.1.11 (Thiers): ========================================================================== -diff --recursive --unified libmikmod-3.1.11/config.guess libmikmod-3.1.11-a/config.guess ---- libmikmod-3.1.11/config.guess 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/config.guess 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/config.guess libmikmod-3.1.11/config.guess +--- libmikmod-3.1.11.orig/config.guess 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/config.guess 2009-10-21 17:41:26.000000000 -0200 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -770,9 +770,9 @@ diff --recursive --unified libmikmod-3.1.11/config.guess libmikmod-3.1.11-a/conf # Apollos put the system type in the environment. -diff --recursive --unified libmikmod-3.1.11/config.sub libmikmod-3.1.11-a/config.sub ---- libmikmod-3.1.11/config.sub 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/config.sub 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/config.sub libmikmod-3.1.11/config.sub +--- libmikmod-3.1.11.orig/config.sub 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/config.sub 2009-10-21 17:41:26.000000000 -0200 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1063,9 +1063,9 @@ diff --recursive --unified libmikmod-3.1.11/config.sub libmikmod-3.1.11-a/config vendor=wrs ;; -aux*) -diff --recursive --unified libmikmod-3.1.11/configure.in libmikmod-3.1.11-a/configure.in ---- libmikmod-3.1.11/configure.in 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/configure.in 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/configure.in libmikmod-3.1.11/configure.in +--- libmikmod-3.1.11.orig/configure.in 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/configure.in 2009-10-21 17:41:26.000000000 -0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl @@ -1074,9 +1074,9 @@ diff --recursive --unified libmikmod-3.1.11/configure.in libmikmod-3.1.11-a/conf AC_INIT(include/mikmod.h.in) -diff --recursive --unified libmikmod-3.1.11/dlapi/dl_hpux.c libmikmod-3.1.11-a/dlapi/dl_hpux.c ---- libmikmod-3.1.11/dlapi/dl_hpux.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/dlapi/dl_hpux.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/dlapi/dl_hpux.c libmikmod-3.1.11/dlapi/dl_hpux.c +--- libmikmod-3.1.11.orig/dlapi/dl_hpux.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/dlapi/dl_hpux.c 2009-10-21 17:41:26.000000000 -0200 @@ -1,6 +1,6 @@ /*============================================================================== @@ -1085,9 +1085,9 @@ diff --recursive --unified libmikmod-3.1.11/dlapi/dl_hpux.c libmikmod-3.1.11-a/d simple dlopen()-like implementation above HP-UX shl_xxx() API -diff --recursive --unified libmikmod-3.1.11/docs/mikmod.texi libmikmod-3.1.11-a/docs/mikmod.texi ---- libmikmod-3.1.11/docs/mikmod.texi 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/docs/mikmod.texi 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/docs/mikmod.texi libmikmod-3.1.11/docs/mikmod.texi +--- libmikmod-3.1.11.orig/docs/mikmod.texi 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/docs/mikmod.texi 2009-10-21 17:41:26.000000000 -0200 @@ -7,7 +7,7 @@ MikMod Sound Library Documentation @@ -1097,9 +1097,9 @@ diff --recursive --unified libmikmod-3.1.11/docs/mikmod.texi libmikmod-3.1.11-a/ @end ignore @c comment this during modifications -diff --recursive --unified libmikmod-3.1.11/drivers/drv_AF.c libmikmod-3.1.11-a/drivers/drv_AF.c ---- libmikmod-3.1.11/drivers/drv_AF.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_AF.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_AF.c libmikmod-3.1.11/drivers/drv_AF.c +--- libmikmod-3.1.11.orig/drivers/drv_AF.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_AF.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1109,9 +1109,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_AF.c libmikmod-3.1.11-a/ Driver for output on AF audio server. -diff --recursive --unified libmikmod-3.1.11/drivers/drv_aix.c libmikmod-3.1.11-a/drivers/drv_aix.c ---- libmikmod-3.1.11/drivers/drv_aix.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_aix.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_aix.c libmikmod-3.1.11/drivers/drv_aix.c +--- libmikmod-3.1.11.orig/drivers/drv_aix.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_aix.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1121,9 +1121,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_aix.c libmikmod-3.1.11-a Driver for output to AIX series audio device -diff --recursive --unified libmikmod-3.1.11/drivers/drv_alsa.c libmikmod-3.1.11-a/drivers/drv_alsa.c ---- libmikmod-3.1.11/drivers/drv_alsa.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_alsa.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_alsa.c libmikmod-3.1.11/drivers/drv_alsa.c +--- libmikmod-3.1.11.orig/drivers/drv_alsa.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_alsa.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1133,9 +1133,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_alsa.c libmikmod-3.1.11- Driver for Advanced Linux Sound Architecture (ALSA) -diff --recursive --unified libmikmod-3.1.11/drivers/drv_dart.c libmikmod-3.1.11-a/drivers/drv_dart.c ---- libmikmod-3.1.11/drivers/drv_dart.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_dart.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_dart.c libmikmod-3.1.11/drivers/drv_dart.c +--- libmikmod-3.1.11.orig/drivers/drv_dart.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_dart.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1145,9 +1145,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_dart.c libmikmod-3.1.11- Driver for output on OS/2 MMPM/2 using direct audio (DART) -diff --recursive --unified libmikmod-3.1.11/drivers/drv_ds.c libmikmod-3.1.11-a/drivers/drv_ds.c ---- libmikmod-3.1.11/drivers/drv_ds.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_ds.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_ds.c libmikmod-3.1.11/drivers/drv_ds.c +--- libmikmod-3.1.11.orig/drivers/drv_ds.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_ds.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1157,9 +1157,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_ds.c libmikmod-3.1.11-a/ Driver for output on win32 platforms using DirectSound -diff --recursive --unified libmikmod-3.1.11/drivers/drv_esd.c libmikmod-3.1.11-a/drivers/drv_esd.c ---- libmikmod-3.1.11/drivers/drv_esd.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_esd.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_esd.c libmikmod-3.1.11/drivers/drv_esd.c +--- libmikmod-3.1.11.orig/drivers/drv_esd.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_esd.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1169,9 +1169,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_esd.c libmikmod-3.1.11-a Driver for the Enlightened sound daemon (EsounD) -diff --recursive --unified libmikmod-3.1.11/drivers/drv_hp.c libmikmod-3.1.11-a/drivers/drv_hp.c ---- libmikmod-3.1.11/drivers/drv_hp.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_hp.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_hp.c libmikmod-3.1.11/drivers/drv_hp.c +--- libmikmod-3.1.11.orig/drivers/drv_hp.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_hp.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1181,9 +1181,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_hp.c libmikmod-3.1.11-a/ Driver for output to HP 9000 series /dev/audio -diff --recursive --unified libmikmod-3.1.11/drivers/drv_mac.c libmikmod-3.1.11-a/drivers/drv_mac.c ---- libmikmod-3.1.11/drivers/drv_mac.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_mac.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_mac.c libmikmod-3.1.11/drivers/drv_mac.c +--- libmikmod-3.1.11.orig/drivers/drv_mac.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_mac.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1193,9 +1193,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_mac.c libmikmod-3.1.11-a Driver for output to the Macintosh Sound Manager -diff --recursive --unified libmikmod-3.1.11/drivers/drv_nos.c libmikmod-3.1.11-a/drivers/drv_nos.c ---- libmikmod-3.1.11/drivers/drv_nos.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_nos.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_nos.c libmikmod-3.1.11/drivers/drv_nos.c +--- libmikmod-3.1.11.orig/drivers/drv_nos.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_nos.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1205,9 +1205,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_nos.c libmikmod-3.1.11-a Driver for no output -diff --recursive --unified libmikmod-3.1.11/drivers/drv_os2.c libmikmod-3.1.11-a/drivers/drv_os2.c ---- libmikmod-3.1.11/drivers/drv_os2.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_os2.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_os2.c libmikmod-3.1.11/drivers/drv_os2.c +--- libmikmod-3.1.11.orig/drivers/drv_os2.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_os2.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1217,9 +1217,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_os2.c libmikmod-3.1.11-a Driver for output on OS/2 using MMPM/2 MCI interface -diff --recursive --unified libmikmod-3.1.11/drivers/drv_oss.c libmikmod-3.1.11-a/drivers/drv_oss.c ---- libmikmod-3.1.11/drivers/drv_oss.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_oss.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_oss.c libmikmod-3.1.11/drivers/drv_oss.c +--- libmikmod-3.1.11.orig/drivers/drv_oss.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_oss.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1229,9 +1229,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_oss.c libmikmod-3.1.11-a Driver for output on Linux and FreeBSD Open Sound System (OSS) (/dev/dsp) -diff --recursive --unified libmikmod-3.1.11/drivers/drv_pipe.c libmikmod-3.1.11-a/drivers/drv_pipe.c ---- libmikmod-3.1.11/drivers/drv_pipe.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_pipe.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_pipe.c libmikmod-3.1.11/drivers/drv_pipe.c +--- libmikmod-3.1.11.orig/drivers/drv_pipe.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_pipe.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1241,9 +1241,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_pipe.c libmikmod-3.1.11- Driver for output via a pipe to another command -diff --recursive --unified libmikmod-3.1.11/drivers/drv_raw.c libmikmod-3.1.11-a/drivers/drv_raw.c ---- libmikmod-3.1.11/drivers/drv_raw.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_raw.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_raw.c libmikmod-3.1.11/drivers/drv_raw.c +--- libmikmod-3.1.11.orig/drivers/drv_raw.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_raw.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1253,9 +1253,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_raw.c libmikmod-3.1.11-a Driver for output to a file called MUSIC.RAW -diff --recursive --unified libmikmod-3.1.11/drivers/drv_sam9407.c libmikmod-3.1.11-a/drivers/drv_sam9407.c ---- libmikmod-3.1.11/drivers/drv_sam9407.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_sam9407.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_sam9407.c libmikmod-3.1.11/drivers/drv_sam9407.c +--- libmikmod-3.1.11.orig/drivers/drv_sam9407.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_sam9407.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1265,9 +1265,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_sam9407.c libmikmod-3.1. Driver for the Linux sam9407 driver -diff --recursive --unified libmikmod-3.1.11/drivers/drv_sgi.c libmikmod-3.1.11-a/drivers/drv_sgi.c ---- libmikmod-3.1.11/drivers/drv_sgi.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_sgi.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_sgi.c libmikmod-3.1.11/drivers/drv_sgi.c +--- libmikmod-3.1.11.orig/drivers/drv_sgi.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_sgi.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1277,9 +1277,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_sgi.c libmikmod-3.1.11-a Driver for output on SGI audio system (needs libaudio from the dmedia package). -diff --recursive --unified libmikmod-3.1.11/drivers/drv_stdout.c libmikmod-3.1.11-a/drivers/drv_stdout.c ---- libmikmod-3.1.11/drivers/drv_stdout.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_stdout.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_stdout.c libmikmod-3.1.11/drivers/drv_stdout.c +--- libmikmod-3.1.11.orig/drivers/drv_stdout.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_stdout.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1289,9 +1289,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_stdout.c libmikmod-3.1.1 Output data to stdout -diff --recursive --unified libmikmod-3.1.11/drivers/drv_sun.c libmikmod-3.1.11-a/drivers/drv_sun.c ---- libmikmod-3.1.11/drivers/drv_sun.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_sun.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_sun.c libmikmod-3.1.11/drivers/drv_sun.c +--- libmikmod-3.1.11.orig/drivers/drv_sun.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_sun.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1301,9 +1301,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_sun.c libmikmod-3.1.11-a Driver for output on the Sun audio device (/dev/audio). Also works under NetBSD and OpenBSD -diff --recursive --unified libmikmod-3.1.11/drivers/drv_ultra.c libmikmod-3.1.11-a/drivers/drv_ultra.c ---- libmikmod-3.1.11/drivers/drv_ultra.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_ultra.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_ultra.c libmikmod-3.1.11/drivers/drv_ultra.c +--- libmikmod-3.1.11.orig/drivers/drv_ultra.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_ultra.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1313,9 +1313,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_ultra.c libmikmod-3.1.11 Driver for the Linux Ultrasound driver -diff --recursive --unified libmikmod-3.1.11/drivers/drv_wav.c libmikmod-3.1.11-a/drivers/drv_wav.c ---- libmikmod-3.1.11/drivers/drv_wav.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_wav.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_wav.c libmikmod-3.1.11/drivers/drv_wav.c +--- libmikmod-3.1.11.orig/drivers/drv_wav.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_wav.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1325,9 +1325,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_wav.c libmikmod-3.1.11-a Driver for output to a file called MUSIC.WAV -diff --recursive --unified libmikmod-3.1.11/drivers/drv_win.c libmikmod-3.1.11-a/drivers/drv_win.c ---- libmikmod-3.1.11/drivers/drv_win.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/drivers/drv_win.c 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/drivers/drv_win.c libmikmod-3.1.11/drivers/drv_win.c +--- libmikmod-3.1.11.orig/drivers/drv_win.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/drivers/drv_win.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1337,9 +1337,9 @@ diff --recursive --unified libmikmod-3.1.11/drivers/drv_win.c libmikmod-3.1.11-a Driver for output on win32 platforms using the multimedia API -diff --recursive --unified libmikmod-3.1.11/include/mikmod.h.in libmikmod-3.1.11-a/include/mikmod.h.in ---- libmikmod-3.1.11/include/mikmod.h.in 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/include/mikmod.h.in 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/include/mikmod.h.in libmikmod-3.1.11/include/mikmod.h.in +--- libmikmod-3.1.11.orig/include/mikmod.h.in 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/include/mikmod.h.in 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1358,9 +1358,9 @@ diff --recursive --unified libmikmod-3.1.11/include/mikmod.h.in libmikmod-3.1.11 /* 64 bit architectures */ typedef signed char SBYTE; /* 1 byte, signed */ -diff --recursive --unified libmikmod-3.1.11/include/mikmod_internals.h libmikmod-3.1.11-a/include/mikmod_internals.h ---- libmikmod-3.1.11/include/mikmod_internals.h 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/include/mikmod_internals.h 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/include/mikmod_internals.h libmikmod-3.1.11/include/mikmod_internals.h +--- libmikmod-3.1.11.orig/include/mikmod_internals.h 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/include/mikmod_internals.h 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1370,9 +1370,9 @@ diff --recursive --unified libmikmod-3.1.11/include/mikmod_internals.h libmikmod MikMod sound library internal definitions -diff --recursive --unified libmikmod-3.1.11/libmikmod.m4 libmikmod-3.1.11-a/libmikmod.m4 ---- libmikmod-3.1.11/libmikmod.m4 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/libmikmod.m4 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/libmikmod.m4 libmikmod-3.1.11/libmikmod.m4 +--- libmikmod-3.1.11.orig/libmikmod.m4 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/libmikmod.m4 2009-10-21 17:41:26.000000000 -0200 @@ -8,7 +8,7 @@ dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and dnl LIBMIKMOD_LDADD @@ -1382,9 +1382,9 @@ diff --recursive --unified libmikmod-3.1.11/libmikmod.m4 libmikmod-3.1.11-a/libm [dnl dnl Get the cflags and libraries from the libmikmod-config script dnl -diff --recursive --unified libmikmod-3.1.11/loaders/load_669.c libmikmod-3.1.11-a/loaders/load_669.c ---- libmikmod-3.1.11/loaders/load_669.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_669.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_669.c libmikmod-3.1.11/loaders/load_669.c +--- libmikmod-3.1.11.orig/loaders/load_669.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_669.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1394,9 +1394,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_669.c libmikmod-3.1.11- Composer 669 module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_amf.c libmikmod-3.1.11-a/loaders/load_amf.c ---- libmikmod-3.1.11/loaders/load_amf.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_amf.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_amf.c libmikmod-3.1.11/loaders/load_amf.c +--- libmikmod-3.1.11.orig/loaders/load_amf.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_amf.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1406,9 +1406,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_amf.c libmikmod-3.1.11- DMP Advanced Module Format loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_dsm.c libmikmod-3.1.11-a/loaders/load_dsm.c ---- libmikmod-3.1.11/loaders/load_dsm.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_dsm.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_dsm.c libmikmod-3.1.11/loaders/load_dsm.c +--- libmikmod-3.1.11.orig/loaders/load_dsm.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_dsm.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1418,9 +1418,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_dsm.c libmikmod-3.1.11- DSIK internal format (DSM) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_far.c libmikmod-3.1.11-a/loaders/load_far.c ---- libmikmod-3.1.11/loaders/load_far.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_far.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_far.c libmikmod-3.1.11/loaders/load_far.c +--- libmikmod-3.1.11.orig/loaders/load_far.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_far.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1430,9 +1430,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_far.c libmikmod-3.1.11- Farandole (FAR) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_gdm.c libmikmod-3.1.11-a/loaders/load_gdm.c ---- libmikmod-3.1.11/loaders/load_gdm.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_gdm.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_gdm.c libmikmod-3.1.11/loaders/load_gdm.c +--- libmikmod-3.1.11.orig/loaders/load_gdm.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_gdm.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1442,9 +1442,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_gdm.c libmikmod-3.1.11- General DigiMusic (GDM) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_imf.c libmikmod-3.1.11-a/loaders/load_imf.c ---- libmikmod-3.1.11/loaders/load_imf.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_imf.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_imf.c libmikmod-3.1.11/loaders/load_imf.c +--- libmikmod-3.1.11.orig/loaders/load_imf.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_imf.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1454,9 +1454,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_imf.c libmikmod-3.1.11- Imago Orpheus (IMF) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_it.c libmikmod-3.1.11-a/loaders/load_it.c ---- libmikmod-3.1.11/loaders/load_it.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_it.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_it.c libmikmod-3.1.11/loaders/load_it.c +--- libmikmod-3.1.11.orig/loaders/load_it.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_it.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1466,9 +1466,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_it.c libmikmod-3.1.11-a Impulse tracker (IT) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_m15.c libmikmod-3.1.11-a/loaders/load_m15.c ---- libmikmod-3.1.11/loaders/load_m15.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_m15.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_m15.c libmikmod-3.1.11/loaders/load_m15.c +--- libmikmod-3.1.11.orig/loaders/load_m15.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_m15.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1478,9 +1478,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_m15.c libmikmod-3.1.11- 15 instrument MOD loader Also supports Ultimate Sound Tracker (old M15 format) -diff --recursive --unified libmikmod-3.1.11/loaders/load_med.c libmikmod-3.1.11-a/loaders/load_med.c ---- libmikmod-3.1.11/loaders/load_med.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_med.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_med.c libmikmod-3.1.11/loaders/load_med.c +--- libmikmod-3.1.11.orig/loaders/load_med.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_med.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1490,9 +1490,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_med.c libmikmod-3.1.11- Amiga MED module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_mod.c libmikmod-3.1.11-a/loaders/load_mod.c ---- libmikmod-3.1.11/loaders/load_mod.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_mod.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_mod.c libmikmod-3.1.11/loaders/load_mod.c +--- libmikmod-3.1.11.orig/loaders/load_mod.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_mod.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1502,9 +1502,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_mod.c libmikmod-3.1.11- Generic MOD loader (Protracker, StarTracker, FastTracker, etc) -diff --recursive --unified libmikmod-3.1.11/loaders/load_mtm.c libmikmod-3.1.11-a/loaders/load_mtm.c ---- libmikmod-3.1.11/loaders/load_mtm.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_mtm.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_mtm.c libmikmod-3.1.11/loaders/load_mtm.c +--- libmikmod-3.1.11.orig/loaders/load_mtm.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_mtm.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1514,9 +1514,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_mtm.c libmikmod-3.1.11- MTM module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_okt.c libmikmod-3.1.11-a/loaders/load_okt.c ---- libmikmod-3.1.11/loaders/load_okt.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_okt.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_okt.c libmikmod-3.1.11/loaders/load_okt.c +--- libmikmod-3.1.11.orig/loaders/load_okt.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_okt.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1526,9 +1526,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_okt.c libmikmod-3.1.11- Oktalyzer (OKT) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_s3m.c libmikmod-3.1.11-a/loaders/load_s3m.c ---- libmikmod-3.1.11/loaders/load_s3m.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_s3m.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_s3m.c libmikmod-3.1.11/loaders/load_s3m.c +--- libmikmod-3.1.11.orig/loaders/load_s3m.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_s3m.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1538,9 +1538,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_s3m.c libmikmod-3.1.11- Screamtracker (S3M) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_stm.c libmikmod-3.1.11-a/loaders/load_stm.c ---- libmikmod-3.1.11/loaders/load_stm.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_stm.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_stm.c libmikmod-3.1.11/loaders/load_stm.c +--- libmikmod-3.1.11.orig/loaders/load_stm.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_stm.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1550,9 +1550,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_stm.c libmikmod-3.1.11- Screamtracker 2 (STM) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_stx.c libmikmod-3.1.11-a/loaders/load_stx.c ---- libmikmod-3.1.11/loaders/load_stx.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_stx.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_stx.c libmikmod-3.1.11/loaders/load_stx.c +--- libmikmod-3.1.11.orig/loaders/load_stx.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_stx.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1562,9 +1562,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_stx.c libmikmod-3.1.11- STMIK 0.2 (STX) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_ult.c libmikmod-3.1.11-a/loaders/load_ult.c ---- libmikmod-3.1.11/loaders/load_ult.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_ult.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_ult.c libmikmod-3.1.11/loaders/load_ult.c +--- libmikmod-3.1.11.orig/loaders/load_ult.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_ult.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1574,9 +1574,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_ult.c libmikmod-3.1.11- Ultratracker (ULT) module loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_uni.c libmikmod-3.1.11-a/loaders/load_uni.c ---- libmikmod-3.1.11/loaders/load_uni.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_uni.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_uni.c libmikmod-3.1.11/loaders/load_uni.c +--- libmikmod-3.1.11.orig/loaders/load_uni.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_uni.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1586,9 +1586,9 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_uni.c libmikmod-3.1.11- UNIMOD (libmikmod's and APlayer's internal module format) loader -diff --recursive --unified libmikmod-3.1.11/loaders/load_xm.c libmikmod-3.1.11-a/loaders/load_xm.c ---- libmikmod-3.1.11/loaders/load_xm.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/loaders/load_xm.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c +--- libmikmod-3.1.11.orig/loaders/load_xm.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/loaders/load_xm.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1598,9 +1598,19 @@ diff --recursive --unified libmikmod-3.1.11/loaders/load_xm.c libmikmod-3.1.11-a Fasttracker (XM) module loader -diff --recursive --unified libmikmod-3.1.11/macintosh/mikmod.h libmikmod-3.1.11-a/macintosh/mikmod.h ---- libmikmod-3.1.11/macintosh/mikmod.h 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/macintosh/mikmod.h 2004-06-04 08:24:27.000000000 -0400 +@@ -622,7 +622,8 @@ + /* read the remainder of the header */ + for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader); + +- if(_mm_eof(modreader)) { ++ /* last instrument is at the end of file in version 0x0104 */ ++ if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) { + free(nextwav);free(wh); + nextwav=NULL;wh=NULL; + _mm_errno = MMERR_LOADING_SAMPLEINFO; +diff -Naur libmikmod-3.1.11.orig/macintosh/mikmod.h libmikmod-3.1.11/macintosh/mikmod.h +--- libmikmod-3.1.11.orig/macintosh/mikmod.h 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/macintosh/mikmod.h 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1610,9 +1620,9 @@ diff --recursive --unified libmikmod-3.1.11/macintosh/mikmod.h libmikmod-3.1.11- MikMod sound library include file -diff --recursive --unified libmikmod-3.1.11/mkinstalldirs libmikmod-3.1.11-a/mkinstalldirs ---- libmikmod-3.1.11/mkinstalldirs 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/mkinstalldirs 2004-06-04 08:24:26.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/mkinstalldirs libmikmod-3.1.11/mkinstalldirs +--- libmikmod-3.1.11.orig/mkinstalldirs 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/mkinstalldirs 2009-10-21 17:41:26.000000000 -0200 @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain @@ -1622,9 +1632,9 @@ diff --recursive --unified libmikmod-3.1.11/mkinstalldirs libmikmod-3.1.11-a/mki errstatus=0 -diff --recursive --unified libmikmod-3.1.11/mmio/mmalloc.c libmikmod-3.1.11-a/mmio/mmalloc.c ---- libmikmod-3.1.11/mmio/mmalloc.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/mmio/mmalloc.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/mmio/mmalloc.c libmikmod-3.1.11/mmio/mmalloc.c +--- libmikmod-3.1.11.orig/mmio/mmalloc.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/mmio/mmalloc.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1634,9 +1644,9 @@ diff --recursive --unified libmikmod-3.1.11/mmio/mmalloc.c libmikmod-3.1.11-a/mm Dynamic memory routines -diff --recursive --unified libmikmod-3.1.11/mmio/mmerror.c libmikmod-3.1.11-a/mmio/mmerror.c ---- libmikmod-3.1.11/mmio/mmerror.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/mmio/mmerror.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/mmio/mmerror.c libmikmod-3.1.11/mmio/mmerror.c +--- libmikmod-3.1.11.orig/mmio/mmerror.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/mmio/mmerror.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1646,9 +1656,9 @@ diff --recursive --unified libmikmod-3.1.11/mmio/mmerror.c libmikmod-3.1.11-a/mm Error handling functions. Register an error handler with _mm_RegisterErrorHandler() and you're all set. -diff --recursive --unified libmikmod-3.1.11/mmio/mmio.c libmikmod-3.1.11-a/mmio/mmio.c ---- libmikmod-3.1.11/mmio/mmio.c 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/mmio/mmio.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/mmio/mmio.c libmikmod-3.1.11/mmio/mmio.c +--- libmikmod-3.1.11.orig/mmio/mmio.c 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/mmio/mmio.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1658,9 +1668,9 @@ diff --recursive --unified libmikmod-3.1.11/mmio/mmio.c libmikmod-3.1.11-a/mmio/ Portable file I/O routines -diff --recursive --unified libmikmod-3.1.11/os2/configure.cmd libmikmod-3.1.11-a/os2/configure.cmd ---- libmikmod-3.1.11/os2/configure.cmd 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/os2/configure.cmd 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/os2/configure.cmd libmikmod-3.1.11/os2/configure.cmd +--- libmikmod-3.1.11.orig/os2/configure.cmd 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/os2/configure.cmd 2009-10-21 17:41:26.000000000 -0200 @@ -22,7 +22,7 @@ /*==============================================================================
@@ -1670,9 +1680,9 @@ diff --recursive --unified libmikmod-3.1.11/os2/configure.cmd libmikmod-3.1.11-a Configuration script for libmikmod under OS/2
-diff --recursive --unified libmikmod-3.1.11/playercode/mdreg.c libmikmod-3.1.11-a/playercode/mdreg.c ---- libmikmod-3.1.11/playercode/mdreg.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mdreg.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/mdreg.c libmikmod-3.1.11/playercode/mdreg.c +--- libmikmod-3.1.11.orig/playercode/mdreg.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mdreg.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1682,9 +1692,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mdreg.c libmikmod-3.1.11- Routine for registering all drivers in libmikmod for the current platform. -diff --recursive --unified libmikmod-3.1.11/playercode/mdriver.c libmikmod-3.1.11-a/playercode/mdriver.c ---- libmikmod-3.1.11/playercode/mdriver.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mdriver.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/mdriver.c libmikmod-3.1.11/playercode/mdriver.c +--- libmikmod-3.1.11.orig/playercode/mdriver.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mdriver.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1694,9 +1704,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mdriver.c libmikmod-3.1.1 These routines are used to access the available soundcard drivers. -diff --recursive --unified libmikmod-3.1.11/playercode/mdulaw.c libmikmod-3.1.11-a/playercode/mdulaw.c ---- libmikmod-3.1.11/playercode/mdulaw.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mdulaw.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/mdulaw.c libmikmod-3.1.11/playercode/mdulaw.c +--- libmikmod-3.1.11.orig/playercode/mdulaw.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mdulaw.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1706,9 +1716,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mdulaw.c libmikmod-3.1.11 Mu-law routines -diff --recursive --unified libmikmod-3.1.11/playercode/mloader.c libmikmod-3.1.11-a/playercode/mloader.c ---- libmikmod-3.1.11/playercode/mloader.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mloader.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c +--- libmikmod-3.1.11.orig/playercode/mloader.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mloader.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1718,9 +1728,26 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mloader.c libmikmod-3.1.1 These routines are used to access the available module loaders -diff --recursive --unified libmikmod-3.1.11/playercode/mlreg.c libmikmod-3.1.11-a/playercode/mlreg.c ---- libmikmod-3.1.11/playercode/mlreg.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mlreg.c 2004-06-04 08:24:27.000000000 -0400 +@@ -450,10 +450,12 @@ + if (!l->Init || l->Init()) { + _mm_rewind(modreader); + ok = l->Load(curious); +- /* propagate inflags=flags for in-module samples */ +- for (t = 0; t < of.numsmp; t++) +- if (of.samples[t].inflags == 0) +- of.samples[t].inflags = of.samples[t].flags; ++ if (ok) { ++ /* propagate inflags=flags for in-module samples */ ++ for (t = 0; t < of.numsmp; t++) ++ if (of.samples[t].inflags == 0) ++ of.samples[t].inflags = of.samples[t].flags; ++ } + } else + ok = 0; + +diff -Naur libmikmod-3.1.11.orig/playercode/mlreg.c libmikmod-3.1.11/playercode/mlreg.c +--- libmikmod-3.1.11.orig/playercode/mlreg.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mlreg.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1730,9 +1757,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mlreg.c libmikmod-3.1.11- Routine for registering all loaders in libmikmod for the current platform. -diff --recursive --unified libmikmod-3.1.11/playercode/mlutil.c libmikmod-3.1.11-a/playercode/mlutil.c ---- libmikmod-3.1.11/playercode/mlutil.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mlutil.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/mlutil.c libmikmod-3.1.11/playercode/mlutil.c +--- libmikmod-3.1.11.orig/playercode/mlutil.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mlutil.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1742,9 +1769,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mlutil.c libmikmod-3.1.11 Utility functions for the module loader -diff --recursive --unified libmikmod-3.1.11/playercode/mplayer.c libmikmod-3.1.11-a/playercode/mplayer.c ---- libmikmod-3.1.11/playercode/mplayer.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mplayer.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/mplayer.c libmikmod-3.1.11/playercode/mplayer.c +--- libmikmod-3.1.11.orig/playercode/mplayer.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mplayer.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1754,9 +1781,45 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mplayer.c libmikmod-3.1.1 The Protracker Player Driver -diff --recursive --unified libmikmod-3.1.11/playercode/munitrk.c libmikmod-3.1.11-a/playercode/munitrk.c ---- libmikmod-3.1.11/playercode/munitrk.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/munitrk.c 2004-06-04 08:24:27.000000000 -0400 +@@ -2318,7 +2318,7 @@ + SAMPLE *s; + + mod->totalchn=mod->realchn=0; +- for (channel=0;channel<md_sngchn;channel++) { ++ for (channel=0;channel<pf->numchn;channel++) { + aout=&mod->voice[channel]; + i=aout->main.i; + s=aout->main.s; +@@ -3086,7 +3086,7 @@ + pf->patbrk=0; + pf->vbtick=pf->sngspd; + +- for (t=0;t<md_sngchn;t++) { ++ for (t=0;t<pf->numchn;t++) { + Voice_Stop_internal(t); + pf->voice[t].main.i=NULL; + pf->voice[t].main.s=NULL; +@@ -3111,7 +3111,7 @@ + pf->patbrk=0; + pf->vbtick=pf->sngspd; + +- for (t=0;t<md_sngchn;t++) { ++ for (t=0;t<pf->numchn;t++) { + Voice_Stop_internal(t); + pf->voice[t].main.i=NULL; + pf->voice[t].main.s=NULL; +@@ -3138,7 +3138,7 @@ + pf->sngpos=pos; + pf->vbtick=pf->sngspd; + +- for (t=0;t<md_sngchn;t++) { ++ for (t=0;t<pf->numchn;t++) { + Voice_Stop_internal(t); + pf->voice[t].main.i=NULL; + pf->voice[t].main.s=NULL; +diff -Naur libmikmod-3.1.11.orig/playercode/munitrk.c libmikmod-3.1.11/playercode/munitrk.c +--- libmikmod-3.1.11.orig/playercode/munitrk.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/munitrk.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1766,9 +1829,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/munitrk.c libmikmod-3.1.1 All routines dealing with the manipulation of UNITRK streams -diff --recursive --unified libmikmod-3.1.11/playercode/mwav.c libmikmod-3.1.11-a/playercode/mwav.c ---- libmikmod-3.1.11/playercode/mwav.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/mwav.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/mwav.c libmikmod-3.1.11/playercode/mwav.c +--- libmikmod-3.1.11.orig/playercode/mwav.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/mwav.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1778,9 +1841,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/mwav.c libmikmod-3.1.11-a WAV sample loader -diff --recursive --unified libmikmod-3.1.11/playercode/npertab.c libmikmod-3.1.11-a/playercode/npertab.c ---- libmikmod-3.1.11/playercode/npertab.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/npertab.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/npertab.c libmikmod-3.1.11/playercode/npertab.c +--- libmikmod-3.1.11.orig/playercode/npertab.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/npertab.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1790,9 +1853,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/npertab.c libmikmod-3.1.1 MOD format period table. Used by both the MOD and M15 (15-inst mod) Loaders. -diff --recursive --unified libmikmod-3.1.11/playercode/sloader.c libmikmod-3.1.11-a/playercode/sloader.c ---- libmikmod-3.1.11/playercode/sloader.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/sloader.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/sloader.c libmikmod-3.1.11/playercode/sloader.c +--- libmikmod-3.1.11.orig/playercode/sloader.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/sloader.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1802,9 +1865,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/sloader.c libmikmod-3.1.1 Routines for loading samples. The sample loader utilizes the routines provided by the "registered" sample loader. -diff --recursive --unified libmikmod-3.1.11/playercode/virtch.c libmikmod-3.1.11-a/playercode/virtch.c ---- libmikmod-3.1.11/playercode/virtch.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/virtch.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/virtch.c libmikmod-3.1.11/playercode/virtch.c +--- libmikmod-3.1.11.orig/playercode/virtch.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/virtch.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1814,9 +1877,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/virtch.c libmikmod-3.1.11 Sample mixing routines, using a 32 bits mixing buffer. -diff --recursive --unified libmikmod-3.1.11/playercode/virtch2.c libmikmod-3.1.11-a/playercode/virtch2.c ---- libmikmod-3.1.11/playercode/virtch2.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/virtch2.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/virtch2.c libmikmod-3.1.11/playercode/virtch2.c +--- libmikmod-3.1.11.orig/playercode/virtch2.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/virtch2.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1826,9 +1889,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/virtch2.c libmikmod-3.1.1 High-quality sample mixing routines, using a 32 bits mixing buffer, interpolation, and sample smoothing to improve sound quality and remove -diff --recursive --unified libmikmod-3.1.11/playercode/virtch_common.c libmikmod-3.1.11-a/playercode/virtch_common.c ---- libmikmod-3.1.11/playercode/virtch_common.c 2004-01-21 12:43:53.000000000 -0500 -+++ libmikmod-3.1.11-a/playercode/virtch_common.c 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/playercode/virtch_common.c libmikmod-3.1.11/playercode/virtch_common.c +--- libmikmod-3.1.11.orig/playercode/virtch_common.c 2004-01-21 15:43:53.000000000 -0200 ++++ libmikmod-3.1.11/playercode/virtch_common.c 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== @@ -1838,9 +1901,9 @@ diff --recursive --unified libmikmod-3.1.11/playercode/virtch_common.c libmikmod Common source parts between the two software mixers. This file is probably the ugliest part of libmikmod... -diff --recursive --unified libmikmod-3.1.11/win32/mikmod_build.h libmikmod-3.1.11-a/win32/mikmod_build.h ---- libmikmod-3.1.11/win32/mikmod_build.h 2004-01-21 12:43:52.000000000 -0500 -+++ libmikmod-3.1.11-a/win32/mikmod_build.h 2004-06-04 08:24:27.000000000 -0400 +diff -Naur libmikmod-3.1.11.orig/win32/mikmod_build.h libmikmod-3.1.11/win32/mikmod_build.h +--- libmikmod-3.1.11.orig/win32/mikmod_build.h 2004-01-21 15:43:52.000000000 -0200 ++++ libmikmod-3.1.11/win32/mikmod_build.h 2009-10-21 17:41:26.000000000 -0200 @@ -20,7 +20,7 @@ /*============================================================================== diff --git a/media/libs/libmikmod/libmikmod.SlackBuild b/media/libs/libmikmod/libmikmod.SlackBuild index 60d58a32..949430ae 100755 --- a/media/libs/libmikmod/libmikmod.SlackBuild +++ b/media/libs/libmikmod/libmikmod.SlackBuild @@ -10,13 +10,14 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General # Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place - Suite 330, Boston, MA 02111-1307, USA +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # # slackbuild for libmikmod, by Silvio Rhatto # requires: # tested: libmikmod-3.1.11 +# model: generic.mkSlackBuild $Rev: 824 $ # # Look for slackbuildrc @@ -33,11 +34,12 @@ PKG_NAME="libmikmod" ARCH=${ARCH:=i486} SRC_VERSION=${VERSION:=3.1.11} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" -BUILD=${BUILD:=1rha} +BUILD=${BUILD:=2rha} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} +SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/libmikmod"} PREFIX=${PREFIX:=/usr} PKG_WORK="$TMP/$SRC_NAME" CONF_OPTIONS=${CONF_OPTIONS:=""} @@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:=""} LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + SLKCFLAGS="-O2 -march=i386 -mtune=i686" elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mcpu=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fPIC" LIBDIR="$PREFIX/lib64" + LDFLAGS="-L/lib64 -L/usr/lib64" fi # Set error codes (used by createpkg) @@ -64,6 +67,7 @@ ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36 ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 +ERROR_MANIFEST=43; # Clean up any leftovers of previous builds rm -rf "$PKG_WORK" 2> /dev/null @@ -83,21 +87,100 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET fi +# Check Manifest file +if [ -e "$CWD/Manifest" ]; then + + # Manifest signature checking + if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then + echo "Checking Manifest signature..." + gpg --verify $CWD/Manifest + if [ "$?" != "0" ]; then + exit $ERROR_MANIFEST + fi + fi + + MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`" + + for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do + + MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`" + MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`" + MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`" + + if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then + MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE" + else + MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`" + fi + + if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then + continue + fi + + echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..." + + SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`" + SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`" + + # Check source code size + if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then + echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC" + exit $ERROR_MANIFEST + else + echo "Size match." + fi + + # Check source code integrity + for ALGO in md5 rmd160 sha1 sha256 sha512; do + if [ $ALGO = "rmd160" ]; then + ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`" + else + ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`" + fi + ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`" + ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }') + if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then + echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC" + exit $ERROR_MANIFEST + else + echo "$ALGO match." + fi + done + + done + +else + exit $ERROR_MANIFEST +fi + # Untar cd "$PKG_WORK" tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR -PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`" +PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`" cd "$PKG_SRC" # Patch source -patches=" +patches=" [[PATCH URLS]] $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff" for patch in $patches; do + patch="`basename $patch`" if [ -f "$CWD/$patch" ]; then patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH elif [ -f "$CWD/patches/$patch" ]; then patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH + elif [ -f "$CWD/$patch.gz" ]; then + gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH + elif [ -f "$CWD/patches/$patch.gz" ]; then + gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH + elif [ -f "$SRC_DIR/$patch" ]; then + if [ "`basename $patch .gz`" != "$patch" ]; then + gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH + elif [ "`basename $patch .bz2`" != "$patch" ]; then + bzip2 -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH + else + patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH + fi fi done @@ -121,29 +204,6 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL xargs strip --strip-unneeded 2> /dev/null ) -# Compress and link manpages -if [ -d "$PKG/$PREFIX/man" ]; then - ( cd "$PKG/$PREFIX/man" - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Compress info files -if [ -d "$PKG/$PREFIX/info" ]; then - ( cd "$PKG/$PREFIX/info" - rm -f dir - gzip -9 * - ) -fi - # Install documentation DOCS="AUTHORS COPYING.LESSER COPYING.LIB NEWS README TODO" mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR @@ -157,9 +217,9 @@ done mkdir -p "$PKG/install" || exit $ERROR_MKDIR cat << EODESC > "$PKG/install/slack-desc" # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must +# on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. @@ -179,9 +239,10 @@ EODESC # Build the package cd "$PKG" -makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG +mkdir -p $REPOS/$SLACKBUILD_PATH +makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories if requested -if [ "$CLEANUP" == "yes" ]; then +if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then rm -rf "$PKG_WORK" "$PKG" fi |