diff options
| -rw-r--r-- | kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch | 26 | ||||
| -rw-r--r-- | kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch | 26 | ||||
| -rw-r--r-- | kde-apps/kmix/kmix-5.9999.ebuild | 50 | ||||
| -rw-r--r-- | kde-apps/kmix/kmix-9999.ebuild | 36 |
4 files changed, 54 insertions, 84 deletions
diff --git a/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch new file mode 100644 index 00000000000..bbcb894d043 --- /dev/null +++ b/kde-apps/kmix/files/kmix-15.04.2-alsa-optional.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt 2015-06-04 23:19:26.543647639 +0200 ++++ b/CMakeLists.txt 2015-06-04 23:22:08.863655630 +0200 +@@ -79,7 +79,10 @@ + endif() + + find_package(Alsa) +-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) ++if(ALSA_FOUND) ++ alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) ++ add_definitions(-DHAVE_LIBASOUND2) ++endif(ALSA_FOUND) + + add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} ) + add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100) +--- a/backends/kmix-backends.cpp 2015-06-04 23:11:58.084625559 +0200 ++++ b/backends/kmix-backends.cpp 2015-06-04 23:12:34.194627337 +0200 +@@ -23,7 +23,9 @@ + /* This code is being #include'd from mixer.cpp */ + + #include <config.h> ++#ifdef HAVE_LIBASOUND2 + #include <config-alsa.h> ++#endif + + #include "mixer_backend.h" + #include "core/mixer.h" diff --git a/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch b/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch deleted file mode 100644 index 92c258c6119..00000000000 --- a/kde-apps/kmix/files/kmix-5.9999-alsa-optional.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/CMakeLists.txt 2015-05-16 22:31:57.555962909 +0200 -+++ b/CMakeLists.txt 2015-05-16 22:19:13.393985683 +0200 -@@ -79,7 +79,9 @@ - endif() - - find_package(Alsa) --alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) -+if(Alsa_FOUND) -+ alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) -+endif() - - add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} ) - add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100) ---- a/backends/kmix-backends.cpp 2015-05-16 22:31:36.650963532 +0200 -+++ b/backends/kmix-backends.cpp 2015-05-16 22:22:57.761978996 +0200 -@@ -23,7 +23,10 @@ - /* This code is being #include'd from mixer.cpp */ - - #include <config.h> -+ -+#if defined(HAVE_LIBASOUND2) - #include <config-alsa.h> -+#endif - - #include "mixer_backend.h" - #include "core/mixer.h" diff --git a/kde-apps/kmix/kmix-5.9999.ebuild b/kde-apps/kmix/kmix-5.9999.ebuild deleted file mode 100644 index 4158e2903b2..00000000000 --- a/kde-apps/kmix/kmix-5.9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit kde5 - -DESCRIPTION="KDE mixer gui" -HOMEPAGE="http://www.kde.org/applications/multimedia/kmix/" -KEYWORDS="" -IUSE="alsa canberra pulseaudio" - -DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - dev-libs/glib:2 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - alsa? ( >=media-libs/alsa-lib-1.0.14a ) - canberra? ( media-libs/libcanberra ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) -" -RDEPEND="${DEPEND} - !kde-base/kmix:4 -" - -PATCHES=( "${FILESDIR}/${PN}-5.9999-alsa-optional.patch" ) - -src_configure() { - local mycmakeargs=( - -DKMIX_KF5_BUILD=ON - $(cmake-utils_use_find_package alsa) - $(cmake-utils_use_find_package canberra) - $(cmake-utils_use_find_package pulseaudio PulseAudio) - ) - - kde5_src_configure -} diff --git a/kde-apps/kmix/kmix-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild index f7a8cfa568d..346ad98cf5a 100644 --- a/kde-apps/kmix/kmix-9999.ebuild +++ b/kde-apps/kmix/kmix-9999.ebuild @@ -4,27 +4,47 @@ EAPI=5 -KDE_HANDBOOK="optional" -inherit kde4-base +KDE_HANDBOOK="false" +KDE_TEST="false" +inherit kde5 -DESCRIPTION="KDE mixer gui" +DESCRIPTION="Plasma mixer gui" HOMEPAGE="http://www.kde.org/applications/multimedia/kmix/" KEYWORDS="" -IUSE="alsa debug canberra pulseaudio" +IUSE="alsa canberra pulseaudio" DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + dev-libs/glib:2 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) canberra? ( media-libs/libcanberra ) pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-15.04.2-alsa-optional.patch" ) + src_configure() { local mycmakeargs=( - $(cmake-utils_use_with alsa) - $(cmake-utils_use_with canberra) - $(cmake-utils_use_with pulseaudio PulseAudio) + -DKMIX_KF5_BUILD=ON + $(cmake-utils_use_find_package alsa) + $(cmake-utils_use_find_package canberra) + $(cmake-utils_use_find_package pulseaudio PulseAudio) ) - kde4-base_src_configure + kde5_src_configure } |