From 25dd917feee5fd3a1f62592e1d31c5fa4f0d1bdc Mon Sep 17 00:00:00 2001 From: brad Date: Fri, 26 Jul 2002 19:57:23 +0000 Subject: [PATCH] upgrade to esound 0.2.28 -- With some testing by: naddy@ --- audio/esound/Makefile | 5 +- audio/esound/distinfo | 6 +- audio/esound/patches/patch-Makefile.in | 8 +-- audio/esound/patches/patch-acconfig_h | 8 +-- audio/esound/patches/patch-audio_c | 10 +-- audio/esound/patches/patch-config_h_in | 8 +-- audio/esound/patches/patch-configure_in | 10 +-- audio/esound/patches/patch-esd.c | 6 +- audio/esound/patches/patch-esd.h | 19 ------ audio/esound/patches/patch-esdlib.c | 53 +++------------ audio/esound/patches/patch-ltconfig | 85 ----------------------- audio/esound/patches/patch-ltmain.sh | 89 ------------------------- audio/esound/patches/patch-util_c | 66 ++++++++++++++++++ audio/esound/pkg/PFRAG.shared | 4 +- audio/esound/pkg/PLIST | 13 +++- 15 files changed, 119 insertions(+), 271 deletions(-) delete mode 100644 audio/esound/patches/patch-esd.h delete mode 100644 audio/esound/patches/patch-ltconfig delete mode 100644 audio/esound/patches/patch-ltmain.sh create mode 100644 audio/esound/patches/patch-util_c diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 5e068522675..95c66df90c4 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.28 2002/05/13 18:50:36 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2002/07/26 19:57:23 brad Exp $ # $FreeBSD: Makefile,v 1.8 1999/03/09 01:08:46 nectar Exp $ COMMENT= "sound library for Enlightenment" -DISTNAME= esound-0.2.24 +DISTNAME= esound-0.2.28 CATEGORIES= audio -NEED_VERSION= 1.504 MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/esound/} HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html diff --git a/audio/esound/distinfo b/audio/esound/distinfo index aecab0b51e1..35979532222 100644 --- a/audio/esound/distinfo +++ b/audio/esound/distinfo @@ -1,3 +1,3 @@ -MD5 (esound-0.2.24.tar.gz) = d50966ea485e310b17958417168c703d -RMD160 (esound-0.2.24.tar.gz) = 64ded648f88a4f147398d58e9408f6ef9eadd75a -SHA1 (esound-0.2.24.tar.gz) = 340a66d3cbab13d074473187c213069401003a96 +MD5 (esound-0.2.28.tar.gz) = 788d06cfaafc5c8a45f362f1bf61938f +RMD160 (esound-0.2.28.tar.gz) = 9b2c8ea14effc6e073aa5388035ae94a59123ad0 +SHA1 (esound-0.2.28.tar.gz) = e56afc827ba49764792ba7a7944aa5e32276d2f9 diff --git a/audio/esound/patches/patch-Makefile.in b/audio/esound/patches/patch-Makefile.in index c4207968c4e..866ec45d833 100644 --- a/audio/esound/patches/patch-Makefile.in +++ b/audio/esound/patches/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Fri Mar 1 17:07:42 2002 -+++ Makefile.in Tue Mar 5 09:21:37 2002 -@@ -234,7 +234,7 @@ esdplay_LDADD = $(LIBOBJS) $(LDADD) +--- Makefile.in.orig Wed Jun 19 10:05:14 2002 ++++ Makefile.in Fri Jul 19 18:08:06 2002 +@@ -168,7 +168,7 @@ esd_LDADD = $(WRAP_LIB) $(LDADD) m4datadir = $(datadir)/aclocal m4data_DATA = esd.m4 @@ -8,4 +8,4 @@ +esdconfdir = $(datadir)/examples/esound esdconf_DATA = esd.conf - CLEANFILES = esound.spec esound.pc + pkgconfigdir = $(libdir)/pkgconfig diff --git a/audio/esound/patches/patch-acconfig_h b/audio/esound/patches/patch-acconfig_h index 26cff9515fd..59c99c14d8e 100644 --- a/audio/esound/patches/patch-acconfig_h +++ b/audio/esound/patches/patch-acconfig_h @@ -1,8 +1,8 @@ ---- acconfig.h.orig Sat Jul 21 00:21:12 2001 -+++ acconfig.h Sat Jul 21 00:21:18 2001 -@@ -8,6 +8,7 @@ - #undef DRIVER_ALSA +--- acconfig.h.orig Tue Apr 23 05:33:07 2002 ++++ acconfig.h Fri Jul 19 18:08:06 2002 +@@ -9,6 +9,7 @@ #undef DRIVER_NEWALSA + #undef DRIVER_ALSA_09 #undef DRIVER_DART +#undef DRIVER_SUN #undef DRIVER_NONE diff --git a/audio/esound/patches/patch-audio_c b/audio/esound/patches/patch-audio_c index c3f39a8a61b..dc8202d402c 100644 --- a/audio/esound/patches/patch-audio_c +++ b/audio/esound/patches/patch-audio_c @@ -1,9 +1,9 @@ ---- audio.c.orig Tue Sep 26 11:56:18 2000 -+++ audio.c Sun Jul 22 17:41:04 2001 -@@ -23,6 +23,8 @@ static int esd_audio_fd = -1; - /* ALSA before OSS as ALSA is OSS compatible */ - #if defined(DRIVER_ALSA) || defined(DRIVER_NEWALSA) +--- audio.c.orig Tue Jun 4 10:40:44 2002 ++++ audio.c Fri Jul 19 18:32:52 2002 +@@ -25,6 +25,8 @@ static int esd_audio_fd = -1; # include "audio_alsa.c" + #elif defined(DRIVER_ALSA_09) + #include "audio_alsa09.c" +#elif defined(DRIVER_SUN) +# include "audio_sun.c" #elif defined(DRIVER_OSS) diff --git a/audio/esound/patches/patch-config_h_in b/audio/esound/patches/patch-config_h_in index 5a0fc5b1dbb..c5397b00a0f 100644 --- a/audio/esound/patches/patch-config_h_in +++ b/audio/esound/patches/patch-config_h_in @@ -1,8 +1,8 @@ ---- config.h.in.orig Fri Feb 8 02:53:05 2002 -+++ config.h.in Tue Mar 5 09:21:38 2002 -@@ -9,6 +9,7 @@ - #undef DRIVER_ALSA +--- config.h.in.orig Tue Jun 4 10:41:36 2002 ++++ config.h.in Fri Jul 19 18:08:06 2002 +@@ -43,6 +43,7 @@ #undef DRIVER_NEWALSA + #undef DRIVER_ALSA_09 #undef DRIVER_DART +#undef DRIVER_SUN #undef DRIVER_NONE diff --git a/audio/esound/patches/patch-configure_in b/audio/esound/patches/patch-configure_in index f26f356670d..b93c8d43863 100644 --- a/audio/esound/patches/patch-configure_in +++ b/audio/esound/patches/patch-configure_in @@ -1,5 +1,5 @@ ---- configure.in.orig Fri Mar 1 17:07:05 2002 -+++ configure.in Tue Mar 5 09:21:38 2002 +--- configure.in.orig Wed Jun 19 10:03:32 2002 ++++ configure.in Fri Jul 19 18:08:06 2002 @@ -151,6 +151,16 @@ if test "x$enable_local_sound" = "xyes"; esac fi @@ -17,7 +17,7 @@ case ${host_os} in os2*) found_sound=yes -@@ -200,7 +210,9 @@ if test "x$enable_local_sound" = "xyes"; +@@ -203,7 +213,9 @@ if test "x$enable_local_sound" = "xyes"; echo "---------------------------------------------------------------------" echo "--- Checking to see which audio libraries are required for linking."; echo "--- Most of these checks should also fail. Do not be alarmed."; @@ -28,7 +28,7 @@ AC_CHECK_FUNC(ALnewconfig,,[AC_CHECK_LIB(audio,ALnewconfig)]) if test "x$enable_alsa" = "xyes"; then AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)]) -@@ -285,7 +297,8 @@ if test "x$with_libwrap" = "xyes"; then +@@ -290,7 +302,8 @@ if test "x$with_libwrap" = "xyes"; then wrap_ok=no AC_TRY_LINK( @@ -38,7 +38,7 @@ #include int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING;], -@@ -295,7 +308,8 @@ int deny_severity = LOG_WARNING;], +@@ -300,7 +313,8 @@ int deny_severity = LOG_WARNING;], wrap_ok=yes], [LIBS="$LIBS -lnsl" AC_TRY_LINK( diff --git a/audio/esound/patches/patch-esd.c b/audio/esound/patches/patch-esd.c index 7f204088c35..9f35122f128 100644 --- a/audio/esound/patches/patch-esd.c +++ b/audio/esound/patches/patch-esd.c @@ -1,6 +1,6 @@ ---- esd.c.orig Fri Jul 13 14:59:50 2001 -+++ esd.c Tue Mar 5 09:21:39 2002 -@@ -211,12 +211,12 @@ struct stat dir_stats; +--- esd.c.orig Mon Jun 17 05:33:23 2002 ++++ esd.c Fri Jul 19 18:08:06 2002 +@@ -221,12 +221,12 @@ struct stat dir_stats; #if defined(S_ISVTX) #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\ diff --git a/audio/esound/patches/patch-esd.h b/audio/esound/patches/patch-esd.h deleted file mode 100644 index 7cc71d46dd8..00000000000 --- a/audio/esound/patches/patch-esd.h +++ /dev/null @@ -1,19 +0,0 @@ ---- esd.h.orig Tue Oct 3 20:36:53 2000 -+++ esd.h Mon Mar 4 17:02:28 2002 -@@ -7,8 +7,16 @@ extern "C" { - #endif - - /* path and name of the default EsounD domain socket */ -+#if 0 - #define ESD_UNIX_SOCKET_DIR "/tmp/.esd" - #define ESD_UNIX_SOCKET_NAME ESD_UNIX_SOCKET_DIR "/socket" -+#else -+#define ESD_UNIX_SOCKET_DIR esd_unix_socket_dir() -+#define ESD_UNIX_SOCKET_NAME esd_unix_socket_name() -+ -+char *esd_unix_socket_dir(void); -+char *esd_unix_socket_name(void); -+#endif - - /* length of the audio buffer size */ - #define ESD_BUF_SIZE (4 * 1024) diff --git a/audio/esound/patches/patch-esdlib.c b/audio/esound/patches/patch-esdlib.c index 4a2b808c2cf..cfcc1b783bf 100644 --- a/audio/esound/patches/patch-esdlib.c +++ b/audio/esound/patches/patch-esdlib.c @@ -1,46 +1,11 @@ ---- esdlib.c.orig Fri Jul 13 14:59:51 2001 -+++ esdlib.c Tue Mar 5 09:21:39 2002 -@@ -20,6 +20,8 @@ - #include - #include - #include -+#include -+#include +--- esdlib.c.orig Wed Jun 19 09:45:14 2002 ++++ esdlib.c Fri Jul 19 18:26:44 2002 +@@ -660,7 +660,7 @@ int esd_open_sound( const char *host ) + setsid(); + cmd = malloc(sizeof("esd -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0)); - #include +- sprintf(cmd, "esd %s -spawnfd %d", 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]); -@@ -1411,4 +1413,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); - } + execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); + perror("execl"); diff --git a/audio/esound/patches/patch-ltconfig b/audio/esound/patches/patch-ltconfig deleted file mode 100644 index dec5be0d846..00000000000 --- a/audio/esound/patches/patch-ltconfig +++ /dev/null @@ -1,85 +0,0 @@ ---- ltconfig.orig Fri Apr 9 02:12:57 1999 -+++ ltconfig Thu Oct 11 09:39:00 2001 -@@ -484,7 +484,14 @@ fi - - if test -n "$RANLIB"; then - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -+ case "$host_os" in -+ openbsd*) -+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" -+ ;; -+ *) -+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" -+ ;; -+ esac - fi - - # Set sane defaults for `DLLTOOL' and `AS', used on cygwin. -@@ -1030,7 +1037,9 @@ cygwin* | mingw*) - freebsd2* | sunos4*) - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - ;; -- -+openbsd*) -+ with_gnu_ld=no -+ ;; - esac - - ld_shlibs=yes -@@ -1262,10 +1271,24 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ case "$host_os" in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' -+ ;; -+ esac -+ fi - ;; - - os2*) -@@ -1789,9 +1812,25 @@ netbsd*) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -+ need_lib_prefix=no -+ need_version=no -+ sys_lib_search_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ case "$host_os" in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ deplibs_check_method='file_magic OpenBSD.* shared library' -+ shlibpath_overrides_runpath=yes - fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' diff --git a/audio/esound/patches/patch-ltmain.sh b/audio/esound/patches/patch-ltmain.sh deleted file mode 100644 index 0afdd449761..00000000000 --- a/audio/esound/patches/patch-ltmain.sh +++ /dev/null @@ -1,89 +0,0 @@ ---- ltmain.sh.orig Fri Apr 9 02:12:58 1999 -+++ ltmain.sh Thu Oct 11 12:46:12 2001 -@@ -1010,9 +1010,35 @@ compiler." - ;; - - -l*) -+ if test "$arg" = "-lc"; then -+ case "$host" in -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ continue -+ ;; -+ esac -+ elif test "$arg" = "-lc_r"; then -+ case "$host" in -+ *-*-openbsd*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac -+ fi - deplibs="$deplibs $arg" - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - if test "$module" != yes; then - module=yes -@@ -1702,6 +1728,9 @@ compiler." - *-*-cygwin* | *-*-mingw* | *-*-os2*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -3326,40 +3355,6 @@ libdir='$install_libdir'\ - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/audio/esound/patches/patch-util_c b/audio/esound/patches/patch-util_c new file mode 100644 index 00000000000..bbab5842fc6 --- /dev/null +++ b/audio/esound/patches/patch-util_c @@ -0,0 +1,66 @@ +$OpenBSD: patch-util_c,v 1.1 2002/07/26 19:57:23 brad Exp $ +--- util.c.orig Fri May 17 16:09:32 2002 ++++ util.c Fri Jul 19 18:44:08 2002 +@@ -1,40 +1,38 @@ + #include "esd.h" ++#include ++#include ++#include + #include + #include + + const char* + esd_get_socket_dirname (void) + { +- char *audiodev; +- static char *dirname = NULL; ++ static char *sockdir = NULL, sockdirbuf[PATH_MAX]; ++ struct passwd *pw; + +- if (dirname == NULL) { +- if (!(audiodev = getenv("AUDIODEV"))) { +- audiodev = ""; +- } else { +- audiodev = strrchr(audiodev, '/'); +- audiodev++; +- } +- dirname = malloc(strlen(audiodev) + sizeof("/tmp/.esd")); +- strcpy(dirname, "/tmp/.esd"); +- strcat(dirname, audiodev); ++ 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); + } +- +- return dirname; ++ snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir); ++ endpwent(); ++ sockdir = sockdirbuf; ++ return (sockdir); + } + + const char* + esd_get_socket_name (void) + { +- const char *dirname; +- static char *name = NULL; +- +- if (name == NULL) { +- dirname = esd_get_socket_dirname(); +- name = malloc(strlen(dirname) + sizeof("/socket")); +- strcpy(name, dirname); +- strcat(name, "/socket"); +- } ++ static char *sockname = NULL, socknamebuf[PATH_MAX]; + +- return name; ++ if (sockname != NULL) ++ return (sockname); ++ snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket", ++ esd_get_socket_dirname()); ++ sockname = socknamebuf; ++ return (sockname); + } diff --git a/audio/esound/pkg/PFRAG.shared b/audio/esound/pkg/PFRAG.shared index 01316ee481a..c2f2738b70b 100644 --- a/audio/esound/pkg/PFRAG.shared +++ b/audio/esound/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2002/03/05 15:35:13 brad Exp $ -lib/libesd.so.2.24 +@comment $OpenBSD: PFRAG.shared,v 1.7 2002/07/26 19:57:23 brad Exp $ +lib/libesd.so.2.28 DYNLIBDIR(%B) diff --git a/audio/esound/pkg/PLIST b/audio/esound/pkg/PLIST index 21f4cd5fd33..61c36327d93 100644 --- a/audio/esound/pkg/PLIST +++ b/audio/esound/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2000/08/07 11:50:40 brad Exp $ +@comment $OpenBSD: PLIST,v 1.9 2002/07/26 19:57:23 brad Exp $ bin/esd bin/esd-config bin/esdcat @@ -13,6 +13,17 @@ include/esd.h lib/libesd.a lib/libesd.la %%SHARED%% +man/man1/esd-config.1 +man/man1/esd.1 +man/man1/esdcat.1 +man/man1/esdctl.1 +man/man1/esddsp.1 +man/man1/esdfilt.1 +man/man1/esdloop.1 +man/man1/esdmon.1 +man/man1/esdplay.1 +man/man1/esdrec.1 +man/man1/esdsample.1 share/aclocal/esd.m4 share/examples/esound/esd.conf-sample @dirrm share/examples/esound