ports/118336: [PATCH] multimedia/xmms: update to 1.2.11
Ulrich Spoerlein
uspoerlein at gmail.com
Thu Nov 29 21:10:02 UTC 2007
>Number: 118336
>Category: ports
>Synopsis: [PATCH] multimedia/xmms: update to 1.2.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 29 21:10:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 7.0-BETA2 i386
>Organization:
>Environment:
System: FreeBSD roadrunner.spoerlein.net 7.0-BETA2 FreeBSD 7.0-BETA2 #12: Sat Nov 10 11:20:06 CET 2007
>Description:
- Update to 1.2.11
Removed file(s):
- files/patch-Input-mpg123-mpg123.c
- files/patch-Input-vorbis-fileinfo.c
- files/patch-libxmms-configfile.h
- files/patch-libxmms-dirbrowser.h
- files/patch-libxmms-titlestring.h
- files/patch-libxmms-xmmsctrl.h
Port maintainer (esk at ira.uka.de) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- xmms-1.2.11.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/xmms/Makefile,v
retrieving revision 1.90
diff -u -p -u -r1.90 Makefile
--- Makefile 3 Oct 2007 23:42:22 -0000 1.90
+++ Makefile 29 Nov 2007 19:45:37 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= xmms
-PORTVERSION= 1.2.10
-PORTREVISION= 10
+PORTVERSION= 1.2.11
CATEGORIES+= multimedia audio ipv6
MASTER_SITES= http://www.xmms.org/files/1.2.x/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -43,19 +42,6 @@ PLIST_SUB= DATADIR="share"
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
@@ -124,14 +110,6 @@ pre-extract:
.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' \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/multimedia/xmms/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo 2 May 2007 12:43:26 -0000 1.22
+++ distinfo 29 Nov 2007 19:45:37 -0000
@@ -1,6 +1,3 @@
-MD5 (xmms-1.2.10.tar.bz2) = 03a85cfc5e1877a2e1f7be4fa1d3f63c
-SHA256 (xmms-1.2.10.tar.bz2) = ff9eabae2074043294a19ec7beaf0959bd076f6cd60558264faeec08f4a0eb6a
-SIZE (xmms-1.2.10.tar.bz2) = 2418265
-MD5 (xmms-1.2.10-recode-csa28.1.tar.bz2) = 4e77d01a0668e1001eefa7384d337cee
-SHA256 (xmms-1.2.10-recode-csa28.1.tar.bz2) = ff93cf745b2a534284356933cc85a18b17c503fdb4482213f36cffa4f7f3c9a8
-SIZE (xmms-1.2.10-recode-csa28.1.tar.bz2) = 281640
+MD5 (xmms-1.2.11.tar.bz2) = f3e6dbaf0b3f571a532ab575656be506
+SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
+SIZE (xmms-1.2.11.tar.bz2) = 2581032
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/xmms/pkg-plist,v
retrieving revision 1.25
diff -u -p -u -r1.25 pkg-plist
--- pkg-plist 12 Jun 2007 19:21:01 -0000 1.25
+++ pkg-plist 29 Nov 2007 19:45:37 -0000
@@ -1,15 +1,11 @@
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
@@ -47,6 +43,7 @@ share/locale/da/LC_MESSAGES/xmms.mo
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
Index: files/patch-Input-mpg123-mpg123.c
===================================================================
RCS file: files/patch-Input-mpg123-mpg123.c
diff -N files/patch-Input-mpg123-mpg123.c
--- files/patch-Input-mpg123-mpg123.c 15 Apr 2006 21:47:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- Input/mpg123/mpg123.c.orig Tue Feb 28 16:56:08 2006
-+++ Input/mpg123/mpg123.c Tue Feb 28 16:57:40 2006
-@@ -397,6 +397,8 @@
- if (!strncasecmp(ext, ".rm", 3) ||
- !strncasecmp(ext, ".ra", 3) ||
- !strncasecmp(ext, ".rpm", 4) ||
-+ !strncasecmp(ext, ".fla", 4) ||
-+ !strncasecmp(ext, ".flac", 5) ||
- !strncasecmp(ext, ".ram", 4))
- return FALSE;
- }
Index: files/patch-Input-vorbis-fileinfo.c
===================================================================
RCS file: files/patch-Input-vorbis-fileinfo.c
diff -N files/patch-Input-vorbis-fileinfo.c
--- files/patch-Input-vorbis-fileinfo.c 21 Apr 2005 16:13:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,108 +0,0 @@
---- 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
Index: files/patch-am64
===================================================================
RCS file: /home/ncvs/ports/multimedia/xmms/files/patch-am64,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-am64
--- files/patch-am64 11 May 2004 15:04:50 -0000 1.1
+++ files/patch-am64 29 Nov 2007 19:45:37 -0000
@@ -1,36 +1,10 @@
-diff -ru Input/cdaudio/cdaudio.c.orig Input/cdaudio/cdaudio.c
---- Input/cdaudio/cdaudio.c.orig Wed Jan 28 10:09:39 2004
-+++ Input/cdaudio/cdaudio.c Sun Apr 11 21:24:05 2004
-@@ -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);
+--- 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 @@
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);
Index: files/patch-libxmms-configfile.h
===================================================================
RCS file: files/patch-libxmms-configfile.h
diff -N files/patch-libxmms-configfile.h
--- files/patch-libxmms-configfile.h 14 Mar 2005 18:22:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- libxmms/configfile.h.orig Mon Mar 14 18:06:38 2005
-+++ libxmms/configfile.h Mon Mar 14 18:06:55 2005
-@@ -66,7 +66,7 @@
- void xmms_cfg_remove_key(ConfigFile * cfg, gchar * section, gchar * key);
-
- #ifdef __cplusplus
--};
-+}
- #endif
-
- #endif
Index: files/patch-libxmms-dirbrowser.h
===================================================================
RCS file: files/patch-libxmms-dirbrowser.h
diff -N files/patch-libxmms-dirbrowser.h
--- files/patch-libxmms-dirbrowser.h 14 Mar 2005 18:22:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- libxmms/dirbrowser.h.orig Mon Mar 14 18:08:23 2005
-+++ libxmms/dirbrowser.h Mon Mar 14 18:08:30 2005
-@@ -27,7 +27,7 @@
- GtkWidget *xmms_create_dir_browser(gchar * title, gchar * current_path, GtkSelectionMode mode, void (*handler) (gchar *));
-
- #ifdef __cplusplus
--};
-+}
- #endif
-
-
Index: files/patch-libxmms-titlestring.h
===================================================================
RCS file: files/patch-libxmms-titlestring.h
diff -N files/patch-libxmms-titlestring.h
--- files/patch-libxmms-titlestring.h 14 Mar 2005 18:22:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- libxmms/titlestring.h.orig Mon Mar 14 18:05:21 2005
-+++ libxmms/titlestring.h Mon Mar 14 18:05:31 2005
-@@ -80,7 +80,7 @@
- GtkWidget* xmms_titlestring_descriptions(char* tags, int rows);
-
- #ifdef __cplusplus
--};
-+}
- #endif
-
- #endif /* !XMMS_TITLESTRING_H */
Index: files/patch-libxmms-xmmsctrl.h
===================================================================
RCS file: files/patch-libxmms-xmmsctrl.h
diff -N files/patch-libxmms-xmmsctrl.h
--- files/patch-libxmms-xmmsctrl.h 19 Nov 2004 15:45:47 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- libxmms/xmmsctrl.h.orig Fri Nov 19 13:49:06 2004
-+++ libxmms/xmmsctrl.h Fri Nov 19 13:49:14 2004
-@@ -85,7 +85,7 @@
-
-
- #ifdef __cplusplus
--};
-+}
- #endif
-
- /* Deprecated APIs */
Index: files/patch-ltmain.sh
===================================================================
RCS file: /home/ncvs/ports/multimedia/xmms/files/patch-ltmain.sh,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-ltmain.sh
--- files/patch-ltmain.sh 7 Sep 2003 23:39:27 -0000 1.3
+++ files/patch-ltmain.sh 29 Nov 2007 19:45:37 -0000
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/multimedia/xmms/files/patch-ltmain.sh,v 1.3 2003/09/07 23:39:27 edwin Exp $
-
--- ltmain.sh.orig Fri Sep 5 13:18:43 2003
+++ ltmain.sh Fri Sep 5 13:18:09 2003
-@@ -4333,10 +4333,12 @@
+@@ -6038,10 +6038,12 @@
fi
# Install the pseudo-library for information purposes.
--- xmms-1.2.11.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list