NetBSD Problem Report #46662
From www@NetBSD.org Thu Jul 5 22:20:43 2012
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
by www.NetBSD.org (Postfix) with ESMTP id E061163B882
for <gnats-bugs@gnats.NetBSD.org>; Thu, 5 Jul 2012 22:20:42 +0000 (UTC)
Message-Id: <20120705222041.42FE963B85F@www.NetBSD.org>
Date: Thu, 5 Jul 2012 22:20:41 +0000 (UTC)
From: cesium2@gmail.com
Reply-To: cesium2@gmail.com
To: gnats-bugs@NetBSD.org
Subject: [PATCH] upgrade timidity port to 2.14.0
X-Send-Pr-Version: www-1.0
>Number: 46662
>Category: pkg
>Synopsis: [PATCH] upgrade timidity port to 2.14.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Jul 05 22:25:00 +0000 2012
>Closed-Date: Sun Jul 08 09:52:57 +0000 2012
>Last-Modified: Sun Jul 08 09:55:01 +0000 2012
>Originator: Yair K.
>Release: N/A
>Organization:
>Environment:
N/A
>Description:
Timidity is a MIDI player and converter. The attached tarball upgrades the package to the latest version 2.14.0. The Timidity changelog can be seen at [1].
[1]
http://sourceforge.net/mailarchive/forum.php?thread_name=201206290019.AA00513%40tamuki.linet.gr.jp&forum_name=timidity-talk
There are also some additional changes to the port besides mere upgrading of version:
A) All patches were removed. They were either merged upstream (patch-aa) or upstream chose a different path (patch-ab, patch-x_sherry) or they were trivial and unneeded on my system and I wasn't sure anything would break without them given all the time passed from previous release (patch-ac, patch-ae). Maybe the last two would need to be restored for some archs.
B) A default timidity.cfg CONF_FILE should allow timidity to pick up freepats/other gus patches/ by default when they are installed. (This does not break when only some of the patches are installed - the new "trysource" directive doesn't abort when a source file isn't found).
C) x11 and gtk options. x11 is selected by default and compiles timidity with the X interfaces (xaw, WRD, spectrogram). gtk is unselected by default (took too long to build gtk2 so I didn't test it) and enables the gtk interface. Unselecting x11 would allow timidity to compile without linking to X libraries at all.
D) Linking to alsa under Linux, and enabling the ALSA output and ALSA sequencer support there.
E) flac support (this version is patched for flac>=1.1.3), enabling spectrogram and the server interface.
>How-To-Repeat:
>Fix:
begin 644 timidity-2.14.0-port.tar.gz
M'XL(`/P+]D\``^U:>7/:2A+WO^A3S'-<E0LD!DE@NU9;(48F>N$J)"=.U591
M`QJ!GH7$ZO`1Q]]]>W0`MCGRLL')2_0KNT`SW=,C]3'=C7AA;^<H`VHU.?X$
M))]R.;N.QS`&"JDLU:0*C-=DL;:'Y-UO;6\O"D+B([3G>UZXB2[P1T^QG:<&
M+[157:\WU1W*8`JN5J6U^I=!YQA7)%F40>\PCF$([Z'R#O<TQV^N?^7[@3OH
MT/"MWCA&J4D5+Q'F)50-I$=UXT7/'01-R"3,>LEW0$UQ[+D6>!;0469[C>%>V.S[F"J_0
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
*\#^E-YIF`%``````
`
end
>Release-Note:
>Audit-Trail:
From: "Yair K." <cesium2@gmail.com>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/46662: [PATCH] upgrade timidity port to 2.14.0
Date: Sat, 7 Jul 2012 14:34:30 +0300
--Boundary-01=_G7B+Pa/AItCqbzg
Content-Type: text/plain;
charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
I recall that if X11_TYPE is native, pkgsrc will not fetch libXaw and its
deps. It is possible that someone has X11_TYPE == native, XAW_TYPE not set
(i.e. == standard), libxaw3d (etc.) installed but not libxaw. In that case,
the port attached in the report would fail to find xaw and will not check for
Xaw3d - which is perhaps not what the user desired...
I think the best solution would be to let the configure script search for the
other libs in this case, so long as they're after Xaw in the search order. The
diff below should fix this:
--- ./options.mk 2012-07-06 00:40:09.000000000 +0300
+++ ./options.mk 2012-07-07 14:15:55.681307814 +0300
@@ -14,9 +14,9 @@
.include "../../graphics/png/buildlink3.mk"
.if !defined(XAW_TYPE)
-WITH_XAWLIB=--with-xawlib=xaw
+WITH_XAWLIB=--with-xawlib=xaw,xaw3d,neXtaw
.elif ${XAW_TYPE} == "standard"
-WITH_XAWLIB=--with-xawlib=xaw
+WITH_XAWLIB=--with-xawlib=xaw,xaw3d,neXtaw
.elif ${XAW_TYPE} == "3d"
WITH_XAWLIB=--with-xawlib=xaw3d
.elif ${XAW_TYPE} == "xpm"
--Boundary-01=_G7B+Pa/AItCqbzg
Content-Type: text/html;
charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:16pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">I recall that if X11_TYPE is native, pkgsrc will not fetch libXaw and its deps. It is possible that someone has X11_TYPE == native, XAW_TYPE not set (i.e. == standard), libxaw3d (etc.) installed but not libxaw. In that case, the port attached in the report would fail to find xaw and will not check for Xaw3d - which is perhaps not what the user desired...</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> I think the best solution would be to let the configure script search for the other libs in this case, so long as they're after Xaw in the search order. The diff below should fix this:</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">--- ./options.mk 2012-07-06 00:40:09.000000000 +0300</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">+++ ./options.mk 2012-07-07 14:15:55.681307814 +0300</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">@@ -14,9 +14,9 @@</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> .include "../../graphics/png/buildlink3.mk"</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> .if !defined(XAW_TYPE)</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">-WITH_XAWLIB=--with-xawlib=xaw</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">+WITH_XAWLIB=--with-xawlib=xaw,xaw3d,neXtaw</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> .elif ${XAW_TYPE} == "standard"</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">-WITH_XAWLIB=--with-xawlib=xaw</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">+WITH_XAWLIB=--with-xawlib=xaw,xaw3d,neXtaw</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> .elif ${XAW_TYPE} == "3d"</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> WITH_XAWLIB=--with-xawlib=xaw3d</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> .elif ${XAW_TYPE} == "xpm"</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p></body></html>
--Boundary-01=_G7B+Pa/AItCqbzg--
From: Thomas Klausner <tk@giga.or.at>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc:
Subject: Re: pkg/46662: [PATCH] upgrade timidity port to 2.14.0
Date: Sat, 7 Jul 2012 22:43:01 +0200
--nFreZHaLTZJo0R7j
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi!
Thanks for the timidity update.
I've tried it on NetBSD-6.99.8/amd64.
I noticed that you removed all CVS ($NetBSD$) tags from the files --
please don't do that. At least as long as NetBSD's using cvs(1).
I've readded patch-ac because declaring errno as int will break on
some platforms. I'm not sure about patch-ae, so I've left it removed.
I've also applied the changes you sent separately.
The build failed for me with:
--- server_c.o ---
server_c.c: In function 'do_sequencer':
server_c.c:1251:52: error: 'SEQ_MIDIPUTC' undeclared (first use in this function)
server_c.c:1251:52: note: each undeclared identifier is reported only once for each function it appears in
server_c.c:1257:9: error: 'EV_CHN_VOICE' undeclared (first use in this function)
server_c.c:1262:9: error: 'EV_CHN_COMMON' undeclared (first use in this function)
server_c.c:1267:9: error: 'EV_TIMING' undeclared (first use in this function)
server_c.c:1272:9: error: 'EV_SYSEX' undeclared (first use in this function)
server_c.c:1312:13: error: 'MIDI_NOTEON' undeclared (first use in this function)
server_c.c:1325:13: error: 'MIDI_NOTEOFF' undeclared (first use in this function)
server_c.c:1335:13: error: 'MIDI_KEY_PRESSURE' undeclared (first use in this function)
server_c.c:1345:13: error: 'MIDI_CTL_CHANGE' undeclared (first use in this function)
server_c.c:1355:13: error: 'MIDI_PGM_CHANGE' undeclared (first use in this function)
server_c.c:1365:13: error: 'MIDI_CHN_PRESSURE' undeclared (first use in this function)
server_c.c:1375:13: error: 'MIDI_PITCH_BEND' undeclared (first use in this function)
server_c.c:1385:13: error: 'MIDI_SYSTEM_PREFIX' undeclared (first use in this function)
server_c.c:1489:9: error: 'SEQ_FULLSIZE' undeclared (first use in this function)
server_c.c:1496:9: error: 'SEQ_EXTENDED' undeclared (first use in this function)
server_c.c:1502:9: error: 'EV_SEQ_LOCAL' undeclared (first use in this function)
server_c.c:1503:9: error: 'SEQ_PRIVATE' undeclared (first use in this function)
server_c.c: In function 'do_chn_voice':
server_c.c:1547:12: error: 'MIDI_NOTEON' undeclared (first use in this function)
server_c.c:1555:12: error: 'MIDI_NOTEOFF' undeclared (first use in this function)
server_c.c:1559:12: error: 'MIDI_KEY_PRESSURE' undeclared (first use in this function)
server_c.c: In function 'do_chn_common':
server_c.c:1627:12: error: 'MIDI_CTL_CHANGE' undeclared (first use in this function)
server_c.c:1631:12: error: 'MIDI_PGM_CHANGE' undeclared (first use in this function)
server_c.c:1637:12: error: 'MIDI_CHN_PRESSURE' undeclared (first use in this function)
server_c.c:1643:12: error: 'MIDI_PITCH_BEND' undeclared (first use in this function)
server_c.c: In function 'do_timing':
server_c.c:1660:12: error: 'TMR_START' undeclared (first use in this function)
server_c.c:1666:12: error: 'TMR_STOP' undeclared (first use in this function)
server_c.c:1670:12: error: 'TMR_CONTINUE' undeclared (first use in this function)
server_c.c:1679:12: error: 'TMR_TEMPO' undeclared (first use in this function)
server_c.c:1690:12: error: 'TMR_WAIT_ABS' undeclared (first use in this function)
server_c.c:1703:12: error: 'TMR_WAIT_REL' undeclared (first use in this function)
server_c.c: In function 'do_extended':
server_c.c:1769:12: error: 'SEQ_CONTROLLER' undeclared (first use in this function)
server_c.c:1772:9: error: 'CTRL_PITCH_BENDER' undeclared (first use in this function)
server_c.c:1774:9: error: 'CTRL_PITCH_BENDER_RANGE' undeclared (first use in this function)
*** [server_c.o] Error code 1
Can you please take a look and recommend a fix?
Thanks,
Thomas
--nFreZHaLTZJo0R7j
Content-Type: application/x-tar-gz
Content-Disposition: attachment; filename="timidity-2.14v2-pkg.tar.gz"
Content-Transfer-Encoding: base64
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
--nFreZHaLTZJo0R7j--
From: "Yair K." <cesium2@gmail.com>
To: gnats-bugs@netbsd.org
Cc: pkg-manager@netbsd.org,
gnats-admin@netbsd.org,
pkgsrc-bugs@netbsd.org
Subject: Re: pkg/46662: [PATCH] upgrade timidity port to 2.14.0
Date: Sun, 8 Jul 2012 02:50:21 +0300
--Boundary-01=_9sM+PGLFeDEHs+n
Content-Type: text/plain;
charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
On Saturday 07 July 2012 23:45:02 Thomas Klausner wrote:
> The following reply was made to PR pkg/46662; it has been noted by GNATS.
>
> From: Thomas Klausner <tk@giga.or.at>
> To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
> Cc:
> Subject: Re: pkg/46662: [PATCH] upgrade timidity port to 2.14.0
> Date: Sat, 7 Jul 2012 22:43:01 +0200
>
> --nFreZHaLTZJo0R7j
> Content-Type: text/plain; charset=us-ascii
> Content-Disposition: inline
>
> Hi!
>
> Thanks for the timidity update.
>
> I've tried it on NetBSD-6.99.8/amd64.
>
> I noticed that you removed all CVS ($NetBSD$) tags from the files --
> please don't do that. At least as long as NetBSD's using cvs(1).
Oops.
>
> I've readded patch-ac because declaring errno as int will break on
> some platforms. I'm not sure about patch-ae, so I've left it removed.
>
> I've also applied the changes you sent separately.
>
> The build failed for me with:
<snipped>
>
> Can you please take a look and recommend a fix?
>
That's the server interface, which can either use some defines from OSS
soundcard.h or include its own server_defs.h. HAVE_SYS_SOUNDCARD_H is defined
(somehow the configure finds libossaudio's soundcard.h) but libossaudio's
soundcard.h doesn't include these MIDI definitions. I suggest patching
server_c.c to always use its own definitions (which IMHO, sounds like the best
idea in general. An interface which may mutate based on the system's
soundcard.h and compilation mode is silly. Fortunately, soundcard.h is stable
in this regard). An alternative fix would be to remove --enable-server, but it
can be ocassionally useful (e.g. scummvm can output midi via it).
--- server_c.c 2012-07-08 02:44:39.707040910 +0300
+++ server_c.c 2012-07-08 02:44:50.672466303 +0300
@@ -58,11 +58,7 @@
#endif
#include <signal.h>
-#ifdef HAVE_SYS_SOUNDCARD_H
-#include <sys/soundcard.h>
-#else
#include "server_defs.h"
-#endif /* HAVE_SYS_SOUNDCARD_H */
#include "timidity.h"
#include "common.h"
--Boundary-01=_9sM+PGLFeDEHs+n
Content-Type: text/html;
charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:16pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">On Saturday 07 July 2012 23:45:02 Thomas Klausner wrote:</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> The following reply was made to PR pkg/46662; it has been noted by GNATS.</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> From: Thomas Klausner <tk@giga.or.at></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> To: NetBSD bugtracking <gnats-bugs@NetBSD.org></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Cc:</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Subject: Re: pkg/46662: [PATCH] upgrade timidity port to 2.14.0</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Date: Sat, 7 Jul 2012 22:43:01 +0200</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> --nFreZHaLTZJo0R7j</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Content-Type: text/plain; charset=us-ascii</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Content-Disposition: inline</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Hi!</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Thanks for the timidity update.</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> I've tried it on NetBSD-6.99.8/amd64.</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> I noticed that you removed all CVS ($NetBSD$) tags from the files --</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> please don't do that. At least as long as NetBSD's using cvs(1).</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Oops.</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> I've readded patch-ac because declaring errno as int will break on</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> some platforms. I'm not sure about patch-ae, so I've left it removed.</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> I've also applied the changes you sent separately.</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> The build failed for me with:</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"><snipped></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Can you please take a look and recommend a fix?</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> </p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">That's the server interface, which can either use some defines from OSS soundcard.h or include its own server_defs.h. HAVE_SYS_SOUNDCARD_H is defined (somehow the configure finds libossaudio's soundcard.h) but libossaudio's soundcard.h doesn't include these MIDI definitions. I suggest patching server_c.c to always use its own definitions (which IMHO, sounds like the best idea in general. An interface which may mutate based on the system's soundcard.h and compilation mode is silly. Fortunately, soundcard.h is stable in this regard). An alternative fix would be to remove --enable-server, but it can be ocassionally useful (e.g. scummvm can output midi via it).</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">--- server_c.c 2012-07-08 02:44:39.707040910 +0300</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">+++ server_c.c 2012-07-08 02:44:50.672466303 +0300</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">@@ -58,11 +58,7 @@</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> #endif</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> #include <signal.h></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">-#ifdef HAVE_SYS_SOUNDCARD_H</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">-#include <sys/soundcard.h></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">-#else</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> #include "server_defs.h"</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">-#endif /* HAVE_SYS_SOUNDCARD_H */</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> </p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> #include "timidity.h"</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;"> #include "common.h"</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p></body></html>
--Boundary-01=_9sM+PGLFeDEHs+n--
State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Sun, 08 Jul 2012 09:52:57 +0000
State-Changed-Why:
I've fixed two minor things:
x11 PLIST handling
PKGREVISION is not needed if VERSION is bumped
and committed it. Thank you very much!
From: "Thomas Klausner" <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/46662 CVS commit: pkgsrc/audio/timidity
Date: Sun, 8 Jul 2012 09:51:31 +0000
Module Name: pkgsrc
Committed By: wiz
Date: Sun Jul 8 09:51:31 UTC 2012
Modified Files:
pkgsrc/audio/timidity: DESCR MESSAGE Makefile PLIST distinfo
pkgsrc/audio/timidity/patches: patch-ac
Added Files:
pkgsrc/audio/timidity/patches: patch-interface_server__c.c
Removed Files:
pkgsrc/audio/timidity/patches: patch-aa patch-ab patch-ae
patch-interface_x__sherry.c
Log Message:
Update to 2.14.0, provided by Yair K. in PR 46662.
pkgsrc changes:
install default config
enable flac again
enable server and spectogram
enable alsa on Linux
make x11 optional
add gtk option
Upstream changes:
06/29, 2012
* Version 2.14.0 released.
* Add --reverb option for Freeverb parameter.
* Add --preserve-silence option.
* Add a "trysource" config file directive, which allows to try and
source other config files, while continuing without error if the
specified file is missing.
* Support for GM2 Master Fine/Coarse Tuning, GS Master Tune and XG
Master Tuning (4C not 27) SysEx.
* Allow Device Numbers other than 0x10 for XG SYSTEM ON SYSEX
events.
* Fix multiple vulnerabilities found in GNU gzip also apply to lha,
namely: CVE-2006-4335, CVE-2006-4337 and CVE-2006-4338.
* Support for lzma decompression.
* Support for ipv6.
* Support for libpng 1.5 and newer.
* Support for Tcl/Tk 8.5.
* Make compatible with xaw3d v1.5, style changes.
* Various improvements in XAW interface (see README.xaw).
* Support for Windows Named Pipe interface.
* ...and many other bug fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/timidity/DESCR
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/timidity/MESSAGE
cvs rdiff -u -r1.80 -r1.81 pkgsrc/audio/timidity/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/timidity/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/timidity/distinfo
cvs rdiff -u -r1.8 -r0 pkgsrc/audio/timidity/patches/patch-aa
cvs rdiff -u -r1.14 -r0 pkgsrc/audio/timidity/patches/patch-ab
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/timidity/patches/patch-ac
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/timidity/patches/patch-ae
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/timidity/patches/patch-interface_server__c.c
cvs rdiff -u -r1.1 -r0 \
pkgsrc/audio/timidity/patches/patch-interface_x__sherry.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.