diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-01-03 13:58:35 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-01-03 13:58:35 +0000 |
| commit | e007f5829bd6893e19d2965cc14e99dd9fb8ff26 (patch) | |
| tree | 8186dd4327c9d96e28b66badd3e2ad24821fc66c /kde-base/arts/files | |
| parent | Adding amd64 keyword (diff) | |
| download | historical-e007f5829bd6893e19d2965cc14e99dd9fb8ff26.tar.gz historical-e007f5829bd6893e19d2965cc14e99dd9fb8ff26.tar.bz2 historical-e007f5829bd6893e19d2965cc14e99dd9fb8ff26.zip | |
add patches to make arts work with alsa 1.0
Diffstat (limited to 'kde-base/arts/files')
| -rw-r--r-- | kde-base/arts/files/arts-1.1.4-alsafix.diff | 48 | ||||
| -rw-r--r-- | kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff | 48 |
2 files changed, 96 insertions, 0 deletions
diff --git a/kde-base/arts/files/arts-1.1.4-alsafix.diff b/kde-base/arts/files/arts-1.1.4-alsafix.diff new file mode 100644 index 000000000000..09e6aa68617b --- /dev/null +++ b/kde-base/arts/files/arts-1.1.4-alsafix.diff @@ -0,0 +1,48 @@ +--- arts/configure.in.in 2003/09/03 00:02:52 1.81.2.7 ++++ arts/configure.in.in 2003/11/24 15:53:20 1.81.2.8 +@@ -497,6 +497,26 @@ AC_DEFUN([AC_CHECK_LIBASOUND], + #include <alsa/asoundlib.h> + #endif + ],[ ++ #if (SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0) ++ /* we have ALSA 1.x */ ++ #else ++ #error not ALSA 1.x ++ #endif ++ ], ++ kde_has_alsa_1_0=yes, ++ kde_has_alsa_1_0=no) ++ fi ++ ++ if test "x$kde_has_asoundlib" = "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 +@@ -523,6 +543,18 @@ AC_DEFUN([AC_CHECK_LIBASOUND], + AC_DEFINE(HAVE_SND_PCM_RESUME, 1, + [Define if libasound has snd_pcm_resume()])]) + fi ++ if test "x$kde_has_alsa_1_0" = "xyes"; then ++ LIBASOUND="-lasound" ++ AC_DEFINE(HAVE_LIBASOUND2, 1, ++ [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) ++ AC_DEFINE(ALSA_PCM_OLD_SW_PARAMS_API, 1, ++ [Define if you have alsa 1.x]) ++ AC_DEFINE(ALSA_PCM_OLD_HW_PARAMS_API, 1, ++ [Define if you have alsa 1.x]) ++ AC_CHECK_LIB(asound,snd_pcm_resume,[ ++ AC_DEFINE(HAVE_SND_PCM_RESUME, 1, ++ [Define if libasound has snd_pcm_resume()])]) ++ fi + ]) + fi + AC_SUBST(LIBASOUND) diff --git a/kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff b/kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff new file mode 100644 index 000000000000..010d261a27c6 --- /dev/null +++ b/kde-base/arts/files/arts-1.2.0_beta2-alsafix.diff @@ -0,0 +1,48 @@ +--- arts/configure.in.in 2003/08/28 17:28:59 1.94 ++++ arts/configure.in.in 2003/11/24 20:13:09 1.95 +@@ -549,6 +549,26 @@ AC_DEFUN([AC_CHECK_LIBASOUND], + #include <alsa/asoundlib.h> + #endif + ],[ ++ #if (SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0) ++ /* we have ALSA 1.x */ ++ #else ++ #error not ALSA 1.x ++ #endif ++ ], ++ kde_has_alsa_1_0=yes, ++ kde_has_alsa_1_0=no) ++ fi ++ ++ if test "x$kde_has_asoundlib" = "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 +@@ -575,6 +595,18 @@ AC_DEFUN([AC_CHECK_LIBASOUND], + AC_DEFINE(HAVE_SND_PCM_RESUME, 1, + [Define if libasound has snd_pcm_resume()])]) + fi ++ if test "x$kde_has_alsa_1_0" = "xyes"; then ++ LIBASOUND="-lasound" ++ AC_DEFINE(HAVE_LIBASOUND2, 1, ++ [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)]) ++ AC_DEFINE(ALSA_PCM_OLD_SW_PARAMS_API, 1, ++ [Define if you have alsa 1.x]) ++ AC_DEFINE(ALSA_PCM_OLD_HW_PARAMS_API, 1, ++ [Define if you have alsa 1.x]) ++ AC_CHECK_LIB(asound,snd_pcm_resume,[ ++ AC_DEFINE(HAVE_SND_PCM_RESUME, 1, ++ [Define if libasound has snd_pcm_resume()])]) ++ fi + ]) + fi + AC_SUBST(LIBASOUND) |