Attachment #53621 for bug #81118

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




#

PORTNAME=	tunesbrowser
PORTVERSION=	0.3.0
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	http://craz.net/programs/itunes/files/


LIB_DEPENDS=	opendaap.0:${PORTSDIR}/devel/libopendaap

USE_BZIP2=	yes
USE_INC_LIBTOOL_VER=15
USE_X_PREFIX=	yes
USE_GNOME=	gnomehack gnomeprefix gnometarget libglade2
WANT_GNOME=	yes
USE_GSTREAMER=	mad
GNU_CONFIGURE=	yes

MAN1=		tunesbrowser.1

.include <bsd.port.pre.mk>

.if ${HAVE_GNOME:Mlibgnome}!=""
PKGNAMESUFFIX=	-gnome
USE_GNOME+=	libgnome
.else
CONFIGURE_ARGS+=	--disable-gnome
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)audio/tunesbrowser/distinfo (-2 / +2 lines)
1	MD5 (tunesbrowser-0.2.0.tar.bz2) = e0fa00ca89ded223033430f4c54a83f9	1	MD5 (tunesbrowser-0.3.0.tar.bz2) = dacfc3f7209c3165be9a9211dfb7bf0e
2	SIZE (tunesbrowser-0.2.0.tar.bz2) = 208472	2	SIZE (tunesbrowser-0.3.0.tar.bz2) = 222593




--- Makefile.in.orig	Mon May 16 14:48:28 2005
+++ Makefile.in	Mon May 16 19:39:09 2005
@@ -144,7 +144,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUBDIRS = debug
-uidir = $(datadir)
+uidir = $(pkgdatadir)
 bin_PROGRAMS = tunesbrowser
 tunesbrowser_SOURCES = albumlist.c artistlist.c audioplayer.c \
                        daap.c main.c misc_ui.c songlist.c sourcelist.c \
@@ -158,7 +158,7 @@
 man_MANS = tunesbrowser.1
+	  $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/tunesbrowser/$$f; \
 	done
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/debug
-AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(datadir)
+AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(pkgdatadir)
 
 ui_DATA = tunesbrowser.glade \
           comp.blue.png comp.red.png \




--- audioplayer.c.orig	Mon Dec 20 03:03:55 2004
+++ audioplayer.c	Wed Feb  2 21:42:19 2005
@@ -106,7 +106,8 @@
 
 static void async_cmd_cb_gst_setup_clock(__UNUSED__ void *data)
 {
-    GstClock *clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
+    GstClock *clock;
+    clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
     songstarted = gst_clock_get_time(clock) / GST_SECOND;
 }
 
@@ -157,8 +158,10 @@
 
 static void cb_iterate(GstBin *bin, __UNUSED__ gpointer data)
 {
-    GstClock *clock = gst_bin_get_clock(bin);
-    int seconds = gst_clock_get_time(clock) / GST_SECOND;
+    GstClock *clock;
+    int seconds;
+    clock = gst_bin_get_clock(bin);
+    seconds = gst_clock_get_time(clock) / GST_SECOND; 
 
     seconds = seconds - songstarted;
 




--- main.c.orig	Mon Jan  3 21:58:29 2005
+++ main.c	Wed Feb  2 21:56:11 2005
@@ -38,7 +38,7 @@
 {
     fprintf(stderr, "Oops! TunesBrowser has crashed. Sorry about that!\n");
     fprintf(stderr, "This probably won't be of any use unless you feel like debugging,\n");
-    fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_ptr);
+    fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_value.sigval_ptr);
 #if 0
     fprintf(stderr, "\n\nRaised SIGSTOP. You can now attach a debugger.\n");
     fprintf(stderr, "Attach to PID %i\n", getpid());
@@ -66,11 +66,11 @@
     int ret;
 
     sa.sa_handler = (void*)sighandler_sigsegv;
-    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
+    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
     ret = sigaction(SIGSEGV, &sa, NULL);
 
     sa.sa_handler = (void*)sighandler_sigpipe;
-    sa.sa_flags = SA_NOMASK | SA_SIGINFO;
+    sa.sa_flags = SA_NODEFER | SA_SIGINFO;
     ret = sigaction(SIGPIPE, &sa, NULL);
 }
 
@@ -94,7 +94,7 @@
 
     gtk_init(&argc, &argv);
 
-    xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser.glade", NULL, NULL);
+    xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser/tunesbrowser.glade", NULL, NULL);
 
     glade_xml_signal_autoconnect(xml);
 

Lines 3-7 Link Here

(-)audio/tunesbrowser/pkg-plist (+2 lines)
3	share/gnome/tunesbrowser/comp.red.png	3	share/gnome/tunesbrowser/comp.red.png
4	share/gnome/tunesbrowser/sound1.png	4	share/gnome/tunesbrowser/sound1.png
5	share/gnome/tunesbrowser/sound2.png	5	share/gnome/tunesbrowser/sound2.png
		6	share/gnome/tunesbrowser/soundfile.png
		7	share/gnome/tunesbrowser/tips.txt
6	share/gnome/tunesbrowser/tunesbrowser.glade	8	share/gnome/tunesbrowser/tunesbrowser.glade
7	@dirrm share/gnome/tunesbrowser	9	@dirrm share/gnome/tunesbrowser

Return to bug 81118

Lines 6-13 Link Here

(-)audio/tunesbrowser/Makefile (-11 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= tunesbrowser	8	PORTNAME= tunesbrowser
9	PORTVERSION= 0.2.0	9	PORTVERSION= 0.3.0
10	PORTREVISION= 2
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://craz.net/programs/itunes/files/	11	MASTER_SITES= http://craz.net/programs/itunes/files/
13		12
Lines 17-35 Link Here
17	LIB_DEPENDS= opendaap.0:${PORTSDIR}/devel/libopendaap	16	LIB_DEPENDS= opendaap.0:${PORTSDIR}/devel/libopendaap
18		17
19	USE_BZIP2= yes	18	USE_BZIP2= yes
20	USE_INC_LIBTOOL_VER=15
21	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
22	USE_GNOME= libglade2 gnometarget gnomehack gnomeprefix	20	USE_GNOME= gnomehack gnomeprefix gnometarget libglade2
		21	WANT_GNOME= yes
23	USE_GSTREAMER= mad	22	USE_GSTREAMER= mad
		23	GNU_CONFIGURE= yes
24		24
25	MAN1= tunesbrowser.1	25	MAN1= tunesbrowser.1
26		26
27	DATADIR= ${PREFIX}/share/gnome/${PORTNAME}	27	.include <bsd.port.pre.mk>
28		28
29	pre-everything::	29	.if ${HAVE_GNOME:Mlibgnome}!=""
30	@${ECHO_MSG} '===>'	30	PKGNAMESUFFIX= -gnome
31	@${ECHO_MSG} '===> Warning: ${PORTNAME} is extremelly buggy, especially'	31	USE_GNOME+= libgnome
32	@${ECHO_MSG} '===> on the FreeBSD 4.x branch, and may not run at all'	32	.else
33	@${ECHO_MSG} '===>'	33	CONFIGURE_ARGS+= --disable-gnome
		34	.endif
34		35
35	.include <bsd.port.mk>	36	.include <bsd.port.post.mk>

Lines 1-17 Link Here

(-)audio/tunesbrowser/files/patch-Makefile.in (-16 / +19 lines)
1	--- Makefile.in.orig Wed Feb 2 22:27:56 2005	1	--- Makefile.in.orig Mon May 16 14:48:28 2005
2	+++ Makefile.in Wed Feb 2 22:29:51 2005	2	+++ Makefile.in Mon May 16 19:39:09 2005
3	@@ -389,12 +389,12 @@	3	@@ -144,7 +144,7 @@
4	uiDATA_INSTALL = $(INSTALL_DATA)	4	sysconfdir = @sysconfdir@
5	install-uiDATA: $(ui_DATA)	5	target_alias = @target_alias@
6	@$(NORMAL_INSTALL)	6	SUBDIRS = debug
7	- $(mkinstalldirs) $(DESTDIR)$(uidir)	7	-uidir = $(datadir)
8	+ $(mkinstalldirs) $(DESTDIR)$(uidir)/tunesbrowser	8	+uidir = $(pkgdatadir)
9	@list='$(ui_DATA)'; for p in $$list; do \	9	bin_PROGRAMS = tunesbrowser
10	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \	10	tunesbrowser_SOURCES = albumlist.c artistlist.c audioplayer.c \
11	f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \	11	daap.c main.c misc_ui.c songlist.c sourcelist.c \
12	echo " $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/$$f"; \	12	@@ -158,7 +158,7 @@
13	- $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/$$f; \	13	man_MANS = tunesbrowser.1
14	+ $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/tunesbrowser/$$f; \
15	done
16		14
17	uninstall-uiDATA:	15	INCLUDES = -I$(srcdir) -I$(srcdir)/debug
		16	-AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(datadir)
		17	+AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(pkgdatadir)
		18
		19	ui_DATA = tunesbrowser.glade \
		20	comp.blue.png comp.red.png \

Lines 1-25 Link Here

(-)audio/tunesbrowser/files/patch-audioplayer.c (-25 lines)
1	--- audioplayer.c.orig Mon Dec 20 03:03:55 2004
2	+++ audioplayer.c Wed Feb 2 21:42:19 2005
3	@@ -106,7 +106,8 @@
4
5	static void async_cmd_cb_gst_setup_clock(__UNUSED__ void *data)
6	{
7	- GstClock *clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
8	+ GstClock *clock;
9	+ clock = gst_bin_get_clock(GST_BIN(pipeline_thread));
10	songstarted = gst_clock_get_time(clock) / GST_SECOND;
11	}
12
13	@@ -157,8 +158,10 @@
14
15	static void cb_iterate(GstBin *bin, __UNUSED__ gpointer data)
16	{
17	- GstClock *clock = gst_bin_get_clock(bin);
18	- int seconds = gst_clock_get_time(clock) / GST_SECOND;
19	+ GstClock *clock;
20	+ int seconds;
21	+ clock = gst_bin_get_clock(bin);
22	+ seconds = gst_clock_get_time(clock) / GST_SECOND;
23
24	seconds = seconds - songstarted;
25

Lines 1-34 Link Here

(-)audio/tunesbrowser/files/patch-main.c (-34 lines)
1	--- main.c.orig Mon Jan 3 21:58:29 2005
2	+++ main.c Wed Feb 2 21:56:11 2005
3	@@ -38,7 +38,7 @@
4	{
5	fprintf(stderr, "Oops! TunesBrowser has crashed. Sorry about that!\n");
6	fprintf(stderr, "This probably won't be of any use unless you feel like debugging,\n");
7	- fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_ptr);
8	+ fprintf(stderr, "but the crash occured because of %p being bad.\n", siginfo->si_value.sigval_ptr);
9	#if 0
10	fprintf(stderr, "\n\nRaised SIGSTOP. You can now attach a debugger.\n");
11	fprintf(stderr, "Attach to PID %i\n", getpid());
12	@@ -66,11 +66,11 @@
13	int ret;
14
15	sa.sa_handler = (void*)sighandler_sigsegv;
16	- sa.sa_flags = SA_NOMASK \| SA_SIGINFO;
17	+ sa.sa_flags = SA_NODEFER \| SA_SIGINFO;
18	ret = sigaction(SIGSEGV, &sa, NULL);
19
20	sa.sa_handler = (void*)sighandler_sigpipe;
21	- sa.sa_flags = SA_NOMASK \| SA_SIGINFO;
22	+ sa.sa_flags = SA_NODEFER \| SA_SIGINFO;
23	ret = sigaction(SIGPIPE, &sa, NULL);
24	}
25
26	@@ -94,7 +94,7 @@
27
28	gtk_init(&argc, &argv);
29
30	- xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser.glade", NULL, NULL);
31	+ xml = glade_xml_new(XSTR(UIDIR) "/tunesbrowser/tunesbrowser.glade", NULL, NULL);
32
33	glade_xml_signal_autoconnect(xml);
34