| 1 |
ssuominen 12/07/07 07:48:46 |
| 2 |
|
| 3 |
Added: |
| 4 |
timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch |
| 5 |
timidity++-2.14.0-params.patch |
| 6 |
Log: |
| 7 |
Version bump. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch |
| 18 |
=================================================================== |
| 19 |
This will revert part of the commit from: |
| 20 |
|
| 21 |
http://timidity.git.sourceforge.net/git/gitweb.cgi?p=timidity/timidity;a=commit;h=e73b53437dbc1e57e61dd4d0c1407784797b08d9 |
| 22 |
|
| 23 |
Because otherwise TiMidity++ simply won't build as per: |
| 24 |
|
| 25 |
../interface/libinterface.a(xskin_c.o): In function `ctl_event': |
| 26 |
xskin_c.c:(.text+0x17c): undefined reference to `ctl_speana_data' |
| 27 |
collect2: error: ld returned 1 exit status |
| 28 |
|
| 29 |
--- interface/xskin_c.c |
| 30 |
+++ interface/xskin_c.c |
| 31 |
@@ -228,7 +228,6 @@ |
| 32 |
} |
| 33 |
} |
| 34 |
|
| 35 |
-#if 0 |
| 36 |
static void ctl_speana_data(double *val, int size) { |
| 37 |
|
| 38 |
/* 0 <= val[n] <= (AMP*NCOLOR) */ |
| 39 |
@@ -280,7 +279,6 @@ |
| 40 |
|
| 41 |
return; |
| 42 |
} |
| 43 |
-#endif |
| 44 |
|
| 45 |
/*ARGSUSED*/ |
| 46 |
static int ctl_open(int using_stdin, int using_stdout) { |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 media-sound/timidity++/files/timidity++-2.14.0-params.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-params.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-params.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: timidity++-2.14.0-params.patch |
| 56 |
=================================================================== |
| 57 |
--- configure.in |
| 58 |
+++ configure.in |
| 59 |
@@ -2245,10 +2245,15 @@ |
| 60 |
|
| 61 |
AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes") |
| 62 |
|
| 63 |
-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS) |
| 64 |
-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS) |
| 65 |
-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS) |
| 66 |
-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS) |
| 67 |
+# These break flags like --param wrt #276433 |
| 68 |
+# SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS) |
| 69 |
+# SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS) |
| 70 |
+# SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS) |
| 71 |
+# SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS) |
| 72 |
+LDFLAGS="$LDFLAGS" |
| 73 |
+SHLDFLAGS="$SHLDFLAGS" |
| 74 |
+CFLAGS="$EXTRACFLAGS $CFLAGS" |
| 75 |
+CPPFLAGS="$CPPFLAGS $EXTRADEFS" |
| 76 |
|
| 77 |
if test "x$oss_device" != x; then |
| 78 |
AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name) |
Archives