From 37ae38d1a8ed461e6095fbc0b5fdcfc35766066c Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Sat, 19 Mar 2005 01:03:38 +0000
Subject: Fix build on Solaris.  From Simon Kuhn in PR pkg/29709.

---
 multimedia/kdemultimedia3/distinfo         |  4 +++-
 multimedia/kdemultimedia3/patches/patch-as | 22 ++++++++++++++++++++++
 multimedia/kdemultimedia3/patches/patch-at | 13 +++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/kdemultimedia3/patches/patch-as
 create mode 100644 multimedia/kdemultimedia3/patches/patch-at

(limited to 'multimedia')

diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index f094016384c..01f43b04c24 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/03/06 13:02:59 markd Exp $
+$NetBSD: distinfo,v 1.15 2005/03/19 01:03:38 markd Exp $
 
 SHA1 (kdemultimedia-3.3.2.tar.bz2) = 383515292f8c02df9a960a2e9c511aebacf13b78
 RMD160 (kdemultimedia-3.3.2.tar.bz2) = b41cfeb8b410e1da1fb128e928c8aecaf66c8b00
@@ -12,6 +12,8 @@ SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
 SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
 SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
+SHA1 (patch-as) = d38a8d2769b4d65fb3e8d7ffc738380f5dbc4867
+SHA1 (patch-at) = f985efe71df1cfb21e10b02dc23c8d5e8b1651d4
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
 SHA1 (patch-cu) = 5a93444eee0f7aabbdc2879debc56eac28e1deed
diff --git a/multimedia/kdemultimedia3/patches/patch-as b/multimedia/kdemultimedia3/patches/patch-as
new file mode 100644
index 00000000000..9eed58ef63b
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2005/03/19 01:03:38 markd Exp $
+
+--- kmix/mixer_sun.cpp.orig	2004-11-29 06:06:35.000000000 +1300
++++ kmix/mixer_sun.cpp
+@@ -422,7 +422,7 @@ bool Mixer_SUN::isRecsrcHW( int devnum )
+ //======================================================================
+ void Mixer_SUN::VolumeToGainBalance( Volume& volume, uint_t& gain, uchar_t& balance )
+ {
+-   if ( ( volume.channels() == 1 ) ||
++   if ( ( volume.count() == 1 ) ||
+         ( volume[Volume::LEFT] == volume[Volume::RIGHT] ) )
+    {
+       gain = volume[Volume::LEFT];
+@@ -454,7 +454,7 @@ void Mixer_SUN::VolumeToGainBalance( Vol
+ //======================================================================
+ 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 );
+    }
diff --git a/multimedia/kdemultimedia3/patches/patch-at b/multimedia/kdemultimedia3/patches/patch-at
new file mode 100644
index 00000000000..4546f664868
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2005/03/19 01:03:38 markd Exp $
+
+--- mpeglib_artsplug/decoderBaseObject_impl.h.orig	2005-03-18 09:31:02.544121000 +1300
++++ mpeglib_artsplug/decoderBaseObject_impl.h
+@@ -64,7 +64,7 @@ class DecoderBaseObject_impl :
+ 
+   bool m_streaming;
+ 
+-  queue<DataPacket<mcopbyte>*> *m_packetQueue;
++  std::queue<DataPacket<mcopbyte>*> *m_packetQueue;
+ 
+ public:
+ 
-- 
cgit v1.2.3