pkg/29709: kdemultimedia3 fails in kmix on Solaris

[sak8%eecs.cwru.edu@localhost]

>Number:         29709
>Category:       pkg
>Synopsis:       kdemultimedia3 fails in kmix on Solaris
>Confidential:   no
>Severity:       critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 16 17:25:00 +0000 2005
>Originator:     Simon Kuhn
>Release:        pkgsrc-current
>Organization:
Case Western Reserve University
>Environment:
SunOS reducto 5.9 Generic_117171-13 sun4u sparc SUNW,Sun-Fire-V240 Solaris

>Description:
kdemultimedia3-3.3.2 needs to be patched to compile correctly on Solaris SPARC 
according to this message on the kde-solaris list: 
http://lists.kde.org/?l=kde-solaris&m=110156395025791&w=2
>How-To-Repeat:
Attempt to compile kdemultimedia3 on Solaris SPARC or any other architecture 
that would use the sun audio device.
>Fix:
>From the mailing list post:

===================================================================
RCS file: /home/kde/kdemultimedia/kmix/mixer_sun.cpp,v
retrieving revision 1.22
diff -u -r1.22 mixer_sun.cpp
--- mixer_sun.cpp       24 Aug 2004 15:59:44 -0000      1.22
+++ mixer_sun.cpp       27 Nov 2004 13:42:04 -0000
@@ -422,8 +422,8 @@
 //======================================================================
 void Mixer_SUN::VolumeToGainBalance( Volume& volume, uint_t& gain, uchar_t& 
balance )
 {
-   if ( ( volume.channels() == 1 ) ||
-        ( volume[Volume::LEFT] == volume[Volume::RIGHT] ) )
+  if ( (volume.count() == 1 ) ||
+       (volume[Volume::LEFT] == volume[Volume::RIGHT] ))
    {
       gain = volume[Volume::LEFT];
       balance = AUDIO_MID_BALANCE;
@@ -454,7 +454,7 @@
 //======================================================================
 void Mixer_SUN::GainBalanceToVolume( uint_t& gain, uchar_t& balance, Volume& 
volume )
 {
-   if ( volume.channels() == 1 )
+  if ( volume.count() == 1 )
    {
       volume.setVolume( Volume::LEFT, gain );
    }


Index: decoderBaseObject_impl.h
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/decoderBaseObject_impl.h,v
retrieving revision 1.13
diff -u -r1.13 decoderBaseObject_impl.h
--- decoderBaseObject_impl.h    27 Jun 2003 01:36:58 -0000      1.13
+++ decoderBaseObject_impl.h    27 Nov 2004 13:55:20 -0000
@@ -64,7 +64,7 @@
 
   bool m_streaming;
 
-  queue<DataPacket<mcopbyte>*> *m_packetQueue;
+  std::queue<DataPacket<mcopbyte>*> *m_packetQueue;
 
 public: