head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.32 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.30 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.28 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.26 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.24 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.22 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.20 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.18 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.16 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.14 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.12 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.10 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.8 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.6 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.4 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.2 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.8.0.150 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.148 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.146 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.144 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.142 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.140 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.138 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.134 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.114 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.136 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.132 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.130 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.128 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.126 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.124 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.122 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.120 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.118 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.116 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.112 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.110 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.108 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.106 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.104 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.102 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.100 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.98 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.96 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.94 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.92 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.90 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.88 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.86 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.84 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.82 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.80 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.78 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.76 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.74 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.72 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.70 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.68 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.66 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.64 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.62 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.60 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.58 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.56 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.54 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.52 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.50 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.48 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.46 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.44 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.42 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.40 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.38 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.36 pkgsrc-2008Q1:1.8.0.34 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.32 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.30 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.28 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.26 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.24 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.22 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.20 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.18 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.16 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.14 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.12 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.10 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.8 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 netbsd-1-6:1.5.0.4 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.3.0.2 pkgviews-base:1.3 buildlink2:1.2.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.2; locks; strict; comment @# @; 1.9 date 2022.06.06.12.12.47; author martin; state Exp; branches; next 1.8; commitid PaSMqvuWsGDhxYGD; 1.8 date 2004.02.20.00.41.16; author abs; state Exp; branches; next 1.7; 1.7 date 2003.09.03.12.35.12; author martin; state Exp; branches; next 1.6; 1.6 date 2002.10.03.15.46.56; author abs; state Exp; branches; next 1.5; 1.5 date 2002.08.02.23.01.46; author abs; state Exp; branches; next 1.4; 1.4 date 2002.07.31.14.02.44; author abs; state Exp; branches; next 1.3; 1.3 date 2002.06.14.20.04.07; author abs; state Exp; branches; next 1.2; 1.2 date 2002.02.12.14.49.46; author martin; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2002.02.12.14.22.15; author martin; state Exp; branches; next ; 1.2.2.1 date 2002.06.23.18.38.58; author jlam; state Exp; branches; next ; desc @@ 1.9 log @Fix handling of 64bit time_t on 32bit archs @ text @$NetBSD: patch-ab,v 1.8 2004/02/20 00:41:16 abs Exp $ --- mserv/cmd.c.orig Sat Aug 2 15:26:19 2003 +++ mserv/cmd.c @@@@ -49,9 +49,20 @@@@ met: #include #include #include + #include "mserv.h" + +#ifdef HAVE_INTTYPES_H +#include +#define TIME_T_PRI_CAST uint64_t +#define TIME_T_PRI PRIu64 +#else +#define TIME_T_PRI_CAST unsigned long +#define TIME_T_PRI "lu" +#endif + #include "misc.h" -#include "soundcard.h" +#include "mservsoundcard.h" #include "acl.h" #include "filter.h" #include "cmd.h" @@@@ -2534,11 +2545,11 @@@@ static void mserv_cmd_info(t_client *cl, rate = mserv_getrate(ru, track); snprintf(year, sizeof(year), "%d", track->year); mserv_response(cl, "INFT", - "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%d\t%s\t%.1f\t%.1f\t" + "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%" TIME_T_PRI "\t%s\t%.1f\t%.1f\t" "%s\t%s\t%s\t%d:%02d.%d\t%s", track->n_album, track->n_track, album->author, album->name, track->author, track->name, track->year ? year : "unknown", - track->lastplay, ago, 100*track->prating, 100*track->rating, + (TIME_T_PRI_CAST)track->lastplay, ago, 100*track->prating, 100*track->rating, mserv_ratestr(rate), track->genres, track->filterok ? "included" : "excluded", (track->duration/100)/60, (track->duration/100) % 60, @@@@ -2547,11 +2558,11 @@@@ static void mserv_cmd_info(t_client *cl, for (i = 1; i <= 11; i++) { sprintf(token, "INFT%d", i); mserv_response(cl, token, - "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%d\t%s\t%.1f\t%.1f\t" + "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%" TIME_T_PRI "\t%s\t%.1f\t%.1f\t" "%s\t%s\t%s\t%d:%02d.%d\t%s", track->n_album, track->n_track, album->author, album->name, track->author, track->name, - track->year ? year : "unknown", track->lastplay, + track->year ? year : "unknown", (TIME_T_PRI_CAST)track->lastplay, ago, 100*track->prating, 100*track->rating, mserv_ratestr(rate), track->genres, track->filterok ? "included" : "excluded", @ 1.8 log @Update mserv to 0.35nb8: Fix parsing of ID3v1 data, fix some off by one malloc()s and default album author to tracks' author. @ text @d1 1 a1 1 $NetBSD$ d5 3 a7 1 @@@@ -51,7 +51,7 @@@@ met: d9 1 d11 10 d27 28 @ 1.7 log @Update to mserv-0.35. Most previus patches have been integrated, various fixes. This version is compatible with a new nifty win32 gui client, see the homepage for links. @ text @d3 3 a5 3 --- mserv/cmd.c.orig 2003-08-02 16:26:19.000000000 +0200 +++ mserv/cmd.c 2003-09-03 13:51:41.000000000 +0200 @@@@ -51,7 +51,7 @@@@ @ 1.6 log @Update mserv to mserv-0.33nb5: Correctly parse ID3V2 headers. @ text @d3 11 a13 11 --- mserv/cmd.c.orig Sat Jul 15 18:52:56 2000 +++ mserv/cmd.c @@@@ -2789,6 +2789,8 @@@@ static void mserv_cmd_reset(t_client *cl mserv_response(cl, "RESETER", NULL); return; } + mserv_broadcast("RESETGO", "%s", cl->user); + mserv_flush(); mserv_log("Reset initiated by %s", cl->user); mserv_reset(); mserv_broadcast("RESET", "%s", cl->user); @ 1.5 log @Updated mserv to 0.33nb4: Ensure reset message is flushed before restart starts, and fix volume control to correctly report new value so 'volume -' and 'volume +' will always reduce/increase the volume by the minimum value. @ text @@ 1.4 log @Update mserv to 0.33nb3: Broadcast an information line both on server RESET initiation and on completion. @ text @d3 1 a3 1 --- mserv/cmd.c.orig Wed Jul 31 14:59:21 2002 d5 2 a6 1 @@@@ -2790,6 +2790,7 @@@@ static void mserv_cmd_reset(t_client *cl d9 2 a11 1 + mserv_broadcast("RESETGO", "%s", cl->user); a13 1 if (cl->mode != mode_human) @ 1.3 log @Update mserv to mserv-0.33nb2 - Clip TRACKSPERALBUM to 250 not 1200 as more than 255 loses - Fix default pathname to mpg123 - Add DEPENDS for mpg123 - Fix soundcard support @ text @d3 10 a12 12 --- mserv/config.h.in.orig Tue Jan 25 19:59:08 2000 +++ mserv/config.h.in @@@@ -11,6 +11,9 @@@@ #define RETSIGTYPE void /* Define if we have soundcard.h */ +#undef HAVE_SOUNDCARD_H + +/* Define if we have sys/soundcard.h */ #undef HAVE_SYS_SOUNDCARD_H /* Define if we have strsep() */ @ 1.2 log @Ooops, default language file should be in ${PRFIX}/share, not /usr/local... @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2002/02/12 14:22:15 martin Exp $ d3 4 a6 4 --- Makefile.orig Sat Jul 15 20:29:10 2000 +++ Makefile Tue Feb 12 15:13:35 2002 @@@@ -2,11 +2,11 @@@@ BASE = ${shell basename ${PWD}} d8 5 a12 10 default: - (cd mserv; ./configure) + (cd mserv; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) (cd mserv; make DEFS=${DEFS}) - (cd mservcli; ./configure) + (cd mservcli; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) (cd mservcli; make DEFS=${DEFS}) - (cd mservutils; ./configure) + (cd mservutils; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share) (cd mservutils; make DEFS=${DEFS}) d14 1 a14 1 install: @ 1.2.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2002/06/14 20:04:07 abs Exp $ d3 4 a6 4 --- mserv/config.h.in.orig Tue Jan 25 19:59:08 2000 +++ mserv/config.h.in @@@@ -11,6 +11,9 @@@@ #define RETSIGTYPE void d8 10 a17 5 /* Define if we have soundcard.h */ +#undef HAVE_SOUNDCARD_H + +/* Define if we have sys/soundcard.h */ #undef HAVE_SYS_SOUNDCARD_H d19 1 a19 1 /* Define if we have strsep() */ @ 1.1 log @Add and enable mserv, a server for shared music playback in rooms with multiple listeners. There are thml, telnet and windows based clients that can be used to vote for the currently playing song, skip to the next song or pause playback (on phone rings etc.). @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 + (cd mserv; ./configure --prefix=${PREFIX}) d13 1 a13 1 + (cd mservcli; ./configure --prefix=${PREFIX}) d16 1 a16 1 + (cd mservutils; ./configure --prefix=${PREFIX}) @