Date: Tue, 11 Feb 2003 09:35:26 +0100 (CET) From: Volker Stolz <vs@foldr.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: arved@FreeBSD.org Subject: ports/48168: [patch] Unbreak audio/blop on -STABLE (bento) Message-ID: <200302110835.h1B8ZQQQ089395@monster.theater.foldr.org>
next in thread | raw e-mail | index | archive | help
>Number: 48168
>Category: ports
>Synopsis: [patch] Unbreak audio/blop on -STABLE (bento)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 11 00:40:07 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD monster.theater.foldr.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Sun Nov 24 14:40:01 CET 2002 root@monster.theater.foldr.org:/usr/obj/usr/src/sys/MONSTER i386
>Description:
Bento noticed that getopt didn't get pulled in correctly on
-STABLE. Then, gcc didn't like some variable declarations.
>How-To-Repeat:
>Fix:
- add -L${LOCALBASE}/lib -lgnugetopt to $LIBS
- patched three files into submission
- tested against: -CURRENT
--- blob.patch begins here ---
diff -urN blop.orig/Makefile blop/Makefile
--- blop.orig/Makefile Tue Feb 11 09:28:46 2003
+++ blop/Makefile Tue Feb 11 08:02:58 2003
@@ -15,6 +15,7 @@
BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
.if !exists(/usr/include/getopt.h)
LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
+CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -lgnugetopt"
.endif
USE_GMAKE= yes
diff -urN blop.orig/files/patch-src-sequencer16_1677.so.c blop/files/patch-src-sequencer16_1677.so.c
--- blop.orig/files/patch-src-sequencer16_1677.so.c Thu Jan 1 01:00:00 1970
+++ blop/files/patch-src-sequencer16_1677.so.c Tue Feb 11 09:19:39 2003
@@ -0,0 +1,27 @@
+--- src/sequencer16_1677.so.c.orig Tue Feb 11 09:18:27 2003
++++ src/sequencer16_1677.so.c Tue Feb 11 09:18:44 2003
+@@ -132,6 +132,8 @@
+ void runSequencer(LADSPA_Handle instance,
+ unsigned long sample_count)
+ {
++ int i,rst;
++ unsigned long s;
+ Sequencer *plugin = (Sequencer *)instance;
+
+ /* Gate */
+@@ -165,14 +167,11 @@
+ unsigned int loop_index = f_round_i(loop_steps);
+ loop_index = loop_index == 0 ? 1 : loop_index;
+ loop_index = loop_index > 16 ? 16 : loop_index;
+- int rst = f_round_i(reset);
+- int i;
++ rst = f_round_i(reset);
+
+ for (i = 0; i < 16; i++) {
+ values[i] = *(plugin->values[i]);
+ }
+-
+- unsigned long s;
+
+ for (s = 0; s < sample_count; s++) {
+ if (gate[s] > 0.0f) {
diff -urN blop.orig/files/patch-src-sequencer32_1676.so.c blop/files/patch-src-sequencer32_1676.so.c
--- blop.orig/files/patch-src-sequencer32_1676.so.c Thu Jan 1 01:00:00 1970
+++ blop/files/patch-src-sequencer32_1676.so.c Tue Feb 11 09:20:06 2003
@@ -0,0 +1,27 @@
+--- src/sequencer32_1676.so.c.orig Tue Feb 11 09:17:55 2003
++++ src/sequencer32_1676.so.c Tue Feb 11 09:18:15 2003
+@@ -132,6 +132,8 @@
+ void runSequencer(LADSPA_Handle instance,
+ unsigned long sample_count)
+ {
++ int i,rst;
++ unsigned long s;
+ Sequencer *plugin = (Sequencer *)instance;
+
+ /* Gate */
+@@ -165,14 +167,11 @@
+ unsigned int loop_index = f_round_i(loop_steps);
+ loop_index = loop_index == 0 ? 1 : loop_index;
+ loop_index = loop_index > 32 ? 32 : loop_index;
+- int rst = f_round_i(reset);
+- int i;
++ rst = f_round_i(reset);
+
+ for (i = 0; i < 32; i++) {
+ values[i] = *(plugin->values[i]);
+ }
+-
+- unsigned long s;
+
+ for (s = 0; s < sample_count; s++) {
+ if (gate[s] > 0.0f) {
diff -urN blop.orig/files/patch-src-sequencer64_1675.so.c blop/files/patch-src-sequencer64_1675.so.c
--- blop.orig/files/patch-src-sequencer64_1675.so.c Thu Jan 1 01:00:00 1970
+++ blop/files/patch-src-sequencer64_1675.so.c Tue Feb 11 09:20:28 2003
@@ -0,0 +1,27 @@
+--- src/sequencer64_1675.so.c.orig Tue Feb 11 09:17:22 2003
++++ src/sequencer64_1675.so.c Tue Feb 11 09:17:46 2003
+@@ -132,6 +132,8 @@
+ void runSequencer(LADSPA_Handle instance,
+ unsigned long sample_count)
+ {
++ int i,rst;
++ unsigned long s;
+ Sequencer *plugin = (Sequencer *)instance;
+
+ /* Gate */
+@@ -165,14 +167,11 @@
+ unsigned int loop_index = f_round_i(loop_steps);
+ loop_index = loop_index == 0 ? 1 : loop_index;
+ loop_index = loop_index > 64 ? 64 : loop_index;
+- int rst = f_round_i(reset);
+- int i;
++ rst = f_round_i(reset);
+
+ for (i = 0; i < 64; i++) {
+ values[i] = *(plugin->values[i]);
+ }
+-
+- unsigned long s;
+
+ for (s = 0; s < sample_count; s++) {
+ if (gate[s] > 0.0f) {
--- blob.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302110835.h1B8ZQQQ089395>