[Midnightbsd-cvs] mports: audio/esound: update to 0.2.40
crash at midnightbsd.org
crash at midnightbsd.org
Sun Sep 21 18:23:26 EDT 2008
Log Message:
-----------
update to 0.2.40
Modified Files:
--------------
mports/audio/esound:
Makefile (r1.3 -> r1.4)
distinfo (r1.2 -> r1.3)
mports/audio/esound/files:
patch-aa (r1.2 -> r1.3)
patch-ad (r1.1 -> r1.2)
patch-audio_oss.c (r1.1 -> r1.2)
patch-esddsp.c (r1.2 -> r1.3)
patch-esddsp.in (r1.1 -> r1.2)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/audio/esound/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L audio/esound/Makefile -L audio/esound/Makefile -u -r1.3 -r1.4
--- audio/esound/Makefile
+++ audio/esound/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= esound
-PORTVERSION= 0.2.38
+PORTVERSION= 0.2.40
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -26,7 +26,7 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= JW=false
-USE_GETOPT_LONG=yes
+
CONFLICTS= py*-ro-[0-9]*
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/audio/esound/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L audio/esound/distinfo -L audio/esound/distinfo -u -r1.2 -r1.3
--- audio/esound/distinfo
+++ audio/esound/distinfo
@@ -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.40.tar.bz2) = e9009889ab81269f3021ebcad8addb96
+SHA256 (gnome/esound-0.2.40.tar.bz2) = 74b6d9f3dd68ee0b8d95d4d2c78cbd913807cb6c0739d05d8dd75a73fc84d4a7
+SIZE (gnome/esound-0.2.40.tar.bz2) = 423798
Index: patch-esddsp.in
===================================================================
RCS file: /home/cvs/mports/audio/esound/files/patch-esddsp.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/esound/files/patch-esddsp.in -L audio/esound/files/patch-esddsp.in -u -r1.1 -r1.2
--- audio/esound/files/patch-esddsp.in
+++ audio/esound/files/patch-esddsp.in
@@ -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. at ESD_MAJOR_VERSION@ @libdir@/libesd.so. at ESD_MAJOR_VERSION@ $LD_PRELOAD"
-+LD_PRELOAD="@libdir@/libesddsp.so @libdir@/libesd.so $LD_PRELOAD"
+
+-LD_PRELOAD="libesddsp.so. at ESD_MAJOR_VERSION@ libesd.so. at ESD_MAJOR_VERSION@ $LD_PRELOAD"
++LD_PRELOAD="libesddsp.so libesd.so $LD_PRELOAD"
export LD_PRELOAD
# invoke the program with the args given
Index: patch-esddsp.c
===================================================================
RCS file: /home/cvs/mports/audio/esound/files/patch-esddsp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L audio/esound/files/patch-esddsp.c -L audio/esound/files/patch-esddsp.c -u -r1.2 -r1.3
--- audio/esound/files/patch-esddsp.c
+++ audio/esound/files/patch-esddsp.c
@@ -1,22 +1,40 @@
---- 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, .
}
}
@@ -32,7 +50,16 @@
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,
}
}
@@ -48,3 +75,4 @@
return open_wrapper(func, pathname, flags, mode);
}
+
Index: patch-ad
===================================================================
RCS file: /home/cvs/mports/audio/esound/files/patch-ad,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/esound/files/patch-ad -L audio/esound/files/patch-ad -u -r1.1 -r1.2
--- audio/esound/files/patch-ad
+++ audio/esound/files/patch-ad
@@ -1,15 +1,15 @@
---- esdlib.c.orig Mon Jul 15 05:28:26 2002
-+++ esdlib.c Tue Aug 27 13:06:16 2002
-@@ -20,6 +20,8 @@
- #include <arpa/inet.h>
+--- esdlib.c.orig 2008-07-30 17:08:59.000000000 -0400
++++ esdlib.c 2008-09-07 22:19:48.000000000 -0400
+@@ -21,6 +21,8 @@
#include <errno.h>
#include <sys/wait.h>
+ #include <poll.h>
+#include <pwd.h>
+#include <limits.h>
#include <sys/un.h>
-@@ -660,8 +662,7 @@
+@@ -895,8 +897,7 @@ int esd_open_sound( const char *host )
setsid();
cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0));
@@ -19,11 +19,10 @@
execl("/bin/sh", "/bin/sh", "-c", cmd, NULL);
perror("execl");
_exit(1);
-@@ -1421,3 +1422,34 @@
-
- return close( esd );
+@@ -1709,3 +1710,34 @@ int esd_close( int esd )
+ return close( esd );
}
-+
+
+char *
+esd_unix_socket_dir(void) {
+ static char *sockdir = NULL, sockdirbuf[PATH_MAX];
@@ -54,3 +53,4 @@
+ return (sockname);
+ }
+
++
Index: patch-aa
===================================================================
RCS file: /home/cvs/mports/audio/esound/files/patch-aa,v
retrieving revision 1.2
retrieving revision 1.3
diff -L audio/esound/files/patch-aa -L audio/esound/files/patch-aa -u -r1.2 -r1.3
--- audio/esound/files/patch-aa
+++ audio/esound/files/patch-aa
@@ -1,6 +1,6 @@
---- 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)
@@ -9,12 +9,12 @@
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
Index: patch-audio_oss.c
===================================================================
RCS file: /home/cvs/mports/audio/esound/files/patch-audio_oss.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/esound/files/patch-audio_oss.c -L audio/esound/files/patch-audio_oss.c -u -r1.1 -r1.2
--- audio/esound/files/patch-audio_oss.c
+++ audio/esound/files/patch-audio_oss.c
@@ -1,18 +1,18 @@
---- 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 @@
- # endif
- #endif
+--- audio_oss.c.orig 2008-07-29 14:07:50.000000000 -0400
++++ audio_oss.c 2008-09-07 22:22:15.000000000 -0400
+@@ -12,8 +13,14 @@
+
+ #include <errno.h>
+#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
-
+
More information about the Midnightbsd-cvs
mailing list