- added link patch (so that as-needed in LDFLAGS actually works)

[packages/SDL_mixer.git] / SDL_mixer-timidity_cfg.patch

diff --git a/SDL_mixer-timidity_cfg.patch b/SDL_mixer-timidity_cfg.patch
index dca2cc3bc8238adb129beba15042ca8d5e1a49eb..6cd05b8a22582922d5549c00d74834662e8300c2 100644 (file)
--- a/SDL_mixer-timidity_cfg.patch
+++ b/SDL_mixer-timidity_cfg.patch
@@ -1,17 +1,14 @@
-diff -Nru SDL_mixer-1.1.0/timidity/config.h SDL_mixer-1.1.0.new/timidity/config.h
---- SDL_mixer-1.1.0/timidity/config.h  Tue Feb  6 09:29:33 2001
-+++ SDL_mixer-1.1.0.new/timidity/config.h      Tue Feb  6 09:32:54 2001
-@@ -202,11 +202,11 @@
+--- 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,11 +294,9 @@
+ {
+   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);
+       }
+-    }
+   }
  
- /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
-    then specify the library directory in the configuration file. */
--#define CONFIG_FILE   "timidity.cfg"
-+#define CONFIG_FILE   "/etc/timidity.cfg"
- #ifdef __WIN32__
- #define DEFAULT_PATH  "\\TIMIDITY"
- #else
--#define DEFAULT_PATH  "/usr/local/lib/timidity"
-+#define DEFAULT_PATH  "/usr/share/timidity"
- #endif
- 
- /* These affect general volume */
+   if (channels < 1 || channels == 3 || channels == 5 || channels > 6) return(-1);