Fix build with OSS4. Patch by Franz Fellner <alpine.art.de@googlemail.com>. Fixes bug #415573.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

4 files changed, 124 insertions, 18 deletions

diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index fa71424c2924..a5296d9d0acc 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.212 2012/05/08 15:43:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.213 2012/05/17 18:07:22 kensington Exp $
+
+  17 May 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kmix-4.8.3-oss4.patch, kmix-4.8.3.ebuild:
+  Fix build with OSS4. Patch by Franz Fellner <alpine.art.de@googlemail.com>.
+  Fixes bug #415573.
 
   08 May 2012; Johannes Huber <johu@gentoo.org> -kmix-4.8.2.ebuild:
   Remove KDE SC 4.8.2
diff --git a/kde-base/kmix/Manifest b/kde-base/kmix/Manifest
index 35f2812400cc..eccfa9474591 100644
--- a/kde-base/kmix/Manifest
+++ b/kde-base/kmix/Manifest
@@ -1,22 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX kmix-4.8.3-oss4.patch 3405 RMD160 e341dffdf08fdffb383ac52899e37bc24bc308cf SHA1 386507192da583dc9c52e2ed1a92d115783fef53 SHA256 ea7949f04584b243fa1c5a461edab2070cd9523c80c643c59e32c63ffc1fccd4
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
 DIST kdemultimedia-4.8.1.tar.xz 1472892 RMD160 15662d3fbce6f3220c84c655a6307199cbc80f7f SHA1 9de14f08c7f1649201be029b8e683a296cc75f52 SHA256 d8c52583f3b3f3d4ba6b67424af31d987d8dbfa98b9cc46092a90deccb08a618
 DIST kdemultimedia-4.8.3.tar.xz 1501996 RMD160 3cca6d3100eb4e4df86d322650717c7dcb11354b SHA1 8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e SHA256 9dbad22a853cfc3042305218035ad097b9cb1da287591ace410f9fe430e1b4c8
 EBUILD kmix-4.7.4.ebuild 667 RMD160 8e349f8bfb9066d30921cec362339aa6abbc6d9d SHA1 3b4883d1c263962f31c9f9bcef46b056e7b79646 SHA256 c83925828df39e4f3addb8ac521d688efdf47a35a9ad4f4ad98192b33ddad174
 EBUILD kmix-4.8.1.ebuild 656 RMD160 cac69d0e4fa8c462c3d15c3fb2a12c6358bea0ac SHA1 4fc60fda975e97ba8825f5999f4e3b68b20aab89 SHA256 6553eba0c188e67a3888c1e8c645b3bca5ea1c5d2ba2035de93382e4d4a64e56
-EBUILD kmix-4.8.3.ebuild 656 RMD160 bae978815cf629185941bb90cd454b796773ae9d SHA1 e7b7699e522c6575a3af46889f6908813f3d8b3d SHA256 ae7dc36efde1a5d95c92f8f2ccadda883da422ec402bf8a25f113c6175b54823
-MISC ChangeLog 24537 RMD160 ae34937a15faef2d40519e591a4030a9c7cb3e4f SHA1 f63b47bf05b96f97dee49772c3a35d105d8f8560 SHA256 2f1b6b5eb6f773d7c9de7d4f01d7b4fd24d4febfa794794ede75230f73ad3d3d
+EBUILD kmix-4.8.3.ebuild 705 RMD160 e4973d5c32d969f73dfb2ff31f74d1ca0cf75119 SHA1 7d39e9768968d9d7cb343008fab62ce46e789a7e SHA256 ac69d6f5f22b190145fb1be415d4c96af26c1b1e4b0a839c991c5a7f3ff738de
+MISC ChangeLog 24750 RMD160 f2d3d693b76acb9f2cb6b8be3e7bdf2412c7a6a4 SHA1 7f7232f242803af162d4702f8e352c90eae865e5 SHA256 3e0e7a7229cda19ba2eab493deb8ac6191f14ca7c0aaec8264bb4e05bb3082f3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPqT9aAAoJEO+t9ga+3I3aRbAH/Ap/mU7m4d9ozN7DoIZC61NQ
-nwfGhxw/TtsWDV4TENsp5E9uqdFulOajL+MF5krNtMeINidUEMFHT4/KnwRLAQHE
-iv3ZqLBoK46LocjBAixXnPkN1Zm2zI8yX0iqarxoxhgRTuop0POyTwSwjxfJOoAu
-L0IV9joRh/uc3zOyeMod/vyvcP78ZR6GEq7ktjZ0KJhF4N2H5m5tA+GlLQwGs+c3
-X+OUygebFfWyAkbbqIrEId+eSxBDxOhIHUM2TCs5nqHBmYOwMwxwe34DYhNNijJZ
-jhbhP0KtUwCgA49F1SBbLA94N7I1iwoSxv/EXvvgZvIzSGhw/kOT/t/adkkzSt4=
-=5knH
------END PGP SIGNATURE-----
diff --git a/kde-base/kmix/files/kmix-4.8.3-oss4.patch b/kde-base/kmix/files/kmix-4.8.3-oss4.patch
new file mode 100644
index 000000000000..da5e7ccf54dd
--- /dev/null
+++ b/kde-base/kmix/files/kmix-4.8.3-oss4.patch
@@ -0,0 +1,112 @@
+--- kmix/backends/mixer_oss4.cpp.org	2012-05-13 07:52:08.206663114 +0200
++++ kmix/backends/mixer_oss4.cpp	2012-05-13 09:08:36.277009292 +0200
+@@ -335,10 +335,13 @@
+ 					Volume vol (ext.maxvalue, ext.minvalue, false, isCapture);
+ 					vol.addVolumeChannels(chMask);
+ 
+-					MixDevice* md =	new MixDevice(_mixer,
++					MixDevice* md_ptr =	new MixDevice(_mixer,
+ 									QString::number(i),
+ 									name,
+ 									cType);
++                                        
++                                        shared_ptr<MixDevice> md = md_ptr->addToPool();
++                                        m_mixDevices.append(md);
+ 					
+ 					if(isCapture)
+ 					{
+@@ -360,8 +363,6 @@
+ 						m_recommendedMaster = md;
+ 						masterChosen = true;
+ 					}
+-
+-					m_mixDevices.append(md->addToPool());
+ 				}
+ 				else if ( ext.type == MIXT_HEXVALUE )
+ 				{
+@@ -369,10 +370,13 @@
+ 					Volume vol (ext.maxvalue, ext.minvalue, false, isCapture);
+ 					vol.addVolumeChannels(chMask);
+ 
+-					MixDevice* md =	new MixDevice(_mixer,
++					MixDevice* md_ptr =	new MixDevice(_mixer,
+ 								      QString::number(i),
+ 								      name,
+ 								      cType);
++                                        
++                                        shared_ptr<MixDevice> md = md_ptr->addToPool();
++                                        m_mixDevices.append(md);
+ 					
+ 					if(isCapture)
+ 					{
+@@ -388,8 +392,6 @@
+ 						m_recommendedMaster = md;
+ 						masterChosen = true;
+ 					}
+-
+-					m_mixDevices.append(md->addToPool());
+ 				}
+ 				else if ( ext.type == MIXT_ONOFF 
+ #ifdef MIXT_MUTE
+@@ -406,11 +408,15 @@
+ 						 vol.setSwitchType (Volume::SpecialSwitch);
+ 					}
+ 					
+-					MixDevice* md = new MixDevice(_mixer,
++					MixDevice* md_ptr = new MixDevice(_mixer,
+ 								      QString::number(i),
+ 							 	      name,
+ 								      cType);
+-					if(isCapture)
++                                        
++                                        shared_ptr<MixDevice> md = md_ptr->addToPool();
++                                        m_mixDevices.append(md);
++
++                                        if(isCapture)
+ 					{
+ 						md->addCaptureVolume(vol);
+ 					}
+@@ -418,8 +424,6 @@
+ 					{
+ 						md->addPlaybackVolume(vol);
+ 					}
+-
+-					m_mixDevices.append(md->addToPool());
+ 				}
+ 				else if ( ext.type == MIXT_ENUM )
+ 				{
+@@ -431,9 +435,9 @@
+ 					{
+ 						Volume vol(ext.maxvalue, ext.minvalue,
+ 									false, isCapture);
+-						vol.addVolumeChannel(VolumeChannel(Volume::MLEFT));
++						vol.addVolumeChannel(VolumeChannel(Volume::LEFT));
+ 
+-						MixDevice* md = new MixDevice (_mixer,
++						MixDevice* md_ptr = new MixDevice (_mixer,
+ 						                               QString::number(i),
+ 									       name,
+ 						                               cType);
+@@ -451,9 +455,10 @@
+ 							}
+ 							enumValuesRef.append( new QString(thisElement) );
+ 						}
+-						md->addEnums(enumValuesRef);
+-
+-						m_mixDevices.append(md->addToPool());
++						md_ptr->addEnums(enumValuesRef);
++                                        
++                                                shared_ptr<MixDevice> md = md_ptr->addToPool();
++                                                m_mixDevices.append(md);
+ 					}
+ 				}
+ 
+@@ -477,7 +482,7 @@
+ 	m_isOpen = false;
+ 	int l_i_ret = ::close(m_fd);
+ 	m_mixDevices.clear();
+-	m_recommendedMaster = NULL;
++	m_recommendedMaster.reset();
+ 	return l_i_ret;
+ }
+ 
diff --git a/kde-base/kmix/kmix-4.8.3.ebuild b/kde-base/kmix/kmix-4.8.3.ebuild
index 355bcd93ee3d..d97fed60f6f6 100644
--- a/kde-base/kmix/kmix-4.8.3.ebuild
+++ b/kde-base/kmix/kmix-4.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.8.3.ebuild,v 1.1 2012/05/03 20:07:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-4.8.3.ebuild,v 1.2 2012/05/17 18:07:22 kensington Exp $
 
 EAPI=4
 
@@ -18,6 +18,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-oss4.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with pulseaudio PulseAudio)