Hello community,
here is the log from the commit of package esound
checked in at Tue Jul 10 17:44:37 CEST 2007.
--------
--- GNOME/esound/esound.changes 2007-04-18 17:36:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/esound/esound.changes 2007-07-05 21:30:04.616033000 +0200
@@ -1,0 +2,7 @@
+Thu Jul 5 21:13:46 CEST 2007 - maw@suse.de
+
+- Update to version 0.2.38, which makes the following line
+ necessary:
+- Remove upstreamed esound-cpu-load.patch and abuild.patch.
+
+-------------------------------------------------------------------
Old:
----
abuild.patch
esound-0.2.37.tar.bz2
esound-cpu-load.patch
New:
----
esound-0.2.38.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ esound.spec ++++++
--- /var/tmp/diff_new_pack.Ba6344/_old 2007-07-10 17:44:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Ba6344/_new 2007-07-10 17:44:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package esound (Version 0.2.37)
+# spec file for package esound (Version 0.2.38)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,20 +12,18 @@
Name: esound
BuildRequires: alsa-devel audiofile-devel pkg-config tcpd-devel
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/Sound Daemons
Autoreqprov: on
Summary: A Sound Daemon for Enlightenment and GNOME
-Version: 0.2.37
-Release: 6
+Version: 0.2.38
+Release: 1
URL: ftp://ftp.gnome.org/pub/gnome/sources/esound/
Source: ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/%{name}-%{version}.tar.bz2
Source1: esound.init
Source2: sysconfig.esound
-Patch: esd-as.patch
+Patch0: esd-as.patch
Patch1: esound-biarch.patch
-Patch2: esound-cpu-load.patch
-Patch3: abuild.patch
# Suggest -32bit package for proper work of preloader for 32-bit apps.
%if %_lib != lib
%if %suse_version > 1000
@@ -84,10 +82,8 @@
%prep
%setup -q
-%patch
+%patch0
%patch1
-%patch2
-%patch3 -p1
%build
autoreconf -f -i
@@ -140,6 +136,10 @@
%doc %{_mandir}/man1/esd-config.*
%changelog
+* Thu Jul 05 2007 - maw@suse.de
+- Update to version 0.2.38, which makes the following line
+ necessary:
+- Remove upstreamed esound-cpu-load.patch and abuild.patch.
* Wed Apr 18 2007 - sbrabec@suse.cz
- Fixed 100%% CPU load (#264637, GNOME #412951, Joe Marcus Clarke).
- Removed upstreamed esound-close-fds.patch.
++++++ esound-0.2.37.tar.bz2 -> esound-0.2.38.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/aclocal.m4 new/esound-0.2.38/aclocal.m4
--- old/esound-0.2.37/aclocal.m4 2007-02-26 23:00:51.000000000 +0100
+++ new/esound-0.2.38/aclocal.m4 2007-05-03 22:47:51.000000000 +0200
@@ -1602,7 +1602,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/ChangeLog new/esound-0.2.38/ChangeLog
--- old/esound-0.2.37/ChangeLog 2007-02-26 22:59:23.000000000 +0100
+++ new/esound-0.2.38/ChangeLog 2007-05-03 22:42:50.000000000 +0200
@@ -1,3 +1,43 @@
+============================== 0.2.38 ===========================
+
+2007-05-03 Bastien Nocera
+
+ * configure.ac: Release 0.2.38
+ * NEWS: upd
+
+2007-04-28 David Schleef
+
+ * esd.c: chdir to /. Fixes #399500.
+
+2007-03-19 David Schleef
+
+ * players.c: the read/write wrapper macros don't have return
+ values. Fixes #419642.
+
+2007-03-02 David Schleef
+
+ * esddsp.c:
+ Fix leaking of file descriptors. Patch from Pierre Ossman.
+ Fixes bug #362826. (Also fix an important warning.)
+
+2007-03-02 David Schleef
+
+ * Makefile.am:
+ * configure.ac:
+ Fix detection for linking against libdl.
+ Patch from Loïc Minier. Fixes bug #409269.
+
+2007-03-01 Kjartan Maraas
+
+ * players.c: (read_player): Fix 100% CPU problem introduced
+ in 0.2.37. Patch from Joe Marcus Clarke. Closes bug #412951.
+
+2007-03-01 Kjartan Maraas
+
+ * docs/Makefile.am: Only install the esddsp man page if
+ we build the binary. Closes bug #412918. Patch from
+ Cygwin Ports Maintainer.
+
============================== 0.2.37 ===========================
2007-01-31 Kjartan Maraas
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/configure new/esound-0.2.38/configure
--- old/esound-0.2.37/configure 2007-02-26 23:00:54.000000000 +0100
+++ new/esound-0.2.38/configure 2007-05-03 22:47:56.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for esound 0.2.37.
+# Generated by GNU Autoconf 2.61 for esound 0.2.38.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
# Identity of this package.
PACKAGE_NAME='esound'
PACKAGE_TARNAME='esound'
-PACKAGE_VERSION='0.2.37'
-PACKAGE_STRING='esound 0.2.37'
+PACKAGE_VERSION='0.2.38'
+PACKAGE_STRING='esound 0.2.38'
PACKAGE_BUGREPORT=''
ac_unique_file="esd.h"
@@ -888,6 +888,8 @@
ALLOCA
NEED_GETOPT_TRUE
NEED_GETOPT_FALSE
+BUILD_ESDDSP_TRUE
+BUILD_ESDDSP_FALSE
ARTS_CONFIG
ARTS_CXXFLAGS
ARTS_LIBS
@@ -901,8 +903,6 @@
JW
HAVE_JW_TRUE
HAVE_JW_FALSE
-BUILD_ESDDSP_TRUE
-BUILD_ESDDSP_FALSE
WRAP_LIB
SOUND_LIBS
DL_LIB
@@ -1431,7 +1431,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures esound 0.2.37 to adapt to many kinds of systems.
+\`configure' configures esound 0.2.38 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1502,7 +1502,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of esound 0.2.37:";;
+ short | recursive ) echo "Configuration of esound 0.2.38:";;
esac
cat <<\_ACEOF
@@ -1622,7 +1622,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-esound configure 0.2.37
+esound configure 0.2.38
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1636,7 +1636,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by esound $as_me 0.2.37, which was
+It was created by esound $as_me 0.2.38, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1992,7 +1992,7 @@
ESD_MAJOR_VERSION=0
ESD_MINOR_VERSION=2
-ESD_MICRO_VERSION=37
+ESD_MICRO_VERSION=38
ESD_VERSION=$ESD_MAJOR_VERSION.$ESD_MINOR_VERSION.$ESD_MICRO_VERSION
ac_aux_dir=
@@ -2458,7 +2458,7 @@
# Define the identity of the package.
PACKAGE='esound'
- VERSION='0.2.37'
+ VERSION='0.2.38'
cat >>confdefs.h <<_ACEOF
@@ -9323,7 +9323,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^ *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -13266,7 +13266,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^ *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -15873,7 +15873,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^ *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -18487,7 +18487,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^ *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -22624,6 +22624,182 @@
fi
+dsp_ok=no DL_LIB=
+
+{ echo "$as_me:$LINENO: checking if your platform supports esddsp" >&5
+echo $ECHO_N "checking if your platform supports esddsp... $ECHO_C" >&6; }
+case "$host_os" in
+ linux* | freebsd* | kfreebsd*-gnu | bsdi4* )
+ dsp_ok=yes
+ ;;
+esac
+{ echo "$as_me:$LINENO: result: $dsp_ok" >&5
+echo "${ECHO_T}$dsp_ok" >&6; }
+
+if test "x$dsp_ok" = xyes; then
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+if test "${ac_cv_func_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define dlopen to an innocuous variant, in case declares dlopen.
+ For example, HP-UX 11i declares gettimeofday. */
+#define dlopen innocuous_dlopen
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dlopen (); below.
+ Prefer to if __STDC__ is defined, since
+ exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+
+#undef dlopen
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_dlopen || defined __stub___dlopen
+choke me
+#endif
+
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_dlopen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+if test $ac_cv_func_dlopen = yes; then
+ DL_LIB=
+else
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dl_dlopen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+if test $ac_cv_lib_dl_dlopen = yes; then
+ DL_LIB=-ldl
+fi
+
+fi
+
+ ESDDSP=esddsp
+ LIBESDDSP=libesddsp.la
+fi
+ if test "x$dsp_ok" = xyes; then
+ BUILD_ESDDSP_TRUE=
+ BUILD_ESDDSP_FALSE='#'
+else
+ BUILD_ESDDSP_TRUE='#'
+ BUILD_ESDDSP_FALSE=
+fi
+
+
if test "x$enable_local_sound" = "xyes"; then
found_sound=no
@@ -25116,182 +25292,6 @@
LIBS="$esound_save_LIBS"
fi
-dsp_ok=no DL_LIB=
-
-{ echo "$as_me:$LINENO: checking if your platform supports esddsp" >&5
-echo $ECHO_N "checking if your platform supports esddsp... $ECHO_C" >&6; }
-case "$host_os" in
- linux* | freebsd* | kfreebsd*-gnu | bsdi4* )
- dsp_ok=yes
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $dsp_ok" >&5
-echo "${ECHO_T}$dsp_ok" >&6; }
-
-if test "x$dsp_ok" = xyes; then
- { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case declares dlopen.
- For example, HP-UX 11i declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer to if __STDC__ is defined, since
- exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include
-#else
-# include
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
- dsp_ok=yes
-else
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- dsp_ok=yes DL_LIB=-ldl
-fi
-
-fi
-
- ESDDSP=esddsp
- LIBESDDSP=libesddsp.la
-fi
- if test "x$dsp_ok" = xyes; then
- BUILD_ESDDSP_TRUE=
- BUILD_ESDDSP_FALSE='#'
-else
- BUILD_ESDDSP_TRUE='#'
- BUILD_ESDDSP_FALSE=
-fi
-
-
{ echo "$as_me:$LINENO: checking to see if compiler understands -Wall" >&5
echo $ECHO_N "checking to see if compiler understands -Wall... $ECHO_C" >&6; }
@@ -25496,6 +25496,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BUILD_ESDDSP_TRUE}" && test -z "${BUILD_ESDDSP_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_ESDDSP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_ESDDSP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${BUILD_ESDPLAY_TRUE}" && test -z "${BUILD_ESDPLAY_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_ESDPLAY\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -25510,13 +25517,6 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${BUILD_ESDDSP_TRUE}" && test -z "${BUILD_ESDDSP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"BUILD_ESDDSP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_ESDDSP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -25817,7 +25817,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by esound $as_me 0.2.37, which was
+This file was extended by esound $as_me 0.2.38, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25870,7 +25870,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-esound config.status 0.2.37
+esound config.status 0.2.38
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -26227,6 +26227,8 @@
ALLOCA!$ALLOCA$ac_delim
NEED_GETOPT_TRUE!$NEED_GETOPT_TRUE$ac_delim
NEED_GETOPT_FALSE!$NEED_GETOPT_FALSE$ac_delim
+BUILD_ESDDSP_TRUE!$BUILD_ESDDSP_TRUE$ac_delim
+BUILD_ESDDSP_FALSE!$BUILD_ESDDSP_FALSE$ac_delim
ARTS_CONFIG!$ARTS_CONFIG$ac_delim
ARTS_CXXFLAGS!$ARTS_CXXFLAGS$ac_delim
ARTS_LIBS!$ARTS_LIBS$ac_delim
@@ -26240,8 +26242,6 @@
JW!$JW$ac_delim
HAVE_JW_TRUE!$HAVE_JW_TRUE$ac_delim
HAVE_JW_FALSE!$HAVE_JW_FALSE$ac_delim
-BUILD_ESDDSP_TRUE!$BUILD_ESDDSP_TRUE$ac_delim
-BUILD_ESDDSP_FALSE!$BUILD_ESDDSP_FALSE$ac_delim
WRAP_LIB!$WRAP_LIB$ac_delim
SOUND_LIBS!$SOUND_LIBS$ac_delim
DL_LIB!$DL_LIB$ac_delim
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/configure.ac new/esound-0.2.38/configure.ac
--- old/esound-0.2.37/configure.ac 2007-02-26 22:59:11.000000000 +0100
+++ new/esound-0.2.38/configure.ac 2007-05-03 22:47:30.000000000 +0200
@@ -1,9 +1,9 @@
AC_PREREQ([2.58])
-AC_INIT(esound, 0.2.37)
+AC_INIT(esound, 0.2.38)
ESD_MAJOR_VERSION=0
ESD_MINOR_VERSION=2
-ESD_MICRO_VERSION=37
+ESD_MICRO_VERSION=38
ESD_VERSION=$ESD_MAJOR_VERSION.$ESD_MINOR_VERSION.$ESD_MICRO_VERSION
AC_CANONICAL_TARGET([])
@@ -176,6 +176,26 @@
[enable_arts=${enableval}],
[enable_arts=no])
+dnl build the esddsp wrapper for systems,
+dnl that support LD_PRELOAD and RTLD_NEXT only
+dsp_ok=no DL_LIB=
+
+AC_MSG_CHECKING([if your platform supports esddsp])
+case "$host_os" in
+ linux* | freebsd* | kfreebsd*-gnu | bsdi4* )
+ dsp_ok=yes
+ ;;
+esac
+AC_MSG_RESULT($dsp_ok)
+
+if test "x$dsp_ok" = xyes; then
+ AC_CHECK_FUNC(dlopen, DL_LIB=,
+ AC_CHECK_LIB(dl, dlopen, DL_LIB=-ldl))
+ ESDDSP=esddsp
+ LIBESDDSP=libesddsp.la
+fi
+AM_CONDITIONAL(BUILD_ESDDSP, test "x$dsp_ok" = xyes)
+
if test "x$enable_local_sound" = "xyes"; then
found_sound=no
@@ -398,26 +418,6 @@
LIBS="$esound_save_LIBS"
fi
-dnl build the esddsp wrapper for systems,
-dnl that support LD_PRELOAD and RTLD_NEXT only
-dsp_ok=no DL_LIB=
-
-AC_MSG_CHECKING([if your platform supports esddsp])
-case "$host_os" in
- linux* | freebsd* | kfreebsd*-gnu | bsdi4* )
- dsp_ok=yes
- ;;
-esac
-AC_MSG_RESULT($dsp_ok)
-
-if test "x$dsp_ok" = xyes; then
- AC_CHECK_FUNC(dlopen, dsp_ok=yes,
- AC_CHECK_LIB(dl, dlopen, dsp_ok=yes DL_LIB=-ldl))
- ESDDSP=esddsp
- LIBESDDSP=libesddsp.la
-fi
-AM_CONDITIONAL(BUILD_ESDDSP, test "x$dsp_ok" = xyes)
-
AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
# set | sort; # just for double checking the script...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/docs/Makefile.am new/esound-0.2.38/docs/Makefile.am
--- old/esound-0.2.37/docs/Makefile.am 2007-01-02 00:56:06.000000000 +0100
+++ new/esound-0.2.38/docs/Makefile.am 2007-04-19 16:43:58.000000000 +0200
@@ -1,5 +1,9 @@
+if BUILD_ESDDSP
+ESDDSP_MAN = esddsp.1
+endif
+
man_MANS = \
- esd.1 esdcat.1 esd-config.1 esdctl.1 esddsp.1 \
+ esd.1 esdcat.1 esd-config.1 esdctl.1 $(ESDDSP_MAN) \
esdfilt.1 esdloop.1 esdmon.1 esdplay.1 esdrec.1 esdsample.1
EXTRA_DIST = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/docs/Makefile.in new/esound-0.2.38/docs/Makefile.in
--- old/esound-0.2.37/docs/Makefile.in 2007-02-26 23:00:56.000000000 +0100
+++ new/esound-0.2.38/docs/Makefile.in 2007-05-03 22:47:54.000000000 +0200
@@ -194,8 +194,9 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+@BUILD_ESDDSP_TRUE@ESDDSP_MAN = esddsp.1
man_MANS = \
- esd.1 esdcat.1 esd-config.1 esdctl.1 esddsp.1 \
+ esd.1 esdcat.1 esd-config.1 esdctl.1 $(ESDDSP_MAN) \
esdfilt.1 esdloop.1 esdmon.1 esdplay.1 esdrec.1 esdsample.1
EXTRA_DIST = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/esd.c new/esound-0.2.38/esd.c
--- old/esound-0.2.37/esd.c 2007-01-02 00:56:06.000000000 +0100
+++ new/esound-0.2.38/esd.c 2007-05-03 22:28:35.000000000 +0200
@@ -823,6 +823,9 @@
}
}
+ /* cd to / */
+ chdir ("/");
+
/* close all open file descriptors */
max_fds = getdtablesize();
for(i=0;i)
+
+===============
Version 0.2.37
===============
* Fix null derefs and leaks reported by Covertiy (kjartan)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/esound-0.2.37/players.c new/esound-0.2.38/players.c
--- old/esound-0.2.37/players.c 2007-01-02 00:56:06.000000000 +0100
+++ new/esound-0.2.38/players.c 2007-04-19 16:43:59.000000000 +0200
@@ -303,20 +303,20 @@
&rd_fds, NULL, NULL, &timeout ) ;
if ( can_read > 0 )
{
- int bytes_read;
player->actual_length = 0;
do {
- bytes_read = ESD_READ_BIN( player->source_id,
+ ESD_READ_BIN( player->source_id,
player->data_buffer + player->actual_length,
player->buffer_length - player->actual_length,
actual, "str rd" );
- if (bytes_read < player->buffer_length - player->actual_length)
- break;
-
/* check for end of stream */
if ( actual == 0
|| ( actual < 0 && errno != EAGAIN && errno != EINTR ) )
return -1;
+
+ if (actual < player->buffer_length - player->actual_length)
+ break;
+
/* more data, save how much we got */
if ( actual > 0 )
player->actual_length += actual;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org