Attachment #47905 for bug #73343

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




#

PORTNAME=	extace
PORTVERSION=	1.9.2
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw

USE_X_PREFIX=	yes
USE_GNOME=	esound imlib gnomehack gnometarget gnomeprefix
USE_REINPLACE=	yes
USE_LIBTOOL_VER=	15
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"

PLIST_FILES=	bin/extace \
		share/gnome/apps/Multimedia/extace.desktop

post-patch:
	@${REINPLACE_CMD} -e 's|-O2 |$$CFLAGS|g' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|^LIBS =|#LIBS =|g' ${WRKSRC}/src/Makefile.in

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/extace/distinfo (-2 / +2 lines)
1	MD5 (extace-1.9.0.tar.gz) = e866d9408b07223f924663283056922b	1	MD5 (extace-1.9.2.tar.gz) = 4e8296008d313611b287191d30fd07e5
2	SIZE (extace-1.9.0.tar.gz) = 275528	2	SIZE (extace-1.9.2.tar.gz) = 390477




--- configure.orig	Sun May 26 19:57:47 2002
+++ configure	Sat Aug  3 10:36:04 2002
@@ -6717,7 +6717,7 @@
 done
 
 
-CFLAGS="-O2 "
+CFLAGS="$CFLAGS"
 
 
 EFENCE=""
@@ -7149,7 +7149,8 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lgdk_imlib `gtk-config --libs`  $LIBS"
+GDK_IMLIB_LIBS=`imlib-config --libs-gdk`
+LIBS="${GTK_LIBS} ${GDK_IMLIB_LIBS}  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 7155 "configure"
 #include "confdefs.h"
@@ -7383,6 +7384,7 @@
 s%@GTK_CONFIG@%$GTK_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
+s%@GDK_IMLIB_LIBS@%$GDK_IMLIB_LIBS%g
 s%@GLIB_CONFIG@%$GLIB_CONFIG%g
 s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
 s%@GLIB_LIBS@%$GLIB_LIBS%g




--- src/Makefile.in.orig	Wed Apr  9 12:19:08 2003
+++ src/Makefile.in	Fri May 23 18:05:51 2003
@@ -107,9 +107,9 @@
 extace_SOURCES =  	Makefile 	globals.h 	enums.h 	defaults.h 	defines.h 	protos.h 	convolve.h 	configfile.h 	stars.h 	logo.xpm    	stars.c 	init.c 	main.c 	draw.c 	land3d.c 	gc_maker.c 	dir.c 	audio_processing.c 	events.c 	configfile.c 	buttons.c 	color_win.c 	reducer.c 	convolve.c 	win_func.c 	2d_eq.c 	scope.c 	markers.c 	spike_3d.c 	sound.c 	vert_specgram.c 	horiz_specgram.c  	options.c 
 
 
-extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib 
+extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ @GDK_IMLIB_LIBS@
 
-LIBS = -lpthread
+#LIBS = -lpthread
 
 COMMON_FLAGS = @PFLAGS@ @DFLAGS@ 
 




--- src/input.c.orig	Mon Aug 23 23:35:00 2004
+++ src/input.c	Sun Oct 31 00:44:56 2004
@@ -52,8 +52,12 @@
 } handles[MAX_HANDLES];
  */
 
 static GtkWidget *errbox;
+#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;
 static int errorbox_up =0;
 gint tag;		/* Used by gdk_input_* */
+gint timeo;
+gint res;

 
 /*--- globals to this file */
 
@@ -295,7 +299,6 @@
 	
 	/* The rest is error handling */
 
-	GtkWidget *label;
 	if (errorbox_up)
 		return(-1); /* ERROR window already onscreen */
 	errbox = gtk_window_new(GTK_WINDOW_DIALOG);
@@ -536,9 +539,9 @@
 	struct pollfd ufds;
 	ufds.fd = source;
 	ufds.events = POLLIN;

+	res = -1;
+	to_get = 0;
      
 	/* adjust position in ring buffer to be on first channel */
 	ring_pos -= ring_pos%ring_channels;

Lines 1-11 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>

Lines 1-2 Link Here

(-)audio/extace/pkg-plist (-2 lines)
1	bin/extace
2	share/gnome/apps/Multimedia/extace.desktop

Return to bug 73343

Lines 6-13 Link Here

(-)audio/extace/Makefile (-5 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= extace	8	PORTNAME= extace
9	PORTVERSION= 1.9.0	9	PORTVERSION= 1.9.2
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 18-27 Link Here
18	LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw	17	LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
19		18
20	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
21	USE_GNOME= esound imlib gnomehack gnomeprefix	20	USE_GNOME= esound imlib gnomehack gnometarget gnomeprefix
22	USE_LIBTOOL_VER= 13	21	USE_REINPLACE= yes
		22	USE_LIBTOOL_VER= 15
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
24	LDFLAGS="-L${LOCALBASE}/lib"	24	LDFLAGS="-L${LOCALBASE}/lib"
25	CONFIGURE_ARGS= --disable-alsa	25
		26	PLIST_FILES= bin/extace \
		27	share/gnome/apps/Multimedia/extace.desktop
		28
		29	post-patch:
		30	@${REINPLACE_CMD} -e 's\|-O2 \|$$CFLAGS\|g' ${WRKSRC}/configure
		31	@${REINPLACE_CMD} -e 's\|^LIBS =\|#LIBS =\|g' ${WRKSRC}/src/Makefile.in
26		32
27	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)audio/extace/files/patch-aa (-29 lines)
1	--- configure.orig Sun May 26 19:57:47 2002
2	+++ configure Sat Aug 3 10:36:04 2002
3	@@ -6717,7 +6717,7 @@
4	done
5
6
7	-CFLAGS="-O2 "
8	+CFLAGS="$CFLAGS"
9
10
11	EFENCE=""
12	@@ -7149,7 +7149,8 @@
13	echo $ac_n "(cached) $ac_c" 1>&6
14	else
15	ac_save_LIBS="$LIBS"
16	-LIBS="-lgdk_imlib `gtk-config --libs` $LIBS"
17	+GDK_IMLIB_LIBS=`imlib-config --libs-gdk`
18	+LIBS="${GTK_LIBS} ${GDK_IMLIB_LIBS} $LIBS"
19	cat > conftest.$ac_ext <<EOF
20	#line 7155 "configure"
21	#include "confdefs.h"
22	@@ -7383,6 +7384,7 @@
23	s%@GTK_CONFIG@%$GTK_CONFIG%g
24	s%@GTK_CFLAGS@%$GTK_CFLAGS%g
25	s%@GTK_LIBS@%$GTK_LIBS%g
26	+s%@GDK_IMLIB_LIBS@%$GDK_IMLIB_LIBS%g
27	s%@GLIB_CONFIG@%$GLIB_CONFIG%g
28	s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
29	s%@GLIB_LIBS@%$GLIB_LIBS%g

Lines 1-14 Link Here

(-)audio/extace/files/patch-ab (-14 lines)
1	--- src/Makefile.in.orig Wed Apr 9 12:19:08 2003
2	+++ src/Makefile.in Fri May 23 18:05:51 2003
3	@@ -107,9 +107,9 @@
4	extace_SOURCES = Makefile globals.h enums.h defaults.h defines.h protos.h convolve.h configfile.h stars.h logo.xpm stars.c init.c main.c draw.c land3d.c gc_maker.c dir.c audio_processing.c events.c configfile.c buttons.c color_win.c reducer.c convolve.c win_func.c 2d_eq.c scope.c markers.c spike_3d.c sound.c vert_specgram.c horiz_specgram.c options.c
5
6
7	-extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib
8	+extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ @GDK_IMLIB_LIBS@
9
10	-LIBS = -lpthread
11	+#LIBS = -lpthread
12
13	COMMON_FLAGS = @PFLAGS@ @DFLAGS@
14

Lines 1-20 Link Here

(-)audio/extace/files/patch-src::input.c (-20 / +11 lines)
1	--- src/input.c.orig Sat Nov 29 14:05:28 2003	1	--- src/input.c.orig Mon Aug 23 23:35:00 2004
2	+++ src/input.c Sun Nov 30 13:24:14 2003	2	+++ src/input.c Sun Oct 31 00:44:56 2004
3	@@ -15,7 +15,7 @@	3	@@ -52,8 +52,12 @@
4	* No warranty is made or implied. You use this program at your own risk.	4	} handles[MAX_HANDLES];
5	*/
6		5
7	-#include <asm/errno.h>	6	static GtkWidget *errbox;
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;	7	+GtkWidget *label;
17	int errorbox_up;	8	static int errorbox_up =0;
18	gint tag; /* Used by gdk_input_* */	9	gint tag; /* Used by gdk_input_* */
19	+gint timeo;	10	+gint timeo;
20	+gint res;	11	+gint res;
Lines 22-36 Link Here
22		13
23	/--- globals to this file /	14	/--- globals to this file /
24		15
25	@@ -151,7 +155,6 @@	16	@@ -295,7 +299,6 @@
26		17
27	/* The rest is error handling */	18	/* The rest is error handling */
28		19
29	- GtkWidget *label;	20	- GtkWidget *label;
30	if (errorbox_up)	21	if (errorbox_up)
31	return(-1); /* ERROR window already onscreen */	22	return(-1); /* ERROR window already onscreen */
32	errbox = gtk_window_new(GTK_WINDOW_DIALOG);	23	errbox = gtk_window_new(GTK_WINDOW_DIALOG);
33	@@ -380,9 +383,9 @@	24	@@ -536,9 +539,9 @@
34	struct pollfd ufds;	25	struct pollfd ufds;
35	ufds.fd = source;	26	ufds.fd = source;
36	ufds.events = POLLIN;	27	ufds.events = POLLIN;
Lines 41-45 Link Here
41	+ res = -1;	32	+ res = -1;
42	+ to_get = 0;	33	+ to_get = 0;
43		34
44	/* reset data ring buffer */	35	/* adjust position in ring buffer to be on first channel */
45	ring_pos=0;	36	ring_pos -= ring_pos%ring_channels;