diff options
Diffstat (limited to 'kde-base/kdemultimedia/files/kdemultimedia-3.5.6-alsa-tests.patch')
| -rw-r--r-- | kde-base/kdemultimedia/files/kdemultimedia-3.5.6-alsa-tests.patch | 264 |
1 files changed, 264 insertions, 0 deletions
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.5.6-alsa-tests.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.5.6-alsa-tests.patch new file mode 100644 index 000000000000..314523506d98 --- /dev/null +++ b/kde-base/kdemultimedia/files/kdemultimedia-3.5.6-alsa-tests.patch @@ -0,0 +1,264 @@ +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/kscd/kscd.cpp +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/kscd.cpp ++++ kdemultimedia-3.5.6/kscd/kscd.cpp +@@ -108,7 +108,7 @@ KSCD::KSCD( QWidget *parent, const char + #if defined(BUILD_CDDA) + audio_systems_list + << "arts" +-#if defined(HAVE_ARTS_LIBASOUND2) ++#if defined(HAVE_LIBASOUND2) + << "alsa" + #endif + #ifdef USE_SUN_AUDIO +Index: kdemultimedia-3.5.6/arts/midi/alsamidigateway_impl.cc +=================================================================== +--- kdemultimedia-3.5.6.orig/arts/midi/alsamidigateway_impl.cc ++++ kdemultimedia-3.5.6/arts/midi/alsamidigateway_impl.cc +@@ -29,7 +29,7 @@ + /** + * compile real version if we have ALSA support, dummy version otherwise + */ +-#if defined(HAVE_ARTS_LIBASOUND2) || defined(HAVE_ARTS_LIBASOUND) ++#if defined(HAVE_LIBASOUND2) || defined(HAVE_LIBASOUND1) + + #ifdef HAVE_ALSA_ASOUNDLIB_H + #include <alsa/asoundlib.h> +@@ -57,7 +57,7 @@ protected: + }; + list<PortEntry> ports; + +-#ifdef HAVE_ARTS_LIBASOUND2 ++#ifdef HAVE_LIBASOUND2 + /* ALSA-0.9 specific code */ + int alsaOpen() { + return snd_seq_open(&seq, "hw", SND_SEQ_OPEN_DUPLEX, 0); +Index: kdemultimedia-3.5.6/arts/midi/alsamidiport_impl.cc +=================================================================== +--- kdemultimedia-3.5.6.orig/arts/midi/alsamidiport_impl.cc ++++ kdemultimedia-3.5.6/arts/midi/alsamidiport_impl.cc +@@ -22,10 +22,10 @@ + + #include "alsamidiport_impl.h" + +-#if defined(HAVE_ARTS_LIBASOUND2) || defined(HAVE_ARTS_LIBASOUND) ++#if defined(HAVE_LIBASOUND2) || defined(HAVE_LIBASOUND1) + #include <arts/debug.h> + +-#ifdef HAVE_ARTS_LIBASOUND ++#ifdef HAVE_LIBASOUND1 + #define snd_seq_queue_status_alloca(x) \ + *x = (snd_seq_queue_status_t *)alloca(sizeof(snd_seq_queue_status_t)) + #define snd_seq_queue_status_get_tick_time(x) x->tick +@@ -218,7 +218,7 @@ void AlsaMidiPort_impl::close() + + void AlsaMidiPort_impl::flushAlsa() + { +-#ifdef HAVE_ARTS_LIBASOUND2 ++#ifdef HAVE_LIBASOUND2 + snd_seq_drain_output(alsaSeq); + #else + int err; +Index: kdemultimedia-3.5.6/arts/midi/alsamidiport_impl.h +=================================================================== +--- kdemultimedia-3.5.6.orig/arts/midi/alsamidiport_impl.h ++++ kdemultimedia-3.5.6/arts/midi/alsamidiport_impl.h +@@ -30,7 +30,7 @@ + /** + * compile real version if we have ALSA support, dummy version otherwise + */ +-#if defined(HAVE_ARTS_LIBASOUND2) || defined(HAVE_ARTS_LIBASOUND) ++#if defined(HAVE_LIBASOUND2) || defined(HAVE_LIBASOUND1) + + #ifdef HAVE_ALSA_ASOUNDLIB_H + #include <alsa/asoundlib.h> +@@ -81,5 +81,5 @@ public: + }; + + } +-#endif /* HAVE_ARTS_LIBASOUND2 */ ++#endif /* HAVE_LIBASOUND2 */ + #endif /* ARTS_ALSAMIDIPORT_IMPL_H */ +Index: kdemultimedia-3.5.6/arts/midi/Makefile.am +=================================================================== +--- kdemultimedia-3.5.6.orig/arts/midi/Makefile.am ++++ kdemultimedia-3.5.6/arts/midi/Makefile.am +@@ -30,7 +30,7 @@ libartsmidi_la_SOURCES = midimanager_imp + alsamidiport_impl.cc midisyncgroup_impl.cc timestampmath.cc + libartsmidi_la_COMPILE_FIRST = artsmidi.h + +-libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow $(ARTS_LIBASOUND) ++libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow $(ALSA_LIBS) + libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \ + -no-undefined + +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 + +Index: kdemultimedia-3.5.6/kscd/libwm/audio/audio_alsa.c +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/libwm/audio/audio_alsa.c ++++ kdemultimedia-3.5.6/kscd/libwm/audio/audio_alsa.c +@@ -18,7 +18,7 @@ + + #include <config.h> + +-#if defined(HAVE_ARTS_LIBASOUND2) ++#if defined(HAVE_LIBASOUND2) + + #include <alsa/asoundlib.h> + #include "audio.h" +Index: kdemultimedia-3.5.6/kscd/libwm/audio/audio.c +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/libwm/audio/audio.c ++++ kdemultimedia-3.5.6/kscd/libwm/audio/audio.c +@@ -16,7 +16,7 @@ struct audio_oops* setup_soundsystem(con + if(!strcmp(ss, "arts")) + return setup_arts(dev, ctl); + #endif +-#if defined(HAVE_ARTS_LIBASOUND2) ++#if defined(HAVE_LIBASOUND2) + if(!strcmp(ss, "alsa")) + return setup_alsa(dev, ctl); + #endif +Index: kdemultimedia-3.5.6/kscd/libwm/Makefile.am +=================================================================== +--- kdemultimedia-3.5.6.orig/kscd/libwm/Makefile.am ++++ kdemultimedia-3.5.6/kscd/libwm/Makefile.am +@@ -10,7 +10,7 @@ INCLUDES = $(all_includes) + noinst_LTLIBRARIES = libworkman.la + + libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries) +-libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND) ++libworkman_la_LIBADD = audio/libworkmanaudio.la $(ALSA_LIBS) + + libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\ + database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\ |