diff options
Diffstat (limited to 'kde-apps/kmix')
-rw-r--r-- | kde-apps/kmix/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/kmix/files/kmix-4.14.3-alsa-optional.patch | 47 | ||||
-rw-r--r-- | kde-apps/kmix/kmix-4.14.3-r1.ebuild | 32 | ||||
-rw-r--r-- | kde-apps/kmix/kmix-4.14.3.ebuild | 30 |
4 files changed, 0 insertions, 110 deletions
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest index 531cca8b820c..72c207040347 100644 --- a/kde-apps/kmix/Manifest +++ b/kde-apps/kmix/Manifest @@ -1,3 +1,2 @@ DIST kmix-15.12.3.tar.xz 389228 SHA256 c1715f1ba9f6a50a9c211c99463085b16171b7c61f5df3ebf54b6e36de73d99b SHA512 b3f17191cfbbb251a7b61d64b9ac570a946987d08ab7f7fd89d6c85a4390aafff2ddbff6de9a97519e5130f8ff81eff5d6f2a02abd27fd3c5d17f96f244b2b22 WHIRLPOOL b4493bf3206a3719583f6ed4fd32014d17a16d4524dd450c5bc970b9d7ff83aa2b4115ce0f0747b94aff46a243480d81783dae6e56789812edbfea44a0234562 DIST kmix-16.04.2.tar.xz 389204 SHA256 ab5a9dc38e1558eba2b6caf2123231ecb7f682c71c9b24c9281db6b47d055424 SHA512 86102106cc48afb4dc2bd41882226230490e43c4a0bf51f5befdd36078f4ac431005c21d3f8cf00d3c2b247c6aaf0fd8e4560ea7b1ff5b2a4d83ebd9afccb063 WHIRLPOOL 09a2fa887265a7342e958822ac8d747211056ee1a4474dd41d878fdca797ed81585373b59ca1b4871aed6be79fcb5a06429a8496f8b4a301e3e7d949abf72591 -DIST kmix-4.14.3.tar.xz 379220 SHA256 d7dd97ad5ee005fa039696d88ce21a6ede2b5d795001f1d023899f5a848b6e94 SHA512 b4581a8f847618088b55710815c45a64fe22d1ea782aa57d8e724237cf4283a49d005e2c6389974e0587352d10da46718d7a696e4faafce63950288ab7b6cd62 WHIRLPOOL ac9ae7bb39d21de53eb2932720e2f0d7d6784b071343fd04a1c69de551b80a9993a6dc525c3c90643e6098bcfb6f3662dcfe4e5389194ed581cee066fca8d3e7 diff --git a/kde-apps/kmix/files/kmix-4.14.3-alsa-optional.patch b/kde-apps/kmix/files/kmix-4.14.3-alsa-optional.patch deleted file mode 100644 index 4f620fbac828..000000000000 --- a/kde-apps/kmix/files/kmix-4.14.3-alsa-optional.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 233f93b01ff05349793a8a2786750a2195f257ab -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sat Jul 11 15:48:35 2015 +0200 - - Fix build w/ optional alsa, make HAVE_LIBASOUND2 work - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c829005..17c106d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,8 +9,6 @@ include(MacroLibrary) - # Do not yet REQUIRE Phonon. Hint: As long as we do not find_package(), ${KDE4_PHONON_LIBS} will be empty below, but that should not hurt. - #find_package(Phonon REQUIRED) - --find_package(Alsa) -- - set(PA_VER "0.9.16") - macro_optional_find_package(PulseAudio "${PA_VER}") - macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "PulseAudio Audio Server" -@@ -20,8 +18,11 @@ macro_optional_find_package(Canberra) - macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" - "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback") - --alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h) -- -+find_package(Alsa) -+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) -diff --git a/backends/kmix-backends.cpp b/backends/kmix-backends.cpp -index 14ecfb3..1397099 100644 ---- a/backends/kmix-backends.cpp -+++ b/backends/kmix-backends.cpp -@@ -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/kmix-4.14.3-r1.ebuild b/kde-apps/kmix/kmix-4.14.3-r1.ebuild deleted file mode 100644 index 6bc8cffcbc95..000000000000 --- a/kde-apps/kmix/kmix-4.14.3-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_HANDBOOK="optional" -inherit kde4-base - -DESCRIPTION="KDE mixer gui" -HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="alsa debug canberra pulseaudio" - -DEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.14a ) - canberra? ( media-libs/libcanberra ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-4.14.3-alsa-optional.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package alsa) - $(cmake-utils_use_with canberra) - $(cmake-utils_use_with pulseaudio PulseAudio) - ) - - kde4-base_src_configure -} diff --git a/kde-apps/kmix/kmix-4.14.3.ebuild b/kde-apps/kmix/kmix-4.14.3.ebuild deleted file mode 100644 index 92f73d63b5dd..000000000000 --- a/kde-apps/kmix/kmix-4.14.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_HANDBOOK="optional" -inherit kde4-base - -DESCRIPTION="KDE mixer gui" -HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="alsa debug canberra pulseaudio" - -DEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.14a ) - canberra? ( media-libs/libcanberra ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.12 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with alsa) - $(cmake-utils_use_with canberra) - $(cmake-utils_use_with pulseaudio PulseAudio) - ) - - kde4-base_src_configure -} |