Fix headers inclusion, closes bug #165759.

Package-Manager: portage-2.1.2-r8

3 files changed, 70 insertions, 28 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/Manifest b/kde-base/kdemultimedia/Manifest
index 2ccca94a0f53..c40e5f88b915 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -5,10 +5,10 @@ AUX kdemultimedia-3.5.5+flac-1.1.3.patch 2456 RMD160 67dfbe88872adb5fc2064ad0cf5
 MD5 72791ea8b5767cec50d02375322a2315 files/kdemultimedia-3.5.5+flac-1.1.3.patch 2456
 RMD160 67dfbe88872adb5fc2064ad0cf545931a895500f files/kdemultimedia-3.5.5+flac-1.1.3.patch 2456
 SHA256 bb337df8f696f49f1d121ca59113c95f7aef788bfd574ab20fdaf8c7e090021b files/kdemultimedia-3.5.5+flac-1.1.3.patch 2456
-AUX kdemultimedia-3.5.6-alsa-tests.patch 9261 RMD160 f6db3ae822eec5cf2dd4e42e9d02a97d0dab4ade SHA1 5988c8ac825b3493290a601c9bb48633e36d9735 SHA256 2f928e6bb2a88f9b6778ebbb74ed239f3b9a700584572460cd65f3d118719380
-MD5 e94f596d8acdbf5e654f6bd1b48e8665 files/kdemultimedia-3.5.6-alsa-tests.patch 9261
-RMD160 f6db3ae822eec5cf2dd4e42e9d02a97d0dab4ade files/kdemultimedia-3.5.6-alsa-tests.patch 9261
-SHA256 2f928e6bb2a88f9b6778ebbb74ed239f3b9a700584572460cd65f3d118719380 files/kdemultimedia-3.5.6-alsa-tests.patch 9261
+AUX kdemultimedia-3.5.6-alsa-tests.patch 10263 RMD160 ad9932ddc8e80bf5185c1ad397697fd33ff22e3c SHA1 c86ee7466c5f2bc3762aef3dbc4aa94ec21d7f86 SHA256 9c77d3f7fbacaee0316e3b0aeaa4a523187400718968a3d2028e891750441945
+MD5 9f5425527d112f4b4cadc68c7ad19343 files/kdemultimedia-3.5.6-alsa-tests.patch 10263
+RMD160 ad9932ddc8e80bf5185c1ad397697fd33ff22e3c files/kdemultimedia-3.5.6-alsa-tests.patch 10263
+SHA256 9c77d3f7fbacaee0316e3b0aeaa4a523187400718968a3d2028e891750441945 files/kdemultimedia-3.5.6-alsa-tests.patch 10263
 DIST kdemultimedia-3.5.5.tar.bz2 6287234 RMD160 c31d81efeb02cea29048fbdefcb8c4f13726fded SHA1 8ddc3174d400827e58e2e5cf87a5bd279a6bfdc1 SHA256 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c
 DIST kdemultimedia-3.5.6.tar.bz2 6291692 RMD160 7411019e2765f740ad0f3fd592e74f62e04b8387 SHA1 030ca0b5e79f04c6baa99108f1c871f194effee7 SHA256 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719
 EBUILD kdemultimedia-3.5.5.ebuild 2750 RMD160 7219d8046ef456f97dfc1524d4d4c8bdef37b9a3 SHA1 6824139bc9bcf039180c3c39b4d10ef448519bf3 SHA256 c7afd4f1bd6c8eb5b0ca0001656ed3837e1507fcfdd809e4de24693a893c5988
@@ -19,10 +19,10 @@ EBUILD kdemultimedia-3.5.6.ebuild 2766 RMD160 02a5d589e315fbefdb47a41e654ee4899a
 MD5 256c720f9d265c801e8861f301a72314 kdemultimedia-3.5.6.ebuild 2766
 RMD160 02a5d589e315fbefdb47a41e654ee4899ab90a5a kdemultimedia-3.5.6.ebuild 2766
 SHA256 3202dd60eb9a78d1a155bf73a434eeb716530548ca9beadf3c05509dc9ce2755 kdemultimedia-3.5.6.ebuild 2766
-MISC ChangeLog 34834 RMD160 f3c0dd1b11599af04c3327b53d594990693398e2 SHA1 1a0a0b44ad07f187f5561b67367cde8450e02923 SHA256 42f3dc5cad0851f9d6e676546a570e736109081791a64605bdb8b52ea6eaee7e
-MD5 458e3b780e84b488d583ad5f69747bce ChangeLog 34834
-RMD160 f3c0dd1b11599af04c3327b53d594990693398e2 ChangeLog 34834
-SHA256 42f3dc5cad0851f9d6e676546a570e736109081791a64605bdb8b52ea6eaee7e ChangeLog 34834
+MISC ChangeLog 34979 RMD160 9344433cf3983bd65b44211f0e7c4acfea4eee8d SHA1 1b4b23e9fcb87c4d27320e31e46141ff600f9a8a SHA256 1aa0ca23a9cc3af4eb1378a171cc8d7b0b3b0496f12e114c2fa7e3ae45541842
+MD5 57c67632a38f17a9478db59f55fb65bf ChangeLog 34979
+RMD160 9344433cf3983bd65b44211f0e7c4acfea4eee8d ChangeLog 34979
+SHA256 1aa0ca23a9cc3af4eb1378a171cc8d7b0b3b0496f12e114c2fa7e3ae45541842 ChangeLog 34979
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -36,7 +36,7 @@ SHA256 8c8f0b56dd810d9202f532206814eed4c4ff4e6062a88e0bbee4523b8cf5f4d7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFyTY4AiZjviIA2XgRAvZ8AKCBev7NGWrmjw6vI5AB9EWfKTyA9QCfWHWO
-SM6JdK7+ygHrMBKudk0CAdo=
-=lhc4
+iD8DBQFFyduWAiZjviIA2XgRAsTnAKCq8sIQR+JRgiXt52IMKDin1+YaSwCgvZDk
+VbxMb4L+ekgoICzu92vmT5w=
+=KCjV
 -----END PGP SIGNATURE-----
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