added ppc-macos patch. fixes dyld linking errors

4 files changed, 78 insertions, 6 deletions

diff --git a/media-libs/libao/ChangeLog b/media-libs/libao/ChangeLog
index 8ad930069fa8..02f9a227071e 100644
--- a/media-libs/libao/ChangeLog
+++ b/media-libs/libao/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libao
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.43 2004/11/06 14:40:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.44 2004/11/13 01:52:19 kito Exp $
+
+  12 Nov 2004; Kito <kito@gentoo.org> +files/libao-0.8.5-ppc-macos.patch,
+  libao-0.8.5.ebuild:
+  added ppc-macos patch
 
   06 Nov 2004; Lars Weiler <pylon@gentoo.org> libao-0.8.5.ebuild:
   Stable on ppc.
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index a7a80607debf..1cec95d5daa3 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,8 +1,8 @@
-MD5 e533eff36a6d1c6bc50889e32acdbd56 ChangeLog 5804
+MD5 1c55ca17e4917a7327c222c1bf397f65 ChangeLog 5924
 MD5 947d69b69006fd57864eae28d8e995ba libao-0.8.3-r1.ebuild 846
 MD5 90ada40c24caa5fca756bf99769a9f1c libao-0.8.4-r1.ebuild 1279
 MD5 36a7e2c9bd6b7c962a0e66844c9c1d6c libao-0.8.4.ebuild 874
-MD5 b981676e1dfe5da0f3e4d2908e1229e6 libao-0.8.5.ebuild 1160
+MD5 b4bf157c9be9db02cb78f7012197e07d libao-0.8.5.ebuild 1223
 MD5 c3f0408a07f0c5d2af3ebcffcd836154 metadata.xml 257
 MD5 e379fe3da46646e9aad3e91faea68606 files/alsa-1.0.patch 278
 MD5 5d49f3e442bd95b0fe757ce978db12f9 files/digest-libao-0.8.3-r1 63
@@ -11,3 +11,4 @@ MD5 1c57b32742f5d9c82ff22b45b1f5865e files/digest-libao-0.8.4-r1 63
 MD5 e2d17570d5e260a709cfe3715107d94d files/digest-libao-0.8.5 63
 MD5 7136898ef15fe566b6e7dd2b72183df1 files/libao-0.8.3-r1.patch 671
 MD5 2a007685813f036e268b422d430f1450 files/libao-0.8.4-esd.patch 437
+MD5 91ea6d44f5feb641704b813186508a0d files/libao-0.8.5-ppc-macos.patch 3038
diff --git a/media-libs/libao/files/libao-0.8.5-ppc-macos.patch b/media-libs/libao/files/libao-0.8.5-ppc-macos.patch
new file mode 100644
index 000000000000..d0ade8a794bd
--- /dev/null
+++ b/media-libs/libao/files/libao-0.8.5-ppc-macos.patch
@@ -0,0 +1,66 @@
+diff -uNr libao-0.8.5/configure libao-0.8.5-new/configure
+--- libao-0.8.5/configure	Fri Mar 19 09:49:41 2004
++++ libao-0.8.5-new/configure	Fri Nov 12 16:01:29 2004
+@@ -5873,7 +5873,7 @@
+       allow_undefined_flag='-undefined suppress'
+       ;;
+     *) # Darwin 1.3 on
+-      allow_undefined_flag='-flat_namespace -undefined suppress'
++      allow_undefined_flag='-undefined dynamic_lookup'
+       ;;
+     esac
+     # FIXME: Relying on posixy $() will cause problems for
+@@ -8081,9 +8081,10 @@
+                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
+         *-darwin*)
+                 PLUGIN_LDFLAGS="-module -avoid-version"
+-                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
+-                CFLAGS="-D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
+-                PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
++                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
++                CFLAGS="-D__NO_MATH_INLINES -fsigned-char"
++                LIBS="-Wl,-framework -Wl,CoreAudio"
++                PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+         *)
+                 PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
+                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+@@ -8184,7 +8185,7 @@
+ 	DLOPEN_FLAG='(RTLD_LAZY)'
+ 	SHARED_LIB_EXT='.sl'
+ 	;;
+-    *openbsd* | *netbsd* | *solaris2.7)
++    *darwin* | *openbsd* | *netbsd* | *solaris2.7)
+ 	DLOPEN_FLAG='(RTLD_LAZY)'
+ 	SHARED_LIB_EXT='.so'
+ 	;;
+diff -uNr libao-0.8.5/src/plugins/macosx/ao_macosx.c libao-0.8.5-new/src/plugins/macosx/ao_macosx.c
+--- libao-0.8.5/src/plugins/macosx/ao_macosx.c	Tue Jun 24 07:15:00 2003
++++ libao-0.8.5-new/src/plugins/macosx/ao_macosx.c	Fri Nov 12 16:08:25 2004
+@@ -173,6 +173,27 @@
+ 	return 0;
+     }
+ 
++	if (internal->outputStreamBasicDescription.mChannelsPerFrame != format->channels)
++	{
++		internal->outputStreamBasicDescription.mChannelsPerFrame = format->channels;
++		internal->outputStreamBasicDescription.mBytesPerFrame =
++			internal->outputStreamBasicDescription.mChannelsPerFrame * sizeof (float);
++		internal->outputStreamBasicDescription.mBytesPerPacket =
++			internal->outputStreamBasicDescription.mBytesPerFrame *
++			internal->outputStreamBasicDescription.mFramesPerPacket;
++		status = AudioDeviceSetProperty(internal->outputDeviceID, 0, 0, 0,
++			kAudioDevicePropertyStreamFormat,
++			sizeof (internal->outputStreamBasicDescription),
++			&internal->outputStreamBasicDescription);
++		if (status != noErr)
++		{
++			fprintf(stderr, "ao_macosx_open: AudioDeviceSetProperty returned %.*s when setting kAudioDevicePropertyStreamFormat\n",
++				(int) sizeof (status), (char *) &status);
++			return 0;
++		}
++	}
++
++
+     fprintf(stderr, "hardware format...\n");
+     fprintf(stderr, "%f mSampleRate\n", internal->outputStreamBasicDescription.mSampleRate);
+     fprintf(stderr, "%c%c%c%c mFormatID\n", (int)(internal->outputStreamBasicDescription.mFormatID & 0xff000000) >> 24,
diff --git a/media-libs/libao/libao-0.8.5.ebuild b/media-libs/libao/libao-0.8.5.ebuild
index 1a2d142e9539..8c85be6e17c9 100644
--- a/media-libs/libao/libao-0.8.5.ebuild
+++ b/media-libs/libao/libao-0.8.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.5.ebuild,v 1.14 2004/11/06 14:40:45 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-0.8.5.ebuild,v 1.15 2004/11/13 01:52:19 kito Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="the audio output library"
 HOMEPAGE="http://www.xiph.org/ao/"
@@ -22,6 +22,7 @@ DEPEND="virtual/libc
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	use ppc-macos && epatch ${FILESDIR}/${P}-ppc-macos.patch
 	elibtoolize
 }
 
@@ -46,4 +47,4 @@ src_install () {
 	rm -rf ${D}/usr/share/doc
 	dodoc AUTHORS CHANGES COPYING README TODO
 	dohtml -A c doc/*.html
-}
+}
\ No newline at end of file