diff options
| -rw-r--r-- | kde-base/kmix/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch | 131 | ||||
| -rw-r--r-- | kde-base/kmix/kmix-3.5.10.ebuild | 21 |
3 files changed, 5 insertions, 153 deletions
diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog index 942a7d1d8fb2..9df89d8e63cf 100644 --- a/kde-base/kmix/ChangeLog +++ b/kde-base/kmix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kmix # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.136 2009/11/08 23:46:02 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.137 2009/11/19 21:17:44 ssuominen Exp $ + + 19 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> + -files/kmix-3.5.6-alsa-tests.patch, -kmix-3.5.10.ebuild: + Remove KDE 3.5.10. 08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -kmix-4.3.2.ebuild: Drop KDE 4.3.2 diff --git a/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch b/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch deleted file mode 100644 index 898de4454612..000000000000 --- a/kde-base/kmix/files/kmix-3.5.6-alsa-tests.patch +++ /dev/null @@ -1,131 +0,0 @@ -Index: kdemultimedia-3.5.6/configure.in.in -=================================================================== ---- kdemultimedia-3.5.6.orig/configure.in.in -+++ kdemultimedia-3.5.6/configure.in.in -@@ -152,88 +152,19 @@ AC_DEFUN([KDE_CHECK_OSSAUDIO], - - AC_DEFUN([KDE_CHECK_ALSA], - [ -- have_alsa=no -+ AC_CHECK_LIB([asound], [snd_pcm_open], [have_alsa05=yes], [have_alsa04=no]) - -- AC_CHECK_HEADERS([sys/asoundlib.h alsa/asoundlib.h], -- [have_alsa=yes]) -+ PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa09=yes], [have_alsa09=no]) - -- AC_CHECK_LIB(asound, snd_seq_create_simple_port, -- [:], [have_alsa=no]) -- -- AC_LANG_SAVE -- AC_LANG_C -- if test "x$have_alsa" = xyes; then -- AC_TRY_COMPILE([ -- #include "confdefs.h" -- #ifdef HAVE_SYS_ASOUNDLIB_H -- #include <sys/asoundlib.h> -- #endif -- #ifdef HAVE_ALSA_ASOUNDLIB_H -- #include <alsa/asoundlib.h> -- #endif -- ],[ -- #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5) -- /* we have ALSA 0.5.x */ -- #else -- #error not ALSA 0.5.x -- #endif -- ], -- have_alsa_0_5=yes) -- -- AC_TRY_COMPILE([ -- #include "confdefs.h" -- #ifdef HAVE_SYS_ASOUNDLIB_H -- #include <sys/asoundlib.h> -- #endif -- #ifdef HAVE_ALSA_ASOUNDLIB_H -- #include <alsa/asoundlib.h> -- #endif -- ],[ -- #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9) -- /* we have ALSA 0.9.x */ -- #else -- #error not ALSA 0.9.x -- #endif -- ], -- have_alsa_0_9=yes) -- -- AC_TRY_COMPILE([ -- #include "confdefs.h" -- #ifdef HAVE_SYS_ASOUNDLIB_H -- #include <sys/asoundlib.h> -- #endif -- #ifdef HAVE_ALSA_ASOUNDLIB_H -- #include <alsa/asoundlib.h> -- #endif -- ],[ -- #if (SND_LIB_MAJOR == 1) -- /* we have ALSA 1.x */ -- #else -- #error not ALSA 1.x -- #endif -- ], -- have_alsa_1=yes) -- fi -- AC_LANG_RESTORE -- -- if test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes; then -- # for kmix/ and akode/ -- LIBASOUND="-lasound" -+ if test "x$have_alsa09" = "xyes"; then -+ have_alsa="yes" - AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) -- -- # for arts/ -- ARTS_LIBASOUND="-lasound" -- AC_DEFINE(HAVE_ARTS_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) -+ elif test "x$have_alsa05" = "xyes"; then -+ have_alsa="yes" -+ AC_DEFINE(HAVE_LIBASOUND1, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)]) -+ ALSA_LIBS="-lasound" -+ AC_SUBST([ALSA_LIBS]) - fi -- -- if test "x$have_alsa_0_5" = xyes; then -- # for arts/ -- ARTS_LIBASOUND="-lasound" -- AC_DEFINE(HAVE_ARTS_LIBASOUND, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)]) -- fi -- -- AC_SUBST(LIBASOUND) -- AC_SUBST(ARTS_LIBASOUND) - ]) - - AC_DEFUN([KDE_CHECK_CDPARANOIA], -Index: kdemultimedia-3.5.6/kmix/Makefile.am -=================================================================== ---- kdemultimedia-3.5.6.orig/kmix/Makefile.am -+++ kdemultimedia-3.5.6/kmix/Makefile.am -@@ -25,13 +25,13 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmix - volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \ - kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp - --kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS) - kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version - - kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \ - mixertoolbox.cpp mixer_backend.cpp - --kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS) - kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version - - kmix_panelapplet_la_SOURCES = kmixapplet.cpp \ -@@ -42,7 +42,7 @@ kmix_panelapplet_la_SOURCES = kmixapplet - kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp - - kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module --kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -+kmix_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(ALSA_LIBS) - - xdg_apps_DATA = kmix.desktop - diff --git a/kde-base/kmix/kmix-3.5.10.ebuild b/kde-base/kmix/kmix-3.5.10.ebuild deleted file mode 100644 index f2cdaa72448e..000000000000 --- a/kde-base/kmix/kmix-3.5.10.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.5.10.ebuild,v 1.8 2009/10/12 05:40:36 abcd Exp $ - -KMNAME=kdemultimedia -EAPI="1" -inherit kde-meta eutils - -DESCRIPTION="aRts mixer gui" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="alsa" - -DEPEND="alsa? ( media-libs/alsa-lib )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/kmix-3.5.6-alsa-tests.patch" ) - -src_compile() { - local myconf="$(use_with alsa)" - kde-meta_src_compile -} |