summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-12-29 03:19:56 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-12-29 03:19:56 +0000
commitcca83ec11359f8991dd1eb9fd0da1436bcb24401 (patch)
tree073d842c648364ebf15e615b35c589d35f86ef49 /kde-base
parentUpdate prefs to fix imap issues marking mail, bug #298044 (diff)
downloadhistorical-cca83ec11359f8991dd1eb9fd0da1436bcb24401.tar.gz
historical-cca83ec11359f8991dd1eb9fd0da1436bcb24401.tar.bz2
historical-cca83ec11359f8991dd1eb9fd0da1436bcb24401.zip
Fix patch to actually disable ALSA
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/phonon-kde/ChangeLog6
-rw-r--r--kde-base/phonon-kde/Manifest14
-rw-r--r--kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch8
3 files changed, 21 insertions, 7 deletions
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index f535b7c69398..12d3fd28142a 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/phonon-kde
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.39 2009/12/27 15:37:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.40 2009/12/29 03:19:56 abcd Exp $
+
+ 29 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+ files/phonon-kde-4.3.4-optional-alsa.patch:
+ Fix patch to actually disable ALSA
23 Dec 2009; Jonathan Callen <abcd@gentoo.org> phonon-kde-4.3.4.ebuild,
+files/phonon-kde-4.3.4-optional-alsa.patch:
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index 31d4e7b2e038..873008fbc486 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -1,7 +1,17 @@
-AUX phonon-kde-4.3.4-optional-alsa.patch 738 RMD160 d1f7eee14c9ab924bf8f0b7dd8abca246f52f7c5 SHA1 4854176d7e98b15c5863f6fecaf10d7bfb3b5722 SHA256 f5b8154eff091b432cdd002a2a4145ddf173dcc6d3bf91a5ef0a14d5e61036ee
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX phonon-kde-4.3.4-optional-alsa.patch 768 RMD160 f1ecfdc3fa256a74144387aeb367ae92844c8da8 SHA1 3d1dd78caf07c92b192237a89037c8e4afde1a91 SHA256 c4fef73f2458da524452ef9e9b7d2e42b11e508b8eedc5ed6c9b296155290285
DIST kdebase-runtime-4.3.3.tar.bz2 7329976 RMD160 03dadfbdf036a5a6118b36a943bd1e517cef8534 SHA1 43f0b96cbb3c61523fbd283d11c2a5eedde0c9a2 SHA256 18938e50630d6e5ddc3bacf1ccb7446419cd7178db88fc8b935f96e7a08f6481
DIST kdebase-runtime-4.3.4.tar.bz2 7333696 RMD160 5563dd94d3bd70ec90a44cc295d958ec296eb195 SHA1 871d23457c4a2676704722e2e3b7194d447904ee SHA256 046a41ec810ff68ff8d4111992952c91f13ec760a6bae4a62cff7b11a3fd51ba
EBUILD phonon-kde-4.3.3.ebuild 1122 RMD160 23a4c2e2e67bc1b625bd9410080241ef949f9687 SHA1 328c4438aeedb03808db3d46c0e88b85063147a2 SHA256 57162e7b569f793e0e8ed5ba0cf3ebf99c59878ab1a762608bc83bb46bbf886a
EBUILD phonon-kde-4.3.4.ebuild 1222 RMD160 0226b3fbd43256c8b961b2b1197fbb3fff1defef SHA1 9ea0f3553f16fc25f6416c7fec7f32a5dd52ba51 SHA256 42f4b0914d49de0fdd67f0725ee67162f49e5ca2d55aa936857c7a2a859b8bd1
-MISC ChangeLog 5081 RMD160 c84497c4f5e98025b91107a8573a9166f0d7ccc9 SHA1 dc63fafecb359b63eb69261f5b53231c2db1b2e2 SHA256 c53c729304614884b4b558c84b8227bed6c8a349e1d1ee2d0503d74b65c7a9d8
+MISC ChangeLog 5211 RMD160 621a85318d3f12dba14e945672d3d8ad548c828a SHA1 788a13a9ab6123bd79503c685edc06305710428f SHA256 98b49fac27a28706890de44073927908cbdc1a6e8ba5d50a10ac5722398782f1
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAks5dWQACgkQOypDUo0oQOomvACfdewnTXPnMM37yneAMgv6HDX4
+FmkAoMZgYAUDpRHa1GmD15YOzMrX0Mio
+=C9/s
+-----END PGP SIGNATURE-----
diff --git a/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch b/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch
index adc87db3fba6..8c28fd4db092 100644
--- a/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch
+++ b/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch
@@ -8,10 +8,10 @@
+ option(WITH_ALSA "Use ALSA, if found" ON)
+ if(NOT WITH_ALSA)
+ message(STATUS "Disabling ALSA support, by request")
-+ set(ALSA_FOUND)
-+ set(ASOUND_LIBRARY)
-+ set(HAVE_LIBASOUND2)
-+ set(ALSA_INCLUDES)
++ set(ALSA_FOUND FALSE)
++ set(ASOUND_LIBRARY NOTFOUND)
++ set(HAVE_LIBASOUND2 FALSE)
++ set(ALSA_INCLUDES NOTFOUND)
+ endif(NOT WITH_ALSA)
+
ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)