Attachment #37642 for bug #59840

View | Details | Raw Unified | Return to bug 59840
Collapse All | Expand All

Lines 6-12 Link Here

(-)audio/extace/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= extace	8	PORTNAME= extace
9	PORTVERSION= 1.8.11	9	PORTVERSION= 1.9.0
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 19-25 Link Here
19	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
20	USE_GNOME= esound imlib gnomehack gnomeprefix	20	USE_GNOME= esound imlib gnomehack gnomeprefix
21	USE_LIBTOOL= yes	21	USE_LIBTOOL= yes
22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \	22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
23	LDFLAGS="-L${LOCALBASE}/lib"	23	LDFLAGS="-L${LOCALBASE}/lib"
24	CONFIGURE_ARGS= --disable-alsa	24	CONFIGURE_ARGS= --disable-alsa
25		25

Line 1 Link Here

(-)audio/extace/distinfo (-1 / +1 lines)
1	MD5 (extace-1.8.11.tar.gz) = d194f7aae9d4f7650b50524f2c90c227	1	MD5 (extace-1.9.0.tar.gz) = e866d9408b07223f924663283056922b




--- src/sound.c.orig	Sat Aug  3 10:25:15 2002
+++ src/sound.c	Sat Aug  3 10:25:49 2002
@@ -23,7 +23,9 @@
 #include <fcntl.h>
 #include <gtk/gtk.h>
 #include <esd.h>
+#ifndef __FreeBSD__
 #include <asm/errno.h>
+#endif
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 #endif




--- src/audio_processing.c.orig	Thu Jun  5 17:20:26 2003
+++ src/audio_processing.c	Thu Jun  5 17:20:45 2003
@@ -20,7 +20,9 @@
 #include <protos.h>
 #include <math.h>
 #include <gtk/gtk.h>
+#ifndef __FreeBSD__
 #include <asm/errno.h>
+#endif
 #include "convolve.h"
 #ifdef HAVE_LIBRFFTW
 #include <rfftw.h>




--- src/input.c.orig	Sat Nov 29 14:05:28 2003
+++ src/input.c	Sun Nov 30 13:24:14 2003
@@ -15,7 +15,7 @@
  * No warranty is made or implied. You use this program at your own risk.
  */
 
-#include <asm/errno.h>
+#include <errno.h>
 #include <config.h>
 #include <enums.h>
 #include <fcntl.h>
@@ -76,8 +76,12 @@
 static gchar channel_numbers[MAX_STR][10];  /* string containing integers */
 #endif
 GtkWidget *errbox;
+GtkWidget *label;
 int errorbox_up;
 gint tag;		/* Used by gdk_input_* */
+gint timeo;
+gint res;
+gint to_get;
 
 /*--- globals to this file */
 
@@ -151,7 +155,6 @@
 
 	/* The rest is error handling */
 
-	GtkWidget *label;
 	if (errorbox_up)
 		return(-1); /* ERROR window already onscreen */
 	errbox = gtk_window_new(GTK_WINDOW_DIALOG);
@@ -380,9 +383,9 @@
 	struct pollfd ufds;
 	ufds.fd = source;
 	ufds.events = POLLIN;
-	gint timeo = 100; /* wait 100ms max before timeout */
-	gint res = -1;
-	gint to_get = 0;
+	timeo = 100; /* wait 100ms max before timeout */
+	res = -1;
+	to_get = 0;
      
 	/* reset data ring buffer */
 	ring_pos=0;

Line 0 Link Here

(-)audio/extace/files/patch-src::input_processing.c (+11 lines)
	1	--- src/input_processing.c.orig Sat Nov 29 06:25:58 2003
	2	+++ src/input_processing.c Sun Nov 30 13:24:48 2003
	3	@@ -15,7 +15,7 @@
	4	* No warranty is made or implied. You use this program at your own risk.
	5	*/
	6
	7	-#include <asm/errno.h>
	8	+#include <errno.h>
	9	#include <input_processing.h>
	10	#include <config.h>
	11	#include <convolve.h>

Return to bug 59840

Lines 1-12 Link Here

(-)audio/extace/files/patch-ad (-12 lines)
1	--- src/sound.c.orig Sat Aug 3 10:25:15 2002
2	+++ src/sound.c Sat Aug 3 10:25:49 2002
3	@@ -23,7 +23,9 @@
4	#include <fcntl.h>
5	#include <gtk/gtk.h>
6	#include <esd.h>
7	+#ifndef __FreeBSD__
8	#include <asm/errno.h>
9	+#endif
10	#ifdef HAVE_PTHREAD_H
11	#include <pthread.h>
12	#endif

Lines 1-12 Link Here

(-)audio/extace/files/patch-src::audio_processing.c (-12 lines)
1	--- src/audio_processing.c.orig Thu Jun 5 17:20:26 2003
2	+++ src/audio_processing.c Thu Jun 5 17:20:45 2003
3	@@ -20,7 +20,9 @@
4	#include <protos.h>
5	#include <math.h>
6	#include <gtk/gtk.h>
7	+#ifndef __FreeBSD__
8	#include <asm/errno.h>
9	+#endif
10	#include "convolve.h"
11	#ifdef HAVE_LIBRFFTW
12	#include <rfftw.h>

Line 0 Link Here

(-)audio/extace/files/patch-src::input.c (+45 lines)
	1	--- src/input.c.orig Sat Nov 29 14:05:28 2003
	2	+++ src/input.c Sun Nov 30 13:24:14 2003
	3	@@ -15,7 +15,7 @@
	4	* No warranty is made or implied. You use this program at your own risk.
	5	*/
	6
	7	-#include <asm/errno.h>
	8	+#include <errno.h>
	9	#include <config.h>
	10	#include <enums.h>
	11	#include <fcntl.h>
	12	@@ -76,8 +76,12 @@
	13	static gchar channel_numbers[MAX_STR][10]; /* string containing integers */
	14	#endif
	15	GtkWidget *errbox;
	16	+GtkWidget *label;
	17	int errorbox_up;
	18	gint tag; /* Used by gdk_input_* */
	19	+gint timeo;
	20	+gint res;
	21	+gint to_get;
	22
	23	/--- globals to this file /
	24
	25	@@ -151,7 +155,6 @@
	26
	27	/* The rest is error handling */
	28
	29	- GtkWidget *label;
	30	if (errorbox_up)
	31	return(-1); /* ERROR window already onscreen */
	32	errbox = gtk_window_new(GTK_WINDOW_DIALOG);
	33	@@ -380,9 +383,9 @@
	34	struct pollfd ufds;
	35	ufds.fd = source;
	36	ufds.events = POLLIN;
	37	- gint timeo = 100; /* wait 100ms max before timeout */
	38	- gint res = -1;
	39	- gint to_get = 0;
	40	+ timeo = 100; /* wait 100ms max before timeout */
	41	+ res = -1;
	42	+ to_get = 0;
	43
	44	/* reset data ring buffer */
	45	ring_pos=0;