Attachment #82728 for bug #118336

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




#

PORTNAME=	xmms
PORTVERSION=	1.2.11
PORTREVISION=	10
CATEGORIES+=	multimedia audio ipv6
MASTER_SITES=	http://www.xmms.org/files/1.2.x/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}


CONFIGURE_ARGS+=	--enable-ipv6

.if defined(WITH_ENCODING_PATCH) || defined(WITH_ID3V2_PATCH)
ENC_PATCHLEVEL=	28.1
DISTFILES+=	${PORTNAME}-${PORTVERSION}-recode-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
MASTER_SITE_SUBDIR+=	rusxmms/:enc
.endif

.if defined(WITH_ENCODING_PATCH)
PLIST_SUB+=	ENCODING=""
.else
PLIST_SUB+=	ENCODING="@comment "
.endif

.if defined(WITH_EXTENDED_VORBIS_FILEINFO)
CFLAGS+=	-DALL_VORBIS_TAGS
.endif

.endif

post-patch:
.if defined(WITH_ID3V2_PATCH)
	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/recode.3rdparty/id3v2.patch
.endif
.if defined(WITH_ENCODING_PATCH) && defined(WITH_ID3V2_PATCH)
	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms_id3v2-ds-recode.patch
.elif defined(WITH_ENCODING_PATCH)
	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms-ds-recode.patch
.endif
	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
		 's|\(datadir\)/aclocal|(prefix)/share/aclocal|g'
	@${REINPLACE_CMD} -e 's|{datadir}/locale|{prefix}/share/locale|g' \

Lines 1-6 Link Here

(-)distinfo (-6 / +3 lines)
1	MD5 (xmms-1.2.10.tar.bz2) = 03a85cfc5e1877a2e1f7be4fa1d3f63c	1	MD5 (xmms-1.2.11.tar.bz2) = f3e6dbaf0b3f571a532ab575656be506
2	SHA256 (xmms-1.2.10.tar.bz2) = ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a	2	SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
3	SIZE (xmms-1.2.10.tar.bz2) = 2418265	3	SIZE (xmms-1.2.11.tar.bz2) = 2581032
4	MD5 (xmms-1.2.10-recode-csa28.1.tar.bz2) = 4e77d01a0668e1001eefa7384d337cee
5	SHA256 (xmms-1.2.10-recode-csa28.1.tar.bz2) = ff93cf745b2a534284356933cc85a18b17c503fdb4482213f36cffa4f7f3c9a8
6	SIZE (xmms-1.2.10-recode-csa28.1.tar.bz2) = 281640




bin/wmxmms
bin/xmms
bin/xmms-config
%%ENCODING%%include/xmms/charset.h
%%ENCODING%%include/xmms/charset_auto_russian.h
%%ENCODING%%include/xmms/charset_config.h
include/xmms/configfile.h
include/xmms/dirbrowser.h
include/xmms/formatter.h
include/xmms/fullscreen.h
include/xmms/plugin.h
%%ENCODING%%include/xmms/russian_table.h
include/xmms/titlestring.h
include/xmms/util.h
include/xmms/xmmsctrl.h

share/locale/de/LC_MESSAGES/xmms.mo
share/locale/el/LC_MESSAGES/xmms.mo
share/locale/en/LC_MESSAGES/xmms.mo
share/locale/en_GB/LC_MESSAGES/xmms.mo
share/locale/eo/LC_MESSAGES/xmms.mo
share/locale/es/LC_MESSAGES/xmms.mo
share/locale/et/LC_MESSAGES/xmms.mo

Removed Link Here

(-)files/patch-Input-mpg123-mpg123.c (-11 lines)
1	--- Input/mpg123/mpg123.c.orig Tue Feb 28 16:56:08 2006
2	+++ Input/mpg123/mpg123.c Tue Feb 28 16:57:40 2006
3	@@ -397,6 +397,8 @@
4	if (!strncasecmp(ext, ".rm", 3) \|\|
5	!strncasecmp(ext, ".ra", 3) \|\|
6	!strncasecmp(ext, ".rpm", 4) \|\|
7	+ !strncasecmp(ext, ".fla", 4) \|\|
8	+ !strncasecmp(ext, ".flac", 5) \|\|
9	!strncasecmp(ext, ".ram", 4))
10	return FALSE;
11	}




--- Input/vorbis/fileinfo.c.orig	Thu Nov 20 14:35:34 2003
+++ Input/vorbis/fileinfo.c	Sun Nov 21 17:35:46 2004
@@ -429,7 +429,8 @@
 	gchar *location;
 	gchar *rg_track_gain, *rg_album_gain, *rg_track_peak, *rg_album_peak;
 
-	gint time, minutes, seconds, bitrate, rate, channels, filesize, i;
+	gint time, minutes, seconds, bitrate, avgbitrate, rate, channels, filesize, i;
+	gchar *vendor = "N/A";
 
 	OggVorbis_File vf;
 	vorbis_info *vi;
@@ -437,10 +438,11 @@
 	FILE *fh;
 	gboolean clear_vf = FALSE;
 
-	static GtkWidget *info_frame, *info_box, *bitrate_label, *rate_label;
+	static GtkWidget *info_frame, *info_box, *bitrate_label, *avgbitrate_label, *rate_label;
 	static GtkWidget *channel_label, *length_label, *filesize_label;
 	static GtkWidget *replaygain_label, *audiophilegain_label, *peak_label;
 	static GtkWidget *filename_entry, *tag_frame;
+	static GtkWidget *vendor_label;
 
 	g_free(vte.filename);
 	vte.filename = g_strdup(fn);
@@ -721,7 +723,14 @@
 				      GTK_JUSTIFY_LEFT);
 		gtk_box_pack_start(GTK_BOX(info_box), bitrate_label, FALSE,
 				   FALSE, 0);
-		
+
+		avgbitrate_label = gtk_label_new("");
+		gtk_misc_set_alignment(GTK_MISC(avgbitrate_label), 0, 0);
+		gtk_label_set_justify(GTK_LABEL(avgbitrate_label),
+				      GTK_JUSTIFY_LEFT);
+		gtk_box_pack_start(GTK_BOX(info_box), avgbitrate_label, FALSE,
+				   FALSE, 0);
+
 		rate_label = gtk_label_new("");
 		gtk_misc_set_alignment(GTK_MISC(rate_label), 0, 0);
 		gtk_label_set_justify(GTK_LABEL(rate_label), GTK_JUSTIFY_LEFT);
@@ -749,6 +758,13 @@
 		gtk_box_pack_start(GTK_BOX(info_box), filesize_label, FALSE,
 				   FALSE, 0);
 
+		vendor_label = gtk_label_new("");
+		gtk_misc_set_alignment(GTK_MISC(vendor_label), 0, 0);
+		gtk_label_set_justify(GTK_LABEL(vendor_label),
+				      GTK_JUSTIFY_LEFT);
+		gtk_box_pack_start(GTK_BOX(info_box), vendor_label, FALSE,
+				   FALSE, 0);
+
 		replaygain_label = gtk_label_new("");
 		gtk_misc_set_alignment(GTK_MISC(replaygain_label), 0, 0);
 		gtk_label_set_justify(GTK_LABEL(replaygain_label),
@@ -780,10 +796,12 @@
 		gtk_widget_set_sensitive(tag_frame, TRUE);		
 
 	gtk_label_set_text(GTK_LABEL(bitrate_label), "");
+	gtk_label_set_text(GTK_LABEL(avgbitrate_label), "");
 	gtk_label_set_text(GTK_LABEL(rate_label), "");
 	gtk_label_set_text(GTK_LABEL(channel_label), "");
 	gtk_label_set_text(GTK_LABEL(length_label), "");
 	gtk_label_set_text(GTK_LABEL(filesize_label), "");
+	gtk_label_set_text(GTK_LABEL(vendor_label), "");
 
 	if ((fh = fopen(vte.filename, "r")) != NULL)
 	{
@@ -792,9 +810,18 @@
 		if (ov_open(fh, &vf, NULL, 0) == 0)
 		{
 			comment = ov_comment(&vf, -1);
+			if(comment)
+			{
+				vendor = comment->vendor;
+			}
+			else
+			{
+				vendor = (char*)"N/A";
+			}
 			if ((vi = ov_info(&vf, 0)) != NULL)
 			{
 				bitrate = vi->bitrate_nominal/1000;
+				avgbitrate = ov_bitrate(&vf, -1);
 				rate = vi->rate;
 				channels = vi->channels;
 				g_message("version: %d", vi->version);
@@ -803,6 +830,7 @@
 			else
 			{
 				bitrate = 0;
+				avgbitrate = 0;
 				rate = 0;
 				channels = 0;
 			}
@@ -814,10 +842,12 @@
 			filesize = ftell(fh);
 
 			label_set_text(bitrate_label, _("Nominal bitrate: %d kbps"), bitrate);
+			label_set_text(avgbitrate_label, _("Average bitrate: %.1f kbps"), ((float)avgbitrate)/1000);
 			label_set_text(rate_label, _("Samplerate: %d Hz"), rate);
 			label_set_text(channel_label, _("Channels: %d"), channels);
 			label_set_text(length_label, _("Length: %d:%.2d"), minutes, seconds);
 			label_set_text(filesize_label, _("File size: %d B"), filesize);
+			label_set_text(vendor_label, _("Vendor: %s"), vendor);
 
 		}
 		else




--- Output/esd/esdout.h.orig	2007-11-29 20:12:28.743052713 +0100
+++ Output/esd/esdout.h	2007-11-29 20:12:42.453407104 +0100
@@ -68,6 +68,7 @@
@@ -333,7 +333,7 @@
 #elif defined(HAVE_GETMNTINFO)
  	entries = getmntinfo(&fsp, MNT_NOWAIT);
  	if (entries < 0)
- 		return NULL;
+ 		return FALSE;
 	
 	while (entries-- > 0)
 	{
diff -ru Output/esd/esdout.h.orig Output/esd/esdout.h
--- Output/esd/esdout.h.orig	Mon Dec  3 13:38:42 2001
+++ Output/esd/esdout.h	Sun Apr 11 21:23:23 2004
@@ -67,6 +67,7 @@
 void esdout_fetch_volume(int *l, int *r);
 void esdout_set_volume(int l, int r);
 void esdout_mixer_init(void);
 void esdout_mixer_init_vol(int l, int r);
+void esdout_reset_playerid(void);
 
 int esdout_playing(void);
 int esdout_free(void);
diff -ru libxmms/util.c.orig xmms-1.2.10/libxmms/util.c
--- libxmms/util.c.orig	Tue May 20 07:22:07 2003
+++ libxmms/util.c	Sun Apr 11 21:18:58 2004
@@ -80,7 +80,8 @@
 	 * before sched_getschedule() (so that we don't get
 	 * non-present syscall warnings in kernel log).
 	 */
-	int val = 0, len;
+	int val = 0;
+	size_t len;
 
 	len = sizeof(val);
 	sysctlbyname("p1003_1b.priority_scheduling", &val, &len, NULL, 0);

Removed Link Here

(-)files/patch-libxmms-configfile.h (-11 lines)
1	--- libxmms/configfile.h.orig Mon Mar 14 18:06:38 2005
2	+++ libxmms/configfile.h Mon Mar 14 18:06:55 2005
3	@@ -66,7 +66,7 @@
4	void xmms_cfg_remove_key(ConfigFile * cfg, gchar * section, gchar * key);
5
6	#ifdef __cplusplus
7	-};
8	+}
9	#endif
10
11	#endif

Removed Link Here

(-)files/patch-libxmms-dirbrowser.h (-11 lines)
1	--- libxmms/dirbrowser.h.orig Mon Mar 14 18:08:23 2005
2	+++ libxmms/dirbrowser.h Mon Mar 14 18:08:30 2005
3	@@ -27,7 +27,7 @@
4	GtkWidget xmms_create_dir_browser(gchar title, gchar * current_path, GtkSelectionMode mode, void (handler) (gchar ));
5
6	#ifdef __cplusplus
7	-};
8	+}
9	#endif
10
11

Removed Link Here

(-)files/patch-libxmms-titlestring.h (-11 lines)
1	--- libxmms/titlestring.h.orig Mon Mar 14 18:05:21 2005
2	+++ libxmms/titlestring.h Mon Mar 14 18:05:31 2005
3	@@ -80,7 +80,7 @@
4	GtkWidget* xmms_titlestring_descriptions(char* tags, int rows);
5
6	#ifdef __cplusplus
7	-};
8	+}
9	#endif
10
11	#endif /* !XMMS_TITLESTRING_H */

Removed Link Here

(-)files/patch-libxmms-xmmsctrl.h (-11 lines)
1	--- libxmms/xmmsctrl.h.orig Fri Nov 19 13:49:06 2004
2	+++ libxmms/xmmsctrl.h Fri Nov 19 13:49:14 2004
3	@@ -85,7 +85,7 @@
4
5
6	#ifdef __cplusplus
7	-};
8	+}
9	#endif
10
11	/* Deprecated APIs */

Lines 1-9 Link Here

(-)files/patch-ltmain.sh (-4 / +1 lines)
1
2	$FreeBSD: ports/multimedia/xmms/files/patch-ltmain.sh,v 1.3 2003/09/07 23:39:27 edwin Exp $
3
4	--- ltmain.sh.orig Fri Sep 5 13:18:43 2003	1	--- ltmain.sh.orig Fri Sep 5 13:18:43 2003
5	+++ ltmain.sh Fri Sep 5 13:18:09 2003	2	+++ ltmain.sh Fri Sep 5 13:18:09 2003
6	@@ -4333,10 +4333,12 @@	3	@@ -6038,10 +6038,12 @@
7	fi	4	fi
8		5
9	# Install the pseudo-library for information purposes.	6	# Install the pseudo-library for information purposes.

Return to bug 118336

Lines 6-13 Link Here

(-)Makefile (-23 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= xmms	8	PORTNAME= xmms
9	PORTVERSION= 1.2.10	9	PORTVERSION= 1.2.11
10	PORTREVISION= 10
11	CATEGORIES+= multimedia audio ipv6	10	CATEGORIES+= multimedia audio ipv6
12	MASTER_SITES= http://www.xmms.org/files/1.2.x/	11	MASTER_SITES= http://www.xmms.org/files/1.2.x/
13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
Lines 43-61 PLIST_SUB= DATADIR="share" Link Here
43		42
44	CONFIGURE_ARGS+= --enable-ipv6	43	CONFIGURE_ARGS+= --enable-ipv6
45		44
46	.if defined(WITH_ENCODING_PATCH) \|\| defined(WITH_ID3V2_PATCH)
47	ENC_PATCHLEVEL= 28.1
48	DISTFILES+= ${PORTNAME}-${PORTVERSION}-recode-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
49	MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
50	MASTER_SITE_SUBDIR+= rusxmms/:enc
51	.endif
52
53	.if defined(WITH_ENCODING_PATCH)
54	PLIST_SUB+= ENCODING=""
55	.else
56	PLIST_SUB+= ENCODING="@comment "
57	.endif
58
59	.if defined(WITH_EXTENDED_VORBIS_FILEINFO)	45	.if defined(WITH_EXTENDED_VORBIS_FILEINFO)
60	CFLAGS+= -DALL_VORBIS_TAGS	46	CFLAGS+= -DALL_VORBIS_TAGS
61	.endif	47	.endif
Lines 124-137 pre-extract: Link Here
124	.endif	110	.endif
125		111
126	post-patch:	112	post-patch:
127	.if defined(WITH_ID3V2_PATCH)
128	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/recode.3rdparty/id3v2.patch
129	.endif
130	.if defined(WITH_ENCODING_PATCH) && defined(WITH_ID3V2_PATCH)
131	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms_id3v2-ds-recode.patch
132	.elif defined(WITH_ENCODING_PATCH)
133	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms-ds-recode.patch
134	.endif
135	@${FIND} ${WRKSRC} -name "Makefile.in*" \| ${XARGS} ${REINPLACE_CMD} -e \	113	@${FIND} ${WRKSRC} -name "Makefile.in*" \| ${XARGS} ${REINPLACE_CMD} -e \
136	's\|\(datadir\)/aclocal\|(prefix)/share/aclocal\|g'	114	's\|\(datadir\)/aclocal\|(prefix)/share/aclocal\|g'
137	@${REINPLACE_CMD} -e 's\|{datadir}/locale\|{prefix}/share/locale\|g' \	115	@${REINPLACE_CMD} -e 's\|{datadir}/locale\|{prefix}/share/locale\|g' \

Lines 1-15 Link Here

(-)pkg-plist (-4 / +1 lines)
1	bin/wmxmms	1	bin/wmxmms
2	bin/xmms	2	bin/xmms
3	bin/xmms-config	3	bin/xmms-config
4	%%ENCODING%%include/xmms/charset.h
5	%%ENCODING%%include/xmms/charset_auto_russian.h
6	%%ENCODING%%include/xmms/charset_config.h
7	include/xmms/configfile.h	4	include/xmms/configfile.h
8	include/xmms/dirbrowser.h	5	include/xmms/dirbrowser.h
9	include/xmms/formatter.h	6	include/xmms/formatter.h
10	include/xmms/fullscreen.h	7	include/xmms/fullscreen.h
11	include/xmms/plugin.h	8	include/xmms/plugin.h
12	%%ENCODING%%include/xmms/russian_table.h
13	include/xmms/titlestring.h	9	include/xmms/titlestring.h
14	include/xmms/util.h	10	include/xmms/util.h
15	include/xmms/xmmsctrl.h	11	include/xmms/xmmsctrl.h
Lines 47-52 share/locale/da/LC_MESSAGES/xmms.mo Link Here
47	share/locale/de/LC_MESSAGES/xmms.mo	43	share/locale/de/LC_MESSAGES/xmms.mo
48	share/locale/el/LC_MESSAGES/xmms.mo	44	share/locale/el/LC_MESSAGES/xmms.mo
49	share/locale/en/LC_MESSAGES/xmms.mo	45	share/locale/en/LC_MESSAGES/xmms.mo
		46	share/locale/en_GB/LC_MESSAGES/xmms.mo
50	share/locale/eo/LC_MESSAGES/xmms.mo	47	share/locale/eo/LC_MESSAGES/xmms.mo
51	share/locale/es/LC_MESSAGES/xmms.mo	48	share/locale/es/LC_MESSAGES/xmms.mo
52	share/locale/et/LC_MESSAGES/xmms.mo	49	share/locale/et/LC_MESSAGES/xmms.mo

Removed Link Here

(-)files/patch-Input-vorbis-fileinfo.c (-108 lines)
1	--- Input/vorbis/fileinfo.c.orig Thu Nov 20 14:35:34 2003
2	+++ Input/vorbis/fileinfo.c Sun Nov 21 17:35:46 2004
3	@@ -429,7 +429,8 @@
4	gchar *location;
5	gchar rg_track_gain, rg_album_gain, rg_track_peak, rg_album_peak;
6
7	- gint time, minutes, seconds, bitrate, rate, channels, filesize, i;
8	+ gint time, minutes, seconds, bitrate, avgbitrate, rate, channels, filesize, i;
9	+ gchar *vendor = "N/A";
10
11	OggVorbis_File vf;
12	vorbis_info *vi;
13	@@ -437,10 +438,11 @@
14	FILE *fh;
15	gboolean clear_vf = FALSE;
16
17	- static GtkWidget info_frame, info_box, bitrate_label, rate_label;
18	+ static GtkWidget info_frame, info_box, bitrate_label, avgbitrate_label, *rate_label;
19	static GtkWidget channel_label, length_label, *filesize_label;
20	static GtkWidget replaygain_label, audiophilegain_label, *peak_label;
21	static GtkWidget filename_entry, tag_frame;
22	+ static GtkWidget *vendor_label;
23
24	g_free(vte.filename);
25	vte.filename = g_strdup(fn);
26	@@ -721,7 +723,14 @@
27	GTK_JUSTIFY_LEFT);
28	gtk_box_pack_start(GTK_BOX(info_box), bitrate_label, FALSE,
29	FALSE, 0);
30	-
31	+
32	+ avgbitrate_label = gtk_label_new("");
33	+ gtk_misc_set_alignment(GTK_MISC(avgbitrate_label), 0, 0);
34	+ gtk_label_set_justify(GTK_LABEL(avgbitrate_label),
35	+ GTK_JUSTIFY_LEFT);
36	+ gtk_box_pack_start(GTK_BOX(info_box), avgbitrate_label, FALSE,
37	+ FALSE, 0);
38	+
39	rate_label = gtk_label_new("");
40	gtk_misc_set_alignment(GTK_MISC(rate_label), 0, 0);
41	gtk_label_set_justify(GTK_LABEL(rate_label), GTK_JUSTIFY_LEFT);
42	@@ -749,6 +758,13 @@
43	gtk_box_pack_start(GTK_BOX(info_box), filesize_label, FALSE,
44	FALSE, 0);
45
46	+ vendor_label = gtk_label_new("");
47	+ gtk_misc_set_alignment(GTK_MISC(vendor_label), 0, 0);
48	+ gtk_label_set_justify(GTK_LABEL(vendor_label),
49	+ GTK_JUSTIFY_LEFT);
50	+ gtk_box_pack_start(GTK_BOX(info_box), vendor_label, FALSE,
51	+ FALSE, 0);
52	+
53	replaygain_label = gtk_label_new("");
54	gtk_misc_set_alignment(GTK_MISC(replaygain_label), 0, 0);
55	gtk_label_set_justify(GTK_LABEL(replaygain_label),
56	@@ -780,10 +796,12 @@
57	gtk_widget_set_sensitive(tag_frame, TRUE);
58
59	gtk_label_set_text(GTK_LABEL(bitrate_label), "");
60	+ gtk_label_set_text(GTK_LABEL(avgbitrate_label), "");
61	gtk_label_set_text(GTK_LABEL(rate_label), "");
62	gtk_label_set_text(GTK_LABEL(channel_label), "");
63	gtk_label_set_text(GTK_LABEL(length_label), "");
64	gtk_label_set_text(GTK_LABEL(filesize_label), "");
65	+ gtk_label_set_text(GTK_LABEL(vendor_label), "");
66
67	if ((fh = fopen(vte.filename, "r")) != NULL)
68	{
69	@@ -792,9 +810,18 @@
70	if (ov_open(fh, &vf, NULL, 0) == 0)
71	{
72	comment = ov_comment(&vf, -1);
73	+ if(comment)
74	+ {
75	+ vendor = comment->vendor;
76	+ }
77	+ else
78	+ {
79	+ vendor = (char*)"N/A";
80	+ }
81	if ((vi = ov_info(&vf, 0)) != NULL)
82	{
83	bitrate = vi->bitrate_nominal/1000;
84	+ avgbitrate = ov_bitrate(&vf, -1);
85	rate = vi->rate;
86	channels = vi->channels;
87	g_message("version: %d", vi->version);
88	@@ -803,6 +830,7 @@
89	else
90	{
91	bitrate = 0;
92	+ avgbitrate = 0;
93	rate = 0;
94	channels = 0;
95	}
96	@@ -814,10 +842,12 @@
97	filesize = ftell(fh);
98
99	label_set_text(bitrate_label, _("Nominal bitrate: %d kbps"), bitrate);
100	+ label_set_text(avgbitrate_label, _("Average bitrate: %.1f kbps"), ((float)avgbitrate)/1000);
101	label_set_text(rate_label, _("Samplerate: %d Hz"), rate);
102	label_set_text(channel_label, _("Channels: %d"), channels);
103	label_set_text(length_label, _("Length: %d:%.2d"), minutes, seconds);
104	label_set_text(filesize_label, _("File size: %d B"), filesize);
105	+ label_set_text(vendor_label, _("Vendor: %s"), vendor);
106
107	}
108	else

Lines 1-36 Link Here

(-)files/patch-am64 (-30 / +4 lines)
1	diff -ru Input/cdaudio/cdaudio.c.orig Input/cdaudio/cdaudio.c	1	--- Output/esd/esdout.h.orig 2007-11-29 20:12:28.743052713 +0100
2	--- Input/cdaudio/cdaudio.c.orig Wed Jan 28 10:09:39 2004	2	+++ Output/esd/esdout.h 2007-11-29 20:12:42.453407104 +0100
3	+++ Input/cdaudio/cdaudio.c Sun Apr 11 21:24:05 2004	3	@@ -68,6 +68,7 @@
4	@@ -333,7 +333,7 @@
5	#elif defined(HAVE_GETMNTINFO)
6	entries = getmntinfo(&fsp, MNT_NOWAIT);
7	if (entries < 0)
8	- return NULL;
9	+ return FALSE;
10
11	while (entries-- > 0)
12	{
13	diff -ru Output/esd/esdout.h.orig Output/esd/esdout.h
14	--- Output/esd/esdout.h.orig Mon Dec 3 13:38:42 2001
15	+++ Output/esd/esdout.h Sun Apr 11 21:23:23 2004
16	@@ -67,6 +67,7 @@
17	void esdout_fetch_volume(int l, int r);
18	void esdout_set_volume(int l, int r);	4	void esdout_set_volume(int l, int r);
19	void esdout_mixer_init(void);	5	void esdout_mixer_init(void);
		6	void esdout_mixer_init_vol(int l, int r);
20	+void esdout_reset_playerid(void);	7	+void esdout_reset_playerid(void);
21		8
22	int esdout_playing(void);	9	int esdout_playing(void);
23	int esdout_free(void);	10	int esdout_free(void);
24	diff -ru libxmms/util.c.orig xmms-1.2.10/libxmms/util.c
25	--- libxmms/util.c.orig Tue May 20 07:22:07 2003
26	+++ libxmms/util.c Sun Apr 11 21:18:58 2004
27	@@ -80,7 +80,8 @@
28	* before sched_getschedule() (so that we don't get
29	* non-present syscall warnings in kernel log).
30	*/
31	- int val = 0, len;
32	+ int val = 0;
33	+ size_t len;
34
35	len = sizeof(val);
36	sysctlbyname("p1003_1b.priority_scheduling", &val, &len, NULL, 0);