~ppc-macos keyword and patch

4 files changed, 150 insertions, 15 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index b3d0752d5f45..b9fc4df30fb2 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.47 2004/08/18 09:18:28 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.48 2004/10/03 05:37:14 kito Exp $
+
+  03 Oct 2004; Kito <kito@gentoo.org> +files/esound-0.2.35-ppc-macos.patch,
+  esound-0.2.35.ebuild:
+  added patch from fink to improve CoreAudio functionality and keyworded
+  ~ppc-macos
 
 *esound-0.2.35 (18 Aug 2004)
 
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index 9f0127f8926b..6ac963e744e0 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -1,19 +1,20 @@
-MD5 60d8cb57f63e0edc494f5d5feae0a199 esound-0.2.33.ebuild 1331
-MD5 53085084337fa15d5baac5f684d87f22 esound-0.2.35.ebuild 1298
+MD5 d57671f17acab9a388ff10d657240d37 ChangeLog 6137
+MD5 db2a5a236c57479520328b1067c2d239 esound-0.2.32-r1.ebuild 1415
 MD5 0995cc9450d2b0b893e604121f586603 esound-0.2.32.ebuild 1381
+MD5 60d8cb57f63e0edc494f5d5feae0a199 esound-0.2.33.ebuild 1331
 MD5 f6089c2ff513456a10455a86c19a326a esound-0.2.34.ebuild 1291
-MD5 db2a5a236c57479520328b1067c2d239 esound-0.2.32-r1.ebuild 1415
-MD5 75d257dadd95c74ff2499c3dd2a9d0a6 ChangeLog 5949
+MD5 32b366f12be8862771d0a05277fdad55 esound-0.2.35.ebuild 1374
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
-MD5 675f9471a8062d3365ba0748546ade17 files/esound-0.2.32-new-alsa.patch 2831
-MD5 f14e22dbd99b25a4b76dcfe42cfb2099 files/esound-0.2.33-gcc2_fix.patch 1097
-MD5 75aca7b483f56968b69b28ce2fa2389e files/esound-0.2.29-local-vs-remote.diff 474
-MD5 340b8af9191cda014c7963617ede9b77 files/esound-0.2.29-alsa-period.diff 473
-MD5 35f489331d7924542abbe9842c58c59c files/digest-esound-0.2.32-r1 66
 MD5 35f489331d7924542abbe9842c58c59c files/digest-esound-0.2.32 66
+MD5 35f489331d7924542abbe9842c58c59c files/digest-esound-0.2.32-r1 66
 MD5 5b001531455e0ff356512be131dc32cb files/digest-esound-0.2.33 66
 MD5 e2bd989e15dcb9b15096d1a9cd29edf0 files/digest-esound-0.2.34 66
 MD5 b2f099ec9bcaa69a919e28a72c36d548 files/digest-esound-0.2.35 66
-MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737
+MD5 340b8af9191cda014c7963617ede9b77 files/esound-0.2.29-alsa-period.diff 473
+MD5 75aca7b483f56968b69b28ce2fa2389e files/esound-0.2.29-local-vs-remote.diff 474
 MD5 abf9fa5dcfe799ee75cb17808b389739 files/esound-0.2.32-amd64.patch 686
+MD5 675f9471a8062d3365ba0748546ade17 files/esound-0.2.32-new-alsa.patch 2831
+MD5 f14e22dbd99b25a4b76dcfe42cfb2099 files/esound-0.2.33-gcc2_fix.patch 1097
+MD5 949eca433956076ac441c57787eedcc0 files/esound-0.2.35-ppc-macos.patch 4422
+MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737
 MD5 0af490e6c9b79db177214d01027e800e files/esound.init.d 862
diff --git a/media-sound/esound/esound-0.2.35.ebuild b/media-sound/esound/esound-0.2.35.ebuild
index 9cf5f47f272b..5bdc84a2de50 100644
--- a/media-sound/esound/esound-0.2.35.ebuild
+++ b/media-sound/esound/esound-0.2.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.35.ebuild,v 1.1 2004/08/18 09:18:28 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.35.ebuild,v 1.2 2004/10/03 05:37:14 kito Exp $
 
 inherit libtool gnome.org eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.tux.org/~ricdude/EsounD.html"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~ppc-macos"
 IUSE="tcpd alsa ipv6"
 
 DEPEND=">=media-libs/audiofile-0.1.5
@@ -22,7 +22,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-0.2.32-amd64.patch
-
+	use ppc-macos && epatch ${FILESDIR}/${PN}-0.2.35-ppc-macos.patch
 }
 
 src_compile() {
@@ -61,4 +61,4 @@ src_install() {
 	sed "s/@extradepend@/$extradepend/" <${FILESDIR}/esound.init.d >${T}/esound
 	doexe ${T}/esound
 
-}
+}
\ No newline at end of file
diff --git a/media-sound/esound/files/esound-0.2.35-ppc-macos.patch b/media-sound/esound/files/esound-0.2.35-ppc-macos.patch
new file mode 100644
index 000000000000..249aa78fee72
--- /dev/null
+++ b/media-sound/esound/files/esound-0.2.35-ppc-macos.patch
@@ -0,0 +1,129 @@
+diff -uNr esound-0.2.35/Makefile.in esound-0.2.35-new/Makefile.in
+--- esound-0.2.35/Makefile.in	Thu Aug 12 09:23:07 2004
++++ esound-0.2.35-new/Makefile.in	Sat Oct  2 16:14:52 2004
+@@ -281,7 +281,7 @@
+ 
+ LDADD = libesd.la $(AUDIOFILE_LIBS)
+ 
+-esd_LDADD = $(WRAP_LIB) $(LDADD)
++esd_LDADD = $(WRAP_LIB) $(LDADD) $(SOUND_LIBS)
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = esd.m4
+@@ -347,44 +347,44 @@
+ esd_LDFLAGS =
+ am_esdcat_OBJECTS = esdcat.$(OBJEXT)
+ esdcat_OBJECTS = $(am_esdcat_OBJECTS)
+-esdcat_LDADD = $(LDADD)
++esdcat_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdcat_DEPENDENCIES = libesd.la
+ esdcat_LDFLAGS =
+ am__esdctl_SOURCES_DIST = getopt.c getopt1.c esdctl.c
+ am_esdctl_OBJECTS = $(am__objects_2) esdctl.$(OBJEXT)
+ esdctl_OBJECTS = $(am_esdctl_OBJECTS)
+-esdctl_LDADD = $(LDADD)
++esdctl_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdctl_DEPENDENCIES = libesd.la
+ esdctl_LDFLAGS =
+ am_esdfilt_OBJECTS = esdfilt.$(OBJEXT)
+ esdfilt_OBJECTS = $(am_esdfilt_OBJECTS)
+-esdfilt_LDADD = $(LDADD)
++esdfilt_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdfilt_DEPENDENCIES = libesd.la
+ esdfilt_LDFLAGS =
+ am_esdloop_OBJECTS = esdloop.$(OBJEXT)
+ esdloop_OBJECTS = $(am_esdloop_OBJECTS)
+-esdloop_LDADD = $(LDADD)
++esdloop_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdloop_DEPENDENCIES = libesd.la
+ esdloop_LDFLAGS =
+ am_esdmon_OBJECTS = esdmon.$(OBJEXT)
+ esdmon_OBJECTS = $(am_esdmon_OBJECTS)
+-esdmon_LDADD = $(LDADD)
++esdmon_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdmon_DEPENDENCIES = libesd.la
+ esdmon_LDFLAGS =
+ am__esdplay_SOURCES_DIST = getopt.c getopt1.c esdplay.c
+ am_esdplay_OBJECTS = $(am__objects_2) esdplay.$(OBJEXT)
+ esdplay_OBJECTS = $(am_esdplay_OBJECTS)
+-esdplay_LDADD = $(LDADD)
++esdplay_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdplay_DEPENDENCIES = libesd.la
+ esdplay_LDFLAGS =
+ am_esdrec_OBJECTS = esdrec.$(OBJEXT)
+ esdrec_OBJECTS = $(am_esdrec_OBJECTS)
+-esdrec_LDADD = $(LDADD)
++esdrec_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdrec_DEPENDENCIES = libesd.la
+ esdrec_LDFLAGS =
+ am_esdsample_OBJECTS = esdsample.$(OBJEXT)
+ esdsample_OBJECTS = $(am_esdsample_OBJECTS)
+-esdsample_LDADD = $(LDADD)
++esdsample_LDADD = $(LDADD) $(SOUND_LIBS)
+ esdsample_DEPENDENCIES = libesd.la
+ esdsample_LDFLAGS =
+ SCRIPTS = $(bin_SCRIPTS)
+diff -uNr esound-0.2.35/configure esound-0.2.35-new/configure
+--- esound-0.2.35/configure	Thu Aug 12 09:23:05 2004
++++ esound-0.2.35-new/configure	Sat Oct  2 16:14:52 2004
+@@ -5916,7 +5916,7 @@
+       allow_undefined_flag='-undefined suppress'
+       ;;
+     *) # Darwin 1.3 on
+-      allow_undefined_flag='-flat_namespace -undefined suppress'
++      test -z "$LD_TWOLEVEL_NAMESPACE" && allow_undefined_flag='-flat_namespace -undefined suppress'
+       ;;
+     esac
+     # FIXME: Relying on posixy $() will cause problems for
+diff -uNr esound-0.2.35/esd.c esound-0.2.35-new/esd.c
+--- esound-0.2.35/esd.c	Thu Aug 12 08:09:34 2004
++++ esound-0.2.35-new/esd.c	Sat Oct  2 16:14:52 2004
+@@ -8,6 +8,10 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <time.h>
++#include <mach/mach.h>
++#include <mach/thread_policy.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
+ 
+ #ifndef HAVE_NANOSLEEP
+ #include <sys/time.h>
+@@ -607,6 +611,25 @@
+ 
+     int default_format = ESD_BITS16 | ESD_STEREO;
+     /* end test scaffolding parameters */
++    
++    {
++    	struct thread_time_constraint_policy ttcpolicy;
++    	int bus_speed, mib [2] = { CTL_HW, HW_BUS_FREQ };
++    	size_t len;
++    	
++    	len = sizeof (bus_speed);
++    	sysctl (mib, 2, &bus_speed, &len, NULL, 0);
++    	
++    	ttcpolicy.period = bus_speed / 120;
++    	ttcpolicy.computation = bus_speed / 2400;
++    	ttcpolicy.constraint = bus_speed /1200;
++    	ttcpolicy.preemptible = 1;
++    	
++    	thread_policy_set (mach_thread_self (),
++    						THREAD_TIME_CONSTRAINT_POLICY,
++    						(int*)&ttcpolicy,
++    						THREAD_TIME_CONSTRAINT_POLICY_COUNT);
++    }
+ 
+     programname = *argv;
+ 
+diff -uNr esound-0.2.35/esd_config.c esound-0.2.35-new/esd_config.c
+--- esound-0.2.35/esd_config.c	Thu Aug 12 04:14:54 2004
++++ esound-0.2.35-new/esd_config.c	Sat Oct  2 16:14:52 2004
+@@ -9,7 +9,7 @@
+ int esd_no_spawn=1; /* If we can't even find the system config file,
+ 		       things are screwed up - don't try to make things
+ 		       worse. */
+-int esd_spawn_wait_ms=100; /* Time to wait trying to connect to an
++int esd_spawn_wait_ms=999; /* Time to wait trying to connect to an
+ 			      autospawned ESD, in milliseconds. */
+ char esd_spawn_options[LINEBUF_SIZE] = "-terminate -nobeeps -as 2";
+