Attachment #37463 for bug #59628

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





PORTNAME=	beep-media-player
PORTVERSION=	1.0.0
PORTREVISION=	2
CATEGORIES=	multimedia audio
MASTER_SITES=	http://linux-media.net/beep/downloads/
DISTNAME=	${PORTNAME}-${PORTVERSION}-pre5

pre-extract:
.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) || ${HAVE_GNOME:Mesound}!=""
	@${ECHO_MSG}
#.if !defined(WITHOUT_MIKMOD)
#	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
#.endif
.if !defined(WITHOUT_VORBIS)
	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
.endif




--- Input/vorbis/fileinfo.c.orig	Mon Nov 24 02:44:46 2003
+++ Input/vorbis/fileinfo.c	Mon Nov 24 02:48:33 2003
@@ -498,6 +498,8 @@
 
 	static GtkWidget *filename_entry, *tag_frame;
 
+	struct stat mstat;
+	
 	g_free(vte.filename);
 	vte.filename = g_strdup(fn);
 	
@@ -505,7 +507,14 @@
 	{
 		GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox;
 		GtkWidget *table, *bbox, *cancel_button;
-
+		GtkWidget * pixmapwid;
+		GdkPixbuf * pixbuf;
+		PangoAttrList *attrs;
+		PangoAttribute     *attr;
+		GtkWidget * boxx;
+		GtkImage * img;
+		GtkWidget * test_table;
+		
 		window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 		gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
 		g_signal_connect(G_OBJECT(window), "destroy", 
@@ -519,15 +528,11 @@
 		filename_hbox = gtk_hbox_new(FALSE, 5);
 		gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0);
 
-		GtkWidget * pixmapwid;
-		GdkPixbuf * pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm);
+		pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm);
 		pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
 		gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0);
 		gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE, 0);
 
-		PangoAttrList *attrs;
-		PangoAttribute     *attr;
-
 		attrs = pango_attr_list_new ();
 
 		attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
@@ -728,7 +733,6 @@
 				 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
 #endif
 
-		GtkWidget * boxx;
 		boxx = gtk_hbutton_box_new();
 		gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD);
 
@@ -746,7 +750,7 @@
 		gtk_table_attach(table,boxx,0,5,6,7,GTK_FILL,0,0,8);
 
 		rg_show_button = gtk_toggle_button_new();
-		GtkImage * img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
+		img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
 		gtk_container_add(rg_show_button,img);
 		g_signal_connect(G_OBJECT(rg_show_button), "toggled",
 				   G_CALLBACK(rg_show_cb), NULL);
@@ -836,7 +840,7 @@
 		gtk_box_set_spacing(GTK_BOX(info_box), 0);
 
 		// FIXME: Obvious...
-		GtkWidget * test_table = gtk_table_new(2, 10, FALSE);
+		test_table = gtk_table_new(2, 10, FALSE);
 		gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);
 		gtk_container_add(GTK_CONTAINER(info_box), test_table);
 
@@ -1068,7 +1072,6 @@
 	gtk_window_set_title(GTK_WINDOW(window), tmp);
 //	rg_show_cb(rg_show_button, NULL);
 
-	struct stat mstat;
 	stat(fn,&mstat);
 	gtk_widget_set_sensitive(tag_frame, ((mstat.st_mode & S_IWRITE) == S_IWRITE ) );
 




--- Input/vorbis/vorbis.c.orig	Mon Nov 24 02:43:58 2003
+++ Input/vorbis/vorbis.c	Mon Nov 24 02:44:23 2003
@@ -134,7 +134,7 @@
 	FILE *stream;
 	OggVorbis_File vfile; /* avoid thread interaction */
 	char *ext;
-
+	gint result;
 
 	/* is this our http resource? */
 	if (strncasecmp(filename, "http://", 7) == 0) {
@@ -161,7 +161,6 @@
 	memset(&vfile, 0, sizeof(vfile));
 	pthread_mutex_lock(&vf_mutex);
 
-	gint result;
 	result = ov_test(stream, &vfile, NULL, 0);
 
 	switch (result) {




lib/libbeep.so.1
lib/beep/Input/libcdaudio.so
lib/beep/Input/libmpg123.so
%%VORBISPLUGIN:%%lib/beep/Input/libvorbis.so
lib/beep/Output/libOSS.so
%%ESDPLUGIN:%%lib/beep/Output/libesdout.so
lib/beep/Visualization/libbscope.so
share/aclocal/beep.m4
@dirrm lib/beep/Output
@dirrm lib/beep/Input
@dirrm lib/beep/Visualization
@dirrm lib/beep
@dirrm include/beep

Return to bug 59628

Lines 7-13 Link Here

(-)beep-media-player/Makefile (-4 / +4 lines)
7		7
8	PORTNAME= beep-media-player	8	PORTNAME= beep-media-player
9	PORTVERSION= 1.0.0	9	PORTVERSION= 1.0.0
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= multimedia audio	11	CATEGORIES= multimedia audio
12	MASTER_SITES= http://linux-media.net/beep/downloads/	12	MASTER_SITES= http://linux-media.net/beep/downloads/
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-pre5	13	DISTNAME= ${PORTNAME}-${PORTVERSION}-pre5
Lines 94-102 Link Here
94	pre-extract:	94	pre-extract:
95	.if !defined(WITHOUT_MIKMOD) \|\| !defined(WITHOUT_VORBIS) \|\| ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) \|\| ${HAVE_GNOME:Mesound}!=""	95	.if !defined(WITHOUT_MIKMOD) \|\| !defined(WITHOUT_VORBIS) \|\| ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) \|\| ${HAVE_GNOME:Mesound}!=""
96	@${ECHO_MSG}	96	@${ECHO_MSG}
97	.if !defined(WITHOUT_MIKMOD)	97	#.if !defined(WITHOUT_MIKMOD)
98	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."	98	# @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
99	.endif	99	#.endif
100	.if !defined(WITHOUT_VORBIS)	100	.if !defined(WITHOUT_VORBIS)
101	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."	101	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
102	.endif	102	.endif

Line 0 Link Here

(-)beep-media-player/files/patch-Input::vorbis::fileinfo.c (+78 lines)
		1	--- Input/vorbis/fileinfo.c.orig Mon Nov 24 02:44:46 2003
		2	+++ Input/vorbis/fileinfo.c Mon Nov 24 02:48:33 2003
		3	@@ -498,6 +498,8 @@
		4
		5	static GtkWidget filename_entry, tag_frame;
		6
		7	+ struct stat mstat;
		8	+
		9	g_free(vte.filename);
		10	vte.filename = g_strdup(fn);
		11
		12	@@ -505,7 +507,14 @@
		13	{
		14	GtkWidget hbox, label, filename_hbox, vbox, *left_vbox;
		15	GtkWidget table, bbox, *cancel_button;
		16	-
		17	+ GtkWidget * pixmapwid;
		18	+ GdkPixbuf * pixbuf;
		19	+ PangoAttrList *attrs;
		20	+ PangoAttribute *attr;
		21	+ GtkWidget * boxx;
		22	+ GtkImage * img;
		23	+ GtkWidget * test_table;
		24	+
		25	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
		26	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
		27	g_signal_connect(G_OBJECT(window), "destroy",
		28	@@ -519,15 +528,11 @@
		29	filename_hbox = gtk_hbox_new(FALSE, 5);
		30	gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0);
		31
		32	- GtkWidget * pixmapwid;
		33	- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm);
		34	+ pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)gnome_mime_audio_ogg_xpm);
		35	pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
		36	gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0);
		37	gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE, 0);
		38
		39	- PangoAttrList *attrs;
		40	- PangoAttribute *attr;
		41	-
		42	attrs = pango_attr_list_new ();
		43
		44	attr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
		45	@@ -728,7 +733,6 @@
		46	GTK_FILL \| GTK_EXPAND \| GTK_SHRINK, 0, 5);
		47	#endif
		48
		49	- GtkWidget * boxx;
		50	boxx = gtk_hbutton_box_new();
		51	gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD);
		52
		53	@@ -746,7 +750,7 @@
		54	gtk_table_attach(table,boxx,0,5,6,7,GTK_FILL,0,0,8);
		55
		56	rg_show_button = gtk_toggle_button_new();
		57	- GtkImage * img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
		58	+ img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
		59	gtk_container_add(rg_show_button,img);
		60	g_signal_connect(G_OBJECT(rg_show_button), "toggled",
		61	G_CALLBACK(rg_show_cb), NULL);
		62	@@ -836,7 +840,7 @@
		63	gtk_box_set_spacing(GTK_BOX(info_box), 0);
		64
65	// FIXME: Obvious...
66	- GtkWidget * test_table = gtk_table_new(2, 10, FALSE);
67	+ test_table = gtk_table_new(2, 10, FALSE);
68	gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);
69	gtk_container_add(GTK_CONTAINER(info_box), test_table);
70
71	@@ -1068,7 +1072,6 @@
72	gtk_window_set_title(GTK_WINDOW(window), tmp);
73	// rg_show_cb(rg_show_button, NULL);
74
75	- struct stat mstat;
76	stat(fn,&mstat);
77	gtk_widget_set_sensitive(tag_frame, ((mstat.st_mode & S_IWRITE) == S_IWRITE ) );
78

Line 0 Link Here

(-)beep-media-player/files/patch-Input::vorbis::vorbis.c (+19 lines)
	1	--- Input/vorbis/vorbis.c.orig Mon Nov 24 02:43:58 2003
	2	+++ Input/vorbis/vorbis.c Mon Nov 24 02:44:23 2003
	3	@@ -134,7 +134,7 @@
	4	FILE *stream;
	5	OggVorbis_File vfile; /* avoid thread interaction */
	6	char *ext;
	7	-
	8	+ gint result;
	9
	10	/* is this our http resource? */
	11	if (strncasecmp(filename, "http://", 7) == 0) {
	12	@@ -161,7 +161,6 @@
	13	memset(&vfile, 0, sizeof(vfile));
	14	pthread_mutex_lock(&vf_mutex);
	15
	16	- gint result;
	17	result = ov_test(stream, &vfile, NULL, 0);
	18
	19	switch (result) {

Lines 13-23 Link Here

(-)beep-media-player/pkg-plist (+2 lines)
13	lib/libbeep.so.1	13	lib/libbeep.so.1
14	lib/beep/Input/libcdaudio.so	14	lib/beep/Input/libcdaudio.so
15	lib/beep/Input/libmpg123.so	15	lib/beep/Input/libmpg123.so
		16	%%VORBISPLUGIN:%%lib/beep/Input/libvorbis.so
16	lib/beep/Output/libOSS.so	17	lib/beep/Output/libOSS.so
17	%%ESDPLUGIN:%%lib/beep/Output/libesdout.so	18	%%ESDPLUGIN:%%lib/beep/Output/libesdout.so
18	lib/beep/Visualization/libbscope.so	19	lib/beep/Visualization/libbscope.so
19	share/aclocal/beep.m4	20	share/aclocal/beep.m4
20	@dirrm lib/beep/Output	21	@dirrm lib/beep/Output
21	@dirrm lib/beep/Input	22	@dirrm lib/beep/Input
		23	@dirrm lib/beep/Visualization
22	@dirrm lib/beep	24	@dirrm lib/beep
23	@dirrm include/beep	25	@dirrm include/beep