Index: head/audio/esound/Makefile =================================================================== --- head/audio/esound/Makefile (revision 216966) +++ head/audio/esound/Makefile (revision 216967) @@ -1,46 +1,46 @@ # New ports collection makefile for: esound # Date created: 19 July 1998 # Whom: Vanilla I. Shu # # $FreeBSD$ # PORTNAME= esound -PORTVERSION= 0.2.38 +PORTVERSION= 0.2.39 PORTREVISION= 0 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= A sound library for enlightenment package LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes USE_GNOME= gnometarget gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= JW=false CONFLICTS= py*-ro-[0-9]* MAN1= esd-config.1 esd.1 esdcat.1 esdctl.1 esddsp.1 esdfilt.1 esdloop.1 \ esdmon.1 esdplay.1 esdrec.1 esdsample.1 post-patch: @${REINPLACE_CMD} -e 's|esdconf_DATA = esd.conf|esdconf_DATA = |g' \ ${WRKSRC}/Makefile.in post-install: if [ ! -f ${PREFIX}/etc/esd.conf ]; then \ ${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf; \ ${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf.default; \ else \ ${INSTALL_DATA} ${WRKSRC}/esd.conf ${PREFIX}/etc/esd.conf.default; \ fi @${CAT} ${PKGMESSAGE} .include Property changes on: head/audio/esound/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.69 \ No newline at end of property +1.70 \ No newline at end of property Index: head/audio/esound/distinfo =================================================================== --- head/audio/esound/distinfo (revision 216966) +++ head/audio/esound/distinfo (revision 216967) @@ -1,3 +1,3 @@ -MD5 (gnome/esound-0.2.38.tar.bz2) = 1c48c100b450d617b58dacb59837d34f -SHA256 (gnome/esound-0.2.38.tar.bz2) = 08ea208cb3948650250bb068de5c75b877e78902d679e8af5d0a14062c939b37 -SIZE (gnome/esound-0.2.38.tar.bz2) = 393758 +MD5 (gnome/esound-0.2.39.tar.bz2) = d950b9cd0d7b5406cc4bb16bcdcea8f4 +SHA256 (gnome/esound-0.2.39.tar.bz2) = 41ce2f8c84f7703d0b62ed1f49d0885ac006563d86f8cacaa0c770180b81c289 +SIZE (gnome/esound-0.2.39.tar.bz2) = 423581 Property changes on: head/audio/esound/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/audio/esound/files/patch-aa =================================================================== --- head/audio/esound/files/patch-aa (revision 216966) +++ head/audio/esound/files/patch-aa (revision 216967) @@ -1,20 +1,20 @@ ---- Makefile.in.orig Mon May 28 15:23:55 2007 -+++ Makefile.in Mon May 28 15:24:56 2007 -@@ -341,7 +341,7 @@ bin_SCRIPTS = \ +--- Makefile.in.orig 2008-07-17 13:45:22.000000000 -0400 ++++ Makefile.in 2008-07-17 13:45:46.000000000 -0400 +@@ -342,7 +342,7 @@ bin_SCRIPTS = \ lib_LTLIBRARIES = libesd.la $(libesddsp_la) libesd_la_CFLAGS = $(AM_CFLAGS) -libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) -no-undefined +libesd_la_LDFLAGS = -version-info 2:0:0 -no-undefined libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS) libesd_la_SOURCES = \ esdlib.c \ -@@ -372,7 +372,7 @@ AUDIO_BACKENDS = \ +@@ -373,7 +373,7 @@ AUDIO_BACKENDS = \ audio_solaris.c \ audio_win32.c -libesddsp_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) +libesddsp_la_LDFLAGS = -version-info 2:0:0 - libesddsp_la_LIBADD = $(DL_LIB) -lm libesd.la + libesddsp_la_LIBADD = libesd.la $(DL_LIB) -lm libesddsp_la_SOURCES = \ esddsp.c Property changes on: head/audio/esound/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/audio/esound/files/patch-ad =================================================================== --- head/audio/esound/files/patch-ad (revision 216966) +++ head/audio/esound/files/patch-ad (revision 216967) @@ -1,56 +1,56 @@ ---- esdlib.c.orig Mon Jul 15 05:28:26 2002 -+++ esdlib.c Tue Aug 27 13:06:16 2002 -@@ -20,6 +20,8 @@ - #include +--- esdlib.c.orig 2008-07-15 11:35:15.000000000 -0400 ++++ esdlib.c 2008-07-17 13:46:44.000000000 -0400 +@@ -21,6 +21,8 @@ #include #include + #include +#include +#include #include -@@ -660,8 +662,7 @@ +@@ -889,8 +891,7 @@ int esd_open_sound( const char *host ) setsid(); cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0)); - sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options?esd_spawn_options:"", esd_pipe[1]); - + sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]); execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); perror("execl"); _exit(1); -@@ -1421,3 +1422,34 @@ - +@@ -1703,3 +1704,34 @@ int esd_close( int esd ) return close( esd ); } -+ + +char * +esd_unix_socket_dir(void) { + static char *sockdir = NULL, sockdirbuf[PATH_MAX]; + struct passwd *pw; + + if (sockdir != NULL) + return (sockdir); + pw = getpwuid(getuid()); + if (pw == NULL || pw->pw_dir == NULL) { + fprintf(stderr, "esd: could not find home directory\n"); + exit(1); + } + snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir); + endpwent(); + sockdir = sockdirbuf; + return (sockdir); +} + +char * +esd_unix_socket_name(void) { + static char *sockname = NULL, socknamebuf[PATH_MAX]; + + if (sockname != NULL) + return (sockname); + snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket", + esd_unix_socket_dir()); + sockname = socknamebuf; + return (sockname); + } ++ + Property changes on: head/audio/esound/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/audio/esound/files/patch-audio_oss.c =================================================================== --- head/audio/esound/files/patch-audio_oss.c (revision 216966) +++ head/audio/esound/files/patch-audio_oss.c (revision 216967) @@ -1,18 +1,24 @@ ---- audio_oss.c.orig Tue Jun 4 08:55:37 2002 -+++ audio_oss.c Sun Jun 9 01:55:21 2002 -@@ -10,9 +10,14 @@ +--- audio_oss.c.orig 2008-07-15 12:00:03.000000000 -0400 ++++ audio_oss.c 2008-07-17 13:56:25.000000000 -0400 +@@ -1,4 +1,5 @@ + #include "config.h" ++#include + + #ifdef HAVE_MACHINE_SOUNDCARD_H + # include +@@ -10,9 +11,14 @@ # endif #endif +#if defined(__sparc__) || defined(__powerpc__) +#define AFMT_S16_NE AFMT_S16_BE +#else +#define AFMT_S16_NE AFMT_S16_LE +#endif /* FreeBSD uses a different identifier? what other BSDs? */ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#ifndef SNDCTL_DSP_SETDUPLEX #define SNDCTL_DSP_SETDUPLEX DSP_CAP_DUPLEX #endif Property changes on: head/audio/esound/files/patch-audio_oss.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/audio/esound/files/patch-esddsp.c =================================================================== --- head/audio/esound/files/patch-esddsp.c (revision 216966) +++ head/audio/esound/files/patch-esddsp.c (revision 216967) @@ -1,50 +1,77 @@ ---- esddsp.c.orig Mon Jan 1 18:56:06 2007 -+++ esddsp.c Thu Mar 22 19:49:15 2007 -@@ -224,9 +224,12 @@ open_wrapper (int (*func) (const char *, +--- esddsp.c.orig 2008-07-15 11:47:20.000000000 -0400 ++++ esddsp.c 2008-07-17 13:58:09.000000000 -0400 +@@ -220,16 +220,19 @@ open_wrapper (int (*func) (const char *, + const char *pathname, int flags, ...) + { + va_list args; +- mode_t mode; ++ mode_t mode = 0; dsp_init (); - va_start (args, flags); -- mode = va_arg (args, mode_t); -- va_end (args); +- if (sizeof (mode_t) < sizeof (int)) + if ((flags & O_CREAT) != 0) + { + va_start (args, flags); -+ mode = va_arg (args, int); ++ if (sizeof (mode_t) < sizeof (int)) + mode = va_arg (args, int); +- else ++ else + mode = va_arg (args, mode_t); +- va_end (args); + va_end (args); + } if (!strcmp (pathname, "/dev/dsp")) { -@@ -272,9 +275,12 @@ open (const char *pathname, int flags, . +@@ -260,7 +263,7 @@ open (const char *pathname, int flags, . + { + static int (*func) (const char *, int, mode_t) = NULL; + va_list args; +- mode_t mode; ++ mode_t mode = 0; + + DPRINTF ("open\n"); + +@@ -275,9 +278,12 @@ open (const char *pathname, int flags, . } } - va_start (args, flags); - mode = va_arg (args, mode_t); - va_end (args); + if ((flags & O_CREAT) != 0) + { + va_start (args, flags); + mode = va_arg (args, mode_t); + va_end (args); + } return open_wrapper(func, pathname, flags, mode); } -@@ -299,9 +305,12 @@ open64 (const char *pathname, int flags, +@@ -287,7 +293,7 @@ open64 (const char *pathname, int flags, + { + static int (*func) (const char *, int, mode_t) = NULL; + va_list args; +- mode_t mode; ++ mode_t mode = 0; + + DPRINTF ("open64\n"); + +@@ -302,9 +308,12 @@ open64 (const char *pathname, int flags, } } - va_start (args, flags); - mode = va_arg (args, mode_t); - va_end (args); + if ((flags & O_CREAT) != 0) + { + va_start (args, flags); + mode = va_arg (args, mode_t); + va_end (args); + } return open_wrapper(func, pathname, flags, mode); } Property changes on: head/audio/esound/files/patch-esddsp.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/audio/esound/files/patch-esddsp.in =================================================================== --- head/audio/esound/files/patch-esddsp.in (revision 216966) +++ head/audio/esound/files/patch-esddsp.in (revision 216967) @@ -1,11 +1,11 @@ ---- esddsp.in.orig Sun Oct 5 15:31:52 2003 -+++ esddsp.in Sun Oct 5 15:32:08 2003 -@@ -97,7 +97,7 @@ +--- esddsp.in.orig 2008-07-15 12:05:18.000000000 -0400 ++++ esddsp.in 2008-07-17 13:54:49.000000000 -0400 +@@ -106,7 +106,7 @@ fi prefix=@prefix@ exec_prefix=@exec_prefix@ --LD_PRELOAD="@libdir@/libesddsp.so.@ESD_MAJOR_VERSION@ @libdir@/libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD" -+LD_PRELOAD="@libdir@/libesddsp.so @libdir@/libesd.so $LD_PRELOAD" +-LD_PRELOAD="libesddsp.so.@ESD_MAJOR_VERSION@ libesd.so.@ESD_MAJOR_VERSION@ $LD_PRELOAD" ++LD_PRELOAD="libesddsp.so libesd.so $LD_PRELOAD" export LD_PRELOAD # invoke the program with the args given Property changes on: head/audio/esound/files/patch-esddsp.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property