pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/46662: [PATCH] upgrade timidity port to 2.14.0

The following reply was made to PR pkg/46662; it has been noted by GNATS.

From: "Yair K." <cesium2%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: pkg-manager%netbsd.org@localhost,
 gnats-admin%netbsd.org@localhost,
 pkgsrc-bugs%netbsd.org@localhost
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@localhost>
 > To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
 > 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;">&gt; 
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;">&gt; 
</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;">&gt; 
From: Thomas Klausner &lt;tk%giga.or.at@localhost&gt;</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;">&gt; 
To: NetBSD bugtracking &lt;gnats-bugs%NetBSD.org@localhost&gt;</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;">&gt; 
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;">&gt; 
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;">&gt; 
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;">&gt; 
</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;">&gt;  
--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;">&gt;  
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;">&gt;  
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;">&gt; 
</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;">&gt;  
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;">&gt; 
</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;">&gt;  
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;">&gt; 
</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;">&gt;  
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;">&gt; 
</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;">&gt;  
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;">&gt;  
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; 
">&nbsp;</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; 
">&nbsp;</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;">&gt; 
</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;">&gt;  
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;">&gt;  
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;">&gt; 
</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;">&gt;  
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;">&gt; 
</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;">&gt;  
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;">&lt;snipped&gt;</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;">&gt; 
</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;">&gt;  
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;">&gt; 
</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; 
">&nbsp;</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; 
">&nbsp;</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 &lt;signal.h&gt;</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 &lt;sys/soundcard.h&gt;</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 &quot;server_defs.h&quot;</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 &quot;timidity.h&quot;</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 &quot;common.h&quot;</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; 
">&nbsp;</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; 
">&nbsp;</p></body></html>
 --Boundary-01=_9sM+PGLFeDEHs+n--
Home | Main Index | Thread Index | Old Index