Applied Debian patch 05_fallback_to_freepats.patch
authorSam Lantinga <slouken@libsdl.org>
Fri, 15 Feb 2013 15:09:10 -0800
changeset 604c932750a78ce
parent 603 72a476dc43ea
child 605 89bac9307337
Applied Debian patch 05_fallback_to_freepats.patch
timidity/config.h
timidity/timidity.c
     1.1 --- a/timidity/config.h	Fri Feb 15 15:08:25 2013 -0800
     1.2 +++ b/timidity/config.h	Fri Feb 15 15:09:10 2013 -0800
     1.3 @@ -162,6 +162,7 @@
     1.4     then specify the library directory in the configuration file. */
     1.5  #define CONFIG_FILE	"timidity.cfg"
     1.6  #define CONFIG_FILE_ETC "/etc/timidity.cfg"
     1.7 +#define CONFIG_FILE_ETC_TIMIDITY_FREEPATS "/etc/timidity/freepats.cfg"
     1.8  
     1.9  #if defined(__WIN32__) || defined(__OS2__)
    1.10  #define DEFAULT_PATH	"C:\\TIMIDITY"
     2.1 --- a/timidity/timidity.c	Fri Feb 15 15:08:25 2013 -0800
     2.2 +++ b/timidity/timidity.c	Fri Feb 15 15:09:10 2013 -0800
     2.3 @@ -286,7 +286,9 @@
     2.4    if (!env || read_config_file(env)<0) {
     2.5      if (read_config_file(CONFIG_FILE)<0) {
     2.6        if (read_config_file(CONFIG_FILE_ETC)<0) {
     2.7 -        return(-1);
     2.8 +        if (read_config_file(CONFIG_FILE_ETC_TIMIDITY_FREEPATS)<0) {
     2.9 +          return(-1);
    2.10 +        }
    2.11        }
    2.12      }
    2.13    }