diff options
| -rw-r--r-- | kde-base/phonon-kde/Manifest | 5 | ||||
| -rw-r--r-- | kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch | 19 | ||||
| -rw-r--r-- | kde-base/phonon-kde/phonon-kde-4.4.9999.ebuild | 14 | ||||
| -rw-r--r-- | kde-base/phonon-kde/phonon-kde-9999.ebuild | 14 |
4 files changed, 4 insertions, 48 deletions
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest index 75d5a5d611c..03524716e5b 100644 --- a/kde-base/phonon-kde/Manifest +++ b/kde-base/phonon-kde/Manifest @@ -1,4 +1,3 @@ -AUX phonon-kde-4.3.4-optional-alsa.patch 768 RMD160 f1ecfdc3fa256a74144387aeb367ae92844c8da8 SHA1 3d1dd78caf07c92b192237a89037c8e4afde1a91 SHA256 c4fef73f2458da524452ef9e9b7d2e42b11e508b8eedc5ed6c9b296155290285 -EBUILD phonon-kde-4.4.9999.ebuild 789 RMD160 cb4a66691f2119894f0564921b5ecfdef44f3569 SHA1 988c54a8a06c497e8b1c40113ceb9a3da595cdd3 SHA256 5c3f027c045e34e69f8a5728c2ccf4a9b92c13ef60c73c3ac9482338147dd7ba -EBUILD phonon-kde-9999.ebuild 789 RMD160 cb4a66691f2119894f0564921b5ecfdef44f3569 SHA1 988c54a8a06c497e8b1c40113ceb9a3da595cdd3 SHA256 5c3f027c045e34e69f8a5728c2ccf4a9b92c13ef60c73c3ac9482338147dd7ba +EBUILD phonon-kde-4.4.9999.ebuild 562 RMD160 f5fc283523af4889968bc5d0545059ce0daa477d SHA1 e6cad8d50d4ce538638f6a82c33b509b7cc7c7d1 SHA256 58689bbf684018395a275cd120fe16a9a52840c84411114c0dd909c17f574c1c +EBUILD phonon-kde-9999.ebuild 562 RMD160 f5fc283523af4889968bc5d0545059ce0daa477d SHA1 e6cad8d50d4ce538638f6a82c33b509b7cc7c7d1 SHA256 58689bbf684018395a275cd120fe16a9a52840c84411114c0dd909c17f574c1c MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a 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 deleted file mode 100644 index 8c28fd4db09..00000000000 --- a/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- phonon-kde-4.3.4.orig/phonon/CMakeLists.txt -+++ phonon-kde-4.3.4/phonon/CMakeLists.txt -@@ -14,6 +14,16 @@ else(KDE4_DISABLE_MULTIMEDIA) - macro_log_feature(_phonon_version_ok "Phonon" "Phonon library" "svn.kde.org/home/kde/trunk/kdesupport/phonon" TRUE "${PHONON_MIN_VERSION}" "STRONGLY RECOMMENDED: Required for playing audio and video throughout KDE") - - FIND_PACKAGE(Alsa) -+ -+ option(WITH_ALSA "Use ALSA, if found" ON) -+ if(NOT WITH_ALSA) -+ message(STATUS "Disabling ALSA support, by request") -+ 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) - - if(NOT ALSA_FOUND) diff --git a/kde-base/phonon-kde/phonon-kde-4.4.9999.ebuild b/kde-base/phonon-kde/phonon-kde-4.4.9999.ebuild index 1bb4173611d..f3ab3581450 100644 --- a/kde-base/phonon-kde/phonon-kde-4.4.9999.ebuild +++ b/kde-base/phonon-kde/phonon-kde-4.4.9999.ebuild @@ -21,21 +21,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-4.3.4-optional-alsa.patch -) - -src_prepare() { - kde4-meta_src_prepare - - # Don't build tests - they require OpenGL - sed -e 's/add_subdirectory(tests)//' \ - -i phonon/CMakeLists.txt || die "Failed to disable tests" - -} - src_configure() { mycmakeargs=( + -DBUILD_tests=OFF $(cmake-utils_use_with alsa) $(cmake-utils_use_with xine) ) diff --git a/kde-base/phonon-kde/phonon-kde-9999.ebuild b/kde-base/phonon-kde/phonon-kde-9999.ebuild index 1bb4173611d..f3ab3581450 100644 --- a/kde-base/phonon-kde/phonon-kde-9999.ebuild +++ b/kde-base/phonon-kde/phonon-kde-9999.ebuild @@ -21,21 +21,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-4.3.4-optional-alsa.patch -) - -src_prepare() { - kde4-meta_src_prepare - - # Don't build tests - they require OpenGL - sed -e 's/add_subdirectory(tests)//' \ - -i phonon/CMakeLists.txt || die "Failed to disable tests" - -} - src_configure() { mycmakeargs=( + -DBUILD_tests=OFF $(cmake-utils_use_with alsa) $(cmake-utils_use_with xine) ) |