Attachment #31663 for bug #52661

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




#

PORTNAME=	extace
PORTVERSION=	1.7.8
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	An Audio Visualization plugin for the X Window System

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

.include <bsd.port.pre.mk>

USE_X_PREFIX=	yes
USE_GNOME=	gnomehack gnomeprefix gtk12 imlib esound
USE_REINPLACE=	yes
USE_LIBTOOL=	yes
CONFIGURE_ARGS=	--disable-alsa
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--disable-alsa

post-patch:
	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g"  \
		-e "s|DATADIRNAME=lib|DATADIRNAME=share|g"  ${WRKSRC}/configure

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/extace ${PREFIX}/bin
	${INSTALL_DATA} ${WRKSRC}/src/extace.desktop \
		${PREFIX}/share/gnome/apps/Multimedia

.include <bsd.port.mk>

Line 1 Link Here

(-)audio/extace/distinfo (-1 / +1 lines)
1	MD5 (extace-1.7.3.tar.gz) = b12ca26f98da7e306df1d3777b1cb77a	1	MD5 (extace-1.7.8.tar.gz) = 3a8023e5028d679352c755c3084bb867




--- configure.orig	Sun May 26 19:57:47 2002
+++ configure	Sat Aug  3 10:36:04 2002
@@ -1595,13 +1595,13 @@
   CFLAGS="$ac_save_CFLAGS"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+#    CFLAGS="-g -O2"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+#    CFLAGS="-O2"
   else
     CFLAGS=
   fi
@@ -5706,13 +5706,13 @@
   CFLAGS="$ac_save_CFLAGS"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+#    CFLAGS="-g -O2"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+#    CFLAGS="-O2"
   else
     CFLAGS=
   fi
@@ -6717,7 +6717,7 @@
 done
 
 
-CFLAGS="-O2 "
+CFLAGS="$CFLAGS"
 
 
 EFENCE=""

 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"

 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@ 
 
@@ -321,7 +323,6 @@
 uninstall-info-am:
 install-MultimediaDATA: $(Multimedia_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(Multimediadir)
 	@list='$(Multimedia_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -395,7 +396,7 @@
 all-am: Makefile $(PROGRAMS) $(DATA)
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(Multimediadir)
+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
 
 install: install-am
 install-exec: install-exec-am




--- src/audio_processing.c.orig	Mon Mar 17 04:45:48 2003
+++ src/audio_processing.c	Fri May 23 18:11:12 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>





$FreeBSD: ports/audio/extace/files/patch-src::color_win.c,v 1.1 2002/08/30 13:54:17 sobomax Exp $

--- src/color_win.c.orig	Wed Feb 26 01:22:19 2003
+++ src/color_win.c	Fri May 23 18:26:18 2003
@@ -579,12 +579,12 @@
 		button = gtk_button_new_with_label("Set Color");
 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-				(GtkSignalFunc)color_button, (gpointer)SET_COLOR);
+				(GtkSignalFunc)color_button, (gint)SET_COLOR);
 	    update_gradient(NULL, color_loc);
 	    init_colortab();
 	    gradient_update();
 	    break;
 
 		button = gtk_button_new_with_label("Close");
 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-				(GtkSignalFunc)color_button, (gpointer)CLOSE);
+				(GtkSignalFunc)color_button, (gint)CLOSE);
 
 		hbox = gtk_hbox_new(TRUE,0);
 		gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
@@ -592,12 +592,12 @@
 		button = gtk_button_new_with_label("Save");
 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-				(GtkSignalFunc)color_button, (gpointer)SAVE);
+				(GtkSignalFunc)color_button, (gint)SAVE);
 
 		button = gtk_button_new_with_label("Load");
 		gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-				(GtkSignalFunc)color_button, (gpointer)LOAD);
+				(GtkSignalFunc)color_button, (gint)LOAD);
 
 		gtk_widget_show_all(grad_win);
 	}





$FreeBSD: ports/audio/extace/files/patch-src::getfft.c,v 1.1 2002/08/30 13:54:17 sobomax Exp $

--- src/getfft.c	2002/08/30 12:59:05	1.1
+++ src/getfft.c	2002/08/30 12:59:26
@@ -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>

Return to bug 52661

Lines 6-33 Link Here

(-)audio/extace/Makefile (-7 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= extace	8	PORTNAME= extace
9	PORTVERSION= 1.7.3	9	PORTVERSION= 1.7.8
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= extace	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= An Audio Visualization plugin for the X Window System	15	COMMENT= An Audio Visualization plugin for the X Window System
16		16
17	LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw	17	LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
18		18
19	.include <bsd.port.pre.mk>
20
21	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
22	USE_GNOME= gnomehack gnomeprefix gtk12 imlib esound	20	USE_GNOME= gnomehack gnomeprefix gtk12 imlib esound
23	USE_REINPLACE= yes	21	USE_REINPLACE= yes
24	USE_LIBTOOL= yes	22	USE_LIBTOOL= yes
25	CONFIGURE_ARGS= --disable-alsa
26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \	23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \
27	LIBS="-L${LOCALBASE}/lib"	24	LDFLAGS="-L${LOCALBASE}/lib"
		25	CONFIGURE_ARGS= --disable-alsa
28		26
29	post-patch:	27	post-patch:
30	@${REINPLACE_CMD} -e "s\|-lpthread\|${PTHREAD_LIBS}\|g" \	28	@${REINPLACE_CMD} -e "s\|-lpthread\|${PTHREAD_LIBS}\|g" \
31	-e "s\|DATADIRNAME=lib\|DATADIRNAME=share\|g" ${WRKSRC}/configure	29	-e "s\|DATADIRNAME=lib\|DATADIRNAME=share\|g" ${WRKSRC}/configure
32		30
33	.include <bsd.port.post.mk>	31	do-install:
		32	${INSTALL_PROGRAM} ${WRKSRC}/src/extace ${PREFIX}/bin
		33	${INSTALL_DATA} ${WRKSRC}/src/extace.desktop \
		34	${PREFIX}/share/gnome/apps/Multimedia
		35
		36	.include <bsd.port.mk>

Lines 1-43 Link Here

(-)audio/extace/files/patch-aa (-36 / +4 lines)
1	--- configure.orig Sun May 26 19:57:47 2002	1	--- configure.orig Sun May 26 19:57:47 2002
2	+++ configure Sat Aug 3 10:36:04 2002	2	+++ configure Sat Aug 3 10:36:04 2002
3	@@ -1595,13 +1595,13 @@
4	CFLAGS="$ac_save_CFLAGS"
5	elif test $ac_cv_prog_cc_g = yes; then
6	if test "$GCC" = yes; then
7	- CFLAGS="-g -O2"
8	+# CFLAGS="-g -O2"
9	else
10	CFLAGS="-g"
11	fi
12	else
13	if test "$GCC" = yes; then
14	- CFLAGS="-O2"
15	+# CFLAGS="-O2"
16	else
17	CFLAGS=
18	fi
19	@@ -5706,13 +5706,13 @@
20	CFLAGS="$ac_save_CFLAGS"
21	elif test $ac_cv_prog_cc_g = yes; then
22	if test "$GCC" = yes; then
23	- CFLAGS="-g -O2"
24	+# CFLAGS="-g -O2"
25	else
26	CFLAGS="-g"
27	fi
28	else
29	if test "$GCC" = yes; then
30	- CFLAGS="-O2"
31	+# CFLAGS="-O2"
32	else
33	CFLAGS=
34	fi
35	@@ -6717,7 +6717,7 @@	3	@@ -6717,7 +6717,7 @@
36	done	4	done
37		5
38		6
39	-CFLAGS="-O2 "	7	-CFLAGS="-O2 "
40	+#CFLAGS="-O2 "	8	+CFLAGS="$CFLAGS"
41		9
42		10
43	EFENCE=""	11	EFENCE=""
Lines 46-53 Link Here
46	else	14	else
47	ac_save_LIBS="$LIBS"	15	ac_save_LIBS="$LIBS"
48	-LIBS="-lgdk_imlib `gtk-config --libs` $LIBS"	16	-LIBS="-lgdk_imlib `gtk-config --libs` $LIBS"
49	+IMLIB_LIBS=`imlib-config --libs`	17	+GDK_IMLIB_LIBS=`imlib-config --libs-gdk`
50	+LIBS="-lgdk_imlib ${GTK_LIBS} ${IMLIB_LIBS} $LIBS"	18	+LIBS="${GTK_LIBS} ${GDK_IMLIB_LIBS} $LIBS"
51	cat > conftest.$ac_ext <<EOF	19	cat > conftest.$ac_ext <<EOF
52	#line 7155 "configure"	20	#line 7155 "configure"
53	#include "confdefs.h"	21	#include "confdefs.h"
Lines 55-61 Link Here
55	s%@GTK_CONFIG@%$GTK_CONFIG%g	23	s%@GTK_CONFIG@%$GTK_CONFIG%g
56	s%@GTK_CFLAGS@%$GTK_CFLAGS%g	24	s%@GTK_CFLAGS@%$GTK_CFLAGS%g
57	s%@GTK_LIBS@%$GTK_LIBS%g	25	s%@GTK_LIBS@%$GTK_LIBS%g
58	+s%@IMLIB_LIBS@%$IMLIB_LIBS%g	26	+s%@GDK_IMLIB_LIBS@%$GDK_IMLIB_LIBS%g
59	s%@GLIB_CONFIG@%$GLIB_CONFIG%g	27	s%@GLIB_CONFIG@%$GLIB_CONFIG%g
60	s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g	28	s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
61	s%@GLIB_LIBS@%$GLIB_LIBS%g	29	s%@GLIB_LIBS@%$GLIB_LIBS%g

Lines 1-31 Link Here

(-)audio/extace/files/patch-ab (-22 / +5 lines)
1	--- src/Makefile.in.orig Sun May 26 19:59:24 2002	1	--- src/Makefile.in.orig Wed Apr 9 12:19:08 2003
2	+++ src/Makefile.in Sat Aug 3 10:36:57 2002	2	+++ src/Makefile.in Fri May 23 18:05:51 2003
3	@@ -146,9 +146,9 @@	3	@@ -107,9 +107,9 @@
4	options.c	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		5
6		6
7	-extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ -lgdk_imlib	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@ @IMLIB_LIBS@ -lgdk_imlib	8	+extace_LDADD = @EFENCE@ @GTK_LIBS@ @ESD_LIBS@ @EXTRA_LIBS@ @ALSA_LIBS@ @GDK_IMLIB_LIBS@
9		9
10	-LIBS = -lpthread	10	-LIBS = -lpthread
11	+#LIBS = -lpthread	11	+#LIBS = -lpthread
12		12
13	COMMON_FLAGS = @PFLAGS@ @DFLAGS@	13	COMMON_FLAGS = @PFLAGS@ @DFLAGS@
14		14
15	@@ -321,7 +323,6 @@
16	uninstall-info-am:
17	install-MultimediaDATA: $(Multimedia_DATA)
18	@$(NORMAL_INSTALL)
19	- $(mkinstalldirs) $(DESTDIR)$(Multimediadir)
20	@list='$(Multimedia_DATA)'; for p in $$list; do \
21	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
22	f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \
23	@@ -395,7 +396,7 @@
24	all-am: Makefile $(PROGRAMS) $(DATA)
25
26	installdirs:
27	- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(Multimediadir)
28	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
29
30	install: install-am
31	install-exec: install-exec-am

Line 0 Link Here

(-)audio/extace/files/patch-src::audio_processing.c (+12 lines)
	1	--- src/audio_processing.c.orig Mon Mar 17 04:45:48 2003
	2	+++ src/audio_processing.c Fri May 23 18:11:12 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>

Lines 1-36 Link Here

(-)audio/extace/files/patch-src::color_win.c (-31 / +30 lines)
1		1
2	$FreeBSD: ports/audio/extace/files/patch-src::color_win.c,v 1.1 2002/08/30 13:54:17 sobomax Exp $	2	$FreeBSD: ports/audio/extace/files/patch-src::color_win.c,v 1.1 2002/08/30 13:54:17 sobomax Exp $
3		3
4	--- src/color_win.c 2002/08/30 13:00:11 1.1	4	--- src/color_win.c.orig Wed Feb 26 01:22:19 2003
5	+++ src/color_win.c 2002/08/30 13:00:52	5	+++ src/color_win.c Fri May 23 18:26:18 2003
6	@@ -61,18 +61,18 @@	6	@@ -579,12 +579,12 @@
7	// printf("Color_button()\n");	7	button = gtk_button_new_with_label("Set Color");
8	switch ((gint)data)	8	gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
9	{	9	gtk_signal_connect(GTK_OBJECT(button), "clicked",
10	- case (gpointer)SET_COLOR:	10	- (GtkSignalFunc)color_button, (gpointer)SET_COLOR);
11	+ case (gint)SET_COLOR:	11	+ (GtkSignalFunc)color_button, (gint)SET_COLOR);
12	update_gradient(NULL, color_loc);
13	init_colortab();
14	gradient_update();
15	break;
16		12
17	- case (gpointer)CLOSE:	13	button = gtk_button_new_with_label("Close");
18	+ case (gint)CLOSE:	14	gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
19	gtk_widget_hide(grad_win_ptr);	15	gtk_signal_connect(GTK_OBJECT(button), "clicked",
20	grad_win_present = 0;	16	- (GtkSignalFunc)color_button, (gpointer)CLOSE);
21	break;	17	+ (GtkSignalFunc)color_button, (gint)CLOSE);
22		18
23	- case (gpointer)SAVE:	19	hbox = gtk_hbox_new(TRUE,0);
24	+ case (gint)SAVE:	20	gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
25	filew = gtk_file_selection_new("Save Colormap");	21	@@ -592,12 +592,12 @@
26	gtk_signal_connect (GTK_OBJECT(filew), "destroy",	22	button = gtk_button_new_with_label("Save");
27	(GtkSignalFunc) gtk_widget_destroy, GTK_OBJECT (filew));	23	gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
28	@@ -85,7 +85,7 @@	24	gtk_signal_connect(GTK_OBJECT(button), "clicked",
29	gtk_file_selection_set_filename(GTK_FILE_SELECTION(filew),g_strconcat(g_get_home_dir(),"/.eXtace/ColorMaps/", NULL));	25	- (GtkSignalFunc)color_button, (gpointer)SAVE);
30	gtk_widget_show(filew);	26	+ (GtkSignalFunc)color_button, (gint)SAVE);
31	break;	27
32	- case (gpointer)LOAD:	28	button = gtk_button_new_with_label("Load");
33	+ case (gint)LOAD:	29	gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
34	filew = gtk_file_selection_new("Load Colormap");	30	gtk_signal_connect(GTK_OBJECT(button), "clicked",
35	gtk_signal_connect (GTK_OBJECT(filew), "destroy",	31	- (GtkSignalFunc)color_button, (gpointer)LOAD);
36	(GtkSignalFunc) gtk_widget_destroy, GTK_OBJECT (filew));	32	+ (GtkSignalFunc)color_button, (gint)LOAD);
		33
		34	gtk_widget_show_all(grad_win);
		35	}

Lines 1-15 Link Here

(-)audio/extace/files/patch-src::getfft.c (-15 lines)
1
2	$FreeBSD: ports/audio/extace/files/patch-src::getfft.c,v 1.1 2002/08/30 13:54:17 sobomax Exp $
3
4	--- src/getfft.c 2002/08/30 12:59:05 1.1
5	+++ src/getfft.c 2002/08/30 12:59:26
6	@@ -20,7 +20,9 @@
7	#include <protos.h>
8	#include <math.h>
9	#include <gtk/gtk.h>
10	+#ifndef __FreeBSD__
11	#include <asm/errno.h>
12	+#endif
13	#include "convolve.h"
14	#ifdef HAVE_LIBRFFTW
15	#include <rfftw.h>