From bf7220deec6df3fa5c1ca244237c1b70b16af69f Mon Sep 17 00:00:00 2001 From: Szymon Siwek Date: Mon, 18 Jan 2010 01:46:40 +0000 Subject: [PATCH] - updated for 1.2.11 (now it contains only "don't read config from cwd" part) Changed files: SDL_mixer-timidity_cfg.patch -> 1.3 --- SDL_mixer-timidity_cfg.patch | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/SDL_mixer-timidity_cfg.patch b/SDL_mixer-timidity_cfg.patch index 0cf31f4..6cd05b8 100644 --- a/SDL_mixer-timidity_cfg.patch +++ b/SDL_mixer-timidity_cfg.patch @@ -1,27 +1,14 @@ ---- SDL_mixer-1.2.7/timidity/config.h.orig 2006-05-01 09:25:52.000000000 +0200 -+++ SDL_mixer-1.2.7/timidity/config.h 2006-05-20 01:17:40.326795750 +0200 -@@ -176,7 +176,7 @@ - #if defined(__WIN32__) || defined(__OS2__) - #define DEFAULT_PATH "\\TIMIDITY" - #else --#define DEFAULT_PATH "/usr/local/lib/timidity" -+#define DEFAULT_PATH "/usr/share/timidity" - #endif - - /* These affect general volume */ --- SDL_mixer-1.2.7/timidity/timidity.c.orig 2006-05-14 21:54:25.000000000 +0200 +++ SDL_mixer-1.2.7/timidity/timidity.c 2006-05-20 01:21:52.074529000 +0200 -@@ -294,13 +294,11 @@ - - int Timidity_Init(int rate, int format, int channels, int samples) +@@ -294,11 +294,9 @@ { -- if (read_config_file(CONFIG_FILE)<0) { - if (read_config_file(CONFIG_FILE_ETC)<0) { - if (read_config_file(CONFIG_FILE_ETC_TIMIDITY)<0) { + const char *env = getenv("TIMIDITY_CFG"); + if (!env || read_config_file(env)<0) { +- if (read_config_file(CONFIG_FILE)<0) { + if (read_config_file(CONFIG_FILE_ETC)<0) { return(-1); } - } -- } +- } + } if (channels < 1 || channels == 3 || channels == 5 || channels > 6) return(-1); - -- 2.43.0