# ChangeLog for media-sound/timidity++
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.144 2011/10/23 16:12:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.145 2011/10/23 16:50:13 ssuominen Exp $
+
+ 23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ -timidity++-2.13.2-r11.ebuild, -files/timidity++-2.13.2-flac.patch,
+ -files/timidity++-2.13.2-flac113.patch, -files/timidity++-2.13.2-gcc4.patch,
+ -files/timidity++-2.13.2-gtk26.patch, -files/timidity++-2.13.2-params.patch,
+ -files/timidity++-2.13.2-polling.patch,
+ -files/timidity++-2.13.2-protos.patch, -files/conf.d.timidity,
+ -files/timidity.desktop:
+ old
23 Oct 2011; Raúl Porcel <armin76@gentoo.org> timidity++-2.13.2-r13.ebuild:
sparc stable wrt #385757
Hash: SHA1
AUX 50timidity++-gentoo.el 180 RMD160 120c40280826edc0e6c746ed2b09372222235492 SHA1 0489f1a36d33c6d6402c30000af21274c85e2a5b SHA256 a5ca92074ec2b79251bf33a1fb9c4007f528c036f951c6e4fa87311d7acc11a0
-AUX conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a SHA1 4636543aa1c2c90afb4ee02e8f11067bda2bd271 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3
AUX conf.d.timidity.2 972 RMD160 60bd6643d195fd846185ca23132a969eef950f55 SHA1 c74e787f048229b7e3795e2783207d85ec9c3dad SHA256 a3a6fc74fc1353f2c5e7eda51a244fb3212cd5f33b407fe5ce1245ca2757593e
AUX init.d.timidity.3 502 RMD160 45dcebcc3e2dd3048b4551941464a6ffcf1b8b0e SHA1 4e9f0069d14bdd121c83163d95f75a02801707a9 SHA256 b11e108210446221ccc8344f07a780349197248194bde5956ca69552f7aa5b14
AUX init.d.timidity.4 509 RMD160 258ba7d4755ddcff250e8436766d614e845963a0 SHA1 d304200de8f256f84d4e9d6215934bf2d2dbb462 SHA256 e982455e275d34c0f2b66b94203c7380ecb2d06a59210ce7702564c858817161
-AUX timidity++-2.13.2-flac.patch 735 RMD160 65abbbc330b0ae486af3686cea8329a4f9a1b75c SHA1 53f4cbf7a343002a3f6508938ba3e24d1f4bf5f5 SHA256 5ae270f3bc0b74def45dde4b85d178c8ebfbef01752ef6b4ec2588ffda48bbca
-AUX timidity++-2.13.2-flac113.patch 11509 RMD160 709a31cc664a9686f1ac22974459e0c932511418 SHA1 173cc8f2ec5ecfc834d5a0027aa3cdecd3f9f14d SHA256 2ed4abfb75d225f6bd295ba4ffbc63f47c6caab57cb09e670df508c5d7447424
-AUX timidity++-2.13.2-gcc4.patch 1325 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 SHA1 8d50618a2379c078b07e8d0fc59457855c16106c SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee
-AUX timidity++-2.13.2-gtk26.patch 588 RMD160 588eefcb0727af0162b24b17970df300ea5fdd64 SHA1 ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4 SHA256 fdb95708e353425fbc8f141d45f5b876fa85636f953200cdbc147834b4a31f56
-AUX timidity++-2.13.2-params.patch 1834 RMD160 7984132baa0c6e6277a3520343e79280945c3704 SHA1 a1d0436a217852a62e6e5ec8bf814fc49733a583 SHA256 ca87dd8d303501c613491ca34b2876a21fa0bfb03610d4b035aeb51388ca587d
-AUX timidity++-2.13.2-polling.patch 960 RMD160 404beaffd1d1618ad6579ef952567f514e82da5d SHA1 6c4f62c045380a6d27c44002c72352943af0fa2b SHA256 933afdd0a6f4dfc98b25818c8c07ea7e2ba8a10a422f23953143d0ae09e39845
-AUX timidity++-2.13.2-protos.patch 231 RMD160 4ae219704a9da1dfc792bde1a9ebc991eac168a1 SHA1 26ce16fa02127896fe3d919a758a067c63b6b8bd SHA256 14ae61bc72897cbbe817227f5dbda68c388c80531bd1659b0a595884747de78e
AUX timidity.cfg-r1 669 RMD160 856294ef64ab459a03375cb86e5f0fbcdef88ab3 SHA1 a1aec57e46d953082d1e59cf80eb1cb15627bb4c SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce
-AUX timidity.desktop 247 RMD160 967015802ff097c5dd7008cba2a0a3026eb9cd75 SHA1 e429daf4c00a018447d4e3ca7b34c7f61d4d7a7c SHA256 91d64b549a3339d65e694a36c3eb95869726743d3cbde39b40bea5f699f2480c
AUX timidity.desktop.2 257 RMD160 9820f1876d172775bc69a25c577d4f2e5efd6edc SHA1 73e517e9ca9cd31d8017381986b71c3017a1fd21 SHA256 9e9d89fe6c03067d90d2786f0c41415cfa379b6d8635e1b206fffd7dd68e65aa
AUX timidity.xpm 1522 RMD160 2b64234979909343fc2775e5eedfe8960a3190d1 SHA1 181555a128d9a512bb74192c85cbfa20099f41d1 SHA256 4b085a4b8af1648495dccc36bcb7b7637318ffb3e9c2011cc8ac43119a8b4db6
DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA1 8e603146e1164335303a5ac5dff291f369241b4e SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
-DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 RMD160 4b1e37c734d124757cbaf7cdf35b487c95a3660a SHA1 4805580e618bddac42bbb4ba9d035f5d1d162caa SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc
-EBUILD timidity++-2.13.2-r11.ebuild 5351 RMD160 8a7028ef934dff51b24b91aac90971ffbe09c8f6 SHA1 2e77d7b5811b0c39278e50a13f9d1811a2c9f104 SHA256 48141cb0ca704d6440523bfd18d2c47da2110d72f59646ddf54329c5cd618c27
EBUILD timidity++-2.13.2-r13.ebuild 5008 RMD160 9def0f3c7efe0ced518e0e944e095cb454de6c24 SHA1 253dd73ba6da849607d9960e26c7777b4bfec838 SHA256 42488211cdf95338d9ce81dcf637f7223efd19d35f7c1420e9fbb1b200f1eb3a
EBUILD timidity++-2.13.2-r14.ebuild 5027 RMD160 50c9777eda9847b2fe0b5f8a3d2a10c8e53f0969 SHA1 3053f58e427b53ef1c2486c1bd7ec6bb223fb86a SHA256 ceb824b04d0b6de6a199ee33c267df6c704b53c22f83a4ecaf8dbe899caaee61
-MISC ChangeLog 22613 RMD160 a91710831409648462b3887d1c6152331c8377b3 SHA1 c2c15bc6a1efe7dc7ac9b6a56d0a157b71d637a7 SHA256 498f4a1c9cc6eea96e7491fbceec266303909c8d2aaebb839a61e42d0a794185
+MISC ChangeLog 23038 RMD160 e6846166c0f4f58a7145957e65711d8dc6740597 SHA1 6909b011d2024059a52d7718c4fcc392445790c8 SHA256 38fa0fd56f54321abfe356596c28144c2afc35806bb15327231ffad34962b37a
MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk6kPOkACgkQuQc30/atMkBxdQCgwOc1fvgw2ImCl/WTVB4d0M9K
-hWsAn3K9JBopsI0kBkcajbrwYbwEnmbE
-=PzY/
+iQEcBAEBAgAGBQJOpEWYAAoJEEdUh39IaPFNnjsH/0gIDVQmGRGOyJ1/NNpo4F/9
+tpOTvkrZK1CR5kXFJQUfCMNWg3T5nUqrFSj2waezUC8GgLZYqvgsN4Cb6K53hy3Z
+ELiUYpp9OTzvi4rJ2VjWB67z6f8Q8cGnT5AmZwOYEu02FluL2+Oh4DxGMePHvv3P
+wo5CUsu/E1RTzDFVLWhf8pLj2Thxw4jcmZzdjcCXD0jcM6oiRuiAy2XYif7h5tg3
+p+LaBh5fUtuwHTUG93qoYMFJcHYPqxGr/NW8ZhqcIGcOGFUCSQ7r5FhTiTeyMNIp
+p91bj2qr32WgIjM9igUAVyr3l6DmW0LtZu2wCdpWptIanwDqzXc8vFb2gaYs34k=
+=5APA
-----END PGP SIGNATURE-----
+++ /dev/null
-# TIMIDITY_OPTS
-# Command line arguements to be passed to timidity. -iA is always used
-# Common options:
-# -Os : Output to ALSA pcm device
-# -Oe : Output to esd
-# -On : Output to NAS
-#
-# -B<n>,<m> : Set number of buffer fragments(n), and buffer size(2^m)
-#
-# -EFreverb=0 : Disable MIDI reverb effect control
-# -EFreverb=1[,level] : Enable MIDI reverb effect control
-# `level' is optional to specify reverb level [0..127]
-# This effect is only available in stereo
-# (default)
-# -EFreverb=2 : Global reverb effect
-
-TIMIDITY_OPTS="-B2,8 -Os -EFreverb=0"
-
-# TIMIDITY_PCM_NAME
-# This option can be used to choose an alternate ALSA pcm device. This will
-# be most useful for users of the dmix alsa plugin or those with multiple
-# cards. If you don't know what this is, chances are you want the default.
-
-#TIMIDITY_PCM_NAME="default"
+++ /dev/null
-*** TiMidity++-2.13.2/timidity/flac_a.c Sun May 23 07:35:44 2004
---- TiMidity++-2.13.2/timidity/flac_a.c Sat Dec 30 13:24:08 2006
-***************
-*** 813,819 ****
- return;
- }
--
-- if (flac_options.isogg) {
- #ifdef AU_OGGFLAC
- if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) {
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)",
---- 813,818 ----
- return;
- }
- #ifdef AU_OGGFLAC
-+ if (flac_options.isogg) {
- if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) {
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)",
+++ /dev/null
-Index: TiMidity++-2.13.2/timidity/flac_a.c
-===================================================================
---- TiMidity++-2.13.2.orig/timidity/flac_a.c
-+++ TiMidity++-2.13.2/timidity/flac_a.c
-@@ -45,6 +45,11 @@
- #endif
-
- #include <FLAC/all.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
- #ifdef AU_OGGFLAC
- #include <OggFLAC/stream_encoder.h>
- #endif
-@@ -100,7 +105,11 @@ typedef struct {
- unsigned long out_bytes;
- union {
- FLAC__StreamEncoderState flac;
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamEncoderState s_flac;
-+#else
-+ FLAC__StreamEncoderState s_flac;
-+#endif
- #ifdef AU_OGGFLAC
- OggFLAC__StreamEncoderState ogg;
- #endif
-@@ -108,7 +117,11 @@ typedef struct {
- union {
- union {
- FLAC__StreamEncoder *stream;
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamEncoder *s_stream;
-+#else
-+ FLAC__StreamEncoder *s_stream;
-+#endif
- } flac;
- #ifdef AU_OGGFLAC
- union {
-@@ -174,11 +187,19 @@ static void flac_stream_encoder_metadata
- const FLAC__StreamMetadata *metadata,
- void *client_data);
- static FLAC__StreamEncoderWriteStatus
-+#ifdef LEGACY_FLAC
- flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder,
-+#else
-+flac_seekable_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
-+#endif
- const FLAC__byte buffer[],
- unsigned bytes, unsigned samples,
- unsigned current_frame, void *client_data);
-+#ifdef LEGACY_FLAC
- static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder,
-+#else
-+static void flac_seekable_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
-+#endif
- const FLAC__StreamMetadata *metadata,
- void *client_data);
-
-@@ -306,8 +327,13 @@ static int flac_session_close()
- #endif /* AU_OGGFLAC */
- if (flac_options.seekable) {
- if (ctx->encoder.flac.s_stream) {
-+#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_finish(ctx->encoder.flac.s_stream);
- FLAC__seekable_stream_encoder_delete(ctx->encoder.flac.s_stream);
-+#else
-+ FLAC__stream_encoder_finish(ctx->encoder.flac.s_stream);
-+ FLAC__stream_encoder_delete(ctx->encoder.flac.s_stream);
-+#endif
- }
- }
- else
-@@ -435,17 +461,29 @@ static int flac_output_open(const char *
- else
- #endif /* AU_OGGFLAC */
- if (flac_options.seekable) {
-+#ifdef LEGACY_FLAC
- if ((ctx->encoder.flac.s_stream = FLAC__seekable_stream_encoder_new()) == NULL) {
-+#else
-+ if ((ctx->encoder.flac.s_stream = FLAC__stream_encoder_new()) == NULL) {
-+#endif
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream");
- flac_session_close();
- return -1;
- }
-
-+#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch);
- /* 16bps only */
- FLAC__seekable_stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16);
-
- FLAC__seekable_stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify);
-+#else
-+ FLAC__stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch);
-+ /* 16bps only */
-+ FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16);
-+
-+ FLAC__stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify);
-+#endif
-
- if (!FLAC__format_sample_rate_is_valid(dpm.rate)) {
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d",
-@@ -453,27 +491,54 @@ static int flac_output_open(const char *
- flac_session_close();
- return -1;
- }
-+#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate);
-
- FLAC__seekable_stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision);
- /* expensive! */
- FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search);
-+#else
-+ FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate);
-+
-+ FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision);
-+ /* expensive! */
-+ FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search);
-+#endif
-+
-
- if (nch == 2) {
-+#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side);
- FLAC__seekable_stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side);
-+#else
-+ FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side);
-+ FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side);
-+#endif
- }
-
-+#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order);
- FLAC__seekable_stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order);
- FLAC__seekable_stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order);
-
- FLAC__seekable_stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize);
- FLAC__seekable_stream_encoder_set_client_data(ctx->encoder.flac.s_stream, ctx);
-+#else
-+ FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order);
-+ FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order);
-+ FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order);
-+
-+ FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize);
-+#endif
-
- if (0 < num_metadata)
-+#ifdef LEGACY_FLAC
- FLAC__seekable_stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata);
-+#else
-+ FLAC__stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata);
-+#endif
-
-+#ifdef LEGACY_FLAC
- /* set callback */
- /* FLAC__seekable_stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */
- #ifndef __BORLANDC__
-@@ -483,8 +548,17 @@ static int flac_output_open(const char *
-
- ctx->state.s_flac = FLAC__seekable_stream_encoder_init(ctx->encoder.flac.s_stream);
- if (ctx->state.s_flac != FLAC__SEEKABLE_STREAM_ENCODER_OK) {
-+#else
-+
-+ ctx->state.s_flac = FLAC__stream_encoder_init_stream(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_write_callback, NULL, NULL, flac_seekable_stream_encoder_metadata_callback, ctx);
-+ if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) {
-+#endif
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)",
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]);
-+#else
-+ FLAC__StreamEncoderStateString[ctx->state.s_flac]);
-+#endif
- flac_session_close();
- return -1;
- }
-@@ -525,16 +599,22 @@ static int flac_output_open(const char *
- FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order);
-
- FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize);
-+#ifdef LEGACY_FLAC
- FLAC__stream_encoder_set_client_data(ctx->encoder.flac.stream, ctx);
-+#endif
-
- if (0 < num_metadata)
- FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata);
-
-+#ifdef LEGACY_FLAC
- /* set callback */
- FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.stream, flac_stream_encoder_metadata_callback);
- FLAC__stream_encoder_set_write_callback(ctx->encoder.flac.stream, flac_stream_encoder_write_callback);
-
- ctx->state.flac = FLAC__stream_encoder_init(ctx->encoder.flac.stream);
-+#else
-+ ctx->state.flac = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, flac_stream_encoder_write_callback, NULL, NULL, flac_stream_encoder_metadata_callback, ctx);
-+#endif
- if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) {
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)",
- FLAC__StreamEncoderStateString[ctx->state.flac]);
-@@ -676,7 +756,11 @@ static void flac_stream_encoder_metadata
- {
- }
- static FLAC__StreamEncoderWriteStatus
-+#ifdef LEGACY_FLAC
- flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder,
-+#else
-+flac_seekable_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
-+#endif
- const FLAC__byte buffer[],
- unsigned bytes, unsigned samples,
- unsigned current_frame, void *client_data)
-@@ -690,7 +774,11 @@ flac_seekable_stream_encoder_write_callb
- else
- return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
- }
-+#ifdef LEGACY_FLAC
- static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder,
-+#else
-+static void flac_seekable_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
-+#endif
- const FLAC__StreamMetadata *metadata,
- void *client_data)
- {
-@@ -747,22 +835,38 @@ static int output_data(char *buf, int32
- else
- #endif /* AU_OGGFLAC */
- if (flac_options.seekable) {
-+#ifdef LEGACY_FLAC
- ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream);
-+#else
-+ ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream);
-+#endif
- if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) {
- if (ctx->state.s_flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR |
- FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) {
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)",
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamDecoderStateString[FLAC__seekable_stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]);
-+#else
-+ FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]);
-+#endif
- }
- else {
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)",
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]);
-+#else
-+ FLAC__StreamEncoderStateString[ctx->state.s_flac]);
-+#endif
- }
- flac_session_close();
- return -1;
- }
-
-+#ifdef LEGACY_FLAC
- if (!FLAC__seekable_stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf,
-+#else
-+ if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf,
-+#endif
- nbytes / nch / 2 )) {
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream");
- flac_session_close();
-@@ -823,9 +927,17 @@ static void close_output(void)
- else
- #endif /* AU_OGGFLAC */
- if (flac_options.seekable) {
-+#ifdef LEGACY_FLAC
- if ((ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__SEEKABLE_STREAM_ENCODER_OK) {
-+#else
-+ if ((ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__STREAM_ENCODER_OK) {
-+#endif
- ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)",
-+#ifdef LEGACY_FLAC
- FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]);
-+#else
-+ FLAC__StreamEncoderStateString[ctx->state.s_flac]);
-+#endif
- /* fall through */
- }
- }
+++ /dev/null
-diff -ur TiMidity++-2.13.2-orig/interface/xaw_i.c TiMidity++-2.13.2/interface/xaw_i.c
---- TiMidity++-2.13.2-orig/interface/xaw_i.c 2005-06-25 21:55:19.000000000 -0400
-+++ TiMidity++-2.13.2/interface/xaw_i.c 2005-06-25 21:56:01.000000000 -0400
-@@ -261,7 +261,7 @@
- String bitmapdir = XAW_BITMAP_DIR;
- Boolean arrangetitle,savelist;
- static char **current_flist = NULL;
--static int voices = 0, last_voice = 0, voices_num_width;
-+static int xaw_i_voices = 0, last_voice = 0, voices_num_width;
- static int maxentry_on_a_menu = 0,submenu_n = 0;
- #define OPTIONS_WINDOW 1
- #define FLIST_WINDOW 2
-@@ -1329,7 +1329,7 @@
- c= *(local_buf+1);
- n= atoi(local_buf+2);
- if(c == 'L')
-- voices = n;
-+ xaw_i_voices = n;
- else
- last_voice = n;
- if(IsTracePlaying()) drawVoices();
-@@ -2070,7 +2070,7 @@
- XSetForeground(disp, gct, tracecolor);
- XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
- MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);
-- sprintf(local_buf, "%3d/%d", last_voice, voices);
-+ sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices);
- XSetForeground(disp, gct, capcolor);
- XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
- MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
+++ /dev/null
---- interface/gtk_i.c 2004/12/21 16:59:33 1.1
-+++ interface/gtk_i.c 2004/12/21 16:59:41
-@@ -365,6 +365,7 @@ void
- Launch_Gtk_Process(int pipe_number)
- {
- int argc = 0;
-+ gchar **argv = NULL;
- GtkWidget *button, *mbar, *swin;
- GtkWidget *table, *align, *handlebox;
- GtkWidget *vbox, *hbox, *vbox2, *scrolled_win;
-@@ -373,7 +374,7 @@ Launch_Gtk_Process(int pipe_number)
- /* enable locale */
- gtk_set_locale ();
-
-- gtk_init (&argc, NULL);
-+ gtk_init (&argc, &argv);
-
- ttip = create_yellow_tooltips();
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+++ /dev/null
-diff -ur TiMidity++-2.13.2.orig/autoconf/arts.m4 TiMidity++-2.13.2/autoconf/arts.m4
---- TiMidity++-2.13.2.orig/autoconf/arts.m4 2002-10-05 06:16:37.000000000 +0300
-+++ TiMidity++-2.13.2/autoconf/arts.m4 2009-07-24 11:35:57.000000000 +0300
-@@ -9,7 +9,7 @@
- dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for aRts, and define ARTS_CFLAGS and ARTS_LIBS
- dnl
--AC_DEFUN(AM_PATH_ARTS,
-+AC_DEFUN([AM_PATH_ARTS],
- [dnl
- dnl Get the cflags and libraries from the arts-config script
- dnl
-@@ -156,4 +156,4 @@
- AC_SUBST(ARTS_LIBS)
- rm -f conf.artstest
- ])
--dnl End of aRts
-\ No newline at end of file
-+dnl End of aRts
-diff -ur TiMidity++-2.13.2.orig/autoconf/vorbis.m4 TiMidity++-2.13.2/autoconf/vorbis.m4
---- TiMidity++-2.13.2.orig/autoconf/vorbis.m4 2002-07-06 17:38:06.000000000 +0300
-+++ TiMidity++-2.13.2/autoconf/vorbis.m4 2009-07-24 11:32:13.000000000 +0300
-@@ -5,7 +5,7 @@
- dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
- dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
- dnl
--AC_DEFUN(AM_PATH_VORBIS,
-+AC_DEFUN([AM_PATH_VORBIS],
- [dnl
- dnl Get the cflags and libraries
- dnl
-diff -ur TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in
---- TiMidity++-2.13.2.orig/configure.in 2004-10-03 15:39:52.000000000 +0300
-+++ TiMidity++-2.13.2/configure.in 2009-07-24 12:26:04.000000000 +0300
-@@ -1925,10 +1925,10 @@
-
- AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
-
--SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
--SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
--SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
--SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
-+LDFLAGS="$LDFLAGS"
-+SHLDFLAGS="$SHLDFLAGS"
-+CFLAGS="$EXTRACFLAGS $CFLAGS"
-+CPPFLAGS="$CPPFLAGS $EXTRADEFS"
-
- if test "x$oss_device" != x; then
- AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)
+++ /dev/null
---- /var/tmp/portage/media-sound/timidity++-2.13.2-r6/work/TiMidity++-2.13.2/interface/alsaseq_c.c 2007-11-27 14:08:14.000000000 -0500
-+++ TiMidity++-2.13.2/interface/alsaseq_c.c 2007-11-27 14:13:49.000000000 -0500
-@@ -501,6 +501,8 @@
-
- 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))
-@@ -528,15 +530,17 @@
- play_event(&ev);
- aq_fill_nonblocking();
- }
-- if (! ctxp->active || ! IS_STREAM_TRACE) {
-- fd_set rfds;
-- struct timeval timeout;
-- FD_ZERO(&rfds);
-- FD_SET(ctxp->fd, &rfds);
-+
-+ 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;
- }
- }
-
+++ /dev/null
---- TiMidity++-2.13.2/timidity/flac_a.c
-+++ TiMidity++-2.13.2/timidity/flac_a.c
-@@ -61,6 +61,7 @@
- #include "w32_libOGGFLAC_dll_g.h"
- #endif
-
-+#include "common.h"
- #include "timidity.h"
- #include "output.h"
- #include "controls.h"
+++ /dev/null
-[Desktop Entry]
-Comment=Software sound renderer (MIDI sequencer, MOD player)
-Name=TiMidity++ MIDI sequencer
-Terminal=false
-Type=Application
-Exec=timidity -ia %F
-Categories=AudioVideo;Audio;Sequencer;
-Icon=timidity
-MimeType=audio/midi;audio/x-mod;
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r11.ebuild,v 1.10 2010/10/10 19:13:36 ulm Exp $
-
-EAPI=2
-inherit autotools eutils elisp-common
-
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2 mirror://gentoo/${P}-exiterror.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao speex flac ncurses"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
- emacs? ( virtual/emacs )
- gtk? ( x11-libs/gtk+:2 )
- tk? ( dev-lang/tk )
- nas? ( >=media-libs/nas-1.4 )
- alsa? ( media-libs/alsa-lib )
- slang? ( sys-libs/slang )
- jack? ( media-sound/jack-audio-connection-kit )
- vorbis? ( media-libs/libvorbis )
- flac? ( media-libs/flac )
- speex? ( media-libs/speex )
- ao? ( >=media-libs/libao-0.8.5 )
- motif? ( >=x11-libs/openmotif-2.3:0 )
- X? ( x11-libs/libXaw
- x11-libs/libXext )
- !~media-libs/libpng-1.4.1"
-RDEPEND="${DEPEND}
- alsa? ( media-sound/alsa-utils )
- app-admin/eselect-timidity"
-
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
- enewgroup audio 18 # Just make sure it exists
- enewuser timidity -1 -1 /var/lib/timidity audio
-}
-
-src_prepare() {
- epatch "${DISTDIR}"/${P}-exiterror.patch \
- "${FILESDIR}"/${P}-gtk26.patch \
- "${FILESDIR}"/${P}-gcc4.patch \
- "${FILESDIR}"/${P}-flac.patch \
- "${FILESDIR}"/${P}-flac113.patch \
- "${FILESDIR}"/${P}-protos.patch \
- "${FILESDIR}"/${P}-params.patch
-
- # fix header location of speex
- sed -i -e "s:#include <speex:#include <speex/speex:g" \
- configure.in timidity/speex_a.c || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
- local audios
-
- use flac && audios="${audios},flac"
- use speex && audios="${audios},speex"
- use vorbis && audios="${audios},vorbis"
-
- use oss && audios="${audios},oss"
- use jack && audios="${audios},jack"
- use ao && audios="${audios},ao"
-
- if use nas; then
- audios="${audios},nas"
- myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so --with-x"
- use X || ewarn "Basic X11 support will be enabled because required by nas."
- fi
-
- if use alsa; then
- audios="${audios},alsa"
- myconf="${myconf} --with-default-output=alsa --enable-alsaseq"
- fi
-
- # We disable motif by default and then only enable it if it's requested.
- if use motif; then
- myconf="${myconf} --enable-motif --with-x"
- use X || ewarn "Basic X11 support will be enabled because required by motif."
- fi
-
- econf \
- --localstatedir=/var/state/timidity++ \
- --with-lispdir="${SITELISP}/${PN}" \
- --with-elf \
- --enable-audio=${audios} \
- --enable-server \
- --enable-network \
- --enable-dynamic \
- --enable-vt100 \
- --enable-spline=cubic \
- $(use_enable emacs) \
- $(use_enable slang) \
- $(use_enable ncurses) \
- $(use_with X x) \
- $(use_enable X spectrogram) \
- $(use_enable X wrd) \
- $(use_enable X xskin) \
- $(use_enable X xaw) \
- $(use_enable gtk) \
- $(use_enable tk tcltk) \
- --disable-motif \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog*
- dodoc NEWS README* "${FILESDIR}/timidity.cfg-r1"
-
- # these are only for the ALSA sequencer mode
- if use alsa; then
- newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
- newinitd "${FILESDIR}"/init.d.timidity.3 timidity
- fi
-
- insinto /etc
- newins "${FILESDIR}/timidity.cfg-r1" timidity.cfg
-
- dodir /usr/share/timidity
- dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- diropts -o timidity -g nobody -m 0700
- keepdir /var/lib/timidity
-
- doicon "${FILESDIR}"/timidity.xpm
- newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
-
- # Order of preference: gtk, X (Xaw), ncurses, slang
- # Do not create menu item for terminal ones
- local interface="-id"
- local terminal="true"
- local nodisplay="true"
- if use gtk || use X; then
- interface="-ia"
- terminal="false"
- nodisplay="false"
- use gtk && interface="-ig"
- elif use ncurses || use slang; then
- local interface="-is"
- use ncurses && interface="-in"
- fi
- sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
- -e "s/Terminal=.*/Terminal=${terminal}/" \
- -e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
- -i "${D}"/usr/share/applications/timidity.desktop || die "sed failed"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-
- elog "A timidity config file has been installed in /etc/timidity.cfg."
- elog "Do not edit this file as it will interfere with the eselect timidity tool."
- elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
-
- if use alsa; then
- elog "An init script for the alsa timidity sequencer has been installed."
- elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
- elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
- fi
-
- if use sparc; then
- elog "Only saving to wave file and ALSA soundback has been tested working."
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
projects / gentoo.git / commitdiff