|--==> Luk Claes writes: LC> -----BEGIN PGP SIGNED MESSAGE----- LC> Hash: SHA1
LC> Hi LC> Attached the patch for the version I intend to upload. Please respond if LC> you don't want this NMU to happen, if you are working yourself on a LC> patch or if you think that the attached patch won't work. Thanks for having worked on #320270. It seems that it has also been fixed upstream. I've packaged it: http://people.miu-ft.org/~free/packages/ please would you check that everything is ok in the upstream source code? If so I'd also ask you if you can upload it for me as I'm not yet a DD. Cheers, Free LC> -----BEGIN PGP SIGNATURE----- LC> Version: GnuPG v1.4.2 (GNU/Linux) LC> iD8DBQFDP7NE5UTeB5t8Mo0RAs+KAKCmAlLEx15oIS9u/vMavXHAzi9KfQCbB6Hp LC> 27te+5xjSktaml7RfzkH3Tc= LC> =+UkT LC> -----END PGP SIGNATURE----- LC> diff -u brutefir-1.0c/debian/changelog brutefir-1.0c/debian/changelog LC> --- brutefir-1.0c/debian/changelog LC> +++ brutefir-1.0c/debian/changelog LC> @@ -1,3 +1,11 @@ LC> +brutefir (1.0c-1.1) unstable; urgency=medium LC> + LC> + * Non-maintainer upload. LC> + * Rebuild for the jack transition (Closes: #317185). LC> + * Patch invalid lvalues in assignments (Closes: #320270). LC> + LC> + -- Luk Claes <[EMAIL PROTECTED]> Sun, 2 Oct 2005 12:00:19 +0200 LC> + LC> brutefir (1.0c-1) unstable; urgency=low LC> * New upstream release LC> only in patch2: LC> unchanged: LC> --- brutefir-1.0c.orig/bfio_jack.c LC> +++ brutefir-1.0c/bfio_jack.c LC> @@ -30,7 +30,7 @@ LC> #define DEFAULT_CLIENTNAME "brutefir" LC> static bool_t debug; LC> -static bool_t stopped = false; LC> +static volatile bool_t stopped = false; LC> static bool_t has_started = false; LC> static struct jack_state *handles[2][BF_MAXCHANNELS]; LC> static void **states[2]; LC> @@ -102,13 +102,13 @@ LC> sizeof(jack_default_audio_sample_t)); LC> } LC> } LC> - (volatile bool_t)stopped = true; LC> + stopped = true; LC> return -1; LC> } LC> frames_left = process_cb(states, n_handles, iobufs, n_frames, LC> BF_CALLBACK_EVENT_NORMAL); LC> if (frames_left == -1) { LC> - (volatile bool_t)stopped = true; LC> + stopped = true; LC> return -1; LC> } LC> @@ -454,7 +454,7 @@ LC> bfio_synch_stop(void) LC> { LC> if (!(volatile bool_t)stopped) { LC> - (volatile bool_t)stopped = true; LC> + stopped = true; LC> jack_client_close(client); LC> } LC> } LC> only in patch2: LC> unchanged: LC> --- brutefir-1.0c.orig/bflogic_eq.c LC> +++ brutefir-1.0c/bflogic_eq.c LC> @@ -39,8 +39,8 @@ LC> int band_count; LC> int taps; LC> int coeff[2]; LC> - int active_coeff; LC> - bool_t not_changed; LC> + volatile int active_coeff; LC> + volatile bool_t not_changed; LC> double *freq; LC> double *mag; LC> double *phase; LC> @@ -113,7 +113,7 @@ LC> active = c[(volatile int)equalisers[n].active_coeff]; LC> if (*coeff == c[0] || *coeff == c[1]) { LC> *coeff = active; LC> - (volatile bool_t)equalisers[n].not_changed = false; LC> + equalisers[n].not_changed = false; LC> } LC> } LC> } LC> only in patch2: LC> unchanged: LC> --- brutefir-1.0c.orig/bfrun.c LC> +++ brutefir-1.0c/bfrun.c LC> @@ -96,19 +96,19 @@ LC> struct intercomm_area { LC> - bool_t doreset_overflow; LC> + volatile bool_t doreset_overflow; LC> int sync[BF_MAXPROCESSES]; LC> - uint32_t period_us[BF_MAXPROCESSES]; LC> - double realtime_index; LC> + volatile uint32_t period_us[BF_MAXPROCESSES]; LC> + volatile double realtime_index; LC> struct bffilter_control fctrl[BF_MAXFILTERS]; LC> struct bfoverflow overflow[BF_MAXCHANNELS]; LC> uint32_t ismuted[2][BF_MAXCHANNELS/32]; LC> - int delay[2][BF_MAXCHANNELS]; LC> - int n_pids; LC> - pid_t pids[BF_MAXPROCESSES]; LC> - int exit_status; LC> - bool_t full_proc[BF_MAXPROCESSES]; LC> - bool_t ignore_rtprio; LC> + volatile int delay[2][BF_MAXCHANNELS]; LC> + volatile int n_pids; LC> + volatile pid_t pids[BF_MAXPROCESSES]; LC> + volatile int exit_status; LC> + volatile bool_t full_proc[BF_MAXPROCESSES]; LC> + volatile bool_t ignore_rtprio; LC> struct { LC> uint64_t ts_start; LC> @@ -496,7 +496,7 @@ LC> if (delay < 0 || delay > bfconf->maxdelay[io][channel]) { LC> return -1; LC> } LC> - (volatile int)icomm->delay[io][channel] = delay; LC> + icomm->delay[io][channel] = delay; LC> if (bfconf->n_virtperphys[io][physch] == 1) { LC> return dai_change_delay(io, physch, delay); LC> @@ -601,7 +601,7 @@ LC> } LC> if ((volatile bool_t)icomm->doreset_overflow) { LC> - (volatile bool_t)icomm->doreset_overflow = false; LC> + icomm->doreset_overflow = false; LC> memset(overflow, 0, sizeof(struct bfoverflow) * bfconf-> n_channels[OUT]); LC> } LC> @@ -631,7 +631,7 @@ LC> pinfo("rti: not full processing - no rti update\n"); LC> } LC> } LC> - (volatile double)icomm->realtime_index = max_rti; LC> + icomm->realtime_index = max_rti; LC> check_overflows(overflow); LC> lastprinttime = tt; LC> } LC> @@ -1324,10 +1324,10 @@ LC> if (bit_find(partial_proc, 0, n_filters - 1) == -1) { LC> timersub(&period_end, &period_start, &tv); LC> period_length = tv.tv_sec * 1000000 + tv.tv_usec; LC> - (volatile uint32_t)icomm->period_us[process_index] = period_length; LC> - (volatile bool_t)icomm->full_proc[process_index] = true; LC> + icomm->period_us[process_index] = period_length; LC> + icomm->full_proc[process_index] = true; LC> } else { LC> - (volatile bool_t)icomm->full_proc[process_index] = false; LC> + icomm->full_proc[process_index] = false; LC> } LC> gettimeofday(&period_start, NULL); LC> @@ -2078,9 +2078,9 @@ LC> memset(&icomm->debug, 0xFF, sizeof(icomm->debug)); LC> memcpy(icomm->fctrl, bfconf->initfctrl, bfconf->n_filters * LC> sizeof(struct bffilter_control)); LC> - (volatile pid_t)icomm->pids[0] = getpid(); LC> - (volatile int)icomm->n_pids = 1; LC> - (volatile int)icomm->exit_status = BF_EXIT_OK; LC> + icomm->pids[0] = getpid(); LC> + icomm->n_pids = 1; LC> + icomm->exit_status = BF_EXIT_OK; LC> FOR_IN_AND_OUT { LC> memcpy(icomm->delay[IO], bfconf->delay[IO], bfconf->n_channels[IO] * LC> sizeof(int)); LC> @@ -2266,8 +2266,8 @@ LC> return; LC> default: LC> - (volatile pid_t)icomm->pids[icomm->n_pids] = pid; LC> - (volatile int)icomm->n_pids += 1; LC> + icomm->pids[icomm->n_pids] = pid; LC> + icomm->n_pids += 1; LC> break; LC> } LC> } LC> @@ -2336,8 +2336,8 @@ LC> return; LC> default: LC> - (volatile pid_t)icomm->pids[icomm->n_pids] = pid; LC> - (volatile int)icomm->n_pids += 1; LC> + icomm->pids[icomm->n_pids] = pid; LC> + icomm->n_pids += 1; LC> close(synch_pipe[1]); LC> if (!readfd(synch_pipe[0], dummydata, 1)) { LC> bf_exit(BF_EXIT_OTHER); LC> @@ -2382,7 +2382,7 @@ LC> dai_trigger_callback_io(); LC> for (n = 0; n < icomm->n_pids; n++) { LC> if ((volatile pid_t)icomm->pids[n] == getpid()) { LC> - (volatile pid_t)icomm->pids[n] = 0; LC> + icomm->pids[n] = 0; LC> break; LC> } LC> } LC> @@ -2462,8 +2462,8 @@ LC> /* never reached */ LC> return; LC> } else { LC> - (volatile pid_t)icomm->pids[icomm->n_pids] = pid; LC> - (volatile int)icomm->n_pids += 1; LC> + icomm->pids[icomm->n_pids] = pid; LC> + icomm->n_pids += 1; LC> } LC> } LC> @@ -2512,7 +2512,7 @@ LC> void LC> bf_reset_peak(void) LC> { LC> - (volatile bool_t)icomm->doreset_overflow = true; LC> + icomm->doreset_overflow = true; LC> memcpy(icomm->overflow, reset_overflow, sizeof(struct bfoverflow) * bfconf-> n_channels[OUT]); LC> } LC> @@ -2611,8 +2611,8 @@ LC> void LC> bf_register_process(pid_t pid) LC> { LC> - (volatile pid_t)icomm->pids[icomm->n_pids] = pid; LC> - (volatile int)icomm->n_pids += 1; LC> + icomm->pids[icomm->n_pids] = pid; LC> + icomm->n_pids += 1; LC> } LC> void LC> @@ -2634,7 +2634,7 @@ LC> pinfo("Warning: not allowed to set realtime priority. Will run " LC> "with default priority\n instead, which is less " LC> "reliable (underflow may occur).\n"); LC> - (volatile bool_t)icomm->ignore_rtprio = true; LC> + icomm->ignore_rtprio = true; LC> return; LC> } else { LC> if (name != NULL) { LC> @@ -2679,10 +2679,10 @@ LC> self = getpid(); LC> if (icomm != NULL) { LC> - (volatile int)icomm->exit_status = status; LC> + icomm->exit_status = status; LC> for (n = 0; n < icomm->n_pids; n++) { LC> if ((volatile pid_t)icomm->pids[n] == self) { LC> - (volatile pid_t)icomm->pids[n] = 0; LC> + icomm->pids[n] = 0; LC> self_pos = n; LC> } LC> } LC> only in patch2: LC> unchanged: LC> --- brutefir-1.0c.orig/dai.c LC> +++ brutefir-1.0c/dai.c LC> @@ -43,7 +43,7 @@ LC> #define CB_MSG_STOP 2 LC> struct subdev { LC> - bool_t finished; LC> + volatile bool_t finished; LC> bool_t uses_callback; LC> bool_t uses_clock; LC> bool_t isinterleaved; LC> @@ -61,18 +61,18 @@ LC> struct { LC> int iodelay_fill; LC> int curbuf; LC> - int frames_left; LC> + volatile int frames_left; LC> } cb; LC> }; LC> struct comarea { LC> - bool_t blocking_stopped; LC> + volatile bool_t blocking_stopped; LC> int lastbuf_index; LC> int frames_left; LC> - int cb_lastbuf_index; LC> - int cb_frames_left; LC> - bool_t is_muted[2][BF_MAXCHANNELS]; LC> - int delay[2][BF_MAXCHANNELS]; LC> + volatile int cb_lastbuf_index; LC> + volatile int cb_frames_left; LC> + volatile bool_t is_muted[2][BF_MAXCHANNELS]; LC> + volatile int delay[2][BF_MAXCHANNELS]; LC> pid_t pid[2]; LC> pid_t callback_pid; LC> struct subdev dev[2][BF_MAXCHANNELS]; LC> @@ -104,7 +104,7 @@ LC> static int cbpipe_s[2], cbpipe_r[2]; LC> static int cbmutex_pipe[2][2]; LC> static int cbreadywait_pipe[2][2]; LC> -static int callback_ready_waiting[2] = { 0, 0 }; LC> +static volatile int callback_ready_waiting[2] = { 0, 0 }; LC> static int LC> process_callback(void **state[2], LC> @@ -974,8 +974,8 @@ LC> if ((io != IN && io != OUT) || channel < 0 || channel >= BF_MAXCHANNELS) { LC> return; LC> } LC> - (volatile bool_t)ca->is_muted[io][channel] = LC> - (volatile bool_t)!ca->is_muted[io][channel]; LC> + ca->is_muted[io][channel] = LC> + !ca->is_muted[io][channel]; LC> } LC> int LC> @@ -992,7 +992,7 @@ LC> { LC> return -1; LC> } LC> - (volatile int)ca->delay[io][channel] = delay; LC> + ca->delay[io][channel] = delay; LC> return 0; LC> } LC> @@ -1322,9 +1322,9 @@ LC> if ((volatile int)ca->frames_left == -1 || LC> frames_left < (volatile int)ca->frames_left) LC> { LC> - (volatile int)ca->frames_left = frames_left; LC> + ca->frames_left = frames_left; LC> } LC> - (volatile int)ca->lastbuf_index = buf_index; LC> + ca->lastbuf_index = buf_index; LC> break; LC> default: LC> @@ -1583,11 +1583,11 @@ bfconf-> iomods[n].stop(OUT); LC> } LC> } LC> - (volatile bool_t)ca->blocking_stopped = true; LC> + ca->blocking_stopped = true; LC> for (n = 0; n < n_devs[OUT]; n++) { LC> sd = dev[OUT][n]; LC> if (!sd->uses_callback) { LC> - (volatile bool_t)sd->finished = true; LC> + sd->finished = true; LC> } LC> } LC> if (output_finish()) { LC> @@ -1696,7 +1696,7 @@ LC> { LC> bf_exit(BF_EXIT_OTHER); LC> } LC> - (volatile int)callback_ready_waiting[io] = 0; LC> + callback_ready_waiting[io] = 0; LC> } LC> cbmutex(io, false); LC> } LC> @@ -1729,14 +1729,14 @@ LC> if ((volatile int)ca->cb_frames_left == -1 || LC> frame_count < (volatile int)ca->cb_frames_left) LC> { LC> - (volatile int)ca->cb_frames_left = frame_count; LC> + ca->cb_frames_left = frame_count; LC> } LC> - (volatile int)ca->cb_lastbuf_index = (volatile int)ca->cb_buf_index[IN]; LC> + ca->cb_lastbuf_index = ca->cb_buf_index[IN]; LC> return 0; LC> case BF_CALLBACK_EVENT_FINISHED: LC> for (n = 0; n < state_count[OUT]; n++) { LC> sd = (struct subdev *)states[OUT][n]; LC> - (volatile bool_t)sd->finished = true; LC> + sd->finished = true; LC> } LC> cbmutex(IN, true); LC> trigger_callback_ready(IN); LC> @@ -1894,7 +1894,7 @@ LC> if (sd->cb.frames_left != -1) { LC> if (sd->cb.frames_left > sd->block_size_frames) { LC> - (volatile int)sd->cb.frames_left -= sd->block_size_frames; LC> + sd->cb.frames_left -= sd->block_size_frames; LC> return 0; LC> } LC> if (sd->cb.frames_left == 0) { LC> only in patch2: LC> unchanged: LC> --- brutefir-1.0c.orig/rendereq.h LC> +++ brutefir-1.0c/rendereq.h LC> @@ -91,8 +91,8 @@ LC> } LC> gettimeofday(&tv2, NULL); LC> timersub(&tv2, &tv1, &tv1); LC> - (volatile int)eq->active_coeff = !eq->active_coeff; LC> - (volatile bool_t)eq->not_changed = true; LC> + eq->active_coeff = !eq->active_coeff; LC> + eq->not_changed = true; LC> if (debug) { LC> fprintf(stderr, "EQ: rendering coefficient set %d took %.2f ms\n", -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
