head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.22 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.20 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.18 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.16 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.14 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.12 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.10 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.8 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.6 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.4 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.2 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.6.0.6 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.4 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.2 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.5.0.22 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.20 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.18 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.16 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.14 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.12 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.10 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.8 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.6 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.4 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.2 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.4.0.6 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 buildlink2-base:1.3; locks; strict; comment @# @; 1.7 date 2007.11.29.18.36.40; author wiz; state dead; branches; next 1.6; 1.6 date 2007.02.01.16.55.59; author drochner; state Exp; branches; next 1.5; 1.5 date 2004.05.06.14.48.57; author drochner; state dead; branches; next 1.4; 1.4 date 2002.10.14.09.47.00; author rh; state Exp; branches; next 1.3; 1.3 date 2002.03.21.18.52.32; author drochner; state dead; branches; next 1.2; 1.2 date 2001.06.21.16.38.34; author rh; state Exp; branches; next 1.1; 1.1 date 2001.05.20.20.52.25; author rh; state Exp; branches; next ; desc @@ 1.7 log @Update to 1.2.11: xmms 1.2.11 The '1211 days since last release' release. XMMS was 10 years old on 2007-11-15. * Make the --toggle switches take an optional value to either enable or disable the function. * New command line switches: --quit, --toggle-shuffle, --toggle-repeat, --toggle-advance, --queue * New remote commands: xmms_remote_playqueue_clear, xmms_remote_get_playqueue_pos_from_playlist_pos, xmms_remote_get_playlist_pos_from_playqueue_pos, xmms_remote_playqueue_add, xmms_remote_get_playqueue_length, xmms_remote_playqueue_remove. * Playqueue manager. Adds queue control enabling you to reorder the queue and a search like the jump to file dialog. OGG/Vorbis: * Save stream to disk adds -N if the file already exist * Don't apply the +6dB boost if replaygain information is missing Alsa: * Soft volume works without mixer Songchange: * Optional command to run at end of song. Diskwriter: * Effect plugins are applied on the saved file MPG123: * Enable shoutcast title streaming by default * CTRL-Q as default keybind to quit * Close dialogs with escape key Solaris: * Support OSS and AMD8111 @ text @$NetBSD: patch-ao,v 1.6 2007/02/01 16:55:59 drochner Exp $ --- libxmms/titlestring.h.orig 2007-02-01 15:18:41.000000000 +0100 +++ libxmms/titlestring.h @@@@ -80,7 +80,7 @@@@ gchar *xmms_get_titlestring(gchar *fmt, GtkWidget* xmms_titlestring_descriptions(char* tags, int rows); #ifdef __cplusplus -}; +} #endif #endif /* !XMMS_TITLESTRING_H */ @ 1.6 log @fix a header file so that C++ plugins can be built, bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @update to 1.2.10 changes: -bugfixes -IPv6 support integrated -new translations -minor feature additions @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.4 2002/10/14 09:47:00 rh Exp $ d3 8 a10 96 --- Input/mpg123/http.c.orig Tue Jan 8 00:08:04 2002 +++ Input/mpg123/http.c @@@@ -332,8 +332,13 @@@@ static void *http_buffer_loop(void *arg) gboolean redirect; int udp_sock = 0; fd_set set; +#ifdef USE_IPV6 + struct addrinfo hints, *res, *res0; + char service[6]; +#else struct hostent *hp; struct sockaddr_in address; +#endif struct timeval tv; url = (gchar *) arg; @@@@ -355,6 +360,45 @@@@ static void *http_buffer_loop(void *arg) chost = mpg123_cfg.use_proxy ? mpg123_cfg.proxy_host : host; cport = mpg123_cfg.use_proxy ? mpg123_cfg.proxy_port : port; +#ifdef USE_IPV6 + snprintf(service, 6, "%d", cport); + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + if (! getaddrinfo(chost, service, &hints, &res0)) { + eof = TRUE; + for (res = res0; res; res = res->ai_next) { + if ((sock = socket (res->ai_family, res->ai_socktype, res->ai_protocol)) < 0) + continue; + fcntl(sock, F_SETFL, O_NONBLOCK); + status = g_strdup_printf(_("CONNECTING TO %s:%d"), chost, cport); + mpg123_ip.set_info_text(status); + g_free(status); + ((struct sockaddr_in6 *)res->ai_addr)->sin6_port = htons(cport); + if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) { + if (errno != EINPROGRESS) { + close(sock); + continue; + } + } + eof = FALSE; + break; + } + freeaddrinfo(res0); + if (eof) { + status = g_strdup_printf(_("Couldn't connect to host %s:%d"), chost, cport); + show_error_message(status); + g_free(status); + mpg123_ip.set_info_text(NULL); + } + } else { + status = g_strdup_printf(_("Couldn't look up host %s"), chost); + show_error_message(status); + g_free(status); + + mpg123_ip.set_info_text(NULL); + eof = TRUE; + } +#else sock = socket(AF_INET, SOCK_STREAM, 0); fcntl(sock, F_SETFL, O_NONBLOCK); address.sin_family = AF_INET; @@@@ -372,9 +416,11 @@@@ static void *http_buffer_loop(void *arg) mpg123_ip.set_info_text(NULL); eof = TRUE; } +#endif if (!eof) { +#ifndef USE_IPV6 memcpy(&address.sin_addr.s_addr, *(hp->h_addr_list), sizeof (address.sin_addr.s_addr)); address.sin_port = g_htons(cport); @@@@ -393,6 +439,7 @@@@ static void *http_buffer_loop(void *arg) eof = TRUE; } } +#endif while (going) { tv.tv_sec = 0; @@@@ -697,14 +744,23 @@@@ char *mpg123_http_get_title(char *url) /* Find a good local udp port and bind udp_sock to it, return the port */ static int udp_establish_listener(int *sock) { +#ifdef USE_IPV6 + struct sockaddr_in6 sin; + socklen_t sinlen = sizeof (struct sockaddr_in6); +#else struct sockaddr_in sin; socklen_t sinlen = sizeof (struct sockaddr_in); +#endif #ifdef DEBUG_UDP fprintf (stderr,"Establishing udp listener\n"); a11 11 +#ifdef USE_IPV6 + if ((*sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) +#else if ((*sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) +#endif { g_log(NULL, G_LOG_LEVEL_CRITICAL, "udp_establish_listener(): unable to create socket"); @@@@ -712,8 +768,12 @@@@ static int udp_establish_listener(int *s } d13 1 a13 53 memset(&sin, 0, sinlen); +#ifdef USE_IPV6 + sin.sin6_family = AF_INET6; +#else sin.sin_family = AF_INET; sin.sin_addr.s_addr = g_htonl(INADDR_ANY); +#endif if (bind(*sock, (struct sockaddr *)&sin, sinlen) < 0) { @@@@ -743,7 +803,11 @@@@ static int udp_establish_listener(int *s fprintf (stderr,"Listening on local %s:%d\n", inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port)); #endif +#ifdef USE_IPV6 + return g_ntohs(sin.sin6_port); +#else return g_ntohs(sin.sin_port); +#endif } static int udp_check_for_data(int sock) @@@@ -752,10 +816,14 @@@@ static int udp_check_for_data(int sock) char *valptr; gchar *title; gint len, i; +#ifdef USE_IPV6 + struct sockaddr_in6 from; +#else struct sockaddr_in from; +#endif socklen_t fromlen; - fromlen = sizeof(struct sockaddr_in); + fromlen = sizeof(from); if ((len = recvfrom(sock, buf, 1024, 0, (struct sockaddr *)&from, &fromlen)) < 0) { @@@@ -840,7 +908,14 @@@@ static int udp_check_for_data(int sock) #ifdef DEBUG_UDP else fprintf(stderr,"Sent ack: %s", obuf); +#ifdef USE_IPV6 +{ + char adr[INET6_ADDRSTRLEN]; + inet_ntop(AF_INET6, &from.sin6_addr, adr, INET6_ADDRSTRLEN); + fprintf (stderr,"Remote: [%s]:%d\n", adr, g_ntohs(from.sin6_port)); +#else fprintf (stderr,"Remote: %s:%d\n", inet_ntoa(from.sin_addr), g_ntohs(from.sin_port)); +#endif #endif } } @ 1.4 log @Add support for IPv6, mainly using the patches from http://www.version6.net/ Bump PKGREVISION. This closes PR pkg/17771 by Tomi Nylund @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @update to 1.2.7 changes: General: * Replaced folder icons. New ones by Jakub Steiner. * Don't display playlist numbers elsewhere when turned off. * Support 32-bit and 16-bit "bitfield" bmps in skins. CD Audio: * Supply a dummy user and hostname to the cddb server. * Picked up support for Darwin (from FINK cvs) and NetBSD (from NetBSD cvs) MPG123: * Handle UTF-16 encoded tags. * Major stability fixes Translation/Internationalization: * New translations: Basque (eu), Tajik (tg), Vietnamese (vi), Nynorsk (nn), Thai (th). General: * --play-pause command to toggle playback. * Updated README/man pages. * Added xmms_remote_play_pause(), xmms_remote_playlist_ins_url_string() * Realtime priority works again, it was broken in 1.2.5. * bzip2 skins should now work regardless of Tar version. * Key bindings are now saved when you exit XMMS. * NetWM support updated to the latest specs. * Handles @@ in URL's properly if username:password@@host is not used. Playlist: * Added 'Sort by date' * Page Up/Down keys scrolls one page, instead of the 3 line inheritance from Winamp. * Extended M3U lists now supported. * Added reading of playlist info for selection. Equalizer: * Added Import/WinAMP Presets to the preset menu to import an entire set of WinAMP presets (WINAMP.q1) into the preset list. Vorbis: * Fixed an endianess problem on smallendian boxes * 1.0rc1 or higher required. MPG123: * Handle more broken mp3s. * No more "-" for mp3s with ID3v2 tags that contain no usable information. * VBR files without XING header are now handled more gracefully. Mikmod: * Mikmod plugin now recognizes mod.* files. CD Audio: * Setting the environmental variable XMMS_CDDB_CLIENT_NAME, will make XMMS use that instead when identifying to CDDB servers. * Better handling of CDDB requests. * Don't poll current time when paused, can cause weird things on some drives. OSS Output: * Do endian/sign conversion if necessary. ESD Output: * Will use ESD stream volume instead of the OSS mixer as default. * Assorted bugfixes/memleaks plugged. @ text @d1 1 a1 1 $NetBSD: patch-ao,v 1.2 2001/06/21 16:38:34 rh Exp $ d3 162 a164 14 --- configure.orig Mon Jun 18 21:53:50 2001 +++ configure @@@@ -7473,7 +7473,11 @@@@ cat > conftest.$ac_ext < +#endif EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:7480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @ 1.2 log @Update xmms to 1.2.5. Changes include: Translation/Internationalization: * New translations (gl, pt, id, sr) * Translations work in libxmms. * Handles broken translations better. Plugins: * Joystick plugin suppports more than 4 buttons. * Vorbis plugin handles streams. * Vorbis plugin generate data in native endianness. * File info dialog for Vorbis plugin. * Alot of bugfixes to the Vorbis plugin. * Tonegen input plugin supports more frequencys at the same time. * Solaris output plugin added. * Additional fixes to the Solaris plugin after it moved to the XMMS source. * IR plugin can now configure IR code length. * OSS Output can now configure the mixer device manually. * Handle no effect plugins without crash. * Esd plugin makes use of ESPEAKER variable. * ID3v1.1 support, ID3v1.0 still saves the entire comment. Portability: * CDAudio ported to OpenBSD. * Fixed glitches in FreeBSD audio playback. * Compilation fixes for Tru64 Unix, FreeBSD, OpenBSD. Playlist: * Physically delete file from playlist. * Right-click menu in the playlist. * Playlist counter wraps at ~136 years instead of ~600 hours. * Pressing middle mouse button in the playlist will try to add the content of the clipboard. Double click will clear the playlist. Misc: * MiniIcon now shows up in KDE2 taskbar. * Gnomexmms shows the title in the tooltip. * DGA support has been dropped. * Fullscreen code should be more sane now. * Man pages. (xmms, gnomexmms, wmxmms) Core: * Set realtime mode and drop root privilieges before initalizing GTK. (XMMS would not work with GTK 1.2.10) * Better shuffleplay support. * Possible to show WM decorations. * Fixed segfaults in the controlsocket. * Generic titles instead of Input plugin specific (mpg123, vorbis, cdaudio). * %F - File path, for titlestrings. * Smaller fixes, memory leaks and stability issues. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Update xmms to 1.2.4. Notable changes include: - localisation support - additional plugins, most notably the ability to play ogg-vorbis files - tons of bugfixes - better sound buffer availability estimates for NetBSD (this hopefully reduces jitter a bit on slower systems). @ text @d3 1 a3 1 --- configure.orig Sun May 20 17:28:50 2001 d5 1 a5 1 @@@@ -7339,7 +7339,11 @@@@ d7 1 a7 1 #line 7341 "configure" d16 1 a16 1 { (eval echo configure:7346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } @