Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26609
Modified Files:
Tag: pangocairo-branch
esound.info esound.patch
Log Message:
Remove some patches that have been incorporated upstream.
Index: esound.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/esound.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- esound.patch 20 Jan 2006 20:30:47 -0000 1.1
+++ esound.patch 1 Mar 2007 07:02:52 -0000 1.1.2.1
@@ -1,39 +1,6 @@
diff -Nurd -x'*~' esound-0.2.36.orig/Makefile.in esound-0.2.36/Makefile.in
--- esound-0.2.36.orig/Makefile.in 2005-06-06 21:04:14.000000000 -0400
+++ esound-0.2.36/Makefile.in 2005-09-30 18:29:03.000000000 -0400
-@@ -81,13 +81,13 @@
- esdPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS) $(esd_PROGRAMS)
- am__esd_SOURCES_DIST = esd.c clients.c filter.c mix.c players.c \
-- proto.c samples.c getopt.c getopt1.c util.c esd-config.h \
-+ proto.c samples.c getopt.c getopt1.c esd-config.h \
- esd-server.h
- am__objects_1 = getopt.$(OBJEXT) getopt1.$(OBJEXT)
- @[EMAIL PROTECTED] = $(am__objects_1)
- am_esd_OBJECTS = esd.$(OBJEXT) clients.$(OBJEXT) filter.$(OBJEXT) \
- mix.$(OBJEXT) players.$(OBJEXT) proto.$(OBJEXT) \
-- samples.$(OBJEXT) $(am__objects_2) util.$(OBJEXT)
-+ samples.$(OBJEXT) $(am__objects_2)
- esd_OBJECTS = $(am_esd_OBJECTS)
- am__DEPENDENCIES_2 = libesd.la $(am__DEPENDENCIES_1)
- esd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-@@ -145,7 +145,7 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/libesd_la-genrand.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/libesd_la-util.Plo ./$(DEPDIR)/mix.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/players.Po ./$(DEPDIR)/proto.Po \
[EMAIL PROTECTED]@ ./$(DEPDIR)/samples.Po ./$(DEPDIR)/util.Po
[EMAIL PROTECTED]@ ./$(DEPDIR)/samples.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-@@ -391,7 +391,6 @@
- proto.c \
- samples.c \
- $(getopt_src) \
-- util.c \
- esd-config.h \
- esd-server.h
-
@@ -422,7 +421,7 @@
esdplay.c
@@ -43,34 +10,6 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = esd.m4
esdconfdir = $(sysconfdir)
-@@ -676,7 +675,6 @@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
-
- .c.o:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
-diff -Nurd -x'*~' esound-0.2.36.orig/docs/Makefile.in
esound-0.2.36/docs/Makefile.in
---- esound-0.2.36.orig/docs/Makefile.in 2005-06-06 21:04:14.000000000
-0400
-+++ esound-0.2.36/docs/Makefile.in 2005-09-30 18:27:06.000000000 -0400
-@@ -455,13 +455,13 @@
- @[EMAIL PROTECTED]:
- @HAVE_JW_TRUE@ $(mkinstalldirs) $(DESTDIR)$(htmldir)
- @HAVE_JW_TRUE@ files=`cd html && echo *.html`; \
[EMAIL PROTECTED]@ test "$$files" || for f in $$files; do \
[EMAIL PROTECTED]@ cp -p $$f $(DESTDIR)$(htmldir)/$$f; \
[EMAIL PROTECTED]@ test "$$files" && for f in $$files; do \
[EMAIL PROTECTED]@ cp -p html/$$f $(DESTDIR)$(htmldir)/$$f; \
- @HAVE_JW_TRUE@ done
-
- @[EMAIL PROTECTED]:
- @HAVE_JW_TRUE@ files=`cd html && echo *.html`; \
[EMAIL PROTECTED]@ test "$$files" || for f in $$files; do \
[EMAIL PROTECTED]@ test "$$files" && for f in $$files; do \
- @HAVE_JW_TRUE@ rm -rf $(DESTDIR)$(htmldir)/$$f; \
- @HAVE_JW_TRUE@ done
- @HAVE_JW_TRUE@ if test -d $(DESTDIR)$(htmldir); then rmdir
$(DESTDIR)$(htmldir); fi
diff -Nurd -x'*~' esound-0.2.36.orig/esd.c esound-0.2.36/esd.c
--- esound-0.2.36.orig/esd.c 2005-05-25 21:02:52.000000000 -0400
+++ esound-0.2.36/esd.c 2005-09-30 18:27:06.000000000 -0400
Index: esound.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/esound.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- esound.info 27 Feb 2007 22:41:24 -0000 1.1.2.2
+++ esound.info 1 Mar 2007 07:02:52 -0000 1.1.2.3
@@ -13,9 +13,6 @@
Source: mirror:gnome:sources/%n/0.2/%n-%v.tar.bz2
Source-MD5: 99cc68770176c8940cf346f60208420e
Patch: %n.patch
-PatchScript: <<
- perl -pi -e 's/(SOUND_LIBS="-Wl,-framework) -Wl,(CoreAudio")/$1,$2/'
configure
-<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCPPFLAGS: -pipe
@@ -73,18 +70,7 @@
Applied a iMacs/eMacs patch from Alexander Strange (>= 0.2.28).
-Daniel Macks corrected passing of multi-word flags in .pc. See:
-
http://sourceforge.net/tracker/?group_id=17203&atid=117203&func=detail&aid=978293
- http://bugzilla.gnome.org/show_bug.cgi?id=313433
-
-Applied patch to fix installation of html docs. See:
-http://bugzilla.gnome.org/show_bug.cgi?id=307366
-
Detects ARTS, but then doesn't use it (?) so no need for dependencies.
-
-Do not link util.o into esd executable because that object is already
-present as libesd_la-util.o in libesd.dylib, which is also linked into
-esd. See: http://bugzilla.gnome.org/show_bug.cgi?id=317554
<<
License: GPL/LGPL
Maintainer: None <fink-devel@lists.sourceforge.net>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
