Fix headers inclusion, closes bug #165759.

(Portage version: 2.1.2-r8)

2 files changed, 59 insertions, 17 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 5fbf3bc25c7e..e33f65e7b65c 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.242 2007/02/07 02:15:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.243 2007/02/07 14:00:47 flameeyes Exp $
+
+  07 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  files/kdemultimedia-3.5.6-alsa-tests.patch:
+  Fix headers inclusion, closes bug #165759.
 
   07 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   +files/kdemultimedia-3.5.6-alsa-tests.patch, kdemultimedia-3.5.6.ebuild:
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
index 314523506d98..dfed23d2f686 100644
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.5.6-alsa-tests.patch
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.5.6-alsa-tests.patch
@@ -2,7 +2,7 @@ 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],
+@@ -152,88 +152,22 @@ AC_DEFUN([KDE_CHECK_OSSAUDIO],
  
  AC_DEFUN([KDE_CHECK_ALSA],
  [
@@ -82,21 +82,23 @@ Index: kdemultimedia-3.5.6/configure.in.in
 -    # 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
+-  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
--
++  elif test "x$have_alsa05" = "xyes"; then
++    have_alsa="yes"
++    AC_CEHCK_HEADERS([sys/asoundlib.h])
++    AC_DEFINE(HAVE_LIBASOUND1, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)])
++    ALSA_LIBS="-lasound"
+   fi
+ 
 -  AC_SUBST(LIBASOUND)
 -  AC_SUBST(ARTS_LIBASOUND)
++  AC_SUBST([ALSA_CFLAGS])
++  AC_SUBST([ALSA_LIBS])
  ])
  
  AC_DEFUN([KDE_CHECK_CDPARANOIA],
@@ -117,15 +119,23 @@ 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 @@
+@@ -29,12 +29,12 @@
  /**
   * 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>
+-#ifdef HAVE_ALSA_ASOUNDLIB_H
+-#include <alsa/asoundlib.h>
+-#elif defined(HAVE_SYS_ASOUNDLIB_H)
++#ifdef HAVE_SYS_ASOUNDLIB_H
+ #include <sys/asoundlib.h>
++#else
++#include <asoundlib.h>
+ #endif
+ 
+ #include "alsamidiport_impl.h"
 @@ -57,7 +57,7 @@ protected:
  	};
  	list<PortEntry> ports;
@@ -165,15 +175,23 @@ 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 @@
+@@ -30,12 +30,12 @@
  /**
   * 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>
+-#ifdef HAVE_ALSA_ASOUNDLIB_H
+-#include <alsa/asoundlib.h>
+-#elif defined(HAVE_SYS_ASOUNDLIB_H)
++#ifdef HAVE_SYS_ASOUNDLIB_H
+ #include <sys/asoundlib.h>
++#else
++#include <asoundlib.h>
+ #endif
+ 
+ #include "artsmidi.h"
 @@ -81,5 +81,5 @@ public:
  };
  
@@ -185,11 +203,12 @@ 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
+@@ -30,7 +30,8 @@ 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_CFLAGS = $(ALSA_CFLAGS)
 +libartsmidi_la_LIBADD = libartsmidi_idl.la -lartsflow $(ALSA_LIBS)
  libartsmidi_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
    -no-undefined
@@ -262,3 +281,22 @@ Index: kdemultimedia-3.5.6/kscd/libwm/Makefile.am
  
  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\
+Index: kdemultimedia-3.5.6/mpg123_artsplugin/mpg123/audio.h
+===================================================================
+--- kdemultimedia-3.5.6.orig/mpg123_artsplugin/mpg123/audio.h
++++ kdemultimedia-3.5.6/mpg123_artsplugin/mpg123/audio.h
+@@ -40,11 +40,10 @@ enum { DECODE_TEST, DECODE_AUDIO, DECODE
+ #include <dmedia/audio.h>
+ #endif
+ 
+-
+-#ifdef HAVE_ALSA_ASOUNDLIB_H
+-#include <alsa/asoundlib.h>
+-#elif defined(HAVE_SYS_ASOUNDLIB_H)
++#ifdef HAVE_SYS_ASOUNDLIB_H
+ #include <sys/asoundlib.h>
++#else
++#include <asoundlib.h>
+ #endif
+ 
+ struct audio_info_struct