diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-05-17 18:07:22 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-05-17 18:07:22 +0000 |
| commit | 063142d332789636e19486d2c0f664f398b576c8 (patch) | |
| tree | 82a6d50a347511d395708447610d33971b0f5dee /kde-base/kmix | |
| parent | Alphabetize deps for last commit (diff) | |
| download | gentoo-2-063142d332789636e19486d2c0f664f398b576c8.tar.gz gentoo-2-063142d332789636e19486d2c0f664f398b576c8.tar.bz2 gentoo-2-063142d332789636e19486d2c0f664f398b576c8.zip | |
Fix build with OSS4. Patch by Franz Fellner <alpine.art.de@googlemail.com>. Fixes bug #415573.
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kmix')
| -rw-r--r-- | kde-base/kmix/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kmix/files/kmix-4.8.3-oss4.patch | 112 | ||||
| -rw-r--r-- | kde-base/kmix/kmix-4.8.3.ebuild | 4 |
3 files changed, 121 insertions, 2 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/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) |