Adding the right patch for 0.2.36 on ppc-macos

(Portage version: 2.0.51.22-r2)

4 files changed, 62 insertions, 82 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index 1ba6cfd84d9e..30ac1d8b5939 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.57 2005/08/26 17:48:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.58 2005/08/28 14:46:58 grobian Exp $
+
+  28 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  -files/esound-0.2.35-ppc-macos.patch,
+  +files/esound-0.2.36-ppc-macos.patch, esound-0.2.36-r1.ebuild:
+  Replacing patch for ppc-macos to reflect version 0.2.36, the old one for
+  0.2.35 was reused without testing.  See bug #103969
 
   26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   esound-0.2.36-r1.ebuild:
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index b396fc8b24e3..9ef18a7242f8 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2ae97f9dc69d72d4632482df2f5cf95c esound-0.2.34.ebuild 1369
-MD5 bafbf0b192d33818658c5dd784aa7c38 esound-0.2.36-r1.ebuild 1600
+MD5 083fda63ad850067398bc8322314e77d esound-0.2.36-r1.ebuild 1697
 MD5 5da3837269f81f7f4a6269ce7828b037 ChangeLog 7298
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 MD5 949eca433956076ac441c57787eedcc0 files/esound-0.2.35-ppc-macos.patch 4422
 MD5 8d815255ab6890911dd9b2bd7904d363 files/digest-esound-0.2.36-r1 66
+MD5 defad2b109b564a607b57788a05e139d files/esound-0.2.36-ppc-macos.patch 4067
 MD5 e2bd989e15dcb9b15096d1a9cd29edf0 files/digest-esound-0.2.34 66
 MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737
 MD5 abf9fa5dcfe799ee75cb17808b389739 files/esound-0.2.32-amd64.patch 686
 MD5 0af490e6c9b79db177214d01027e800e files/esound.init.d 862
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDD1YFKRy60XGEcJIRAlw+AJ4rjfTmDaDDEEg3q0BwZ9CJDLJ+zQCfZs1u
-RNh6FUEfj8EpDQHVkww8258=
-=2/32
------END PGP SIGNATURE-----
diff --git a/media-sound/esound/esound-0.2.36-r1.ebuild b/media-sound/esound/esound-0.2.36-r1.ebuild
index 091e29707288..cd9235c92a6d 100644
--- a/media-sound/esound/esound-0.2.36-r1.ebuild
+++ b/media-sound/esound/esound-0.2.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.5 2005/08/26 17:48:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.36-r1.ebuild,v 1.6 2005/08/28 14:46:58 grobian Exp $
 
 inherit libtool gnome.org eutils
 
@@ -25,7 +25,9 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-0.2.32-amd64.patch
-	use ppc-macos && epatch ${FILESDIR}/${PN}-0.2.35-ppc-macos.patch
+	# please note, this is a conditional, version specific patch!!!
+	# when bumping avoid bugs like #103969
+	use ppc-macos && epatch ${FILESDIR}/${P}-ppc-macos.patch
 }
 
 src_compile() {
diff --git a/media-sound/esound/files/esound-0.2.35-ppc-macos.patch b/media-sound/esound/files/esound-0.2.36-ppc-macos.patch
index 249aa78fee72..de85af43a16a 100644
--- a/media-sound/esound/files/esound-0.2.35-ppc-macos.patch
+++ b/media-sound/esound/files/esound-0.2.36-ppc-macos.patch
@@ -1,83 +1,64 @@
-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 =
+diff -ur esound-0.2.36/Makefile.in esound-0.2.36-patched/Makefile.in
+--- esound-0.2.36/Makefile.in	2005-06-07 09:04:14.000000000 +0800
++++ esound-0.2.36-patched/Makefile.in	2005-08-28 14:17:07.000000000 +0800
+@@ -93,37 +93,37 @@
+ esd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
  am_esdcat_OBJECTS = esdcat.$(OBJEXT)
  esdcat_OBJECTS = $(am_esdcat_OBJECTS)
 -esdcat_LDADD = $(LDADD)
 +esdcat_LDADD = $(LDADD) $(SOUND_LIBS)
- esdcat_DEPENDENCIES = libesd.la
- esdcat_LDFLAGS =
+ esdcat_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
  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 =
+ esdctl_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
  am_esdfilt_OBJECTS = esdfilt.$(OBJEXT)
  esdfilt_OBJECTS = $(am_esdfilt_OBJECTS)
 -esdfilt_LDADD = $(LDADD)
 +esdfilt_LDADD = $(LDADD) $(SOUND_LIBS)
- esdfilt_DEPENDENCIES = libesd.la
- esdfilt_LDFLAGS =
+ esdfilt_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
  am_esdloop_OBJECTS = esdloop.$(OBJEXT)
  esdloop_OBJECTS = $(am_esdloop_OBJECTS)
 -esdloop_LDADD = $(LDADD)
 +esdloop_LDADD = $(LDADD) $(SOUND_LIBS)
- esdloop_DEPENDENCIES = libesd.la
- esdloop_LDFLAGS =
+ esdloop_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
  am_esdmon_OBJECTS = esdmon.$(OBJEXT)
  esdmon_OBJECTS = $(am_esdmon_OBJECTS)
 -esdmon_LDADD = $(LDADD)
 +esdmon_LDADD = $(LDADD) $(SOUND_LIBS)
- esdmon_DEPENDENCIES = libesd.la
- esdmon_LDFLAGS =
+ esdmon_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
  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 =
+ esdplay_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
  am_esdrec_OBJECTS = esdrec.$(OBJEXT)
  esdrec_OBJECTS = $(am_esdrec_OBJECTS)
 -esdrec_LDADD = $(LDADD)
 +esdrec_LDADD = $(LDADD) $(SOUND_LIBS)
- esdrec_DEPENDENCIES = libesd.la
- esdrec_LDFLAGS =
+ esdrec_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
  am_esdsample_OBJECTS = esdsample.$(OBJEXT)
  esdsample_OBJECTS = $(am_esdsample_OBJECTS)
 -esdsample_LDADD = $(LDADD)
 +esdsample_LDADD = $(LDADD) $(SOUND_LIBS)
- esdsample_DEPENDENCIES = libesd.la
- esdsample_LDFLAGS =
+ esdsample_DEPENDENCIES = libesd.la $(am__DEPENDENCIES_1)
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  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
+@@ -422,7 +422,7 @@
+ 	esdplay.c
+ 
+ LDADD = libesd.la $(AUDIOFILE_LIBS)
+-esd_LDADD = $(WRAP_LIB) $(LDADD)
++esd_LDADD = $(WRAP_LIB) $(LDADD) $(SOUND_LIBS)
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = esd.m4
+ esdconfdir = $(sysconfdir)
+diff -ur esound-0.2.36/esd.c esound-0.2.36-patched/esd.c
+--- esound-0.2.36/esd.c	2005-05-26 09:02:52.000000000 +0800
++++ esound-0.2.36-patched/esd.c	2005-08-28 14:24:46.000000000 +0800
 @@ -8,6 +8,10 @@
  #include <errno.h>
  #include <signal.h>
@@ -89,35 +70,35 @@ diff -uNr esound-0.2.35/esd.c esound-0.2.35-new/esd.c
  
  #ifndef HAVE_NANOSLEEP
  #include <sys/time.h>
-@@ -607,6 +611,25 @@
- 
+@@ -641,6 +645,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);
++	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
+ #ifdef DRIVER_ARTS
+diff -ur esound-0.2.36/esd_config.c esound-0.2.36-patched/esd_config.c
+--- esound-0.2.36/esd_config.c	2005-05-26 07:50:41.000000000 +0800
++++ esound-0.2.36-patched/esd_config.c	2005-08-28 14:21:43.000000000 +0800
 @@ -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