ALT Linux repositórios
Group :: Sistema/Bibliotecas
RPM: SDL_mixer
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: SDL_mixer-1.2.11-alt5.patch
Download
Download
diff --git a/Makefile.in b/Makefile.in
index 76fdd3c..fe6b93a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,7 @@ $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-install: all install-hdrs install-lib #install-bin
+install: all install-hdrs install-lib install-bin
install-hdrs:
$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
for src in $(srcdir)/SDL_mixer.h; do \
diff --git a/timidity/config.h b/timidity/config.h
index ace589b..1eaeb72 100644
--- a/timidity/config.h
+++ b/timidity/config.h
@@ -171,8 +171,9 @@ typedef char int8;
/* 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 "/etc/timidity.cfg"
+#define CONFIG_FILE "timidity.cfg"
+#define CONFIG_FILE_ETC "/etc/timidity.cfg"
+#define CONFIG_FILE_SHARE "/usr/share/timidity/midia.cfg"
#if defined(__WIN32__) || defined(__OS2__)
#define DEFAULT_PATH "C:\\TIMIDITY"
diff --git a/timidity/timidity.c b/timidity/timidity.c
index 1dea30c..6d60931 100644
--- a/timidity/timidity.c
+++ b/timidity/timidity.c
@@ -296,11 +296,13 @@ int Timidity_Init(int rate, int format, int channels, int samples)
{
const char *env = getenv("TIMIDITY_CFG");
if (!env || read_config_file(env)<0) {
+ if (read_config_file(CONFIG_FILE_SHARE)<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);