Hello community,
here is the log from the commit of package timidity for openSUSE:Factory checked in at 2012-09-14 12:40:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/timidity (Old)
and /work/SRC/openSUSE:Factory/.timidity.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "timidity", Maintainer is "tiwai@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/timidity/timidity.changes 2012-05-29 10:36:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.timidity.new/timidity.changes 2012-09-14 12:40:56.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 30 17:56:39 CEST 2012 - tiwai@suse.de
+
+- Update to TiMidity++ 2.14.0-pre git version (commit 81c8d72e)
+- Rebase existing patches
+
+-------------------------------------------------------------------
Old:
----
TiMidity++-2.13.2.tar.bz2
timidity-ac_help_string.patch
timidity-alsaseq-poll-fix.diff
timidity-array-range-fix.diff
timidity-codecleanup.patch
timidity-configure_cache_val_name.patch
timidity-el-path.dif
timidity-fix-sndfont-list.diff
timidity-fix_implicit_declarations.patch
timidity-flac_api_changes.patch
timidity-fonts-fix.diff
timidity-gcc4-fix.diff
timidity-int_ptr_casts.patch
timidity-new_decompressors.patch
timidity-quote_m4_macros.patch
timidity-server-warning-fixes.diff
timidity-speex_configury.patch
timidity-tcl-wish-path-fix.diff
timidity-tcl8.5-fix.diff
New:
----
0001-Fix-possible-invalid-access-below-the-array-range.patch
0002-Fix-alsaseq-polling-at-idle-time.patch
0003-Fix-the-faulty-check-of-parameters-in-server_c.c-con.patch
0004-Add-missing-void-argument-for-function-declarations.patch
0005-Add-missing-quotes-in-autoconf-utils.m4.patch
0006-Add-the-lzma-decompression-support.patch
0007-Fix-the-missing-return-value-in-emacs_c.c.patch
0008-Fix-type-punning-in-smplfile.c.patch
0009-Use-AS_HELP_STRING-to-make-the-help-output-more-read.patch
timidity-2.14.0-pre.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ timidity.spec ++++++
--- /var/tmp/diff_new_pack.v8uXD5/_old 2012-09-14 12:40:57.000000000 +0200
+++ /var/tmp/diff_new_pack.v8uXD5/_new 2012-09-14 12:40:57.000000000 +0200
@@ -27,7 +27,7 @@
Summary: Software Synthesizer and MIDI Player
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Midi
-Version: 2.13.2
+Version: 2.13.99
Release: 0
Url: http://timidity.sourceforge.net/
%define package_version 2.13.2
@@ -58,8 +58,8 @@
BuildRequires: xaw3d-devel
%endif
PreReq: %insserv_prereq %fillup_prereq
-Source: TiMidity++-%{package_version}.tar.bz2
-# Source: timidity-cvs20040227.tar.bz2
+# Source: TiMidity++-%{package_version}.tar.bz2
+Source: timidity-2.14.0-pre.tar.bz2
Source1: timidity-patches.tar.bz2
Source2: %name.desktop
Source3: timidity.png
@@ -67,27 +67,17 @@
Source5: %{name}.init
Source6: %{name}.sysconf
Source7: README.SuSE
-Patch: timidity-el-path.dif
-Patch1: timidity-gcc4-fix.diff
-Patch2: timidity-array-range-fix.diff
-Patch3: timidity-tcl-wish-path-fix.diff
-Patch4: timidity-alsaseq-poll-fix.diff
-Patch5: timidity-fonts-fix.diff
-Patch6: timidity-tcl8.5-fix.diff
-Patch7: timidity-server-warning-fixes.diff
-
-Patch8: timidity-fix_implicit_declarations.patch
-Patch9: timidity-int_ptr_casts.patch
-Patch10: timidity-quote_m4_macros.patch
-Patch11: timidity-ac_help_string.patch
-Patch12: timidity-configure_cache_val_name.patch
-Patch13: timidity-flac_api_changes.patch
-Patch14: timidity-speex_configury.patch
-Patch15: timidity-new_decompressors.patch
-Patch16: timidity-codecleanup.patch
-Patch17: timidity-no_date.patch
-Patch18: timidity-add_fluid_cfgs.patch
-Patch19: timidity-fix-sndfont-list.diff
+Patch1: 0001-Fix-possible-invalid-access-below-the-array-range.patch
+Patch2: 0002-Fix-alsaseq-polling-at-idle-time.patch
+Patch3: 0003-Fix-the-faulty-check-of-parameters-in-server_c.c-con.patch
+Patch4: 0004-Add-missing-void-argument-for-function-declarations.patch
+Patch5: 0005-Add-missing-quotes-in-autoconf-utils.m4.patch
+Patch6: 0006-Add-the-lzma-decompression-support.patch
+Patch7: 0007-Fix-the-missing-return-value-in-emacs_c.c.patch
+Patch8: 0008-Fix-type-punning-in-smplfile.c.patch
+Patch9: 0009-Use-AS_HELP_STRING-to-make-the-help-output-more-read.patch
+Patch100: timidity-no_date.patch
+Patch101: timidity-add_fluid_cfgs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -96,33 +86,20 @@
data.
-
-Authors:
---------
- Masanao Izumo
-
%prep
-%setup -q -n TiMidity++-%{package_version} -a 1
-%patch
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
+# setup -q -n TiMidity++-%{package_version} -a 1
+%setup -q -n timidity -a 1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%patch7 -p1
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
-%patch13
-%patch14
-%patch15
-%patch16
-%patch17
-%patch18
-%patch19 -p1
+%patch8 -p1
+%patch9 -p1
+%patch100
+%patch101
for f in ./utils/bitset.c ./utils/bitset.h ./utils/nkflib.c; do
iconv -f EUC-JISX0213 -t UTF-8 $f > $f.utf8 && mv $f.utf8 $f
done
@@ -148,14 +125,14 @@
%install
%makeinstall WISH=tclsh
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/
-cp TiMidity.ad $RPM_BUILD_ROOT/usr/share/X11/app-defaults/TiMidity
+cp interface/TiMidity.ad $RPM_BUILD_ROOT/usr/share/X11/app-defaults/TiMidity
# for japanese locale
# UTF-8 version
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/{ja,ja_JP.UTF-8,ja_JP.eucJP,ja_JP.ujis}/app-defaults
-iconv -feuc-jp -tutf-8 TiMidity-uj.ad > $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/TiMidity
+iconv -feuc-jp -tutf-8 interface/TiMidity-uj.ad > $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/TiMidity
ln -s ../../ja/app-defaults/TiMidity $RPM_BUILD_ROOT%{_datadir}/X11/ja_JP.UTF-8/app-defaults/TiMidity
# EUC-jp version
-cp TiMidity-uj.ad $RPM_BUILD_ROOT%{_datadir}/X11/ja_JP.eucJP/app-defaults/TiMidity
+cp interface/TiMidity-uj.ad $RPM_BUILD_ROOT%{_datadir}/X11/ja_JP.eucJP/app-defaults/TiMidity
ln -s ../../ja_JP.eucJP/app-defaults/TiMidity $RPM_BUILD_ROOT%{_datadir}/X11/ja_JP.ujis/app-defaults/TiMidity
# copy documents
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
++++++ 0001-Fix-possible-invalid-access-below-the-array-range.patch ++++++
From ff03b656542c2c8bb1e91499827289606d6d536a Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 12:51:41 +0200
Subject: [PATCH 1/9] Fix possible invalid access below the array range
Signed-off-by: Takashi Iwai
---
interface/xskin_spectrum.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface/xskin_spectrum.c b/interface/xskin_spectrum.c
index 9fcd234..ae8fdb6 100644
--- a/interface/xskin_spectrum.c
+++ b/interface/xskin_spectrum.c
@@ -102,7 +102,7 @@ int xskin_loadviscolor( Display *d, Window w, char *filename ) {
if ( foreground == 0 ) foreground = BlackPixel( d, sc );
for ( i=0 ; i<16 ; i++ ) {
spe_pixel[i] = xskin_getcolor( d, r0[i], g0[i], b0[i] );
- if ( spe_pixel[i] == 0 )
+ if ( i && spe_pixel[i] == 0 )
spe_pixel[i] = spe_pixel[i-1];
}
for ( i=0 ; i<5 ; i++ ) {
--
1.7.9.2
++++++ 0002-Fix-alsaseq-polling-at-idle-time.patch ++++++
From dcfe540627e65381697785201af5cd6fc90ac3c9 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 12:56:55 +0200
Subject: [PATCH 2/9] Fix alsaseq polling at idle time
The select() must be called even at idle time. Otherwise it goes to
busy loop.
Signed-off-by: Takashi Iwai
---
interface/alsaseq_c.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/interface/alsaseq_c.c b/interface/alsaseq_c.c
index 876a62c..1785ab1 100644
--- a/interface/alsaseq_c.c
+++ b/interface/alsaseq_c.c
@@ -484,6 +484,8 @@ static void stop_playing(void)
static void doit(struct seq_context *ctxp)
{
+ fd_set rfds;
+ struct timeval timeout;
for (;;) {
while (snd_seq_event_input_pending(ctxp->handle, 1)) {
if (do_sequencer(ctxp))
@@ -511,20 +513,17 @@ static void doit(struct seq_context *ctxp)
play_event(&ev);
aq_fill_nonblocking();
}
- if (! ctxp->active || ! IS_STREAM_TRACE) {
- fd_set rfds;
- FD_ZERO(&rfds);
- FD_SET(ctxp->fd, &rfds);
- if (! IS_STREAM_TRACE) {
- struct timeval timeout;
- timeout.tv_sec = 0;
- timeout.tv_usec = 10000; /* 10ms */
- if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0)
- goto __done;
- } else {
- if (select(ctxp->fd + 1, &rfds, NULL, NULL, NULL) < 0)
- goto __done;
- }
+
+ FD_ZERO(&rfds);
+ FD_SET(ctxp->fd, &rfds);
+ if (ctxp->active) {
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 10000; /* 10ms */
+ if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0)
+ goto __done;
+ } else {
+ if (select(ctxp->fd + 1, &rfds, NULL, NULL, NULL) < 0)
+ goto __done;
}
}
--
1.7.9.2
++++++ 0003-Fix-the-faulty-check-of-parameters-in-server_c.c-con.patch ++++++
From 10a3a90dcb65211fa72cd8eac6c080227c415a80 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 13:06:03 +0200
Subject: [PATCH 3/9] Fix the faulty check of parameters in
server_c.c:control_getcmd()
The check of the array size in server_c.c:control_getcmd() is wrong
as the nparmas is incremeted after the check with MAX_GETCMD_PARAMS.
Also, there are other bugs that *nparams isn't initialized when the
first token is NULL, etc. Overall, the code is unnecessarily tricky.
This patch simplifies the code and fixes the array size check.
Bugzila: https://bugzilla.novell.com/show_bug.cgi?id=517719
Signed-off-by: Takashi Iwai
---
interface/server_c.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/interface/server_c.c b/interface/server_c.c
index 196ea7d..1b8b483 100644
--- a/interface/server_c.c
+++ b/interface/server_c.c
@@ -525,11 +525,13 @@ static int control_getcmd(char **params, int *nparams)
}
if(n == 0)
return 1;
- if((params[0] = strtok(buff, " \t\r\n\240")) == NULL)
- return 0;
*nparams = 0;
- while(params[*nparams] && *nparams < MAX_GETCMD_PARAMS)
- params[++(*nparams)] = strtok(NULL," \t\r\n\240");
+ do {
+ params[*nparams] = strtok(*nparams ? NULL : buff, " \t\r\n\240");
+ if (!params[*nparams])
+ break;
+ (*nparams)++;
+ } while (*nparams < MAX_GETCMD_PARAMS);
return 0;
}
--
1.7.9.2
++++++ 0004-Add-missing-void-argument-for-function-declarations.patch ++++++
From d8357d6db147702a45c727817e94f44c9fcf70d0 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 13:13:55 +0200
Subject: [PATCH 4/9] Add missing void argument for function declarations
Signed-off-by: Takashi Iwai
---
libunimod/mloader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libunimod/mloader.c b/libunimod/mloader.c
index 7cf5efa..876aaca 100644
--- a/libunimod/mloader.c
+++ b/libunimod/mloader.c
@@ -527,7 +527,7 @@ SL_RegisterSample (SAMPLE * s, URL reader)
}
static void
-FreeSampleList ()
+FreeSampleList (void)
{
SAMPLOAD *old, *s = musiclist;
@@ -543,7 +543,7 @@ FreeSampleList ()
/* Returns the total amount of memory required by the musiclist queue. */
#ifdef MAX_SAMPLESPACE
static ULONG
-SampleTotal ()
+SampleTotal (void)
{
int total = 0;
SAMPLOAD *samplist = musiclist;
--
1.7.9.2
++++++ 0005-Add-missing-quotes-in-autoconf-utils.m4.patch ++++++
From 8a782575aa2b7ba05168f9bd8ba1565298af7c37 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 13:17:27 +0200
Subject: [PATCH 5/9] Add missing quotes in autoconf/utils.m4
Signed-off-by: Takashi Iwai
---
autoconf/utils.m4 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/autoconf/utils.m4 b/autoconf/utils.m4
index b25eeb9..d2f8db1 100644
--- a/autoconf/utils.m4
+++ b/autoconf/utils.m4
@@ -55,7 +55,7 @@ dnl CC CFLAGS CPPFLAGS LDFLAGS LIBS SHCFLAGS SHLD SHLDFLAGS
dnl ac_cv_header_dlfcn_h lib_dl_opt so
AC_DEFUN([CHECK_DLSYM_UNDERSCORE],
[dnl Check if dlsym need a leading underscore
-AC_MSG_CHECKING(whether your dlsym() needs a leading underscore)
+AC_MSG_CHECKING([whether your dlsym() needs a leading underscore])
AC_CACHE_VAL(timidity_cv_func_dlsym_underscore,
[case "$ac_cv_header_dlfcn_h" in
yes) i_dlfcn=define;;
@@ -146,7 +146,7 @@ dnl contains program from perl5
dnl CONTAINS_INIT()
AC_DEFUN([CONTAINS_INIT],
[dnl Some greps do not return status, grrr.
-AC_MSG_CHECKING(whether grep returns status)
+AC_MSG_CHECKING([whether grep returns status])
echo "grimblepritz" >grimble
if grep blurfldyick grimble >/dev/null 2>&1 ; then
contains="./contains"
--
1.7.9.2
++++++ 0006-Add-the-lzma-decompression-support.patch ++++++
From de4fb4ed09a5ea0a1d42aacdbf27d51aa0e09bc7 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 13:19:58 +0200
Subject: [PATCH 6/9] Add the lzma decompression support
Signed-off-by: Takashi Iwai
---
timidity/timidity.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/timidity/timidity.h b/timidity/timidity.h
index fbac13e..5ba58c8 100644
--- a/timidity/timidity.h
+++ b/timidity/timidity.h
@@ -62,6 +62,7 @@
#define DECOMPRESSOR_LIST { \
".gz", "gunzip -c %s", \
".xz", "xzcat %s", \
+ ".lzma", "lzcat %s", \
".bz2", "bunzip2 -c %s", \
".Z", "zcat %s", \
".zip", "unzip -p %s", \
--
1.7.9.2
++++++ 0007-Fix-the-missing-return-value-in-emacs_c.c.patch ++++++
From 5df279f92338f62440d686fb4874c69fe5cc57b9 Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 15:04:53 +0200
Subject: [PATCH 7/9] Fix the missing return value in emacs_c.c
Signed-off-by: Takashi Iwai
---
interface/emacs_c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface/emacs_c.c b/interface/emacs_c.c
index 0d726c5..1f82e93 100644
--- a/interface/emacs_c.c
+++ b/interface/emacs_c.c
@@ -285,7 +285,7 @@ static int ctl_pass_playing_list(int argc, char *argv[])
int rc;
if(fgets(cmd, sizeof(cmd), stdin) == NULL)
- return; /* Emacs may down */
+ return 0; /* Emacs may down */
chomp(cmd);
if(!strncmp(cmd, "PLAY", 4))
{
--
1.7.9.2
++++++ 0008-Fix-type-punning-in-smplfile.c.patch ++++++
From fd07758bc2b608771a04216b6d862e6766def73d Mon Sep 17 00:00:00 2001
From: Takashi Iwai
Date: Wed, 30 May 2012 15:04:23 +0200
Subject: [PATCH 8/9] Fix type-punning in smplfile.c
Signed-off-by: Takashi Iwai
---
timidity/smplfile.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/timidity/smplfile.c b/timidity/smplfile.c
index cab2727..e528596 100755
--- a/timidity/smplfile.c
+++ b/timidity/smplfile.c
@@ -316,7 +316,11 @@ static int import_wave_discriminant(char *sample_file)
static int import_wave_load(char *sample_file, Instrument *inst)
{
struct timidity_file *tf;
- char buf[12];
+ union {
+ int32 i[3];
+ char c[12];
+ } xbuf;
+ char *buf = xbuf.c;
int state; /* initial > fmt_read > data_read */
int i, chunk_size, type_index, type_size, samples = 0;
int32 chunk_flags;
@@ -339,7 +343,7 @@ static int import_wave_load(char *sample_file, Instrument *inst)
for(;;) {
if (tf_read(&buf[type_index], type_size, 1, tf) != 1)
break;
- chunk_size = LE_LONG(*(int32 *)&buf[4 + 4]);
+ chunk_size = LE_LONG(xbuf.i[2]);
if (memcmp(&buf[4 + 0], "fmt ", 4) == 0)
{
if (state != 0 /* only one format chunk is required */
@@ -598,7 +602,11 @@ static int import_aiff_discriminant(char *sample_file)
static int import_aiff_load(char *sample_file, Instrument *inst)
{
struct timidity_file *tf;
- char buf[12];
+ union {
+ int32 i[3];
+ char c[12];
+ } xbuf;
+ char *buf = xbuf.c;
int chunk_size, type_index, type_size;
int compressed;
int32 chunk_flags;
@@ -627,7 +635,7 @@ static int import_aiff_load(char *sample_file, Instrument *inst)
for(;;) {
if (tf_read(&buf[type_index], type_size, 1, tf) != 1)
break;
- chunk_size = BE_LONG(*(int32 *)&buf[4 + 4]);
+ chunk_size = BE_LONG(xbuf.i[2]);
if (memcmp(&buf[4 + 0], "COMM", 4) == 0)
{
if (chunk_flags & AIFF_CHUNKFLAG_COMMON)
--
1.7.9.2
++++++ 0009-Use-AS_HELP_STRING-to-make-the-help-output-more-read.patch ++++++
++++ 729 lines (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org