hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

audio/TiMidity++: Updated for version 2.14.0. 

Autodetect instrument patch files

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Kyle Guinn 2012-12-20 14:55:56 +01:00 committed by Matteo Bernardini
parent a2025c7559
commit 59c25301a2
10 changed files with 471 additions and 1559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/TiMidity++/README
View File

@ -7,11 +7,15 @@ JACK=yes ./TiMidity++.SlackBuild
To add speex support, install speex and build with:
SPEEX=yes ./TiMidity++.SlackBuild
To use Xaw3d in Xaw interface, build with:
XAW3D=yes ./TiMidity++.SlackBuild
TiMidity++ can also be run as an ALSA sequencer client. To do this, make
/etc/rc.d/rc.timidity executable and add this line to /etc/rc.d/rc.local:
/etc/rc.d/rc.timidity start
You will need a set of instrument patch files for TiMidity++ to be of any
use. The freepats and eawpats packages both provide a set of patch files,
so one of those will be needed.
You will need a set of instrument patch files or soundbank fonts for
TiMidity++ to be of any use. The freepats and eawpats packages both provide
a set of patch files, as well as the fluid-soundfont package, so one of those
will be needed.

48
audio/TiMidity++/TiMidity++.SlackBuild
View File

@ -4,10 +4,11 @@
# Written by Kyle Guinn <elyk03@gmail.com>
# Changes for Slackware 12.1 by Richard Hoyle <hoyle.richard@gmail.com>
# Modified by Michiel van Wessem. <michiel.van.wessem@gmail.com>
# Modified by Yair Kalvariski. <cesium2@gmail.com>
PRGNAM="TiMidity++"
VERSION="2.13.2"
BUILD=${BUILD:-6}
PRGNAM=TiMidity++
VERSION=2.14.0
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -25,7 +26,7 @@ OUTPUT=${OUTPUT:-/tmp}
DOCS="AUTHORS COPYING ChangeLog* INSTALL* NEWS README* TODO doc/C/README* doc/C/FAQ doc/C/CHANGES.02i"
ENABLE_AUDIO="alsa,oss,esd,ao,vorbis,flac"
ENABLE_DYNAMIC="gtk,ncurses,motif,tcltk,emacs,vt100"
ENABLE_DYNAMIC="gtk,ncurses,motif,tcltk,emacs,vt100,xaw"
# Support JACK. Requires JACK, of course.
# Disabled by default for those who don't want to install/configure it.
@ -40,6 +41,14 @@ if [ "$SPEEX" = "yes" ]; then
ENABLE_AUDIO="$ENABLE_AUDIO,speex"
fi
# Use xaw3d library in xaw interface module. Disabled by default.
XAW3D=${XAW3D:-no}
if [ "$XAW3D" = "yes" ]; then
WITH_XAW="xaw3d"
else
WITH_XAW="xaw"
fi
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@ -60,26 +69,24 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
# The patches here include most of those in Debian's 2.13.2-19
# patch set, minus some gross (in both senses of the word) changes
# to the autoconf build scripts to reflect merges of libOggFLAC
# into libFLAC++ since FLAC-1.1.3. ===RAH
# Patches:
# Include tcl's bitmaps in interface to reduce clutter (from git)
# Use tclsh (from git)
# Remove liboggflac autoconf clutter, as it has been merged into flac
# since FLAC-1.1.3
for patch in $CWD/patches/* ; do
patch -p1 < $patch
done
# Regenerate files for automake/autoconf.
# This removes much of the cruft in Debian's patch set.
# Required for --docdir
autoreconf
# Uncomment /etc/timidity.cfg as the default config file location
sed -i "s|/\* #define CONFIG_FILE \"/etc/timidity.cfg\" \*/|#define CONFIG_FILE \"/etc/timidity.cfg\"|" timidity/timidity.h
EXTRACFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@ -89,22 +96,23 @@ EXTRACFLAGS="$SLKCFLAGS" \
--infodir=/usr/info \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/timidity \
--enable-audio=${ENABLE_AUDIO} \
--enable-dynamic=${ENABLE_DYNAMIC} \
--enable-alsaseq \
--enable-server \
--enable-network \
--enable-spectrogram \
--enable-xdnd \
--with-default-path=/etc \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/timidity \
--with-xaw-resource-prefix=/etc/X11 \
--with-xawlib=${WITH_XAW} \
--build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
)
find $PKG/usr/man -type f -exec gzip -9 {} \;
# Create a default timidity.cfg
# TiMidity++ will complain if this file is missing.
@ -112,6 +120,10 @@ mkdir -p $PKG/etc
cat > $PKG/etc/timidity.cfg.new << EOF
# This is the default configuration file for TiMidity++.
# See timidity.cfg(5) for details.
trysource /etc/timidity/crude.cfg
trysource /etc/timidity/freepats.cfg
trysource /etc/timidity/eawpats.cfg
trysource /etc/timidity/fluid.cfg
EOF
# Copy the startup script

8
audio/TiMidity++/TiMidity++.info
View File

@ -1,10 +1,10 @@
PRGNAM="TiMidity++"
VERSION="2.13.2"
VERSION="2.14.0"
HOMEPAGE="http://timidity.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/timidity/TiMidity%2B%2B-2.13.2.tar.bz2"
MD5SUM="a82ceeb2245e22f4de2b41da21eaee32"
DOWNLOAD="http://downloads.sourceforge.net/timidity/TiMidity%2B%2B-2.14.0.tar.xz"
MD5SUM="27927182d62ba24abbf447a9e9919c53"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="eawpats"
REQUIRES="%README%"
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"

481
audio/TiMidity++/patches/autoconf.diff
View File

@ -1,328 +1,173 @@
diff --git a/autoconf/Makefile.am b/autoconf/Makefile.am
index e943a79..b983bc7 100644
--- a/autoconf/Makefile.am
+++ b/autoconf/Makefile.am
@@ -25,7 +25,6 @@ EXTRA_DIST = \
diff -Nur a/autoconf/libOggFLAC.m4 b/autoconf/libOggFLAC.m4
--- a/autoconf/libOggFLAC.m4 2012-06-01 06:45:45.000000000 +0300
+++ b/autoconf/libOggFLAC.m4 1970-01-01 02:00:00.000000000 +0200
@@ -1,116 +0,0 @@
-# Configure paths for libOggFLAC
-# "Inspired" by ogg.m4
-
-dnl AM_PATH_LIBOGGFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libOggFLAC, and define LIBOGGFLAC_CFLAGS and LIBOGGFLAC_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBOGGFLAC],
-[dnl
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(libOggFLAC,
- AS_HELP_STRING([--with-libOggFLAC=PFX],
- [Prefix where libOggFLAC is installed (optional)]),
- [libOggFLAC_prefix="$withval"], [libOggFLAC_prefix=""])
-AC_ARG_WITH(libOggFLAC-libraries,
- AS_HELP_STRING([--with-libOggFLAC-libraries=DIR],
- [Directory where libOggFLAC library is installed (optional)]),
- [libOggFLAC_libraries="$withval"], [libOggFLAC_libraries=""])
-AC_ARG_WITH(libOggFLAC-includes,
- AS_HELP_STRING([--with-libOggFLAC-includes=DIR],
- [Directory where libOggFLAC header files are installed (optional)]),
- [libOggFLAC_includes="$withval"], [libOggFLAC_includes=""])
-AC_ARG_ENABLE(libOggFLACtest,
- AS_HELP_STRING([--disable-libOggFLACtest],
- [Do not try to compile and run a test libOggFLAC program]),,
- [enable_libOggFLACtest=yes])
-
- if test "x$libOggFLAC_libraries" != "x" ; then
- LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries"
- elif test "x$libOggFLAC_prefix" != "x" ; then
- LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib"
- elif test "x$prefix" != "xNONE" ; then
- LIBOGGFLAC_LIBS="-L$prefix/lib"
- fi
-
- LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
-
- if test "x$libOggFLAC_includes" != "x" ; then
- LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes"
- elif test "x$libOggFLAC_prefix" != "x" ; then
- LIBOGGFLAC_CFLAGS="-I$libOggFLAC_prefix/include"
- elif test "$prefix" != "xNONE"; then
- LIBOGGFLAC_CFLAGS="-I$prefix/include"
- fi
-
- AC_MSG_CHECKING(for libOggFLAC)
- no_libOggFLAC=""
-
-
- if test "x$enable_libOggFLACtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS"
- CXXFLAGS="$CXXFLAGS $LIBOGGFLAC_CFLAGS"
- LIBS="$LIBS $LIBOGGFLAC_LIBS"
-dnl
-dnl Now check if the installed libOggFLAC is sufficiently new.
-dnl
- rm -f conf.libOggFLACtest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <OggFLAC/stream_decoder.h>
-
-int main ()
-{
- system("touch conf.libOggFLACtest");
- return 0;
-}
-
-],, no_libOggFLAC=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-
- if test "x$no_libOggFLAC" = "x" ; then
- AC_MSG_RESULT(yes)
- ifelse([$1], , :, [$1])
- else
- AC_MSG_RESULT(no)
- if test -f conf.libOggFLACtest ; then
- :
- else
- echo "*** Could not run libOggFLAC test program, checking why..."
- CFLAGS="$CFLAGS $LIBOGGFLAC_CFLAGS"
- LIBS="$LIBS $LIBOGGFLAC_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <OggFLAC/stream_decoder.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding libOggFLAC or finding the wrong"
- echo "*** version of libOggFLAC. If it is not finding libOggFLAC, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means libOggFLAC was incorrectly installed"
- echo "*** or that you have moved libOggFLAC since it was installed. In the latter case, you"
- echo "*** may want to edit the libOggFLAC-config script: $LIBOGGFLAC_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- LIBOGGFLAC_CFLAGS=""
- LIBOGGFLAC_LIBS=""
- ifelse([$2], , :, [$2])
- fi
- AC_SUBST(LIBOGGFLAC_CFLAGS)
- AC_SUBST(LIBOGGFLAC_LIBS)
- rm -f conf.libOggFLACtest
-])
diff -Nur a/autoconf/Makefile.am b/autoconf/Makefile.am
--- a/autoconf/Makefile.am 2004-05-30 11:02:23.000000000 +0300
+++ b/autoconf/Makefile.am 2012-10-13 18:19:32.837584323 +0200
@@ -25,7 +25,6 @@
gtk.m4 \
gtk-2.0.m4 \
libFLAC.m4 \
- libOggFLAC.m4 \
ogg.m4 \
utils.m4 \
- vorbis.m4
vorbis.m4
\ No newline at end of file
+ vorbis.m4
diff --git a/autoconf/alsa.m4 b/autoconf/alsa.m4
index 3429d08..2b65bc6 100644
--- a/autoconf/alsa.m4
+++ b/autoconf/alsa.m4
@@ -14,7 +14,7 @@ dnl
dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
dnl
-AC_DEFUN(AM_PATH_ALSA,
+AC_DEFUN([AM_PATH_ALSA],
[dnl Save the original CFLAGS, LDFLAGS, and LIBS
alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS"
@@ -151,4 +151,4 @@ fi
dnl That should be it. Now just export out symbols:
AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS)
-])
\ No newline at end of file
+])
diff --git a/autoconf/ao.m4 b/autoconf/ao.m4
index a2bfa67..a852ad8 100644
--- a/autoconf/ao.m4
+++ b/autoconf/ao.m4
@@ -6,7 +6,7 @@
dnl XIPH_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libao, and define AO_CFLAGS and AO_LIBS
dnl
-AC_DEFUN(XIPH_PATH_AO,
+AC_DEFUN([XIPH_PATH_AO],
[dnl
dnl Get the cflags and libraries
dnl
diff --git a/autoconf/arts.m4 b/autoconf/arts.m4
index 7ac4daa..f6b1d94 100644
--- a/autoconf/arts.m4
+++ b/autoconf/arts.m4
@@ -9,7 +9,7 @@ dnl Snarfed from the ESD code below - but the faults are all mine!
dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for aRts, and define ARTS_CFLAGS and ARTS_LIBS
dnl
-AC_DEFUN(AM_PATH_ARTS,
+AC_DEFUN([AM_PATH_ARTS],
[dnl
dnl Get the cflags and libraries from the arts-config script
dnl
@@ -156,4 +156,4 @@ int main ()
AC_SUBST(ARTS_LIBS)
rm -f conf.artstest
])
-dnl End of aRts
\ No newline at end of file
+dnl End of aRts
diff --git a/autoconf/esd.m4 b/autoconf/esd.m4
index 289a6c0..24666c9 100644
--- a/autoconf/esd.m4
+++ b/autoconf/esd.m4
@@ -7,7 +7,7 @@
dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
dnl
-AC_DEFUN(AM_PATH_ESD,
+AC_DEFUN([AM_PATH_ESD],
[dnl
dnl Get the cflags and libraries from the esd-config script
dnl
@@ -172,7 +172,7 @@ int main ()
dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
dnl
-AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD,
+AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
[dnl
AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
ac_save_ESD_CFLAGS="$ESD_CFLAGS"
diff --git a/autoconf/gtk-2.0.m4 b/autoconf/gtk-2.0.m4
index a0c53ac..36a1f9f 100644
--- a/autoconf/gtk-2.0.m4
+++ b/autoconf/gtk-2.0.m4
@@ -5,7 +5,7 @@ dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [,
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config
dnl
-AC_DEFUN(AM_PATH_GTK_2_0,
+AC_DEFUN([AM_PATH_GTK_2_0],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
diff --git a/autoconf/gtk.m4 b/autoconf/gtk.m4
index b8cf402..f2dd472 100644
--- a/autoconf/gtk.m4
+++ b/autoconf/gtk.m4
@@ -4,7 +4,7 @@
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
diff --git a/autoconf/libFLAC.m4 b/autoconf/libFLAC.m4
index 88d8e84..b6950e7 100644
--- a/autoconf/libFLAC.m4
+++ b/autoconf/libFLAC.m4
@@ -4,7 +4,7 @@
dnl AM_PATH_LIBFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBFLAC,
+AC_DEFUN([AM_PATH_LIBFLAC],
[dnl
dnl Get the cflags and libraries
dnl
diff --git a/autoconf/libOggFLAC.m4 b/autoconf/libOggFLAC.m4
index 5ce8bda..9b5f6d2 100644
--- a/autoconf/libOggFLAC.m4
+++ b/autoconf/libOggFLAC.m4
@@ -4,7 +4,7 @@
dnl AM_PATH_LIBOGGFLAC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libOggFLAC, and define LIBOGGFLAC_CFLAGS and LIBOGGFLAC_LIBS
dnl
-AC_DEFUN(AM_PATH_LIBOGGFLAC,
+AC_DEFUN([AM_PATH_LIBOGGFLAC],
[dnl
dnl Get the cflags and libraries
dnl
diff --git a/autoconf/ogg.m4 b/autoconf/ogg.m4
index 89558ab..5c13745 100644
--- a/autoconf/ogg.m4
+++ b/autoconf/ogg.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
dnl
-AC_DEFUN(AM_PATH_OGG,
+AC_DEFUN([AM_PATH_OGG],
[dnl
dnl Get the cflags and libraries
dnl
diff --git a/autoconf/utils.m4 b/autoconf/utils.m4
index ecf03c8..97a2e85 100644
--- a/autoconf/utils.m4
+++ b/autoconf/utils.m4
@@ -17,7 +17,7 @@ dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl MY_DEFINE(VARIABLE)
-AC_DEFUN(MY_DEFINE,
+AC_DEFUN([MY_DEFINE],
[cat >> confdefs.h <<EOF
[#define] $1 1
EOF
@@ -29,7 +29,7 @@ dnl action-if-yes-or-dynamic,
dnl $5
dnl action-if-yes,action-if-dynamic,action-if-no)
dnl $6 $7 $8
-AC_DEFUN(CONFIG_INTERFACE,
+AC_DEFUN([CONFIG_INTERFACE],
[AC_ARG_ENABLE($1,[$4],
[case "x$enable_$1" in xyes|xdynamic) $5 ;; esac])
case "x$enable_$1" in
@@ -53,7 +53,7 @@ dnl CHECK_DLSYM_UNDERSCORE([ACTION-IF-NEED [, ACTION IF-NOT-NEED]])
dnl variable input:
dnl CC CFLAGS CPPFLAGS LDFLAGS LIBS SHCFLAGS SHLD SHLDFLAGS
dnl ac_cv_header_dlfcn_h lib_dl_opt so
-AC_DEFUN(CHECK_DLSYM_UNDERSCORE,
+AC_DEFUN([CHECK_DLSYM_UNDERSCORE],
[dnl Check if dlsym need a leading underscore
AC_MSG_CHECKING(whether your dlsym() needs a leading underscore)
AC_CACHE_VAL(timidity_cv_func_dlsym_underscore,
@@ -144,7 +144,7 @@ esac
dnl contains program from perl5
dnl CONTAINS_INIT()
-AC_DEFUN(CONTAINS_INIT,
+AC_DEFUN([CONTAINS_INIT],
[dnl Some greps do not return status, grrr.
AC_MSG_CHECKING(whether grep returns status)
echo "grimblepritz" >grimble
@@ -171,7 +171,7 @@ esac
])
dnl CONTAINS(word,filename,action-if-found,action-if-not-found)
-AC_DEFUN(CONTAINS,
+AC_DEFUN([CONTAINS],
[if $contains "^[$1]"'[$]' $2 >/dev/null 2>&1; then
[$3]
else
@@ -180,7 +180,7 @@ fi
])
dnl SET_UNIQ_WORDS(shell-variable,words...)
-AC_DEFUN(SET_UNIQ_WORDS,
+AC_DEFUN([SET_UNIQ_WORDS],
[rm -f wordtmp >/dev/null 2>&1
val=''
for f in $2; do
@@ -193,7 +193,7 @@ rm -f wordtmp >/dev/null 2>&1
dnl WAPI_CHECK_FUNC(FUNCTION, INCLUDES, TEST-BODY,
[ACTION-FI-FOUND [, ACTION-IF-NOT-FOUND]])
-AC_DEFUN(WAPI_CHECK_FUNC,
+AC_DEFUN([WAPI_CHECK_FUNC],
[AC_MSG_CHECKING(for $1)
AC_CACHE_VAL(wapi_cv_func_$1,
[AC_TRY_LINK([#include <windows.h>
@@ -214,7 +214,7 @@ dnl WAPI_CHECK_LIB(LIBRARY, FUNCTION,
dnl INCLUDES, TEST-BODY
dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
dnl [, OTHER-LIBRARIES]]])
-AC_DEFUN(WAPI_CHECK_LIB,
+AC_DEFUN([WAPI_CHECK_LIB],
[AC_MSG_CHECKING([for $2 in -l$1])
ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
AC_CACHE_VAL(wapi_cv_lib_$ac_lib_var,
@@ -238,18 +238,18 @@ fi
])
dnl EXTRACT_CPPFLAGS(CPPFLAGS-to-append,others-to-append,FLAGS)
-AC_DEFUN(EXTRACT_CPPFLAGS,
+AC_DEFUN([EXTRACT_CPPFLAGS],
[for f in $3; do
case ".$f" in
.-I?*|.-D?*) $1="[$]$1 $f" ;;
- *) $2="[$]$1 $f" ;;
+ *) $2="[$]$2 $f" ;;
esac
done
])
dnl CHECK_COMPILER_OPTION(OPTIONS [, ACTION-IF-SUCCEED [, ACTION-IF-FAILED]])
-AC_DEFUN(CHECK_COMPILER_OPTION,
+AC_DEFUN([CHECK_COMPILER_OPTION],
[AC_MSG_CHECKING([whether -$1 option is recognized])
ac_ccoption=`echo $1 | sed 'y%./+-%__p_%'`
AC_CACHE_VAL(timidity_cv_ccoption_$ac_ccoption,
@@ -282,7 +282,7 @@ dnl MY_SEARCH_LIBS(FUNCTION, LIBRARIES [, ACTION-IF-FOUND
dnl [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
dnl Search for a library defining FUNC, if it's not already available.
-AC_DEFUN(MY_SEARCH_LIBS,
+AC_DEFUN([MY_SEARCH_LIBS],
[AC_CACHE_CHECK([for library containing $1], [timidity_cv_search_$1],
[ac_func_search_save_LIBS="$LIBS"
timidity_cv_search_$1="no"
@@ -295,4 +295,4 @@ if test "$timidity_cv_search_$1" != "no"; then
$3
else :
$4
-fi])
\ No newline at end of file
+fi])
diff --git a/autoconf/vorbis.m4 b/autoconf/vorbis.m4
index 9910dad..0e266bd 100644
--- a/autoconf/vorbis.m4
+++ b/autoconf/vorbis.m4
@@ -5,7 +5,7 @@
dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
dnl
-AC_DEFUN(AM_PATH_VORBIS,
+AC_DEFUN([AM_PATH_VORBIS],
[dnl
dnl Get the cflags and libraries
dnl
diff --git a/configure.in b/configure.in
index 9f2835b..04897e6 100644
--- a/configure.in
+++ b/configure.in
@@ -388,7 +388,7 @@ dnl End of X configure
# Checks for header files.
AC_HEADER_STDC
-AC_HEADER_STDBOOL
+#AC_HEADER_STDBOOL
AC_HEADER_SYS_WAIT
if test "x$WATCOM_C" != xyes ; then
AC_HEADER_TIME
@@ -689,7 +689,7 @@ dnl arts(R): aRts
dnl esd(e): EsounD
dnl portaudio(p) PortAudio
dnl vorbis(v): Ogg Vorbis
-dnl flac(F): FLAC / OggFLAC
+dnl flac(F): FLAC
dnl speex(S): Ogg Speex
dnl gogo(g): MP3 GOGO
dnl jack(j): JACK
@@ -723,7 +723,7 @@ AC_ARG_ENABLE(audio,
diff -Nur a/configure.in b/configure.in
--- a/configure.in 2012-06-28 17:14:25.000000000 +0300
+++ b/configure.in 2012-10-13 18:19:14.806923746 +0200
@@ -889,7 +889,7 @@
jack: JACK
ao: Libao
vorbis: Ogg Vorbis
- flac: FLAC / OggFLAC
+ flac: FLAC
speex: Ogg Speex
gogo: MP3 GOGO (Only Windows is supported)],
[ enable_audio=$enableval
@@ -1198,11 +1198,6 @@ if test "x$CYGNUS" = xyes || test "x$MSYS" = xyes ; then
EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS)
LIBS="$LIBS $LIBFLAC_LIBS"
gogo: MP3 GOGO (Only Windows is supported)
],
@@ -1393,23 +1393,10 @@
AC_MSG_CHECKING(enable_audio=flac)
if test "x$au_enable_flac" = xyes; then
AC_MSG_RESULT([yes, configuring flac])
- SYSEXTRAS="$SYSEXTRAS flac_a.c w32_libFLAC_dll.c w32_libOggFLAC_dll.c"
+ SYSEXTRAS="$SYSEXTRAS flac_a.c w32_libFLAC_dll.c"
AC_CHECK_HEADER(FLAC/all.h, [
EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_FLAC_DLL"
])
- AM_PATH_LIBOGGFLAC([
- AC_CHECK_HEADER(OggFLAC/all.h, [
- EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC -DAU_OGGFLAC_DLL"
- EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS)
- LIBS="$LIBS $LIBOGGFLAC_LIBS"
- ])
-dnl AM_PATH_LIBFLAC([
-dnl EXTRADEFS="$EXTRADEFS -DAU_FLAC -DAU_FLAC_DLL"
-dnl EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS)
-dnl LIBS="$LIBS $LIBFLAC_LIBS"
-dnl ])
-dnl AM_PATH_LIBOGGFLAC([
-dnl EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC -DAU_OGGFLAC_DLL"
-dnl EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS)
-dnl LIBS="$LIBS $LIBOGGFLAC_LIBS"
-dnl ])
else
AC_MSG_RESULT(no)
fi
@@ -1216,11 +1211,6 @@ else
@@ -1423,11 +1410,6 @@
EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS)
LIBS="$LIBS $LIBFLAC_LIBS"
])
@ -334,24 +179,10 @@ index 9f2835b..04897e6 100644
else
AC_MSG_RESULT(no)
fi
diff --git a/interface/Makefile.am b/interface/Makefile.am
index b02d085..1f50572 100644
--- a/interface/Makefile.am
+++ b/interface/Makefile.am
@@ -247,7 +247,7 @@ clean:
tclIndex: $(TCLSRCS)
rm -f tclIndex
- echo 'auto_mkindex . *.tcl; exit' | $(WISH)
+ echo "auto_mkindex . *.tcl" | tclsh
if ENABLE_TCLTK
install_tk = install.tk
diff --git a/timidity/Makefile.am b/timidity/Makefile.am
index a411d87..d5141ba 100644
--- a/timidity/Makefile.am
+++ b/timidity/Makefile.am
@@ -155,11 +155,7 @@ EXTRA_timidity_SOURCES = \
diff -Nur a/timidity/Makefile.am b/timidity/Makefile.am
--- a/timidity/Makefile.am 2008-03-30 05:31:07.000000000 +0300
+++ b/timidity/Makefile.am 2012-10-13 18:19:32.837584323 +0200
@@ -157,11 +157,7 @@
w32_libFLAC_dll.c \
w32_libFLAC_dll.h \
w32_libFLAC_dll_g.h \
@ -364,7 +195,7 @@ index a411d87..d5141ba 100644
calcnewt_SOURCES = calcnewt.c
@@ -308,7 +304,7 @@ endif
@@ -442,7 +438,7 @@
version.$(OBJEXT): version.c ../configure
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c $(srcdir)/version.c

122
audio/TiMidity++/patches/man_pages.diff
View File

@ -1,122 +0,0 @@
diff --git a/doc/C/timidity.1 b/doc/C/timidity.1
--- a/doc/C/timidity.1
+++ b/doc/C/timidity.1
@@ -199,7 +199,7 @@
.RE
.TP
.B \-a, \-\-[no\-]anti\-alias
-Turns on antialiasing. Samples are run through a lowpass filter
+Turns on anti-aliasing. Samples are run through a lowpass filter
before playing, which reduces aliasing noise at low resampling
frequencies.
.TP
@@ -269,7 +269,7 @@
Sets the system manufacturer ID to \fIHH\fP (where \fIHH\fP are two
hex\-digits).
.br
-In this option, the manufacuture ID is set unchangable. Manufacuture
+In this option, the manufacturer ID is set unchangeable. Manufacturer
ID from the input file would be ignored.
.TP
.BI b n ", \-\-default\-bank=" n
@@ -440,14 +440,12 @@
system has support for the X Window System.
.TP
.BI "\-H " n ", \-\-force\-keysig=" n
-Specify the number of key signature. MIDI file is performed with
-transposition to the key of the number of sharp (when \fIn\fP is
-positive) or flat (when \fIn\fP is negative). Valid values of \fIn\fP
-are in the interval from \fB\-7\fP to \fB7\fP. For example, if \fIn\fP
-is \fB1\fP, MIDI file with any tonality will be performed transposing
-to \fB1\fP flat (i.e., F major or D minor). Therefore, it is
-convenient to use for the accompaniment when practicing a musical
-instrument by the tonality which is easy to perform.
+Specify the key signature. MIDI playback is transposed to the key
+with the same number of sharps (when \fIn\fP is
+positive) or flats (when \fIn\fP is negative). Valid values for \fIn\fP
+range from \fB\-7\fP to \fB7\fP. For example, if \fIn\fP
+is \fB1\fP, MIDI playback would transpose \fB1\fP flat
+(i.e., F major or D minor).
.TP
.B \-h, \-\-help
Show the help message.
@@ -516,10 +514,10 @@
Launch \fBTiMidity++\fP as ALSA sequencer client.
.TP
.B \-iW
-Windodws synthesizer interface
+Windows synthesizer interface
.TP
.B \-iw
-Windodws GUI interface
+Windows GUI interface
.TP
.B \-iP
PortMIDI synthesizer interface
@@ -740,7 +738,7 @@
.B \-Oj
JACK
.TP
-.B \-Or
+.B \-OR
aRts
.TP
.B \-OA
diff --git a/doc/C/timidity.cfg.5 b/doc/C/timidity.cfg.5
--- a/doc/C/timidity.cfg.5
+++ b/doc/C/timidity.cfg.5
@@ -4,7 +4,7 @@
.SH DESCRIPTION
The file \fBtimidity.cfg\fP describes the runtime environments of
timidity(1): that are the path of sound font, instruments
-configurations or else.
+configurations, etc.
.br
\fBTiMidity++\fP looks for the configuration file \fBtimidity.cfg\fP
at startup, before processing any options. If it can't be accessed,
@@ -30,7 +30,7 @@
${variable} # same as $variable
.sp
For the moment, the command which newly defines variables is not
-prepared. The undifined variable is transposed to null string.
+prepared. The undefined variable is transposed to null string.
.br
The variable defined as a regular variable is the next only one.
.TP
@@ -89,13 +89,13 @@
.BI "bank " "[MapID1] number"
Selects the tone bank to modify. Patch mappings that follow will
affect this tone bank. You can indicate specific map as a target, by
-specifing any ofthe following to \fIMapID1\fP: \fBgm2\fP, \fBsc55\fP,
+specifying any of the following to \fIMapID1\fP: \fBgm2\fP, \fBsc55\fP,
\fBsc88\fP, \fBsc88pro\fP, \fBsc8850\fP, \fBxg\fP and \fBxgsfx64\fP.
.TP
.BI "drumset " "[MapID2] number"
Selects the drum set to modify. Patch mappings that follow will
affect this drum set. You can indicate specific map as a target, by
-specifing any ofthe following to \fIMapID2\fP: \fBgm2drum\fP,
+specifying any of the following to \fIMapID2\fP: \fBgm2drum\fP,
\fBsc55drum\fP, \fBsc88drum\fP, \fBsc88prodrum\fP, \fBsc8850drum\fP,
\fBxgdrum\fP and \fBxgsfx126\fP.
.TP
@@ -363,7 +363,7 @@
.TP
.BI "#extension timeout " "program second"
Specifies the time\-out value of the \fIprogram\fP. If any notes
-played with the tone number \fIprogram\fP are suspended more than
+played with the tone number \fIprogram\fP are suspended for more than
\fIsecond\fP seconds, \fBTiMidity++\fP kills the notes.
.TP
.BI "#extension copydrumset " drumset
diff --git a/doc/ja_JP.eucJP/timidity.1 b/doc/ja_JP.eucJP/timidity.1
--- a/doc/ja_JP.eucJP/timidity.1
+++ b/doc/ja_JP.eucJP/timidity.1
@@ -745,7 +745,7 @@
.B \-Oj
JACK
.TP
-.B \-Or
+.B \-OR
aRts
.TP
.B \-OA

1008
audio/TiMidity++/patches/other.diff
View File

File diff suppressed because it is too large Load Diff

135
audio/TiMidity++/patches/patch-tclbitmaps Normal file
View File

@ -0,0 +1,135 @@
commit 009dd7494916089ca8a4a3c15c37bab4bc6fc7c7
Author: Yair K <cesium2@gmail.com>
Date: Mon Aug 20 09:32:05 2012 +0200
Include xbm bitmaps in the tcl interface itself
Include xbm bitmaps in the tcl interface itself rather than as files in the
system.
Also, include tcl.h a bit later to avoid a redefine warning on reverb.h.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
diff --git a/interface/Makefile.am b/interface/Makefile.am
index e45ce43..6ce4795 100644
--- a/interface/Makefile.am
+++ b/interface/Makefile.am
@@ -275,7 +275,7 @@ if ENABLE_DYNAMIC_XAW
install_xaw = install.xaw
endif
-install.tk: $(ALLTCLF) install.bitmaps
+install.tk: $(ALLTCLF)
test -d $(DESTDIR)$(TCL_DIR) || mkdir -p $(DESTDIR)$(TCL_DIR)
for f in $(ALLTCLF) ''; do case ".$$f" in .);; *) $(INSTALL_DATA) $$f $(DESTDIR)$(TCL_DIR);; esac; done
diff --git a/interface/tk_c.c b/interface/tk_c.c
index c5c9074..ff49568 100644
--- a/interface/tk_c.c
+++ b/interface/tk_c.c
@@ -46,8 +46,6 @@
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/sem.h>
-#include <tcl.h>
-#include <tk.h>
#include <sys/wait.h>
#include "timidity.h"
@@ -60,6 +58,9 @@
#include "miditrace.h"
#include "aq.h"
+#include <tcl.h>
+#include <tk.h>
+
#ifndef TKPROGPATH
#define TKPROGPATH PKGLIBDIR "/tkmidity.tcl"
#endif /* TKPROGPATH */
@@ -871,6 +872,21 @@ static Tcl_Interp *my_interp;
static int AppInit(Tcl_Interp *interp)
{
+#include "bitmaps/back.xbm"
+#include "bitmaps/fwrd.xbm"
+#include "bitmaps/next.xbm"
+#include "bitmaps/pause.xbm"
+#include "bitmaps/play.xbm"
+#include "bitmaps/prev.xbm"
+#include "bitmaps/quit.xbm"
+#include "bitmaps/stop.xbm"
+#include "bitmaps/timidity.xbm"
+
+#define DefineBitmap(Bitmap) do { \
+ Tk_DefineBitmap (interp, Tk_GetUid(#Bitmap), Bitmap##_bits, \
+ Bitmap##_width, Bitmap##_height); \
+ } while(0)
+
my_interp = interp;
if (Tcl_Init(interp) == TCL_ERROR) {
@@ -890,7 +906,19 @@ static int AppInit(Tcl_Interp *interp)
(ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
Tcl_CreateCommand(interp, "TraceUpdate", (Tcl_CmdProc*) TraceUpdate,
(ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+
+ DefineBitmap(back);
+ DefineBitmap(fwrd);
+ DefineBitmap(next);
+ DefineBitmap(pause);
+ DefineBitmap(play);
+ DefineBitmap(prev);
+ DefineBitmap(quit);
+ DefineBitmap(stop);
+ DefineBitmap(timidity);
+
return TCL_OK;
+#undef DefineBitmap
}
/*ARGSUSED*/
diff --git a/interface/tkpanel.tcl b/interface/tkpanel.tcl
index e826c54..e64f509 100755
--- a/interface/tkpanel.tcl
+++ b/interface/tkpanel.tcl
@@ -87,7 +87,7 @@ proc InitGlobal {} {
wm title . "TkMidity"
wm iconname . "TkMidity"
global bitmap_path
- wm iconbitmap . @$bitmap_path/timidity.xbm
+ wm iconbitmap . "timidity"
}
@@ -825,22 +825,14 @@ proc CreateWindow {} {
global bitmap_path
frame .body.button -relief raised -bd 1
pack .body.button -side top -expand 1 -fill x
- button .body.button.play -bitmap @$bitmap_path/play.xbm\
- -command "PlayCmd"
- button .body.button.stop -bitmap @$bitmap_path/stop.xbm\
- -command "StopCmd"
- button .body.button.prev -bitmap @$bitmap_path/prev.xbm\
- -command "PrevCmd"
- button .body.button.back -bitmap @$bitmap_path/back.xbm\
- -command "BackwardCmd"
- button .body.button.fwrd -bitmap @$bitmap_path/fwrd.xbm\
- -command "ForwardCmd"
- button .body.button.next -bitmap @$bitmap_path/next.xbm\
- -command "NextCmd"
- button .body.button.pause -bitmap @$bitmap_path/pause.xbm\
- -command "PauseCmd"
- button .body.button.quit -bitmap @$bitmap_path/quit.xbm\
- -command "QuitCmd"
+ button .body.button.play -bitmap "play" -command "PlayCmd"
+ button .body.button.stop -bitmap "stop" -command "StopCmd"
+ button .body.button.prev -bitmap "prev" -command "PrevCmd"
+ button .body.button.back -bitmap "back" -command "BackwardCmd"
+ button .body.button.fwrd -bitmap "fwrd" -command "ForwardCmd"
+ button .body.button.next -bitmap "next" -command "NextCmd"
+ button .body.button.pause -bitmap "pause" -command "PauseCmd"
+ button .body.button.quit -bitmap "quit" -command "QuitCmd"
pack .body.button.play .body.button.pause\
.body.button.prev .body.button.back\
.body.button.stop\

139
audio/TiMidity++/patches/patch-tclsh Normal file
View File

@ -0,0 +1,139 @@
commit 7cbdab2041e378486a74cd9d0ae0b39fb4d1af16
Author: TAMUKI Shoichi <tamuki@linet.gr.jp>
Date: Wed Sep 5 12:26:22 2012 +0900
Remove tclIndex due to autogenerated file
auto_mkindex will now run with tclsh instead of wish.
diff --git a/configure.in b/configure.in
index 286e459..dcc8442 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@ dnl - add to -L LDFLAGS
dnl C_INCLUDE_PATH
dnl - add to -I CPPFLAGS
dnl MSYS - `yes' if cygnus or Mingw windows environment.
-dnl WISH - wish
+dnl TCLSH - tclsh
dnl LN_S - ln -s
dnl tcltk_dep - make dependencies for tcl/tk interface
dnl
@@ -59,7 +59,7 @@ AC_CONFIG_HEADERS([config.h interface.h])
AM_MAINTAINER_MODE
SHELL=${CONFIG_SHELL-"/bin/sh"}
-WISH=${WISH-"wish"}
+TCLSH=${TCLSH-"tclsh"}
dnl to use contains() macro (see autoconf/acinclude.m4)
CONTAINS_INIT
@@ -2287,7 +2287,7 @@ AC_SUBST(SHCFLAGS)
AC_SUBST(dynamic_targets)
AC_SUBST(so)
AC_SUBST(LN_S)
-AC_SUBST(WISH)
+AC_SUBST(TCLSH)
AC_SUBST(tcltk_dep)
AC_SUBST(program_transform_name)
AC_SUBST(INTERFACE_SRCS)
diff --git a/interface/Makefile.am b/interface/Makefile.am
index 6ce4795..6921a83 100644
--- a/interface/Makefile.am
+++ b/interface/Makefile.am
@@ -240,8 +240,7 @@ EXTRA_DIST = \
tkpanel.tcl \
browser.tcl \
misc.tcl \
- timidity.pel \
- tclIndex
+ timidity.pel
.ptcl.tcl:
sed -e 's@%TCL_DIR%@$(TCL_DIR)@g' $< > $@
@@ -249,6 +248,8 @@ EXTRA_DIST = \
sed -e 's@%BIN_DIR%@$(bindir)@g' $< > $@
clean:
rm -f tkmidity.tcl
+ rm -f tclIndex
+ rm -f timidity.el
rm -f *.$(OBJEXT)
rm -f *.$(so)
rm -f *.res
@@ -259,7 +260,7 @@ clean:
tclIndex: $(TCLSRCS)
rm -f tclIndex
- echo 'auto_mkindex . *.tcl; exit' | $(WISH)
+ echo 'auto_mkindex $(srcdir) *.tcl; exit' | $(TCLSH)
if ENABLE_TCLTK
install_tk = install.tk
diff --git a/interface/tclIndex b/interface/tclIndex
deleted file mode 100644
index e62cfcf..0000000
--- a/interface/tclIndex
+++ /dev/null
@@ -1,62 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands. Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(InitGlobal) [list source [file join $dir tkpanel.tcl]]
-set auto_index(HandleInput) [list source [file join $dir tkpanel.tcl]]
-set auto_index(MakeShuffleList) [list source [file join $dir tkpanel.tcl]]
-set auto_index(AppendMsg) [list source [file join $dir tkpanel.tcl]]
-set auto_index(ClearMsg) [list source [file join $dir tkpanel.tcl]]
-set auto_index(SelectNumber) [list source [file join $dir tkpanel.tcl]]
-set auto_index(SetTime) [list source [file join $dir tkpanel.tcl]]
-set auto_index(DispButtonPlay) [list source [file join $dir tkpanel.tcl]]
-set auto_index(SetVolume) [list source [file join $dir tkpanel.tcl]]
-set auto_index(WriteMsg) [list source [file join $dir tkpanel.tcl]]
-set auto_index(JumpCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(VolumeCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(LoadCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(PlayCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(PauseCheck) [list source [file join $dir tkpanel.tcl]]
-set auto_index(PauseCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(StopCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(QuitCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(PrevCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(NextCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(ForwardCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(BackwardCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(VolUpCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(VolDownCmd) [list source [file join $dir tkpanel.tcl]]
-set auto_index(DispTables) [list source [file join $dir tkpanel.tcl]]
-set auto_index(SaveConfig) [list source [file join $dir tkpanel.tcl]]
-set auto_index(LoadConfig) [list source [file join $dir tkpanel.tcl]]
-set auto_index(InitCmdLine) [list source [file join $dir tkpanel.tcl]]
-set auto_index(SelectList) [list source [file join $dir tkpanel.tcl]]
-set auto_index(OpenFiles) [list source [file join $dir tkpanel.tcl]]
-set auto_index(CloseFiles) [list source [file join $dir tkpanel.tcl]]
-set auto_index(ToggleCurFileMode) [list source [file join $dir tkpanel.tcl]]
-set auto_index(CreateWindow) [list source [file join $dir tkpanel.tcl]]
-set auto_index(filebrowser) [list source [file join $dir browser.tcl]]
-set auto_index(fs:init) [list source [file join $dir browser.tcl]]
-set auto_index(fs:init-lbox) [list source [file join $dir browser.tcl]]
-set auto_index(fs:get-cur-lbox) [list source [file join $dir browser.tcl]]
-set auto_index(fs:select) [list source [file join $dir browser.tcl]]
-set auto_index(fs:selall) [list source [file join $dir browser.tcl]]
-set auto_index(fs:updir) [list source [file join $dir browser.tcl]]
-set auto_index(fs:changedir) [list source [file join $dir browser.tcl]]
-set auto_index(fs:update) [list source [file join $dir browser.tcl]]
-set auto_index(retrieve-filename) [list source [file join $dir misc.tcl]]
-set auto_index(sec2time) [list source [file join $dir misc.tcl]]
-set auto_index(numeric-bind) [list source [file join $dir misc.tcl]]
-set auto_index(my-listbox) [list source [file join $dir misc.tcl]]
-set auto_index(my-dialog) [list source [file join $dir misc.tcl]]
-set auto_index(warning) [list source [file join $dir misc.tcl]]
-set auto_index(error) [list source [file join $dir misc.tcl]]
-set auto_index(information) [list source [file join $dir misc.tcl]]
-set auto_index(question) [list source [file join $dir misc.tcl]]
-set auto_index(rootname) [list source [file join $dir misc.tcl]]
-set auto_index(my-random) [list source [file join $dir misc.tcl]]
-set auto_index(init-random) [list source [file join $dir misc.tcl]]

41
audio/TiMidity++/patches/scripts.diff
View File

@ -1,41 +0,0 @@
diff --git a/interface/timidity.el b/interface/timidity.el
index f03ba25..c2019bf 100644
--- a/interface/timidity.el
+++ b/interface/timidity.el
@@ -28,14 +28,14 @@
;;
;; You write follows in ~/.emacs
;; (autoload 'timidity "timidity" "TiMidity Interface" t)
-;; (setq timidity-prog-path "/usr/local/bin/timidity")
+;; (setq timidity-prog-path "/usr/bin/timidity")
;;
;; Then you type:
;; M-x timidity
;; Configuration parameters.
; Absolute path of timidity.
-(defvar timidity-prog-path "/usr/local/bin/timidity")
+(defvar timidity-prog-path "/usr/bin/timidity")
; String list for timidity program options.
(defvar timidity-default-options nil)
diff --git a/interface/tkmidity.ptcl b/interface/tkmidity.ptcl
index caf5e0a..7168bc4 100755
--- a/interface/tkmidity.ptcl
+++ b/interface/tkmidity.ptcl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/wishx -f
+#!/usr/bin/wish -f
#
# TiMidity++ -- MIDI to WAVE converter and player
# Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>
diff --git a/interface/tkpanel.tcl b/interface/tkpanel.tcl
index 0a392b1..e826c54 100755
--- a/interface/tkpanel.tcl
+++ b/interface/tkpanel.tcl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/wishx -f
+#!/usr/bin/wish -f
#
# TiMidity++ -- MIDI to WAVE converter and player
# Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>

38
audio/TiMidity++/patches/speex.diff
View File

@ -1,38 +0,0 @@
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -14785,7 +14785,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <speex.h>
+ #include <speex/speex.h>
#include <ogg/ogg.h>
int
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1230,7 +1230,7 @@
if test "x$au_enable_speex" = xyes; then
AC_CACHE_VAL(have_speex,
[AC_TRY_LINK([
- #include <speex.h>
+ #include <speex/speex.h>
#include <ogg/ogg.h>
],
[
diff --git a/timidity/speex_a.c b/timidity/speex_a.c
--- a/timidity/speex_a.c
+++ b/timidity/speex_a.c
@@ -33,8 +33,8 @@
#include <fcntl.h>
#endif
-#include <speex.h>
-#include <speex_header.h>
+#include <speex/speex.h>
+#include <speex/speex_header.h>
#include <ogg/ogg.h>
#include "timidity.h"