diff --git a/portage/kdesupport/phonon-vlc/fix windows aout selection.diff b/portage/kdesupport/phonon-vlc/fix windows aout selection.diff new file mode 100644 index 000000000..b5d9f51d5 --- /dev/null +++ b/portage/kdesupport/phonon-vlc/fix windows aout selection.diff @@ -0,0 +1,22 @@ +commit 4c9e2ce10dc47e93370a3eab1113eafcc1690b64 +Author: Harald Sitter +Date: Fri Sep 14 20:48:15 2012 +0200 + + fix windows aout selection + + the directx aout is in fact called aout_directx, so make the devicemanager + look for that rather than directx to fix audio on windows + +diff --git a/src/devicemanager.cpp b/src/devicemanager.cpp +index c9bed25..2f5d720 100644 +--- a/src/devicemanager.cpp ++++ b/src/devicemanager.cpp +@@ -232,7 +232,7 @@ void DeviceManager::updateDeviceList() + knownSoundSystems << QByteArray("alsa") + << QByteArray("oss") + << QByteArray("jack") +- << QByteArray("directx") // Windows ++ << QByteArray("aout_directx") // Windows + << QByteArray("auhal"); // Mac + foreach (const QByteArray &soundSystem, knownSoundSystems) { + if (!audioOutBackends.contains(soundSystem)) { diff --git a/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py b/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py index d8887f9cb..407a72da2 100644 --- a/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py +++ b/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py @@ -1,43 +1,45 @@ # -*- coding: utf-8 -*- import info import os import compiler from Package.CMakePackageBase import * class subinfo(info.infoclass): def setDependencies( self ): self.dependencies['kdesupport/phonon'] = 'default' self.dependencies['binary/vlc'] = 'default' if compiler.isMSVC(): self.dependencies['kdesupport/kdewin'] = 'default' def setTargets( self ): self.targets['0.3.1'] = "http://download.kde.org/download.php?url=stable/phonon-backend-vlc/0.3.1/src/phonon-backend-vlc-0.3.1.tar.bz2" self.targetInstSrc['0.3.1'] = "phonon-backend-vlc-0.3.1" self.targetDigests['0.3.1'] = 'b94dddc6f37924c101a8bab7b7a184b7d6b42d96' self.patchToApply['0.3.1'] = ("phonon-backend-vlc-0.3.1-20101223.diff", 1) self.targets['0.4.1'] = "http://download.kde.org/download.php?url=stable/phonon/phonon-backend-vlc/0.4.1/phonon-backend-vlc-0.4.1.tar.xz" self.targetInstSrc['0.4.1'] = "phonon-backend-vlc-0.4.1" self.targetDigests['0.4.1'] = 'b2957b70e1722f08a231b9e64acfafb799b52d11' self.patchToApply['0.4.1'] = [("phonon-backend-vlc-0.4.1-20111213.diff", 1),("phonon-backend-vlc-0.4.1-20111223.diff",1)] self.targets['0.5.0'] = "http://download.kde.org/download.php?url=stable/phonon/phonon-backend-vlc/0.5.0/src/phonon-backend-vlc-0.5.0.tar.xz" self.targetInstSrc['0.5.0'] = "phonon-backend-vlc-0.5.0" self.patchToApply['0.5.0'] = [("0001-Revert-stop-leaking-video-audio-abstraction.patch",1)] self.targets['0.6.0'] = "http://download.kde.org/download.php?url=stable/phonon/phonon-backend-vlc/0.6.0/src/phonon-backend-vlc-0.6.0.tar.xz" self.targetDigests['0.6.0'] = 'f66a70cd27ad49dc98eb6526d0566cfe0802774b' self.targetInstSrc['0.6.0'] = "phonon-backend-vlc-0.6.0" + self.patchToApply['0.6.0'] = [("fix windows aout selection.diff",1)] + self.svnTargets['gitHEAD'] = '[git]kde:phonon-vlc' self.shortDescription = "the vlc based phonon multimedia backend" self.defaultTarget = '0.6.0' class Package( CMakePackageBase ): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__(self) self.subinfo.options.configure.defines = '-DCMAKE_CXX_FLAGS=-DWIN32 -DPHONON_BUILDSYSTEM_DIR=\"%s;%s\" ' % (os.path.join(os.getenv('KDEROOT'),'share','phonon','buildsystem').replace('\\','/'),os.path.join(os.getenv('KDEROOT'),'share','phonon-buildsystem').replace('\\','/')) if __name__ == '__main__': Package().execute()