[Demudi-commits] r308 - in brutefir/trunk: . debian debian/patches
Free Ekanayaka
free-guest@haydn.debian.org
Thu, 09 Dec 2004 03:44:30 -0700
Author: free-guest
Date: 2004-12-09 03:43:55 -0700 (Thu, 09 Dec 2004)
New Revision: 308
Added:
brutefir/trunk/debian/patches/
brutefir/trunk/debian/patches/10_amd64_gcc-4.0.dpatch
Modified:
brutefir/trunk/brutefir.1
brutefir/trunk/debian/changelog
Log:
brutefir:
* Bug fix: "brutefir: FTBFS (amd64/gcc-4.0): invalid lvalue in
Modified: brutefir/trunk/brutefir.1
===================================================================
--- brutefir/trunk/brutefir.1 2004-12-05 22:57:56 UTC (rev 307)
+++ brutefir/trunk/brutefir.1 2004-12-09 10:43:55 UTC (rev 308)
@@ -15,7 +15,7 @@
\!!save /psv exch def currentpoint translate 0 0 moveto
\!!/showpage{}def
.fl \" prolog
-.sy sed -e 's/^/!/' \\$1\" bring in postscript file
+.sy sed \-e 's/^/!/' \\$1\" bring in postscript file
\!!psv restore
.
.de pF
@@ -66,4 +66,4 @@
.PP
info (1), whatis (1), apropos (1), dpkg (8), locate (1),
find (1), updatedb (1), undocumented (2), man (7), missing (7)
-.\" created by instant / docbook-to-man, Fri 11 Jun 2004, 22:02
+.\" created by instant / docbook-to-man, Thu 09 Dec 2004, 10:21
Modified: brutefir/trunk/debian/changelog
===================================================================
--- brutefir/trunk/debian/changelog 2004-12-05 22:57:56 UTC (rev 307)
+++ brutefir/trunk/debian/changelog 2004-12-09 10:43:55 UTC (rev 308)
@@ -1,8 +1,10 @@
brutefir (1.0-2) UNRELEASED; urgency=low
* Using dpatch
+ * Bug fix: "brutefir: FTBFS (amd64/gcc-4.0): invalid lvalue in
+ assignment", thanks to Andreas Jochens (Closes: #284751).
- -- Free Ekanayaka <free@agnula.org> Mon, 22 Nov 2004 10:29:45 +0100
+ --
brutefir (1.0-1) unstable; urgency=low
Added: brutefir/trunk/debian/patches/10_amd64_gcc-4.0.dpatch
===================================================================
--- brutefir/trunk/debian/patches/10_amd64_gcc-4.0.dpatch 2004-12-05 22:57:56 UTC (rev 307)
+++ brutefir/trunk/debian/patches/10_amd64_gcc-4.0.dpatch 2004-12-09 10:43:55 UTC (rev 308)
@@ -0,0 +1,286 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_amd64_gcc-4.0.dpatch by Free Ekanayaka <free@agnula.org>
+##
+## DP: Makes the package compile with amd64/gcc-4.0
+
+@DPATCH@
+diff -urNad brutefir-1.0/bfio_jack.c /tmp/dpep.KVasdB/brutefir-1.0/bfio_jack.c
+--- brutefir-1.0/bfio_jack.c 2004-04-21 21:49:00.000000000 +0200
++++ /tmp/dpep.KVasdB/brutefir-1.0/bfio_jack.c 2004-12-09 10:32:51.000000000 +0100
+@@ -101,13 +101,13 @@
+ sizeof(jack_default_audio_sample_t));
+ }
+ }
+- (volatile bool_t)stopped = true;
++ stopped = true;
+ return -1;
+ }
+ frames_left = process_cb(states, n_handles, iobufs, n_frames,
+ BF_CALLBACK_EVENT_NORMAL);
+ if (frames_left == -1) {
+- (volatile bool_t)stopped = true;
++ stopped = true;
+ return -1;
+ }
+
+@@ -432,7 +432,7 @@
+ bfio_synch_stop(void)
+ {
+ if (!(volatile bool_t)stopped) {
+- (volatile bool_t)stopped = true;
++ stopped = true;
+ jack_client_close(client);
+ }
+ }
+diff -urNad brutefir-1.0/bflogic_eq.c /tmp/dpep.KVasdB/brutefir-1.0/bflogic_eq.c
+--- brutefir-1.0/bflogic_eq.c 2004-04-21 21:49:00.000000000 +0200
++++ /tmp/dpep.KVasdB/brutefir-1.0/bflogic_eq.c 2004-12-09 10:32:51.000000000 +0100
+@@ -113,7 +113,7 @@
+ active = c[(volatile int)equalisers[n].active_coeff];
+ if (*coeff == c[0] || *coeff == c[1]) {
+ *coeff = active;
+- (volatile bool_t)equalisers[n].not_changed = false;
++ equalisers[n].not_changed = false;
+ }
+ }
+ }
+diff -urNad brutefir-1.0/bfrun.c /tmp/dpep.KVasdB/brutefir-1.0/bfrun.c
+--- brutefir-1.0/bfrun.c 2004-04-21 21:49:00.000000000 +0200
++++ /tmp/dpep.KVasdB/brutefir-1.0/bfrun.c 2004-12-09 10:32:51.000000000 +0100
+@@ -496,7 +496,7 @@
+ if (delay < 0 || delay > bfconf->maxdelay[io][channel]) {
+ return -1;
+ }
+- (volatile int)icomm->delay[io][channel] = delay;
++ icomm->delay[io][channel] = delay;
+
+ if (bfconf->n_virtperphys[io][physch] == 1) {
+ return dai_change_delay(io, physch, delay);
+@@ -601,7 +601,7 @@
+ }
+
+ if ((volatile bool_t)icomm->doreset_overflow) {
+- (volatile bool_t)icomm->doreset_overflow = false;
++ icomm->doreset_overflow = false;
+ memset(overflow, 0, sizeof(struct bfoverflow) *
+ bfconf->n_channels[OUT]);
+ }
+@@ -631,7 +631,7 @@
+ pinfo("rti: not full processing - no rti update\n");
+ }
+ }
+- (volatile double)icomm->realtime_index = max_rti;
++ icomm->realtime_index = max_rti;
+ check_overflows(overflow);
+ lastprinttime = tt;
+ }
+@@ -1324,10 +1324,10 @@
+ if (bit_find(partial_proc, 0, n_filters - 1) == -1) {
+ timersub(&period_end, &period_start, &tv);
+ period_length = tv.tv_sec * 1000000 + tv.tv_usec;
+- (volatile uint32_t)icomm->period_us[process_index] = period_length;
+- (volatile bool_t)icomm->full_proc[process_index] = true;
++ icomm->period_us[process_index] = period_length;
++ icomm->full_proc[process_index] = true;
+ } else {
+- (volatile bool_t)icomm->full_proc[process_index] = false;
++ icomm->full_proc[process_index] = false;
+ }
+ gettimeofday(&period_start, NULL);
+
+@@ -2078,9 +2078,9 @@
+ memset(&icomm->debug, 0xFF, sizeof(icomm->debug));
+ memcpy(icomm->fctrl, bfconf->initfctrl, bfconf->n_filters *
+ sizeof(struct bffilter_control));
+- (volatile pid_t)icomm->pids[0] = getpid();
+- (volatile int)icomm->n_pids = 1;
+- (volatile int)icomm->exit_status = BF_EXIT_OK;
++ icomm->pids[0] = getpid();
++ icomm->n_pids = 1;
++ icomm->exit_status = BF_EXIT_OK;
+ FOR_IN_AND_OUT {
+ memcpy(icomm->delay[IO], bfconf->delay[IO], bfconf->n_channels[IO] *
+ sizeof(int));
+@@ -2266,8 +2266,8 @@
+ return;
+
+ default:
+- (volatile pid_t)icomm->pids[icomm->n_pids] = pid;
+- (volatile int)icomm->n_pids += 1;
++ icomm->pids[icomm->n_pids] = pid;
++ icomm->n_pids += 1;
+ break;
+ }
+ }
+@@ -2336,8 +2336,8 @@
+ return;
+
+ default:
+- (volatile pid_t)icomm->pids[icomm->n_pids] = pid;
+- (volatile int)icomm->n_pids += 1;
++ icomm->pids[icomm->n_pids] = pid;
++ icomm->n_pids += 1;
+ close(synch_pipe[1]);
+ if (!readfd(synch_pipe[0], dummydata, 1)) {
+ bf_exit(BF_EXIT_OTHER);
+@@ -2382,7 +2382,7 @@
+ dai_trigger_callback_io();
+ for (n = 0; n < icomm->n_pids; n++) {
+ if ((volatile pid_t)icomm->pids[n] == getpid()) {
+- (volatile pid_t)icomm->pids[n] = 0;
++ icomm->pids[n] = 0;
+ break;
+ }
+ }
+@@ -2462,8 +2462,8 @@
+ /* never reached */
+ return;
+ } else {
+- (volatile pid_t)icomm->pids[icomm->n_pids] = pid;
+- (volatile int)icomm->n_pids += 1;
++ icomm->pids[icomm->n_pids] = pid;
++ icomm->n_pids += 1;
+ }
+ }
+
+@@ -2512,7 +2512,7 @@
+ void
+ bf_reset_peak(void)
+ {
+- (volatile bool_t)icomm->doreset_overflow = true;
++ icomm->doreset_overflow = true;
+ memcpy(icomm->overflow, reset_overflow, sizeof(struct bfoverflow) *
+ bfconf->n_channels[OUT]);
+ }
+@@ -2611,8 +2611,8 @@
+ void
+ bf_register_process(pid_t pid)
+ {
+- (volatile pid_t)icomm->pids[icomm->n_pids] = pid;
+- (volatile int)icomm->n_pids += 1;
++ icomm->pids[icomm->n_pids] = pid;
++ icomm->n_pids += 1;
+ }
+
+ void
+@@ -2634,7 +2634,7 @@
+ pinfo("Warning: not allowed to set realtime priority. Will run "
+ "with default priority\n instead, which is less "
+ "reliable (underflow may occur).\n");
+- (volatile bool_t)icomm->ignore_rtprio = true;
++ icomm->ignore_rtprio = true;
+ return;
+ } else {
+ if (name != NULL) {
+@@ -2679,10 +2679,10 @@
+ self = getpid();
+
+ if (icomm != NULL) {
+- (volatile int)icomm->exit_status = status;
++ icomm->exit_status = status;
+ for (n = 0; n < icomm->n_pids; n++) {
+ if ((volatile pid_t)icomm->pids[n] == self) {
+- (volatile pid_t)icomm->pids[n] = 0;
++ icomm->pids[n] = 0;
+ self_pos = n;
+ }
+ }
+diff -urNad brutefir-1.0/dai.c /tmp/dpep.KVasdB/brutefir-1.0/dai.c
+--- brutefir-1.0/dai.c 2004-04-21 21:49:01.000000000 +0200
++++ /tmp/dpep.KVasdB/brutefir-1.0/dai.c 2004-12-09 10:32:51.000000000 +0100
+@@ -957,8 +957,8 @@
+ if ((io != IN && io != OUT) || channel < 0 || channel >= BF_MAXCHANNELS) {
+ return;
+ }
+- (volatile bool_t)ca->is_muted[io][channel] =
+- (volatile bool_t)!ca->is_muted[io][channel];
++ ca->is_muted[io][channel] =
++ !ca->is_muted[io][channel];
+ }
+
+ int
+@@ -975,7 +975,7 @@
+ {
+ return -1;
+ }
+- (volatile int)ca->delay[io][channel] = delay;
++ ca->delay[io][channel] = delay;
+ return 0;
+ }
+
+@@ -1305,9 +1305,9 @@
+ if ((volatile int)ca->frames_left == -1 ||
+ frames_left < (volatile int)ca->frames_left)
+ {
+- (volatile int)ca->frames_left = frames_left;
++ ca->frames_left = frames_left;
+ }
+- (volatile int)ca->lastbuf_index = buf_index;
++ ca->lastbuf_index = buf_index;
+ break;
+
+ default:
+@@ -1567,11 +1567,11 @@
+ bfconf->iomods[n].stop(OUT);
+ }
+ }
+- (volatile bool_t)ca->blocking_stopped = true;
++ ca->blocking_stopped = true;
+ for (n = 0; n < n_devs[OUT]; n++) {
+ sd = dev[OUT][n];
+ if (!sd->uses_callback) {
+- (volatile bool_t)sd->finished = true;
++ sd->finished = true;
+ }
+ }
+ if (output_finish()) {
+@@ -1680,7 +1680,7 @@
+ {
+ bf_exit(BF_EXIT_OTHER);
+ }
+- (volatile int)callback_ready_waiting[io] = 0;
++ callback_ready_waiting[io] = 0;
+ }
+ cbmutex(io, false);
+ }
+@@ -1713,14 +1713,14 @@
+ if ((volatile int)ca->cb_frames_left == -1 ||
+ frame_count < (volatile int)ca->cb_frames_left)
+ {
+- (volatile int)ca->cb_frames_left = frame_count;
++ ca->cb_frames_left = frame_count;
+ }
+- (volatile int)ca->cb_lastbuf_index = (volatile int)ca->cb_buf_index[IN];
++ ca->cb_lastbuf_index = (volatile int)ca->cb_buf_index[IN];
+ return 0;
+ case BF_CALLBACK_EVENT_FINISHED:
+ for (n = 0; n < state_count[OUT]; n++) {
+ sd = (struct subdev *)states[OUT][n];
+- (volatile bool_t)sd->finished = true;
++ sd->finished = true;
+ }
+ cbmutex(IN, true);
+ trigger_callback_ready(IN);
+@@ -1878,7 +1878,7 @@
+
+ if (sd->cb.frames_left != -1) {
+ if (sd->cb.frames_left > sd->block_size_frames) {
+- (volatile int)sd->cb.frames_left -= sd->block_size_frames;
++ sd->cb.frames_left -= sd->block_size_frames;
+ return 0;
+ }
+ if (sd->cb.frames_left == 0) {
+diff -urNad brutefir-1.0/rendereq.h /tmp/dpep.KVasdB/brutefir-1.0/rendereq.h
+--- brutefir-1.0/rendereq.h 2004-04-21 21:49:01.000000000 +0200
++++ /tmp/dpep.KVasdB/brutefir-1.0/rendereq.h 2004-12-09 10:32:51.000000000 +0100
+@@ -93,8 +93,8 @@
+ }
+ gettimeofday(&tv2, NULL);
+ timersub(&tv2, &tv1, &tv1);
+- (volatile int)eq->active_coeff = !eq->active_coeff;
+- (volatile bool_t)eq->not_changed = true;
++ eq->active_coeff = !eq->active_coeff;
++ eq->not_changed = true;
+
+ if (debug) {
+ fprintf(stderr, "EQ: rendering coefficient set %d took %.2f ms\n",
Property changes on: brutefir/trunk/debian/patches/10_amd64_gcc-4.0.dpatch
___________________________________________________________________
Name: svn:executable
+ *