Re: [GnomeMeeting-devel-list] [PATCH suggestion] remove esound dependency

[Damien Sandras <dsandras seconix com>]

Thanks, I will put this into my patches queue,

Le mercredi 13 avril 2005 à 13:56 +0200, Prakash Punnoor a écrit :
> Damien Sandras schrieb:
> > Le mercredi 13 avril 2005 à 10:12 +0200, Prakash Punnoor a écrit :
> >>Damien Sandras schrieb:
> 
> > Even without the patch you don't need to run the daemon, you just
> > need /usr/lib/libesound.so

> I know, I just don't want this at all. ;-)
> 
> > Anyway, I have kept your patch and I will apply it at a later stage.
> 
> Oh, I thought you wanted to clean up my patch. So I rather did it. I think no
> it is more readable what happens in configure.in.
> 
> There is one thing to take a look: I don't know whether purpose or typo, but
> the libxml dependency is w/o gnome 2.5.0 and w/ gnome 2.6.0. If that is wanted
> the patch needs to be modified. If not, be happy with this version :-) (Again:
> to be applied with -R)
> 
> --- configure.in	2005-04-13 13:29:24.338110424 +0200
> +++ configure.in~	2005-04-13 13:31:53.170484464 +0200
> @@ -75,28 +75,19 @@
>  dnl ###########################################################################
>  dnl PKG_CONFIG and required versions
>  dnl ###########################################################################
> -PKG_CHECK_MODULES(ESOUND, esound >= 0.2.28, esound228=yes, esound228=no)
> -if test "x${esound228}" = "xno"; then
> -AC_DEFINE(NO_ESOUND, 1, no esound found)
> -fi
> -
> -PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0
> libxml-2.0 >= 2.5.0)
> -
>  if test x"${disable_gnome}" = xyes; then
> +PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound
> >= 0.2.28 libxml-2.0 >= 2.5.0)
>  GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS -DDISABLE_GNOME"
>  else
> -PKG_CHECK_MODULES(GNOMEBASE, gconf-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0
> libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0)
> -
> +PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound
> >= 0.2.28 gconf-2.0 >= 2.2.0 libxml-2.0 >= 2.6.0 libgnome-2.0 >= 2.2.0
> libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0)
>  PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4,ebook12=yes,ebook12=no)
>  if test x"${ebook12}" = xno ; then
>  PKG_CHECK_MODULES(EDS, libebook-1.0 >= 0.0.94)
>  fi
> +GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $EDS_CFLAGS"
> +GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS $EDS_LIBS"
>  fi
> 
> -GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $ESOUND_CFLAGS $GNOMEBASE_CFLAGS
> $EDS_CFLAGS"
> -GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS  $ESOUND_LIBS $GNOMEBASE_LIBS $EDS_LIBS"
> -
> -
>  PWLIB_REC_VERSION="1.8.4"
>  OPENH323_REC_VERSION="1.15.3"
> 
> --- src/sound_handling.h	2005-04-12 13:52:26.834481088 +0200
> +++ src/sound_handling.h~	2004-09-10 11:44:23.000000000 +0200
> @@ -42,7 +42,7 @@
>  #include "common.h"
>  #include "endpoint.h"
> 
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>  #include <esd.h>
>  #endif
> 
> --- src/sound_handling.cpp	2005-04-12 13:08:29.801371056 +0200
> +++ src/sound_handling.cpp~	2005-03-06 14:11:32.000000000 +0100
> @@ -90,7 +90,7 @@
>  void
>  gnomemeeting_sound_daemons_suspend (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>    int esd_client = 0;
> 
>    /* Put ESD into standby mode */
> @@ -108,7 +108,7 @@
>  void
>  gnomemeeting_sound_daemons_resume (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>    int esd_client = 0;
> 
>    /* Put ESD into normal mode */
> @@ -126,7 +126,7 @@
>  void
>  gnomemeeting_mixers_mic_select (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>  #ifndef P_MACOSX
>    int rcsrc = 0;
>    int mixerfd = -1;
> 
> 
> pièce jointe plain text document (gm-noesound-2.diff)
> --- configure.in	2005-04-13 13:29:24.338110424 +0200
> +++ configure.in~	2005-04-13 13:31:53.170484464 +0200
> @@ -75,28 +75,19 @@
>  dnl ###########################################################################
>  dnl PKG_CONFIG and required versions
>  dnl ###########################################################################
> -PKG_CHECK_MODULES(ESOUND, esound >= 0.2.28, esound228=yes, esound228=no)
> -if test "x${esound228}" = "xno"; then
> -AC_DEFINE(NO_ESOUND, 1, no esound found)
> -fi
> -
> -PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 libxml-2.0 >= 2.5.0)
> -
>  if test x"${disable_gnome}" = xyes; then
> +PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 libxml-2.0 >= 2.5.0)
>  GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS -DDISABLE_GNOME"
>  else
> -PKG_CHECK_MODULES(GNOMEBASE, gconf-2.0 >= 2.2.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0)
> -
> +PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 gconf-2.0 >= 2.2.0 libxml-2.0 >= 2.6.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0)
>  PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4,ebook12=yes,ebook12=no)
>  if test x"${ebook12}" = xno ; then
>  PKG_CHECK_MODULES(EDS, libebook-1.0 >= 0.0.94)
>  fi
> +GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $EDS_CFLAGS"
> +GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS $EDS_LIBS"
>  fi
>  
> -GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $ESOUND_CFLAGS $GNOMEBASE_CFLAGS $EDS_CFLAGS"
> -GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS  $ESOUND_LIBS $GNOMEBASE_LIBS $EDS_LIBS"
> -
> -
>  PWLIB_REC_VERSION="1.8.4"
>  OPENH323_REC_VERSION="1.15.3"
>  
> --- src/sound_handling.h	2005-04-12 13:52:26.834481088 +0200
> +++ src/sound_handling.h~	2004-09-10 11:44:23.000000000 +0200
> @@ -42,7 +42,7 @@
>  #include "common.h"
>  #include "endpoint.h"
>  
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>  #include <esd.h>
>  #endif
>  
> --- src/sound_handling.cpp	2005-04-12 13:08:29.801371056 +0200
> +++ src/sound_handling.cpp~	2005-03-06 14:11:32.000000000 +0100
> @@ -90,7 +90,7 @@
>  void 
>  gnomemeeting_sound_daemons_suspend (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>    int esd_client = 0;
>    
>    /* Put ESD into standby mode */
> @@ -108,7 +108,7 @@
>  void 
>  gnomemeeting_sound_daemons_resume (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>    int esd_client = 0;
>  
>    /* Put ESD into normal mode */
> @@ -126,7 +126,7 @@
>  void 
>  gnomemeeting_mixers_mic_select (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>  #ifndef P_MACOSX
>    int rcsrc = 0;
>    int mixerfd = -1;                                                            
> _______________________________________________
> Gnomemeeting-devel-list mailing list
> Gnomemeeting-devel-list gnome org
> http://mail.gnome.org/mailman/listinfo/gnomemeeting-devel-list
-- 
 _      Damien Sandras
(o-     GnomeMeeting: http://www.gnomemeeting.org/
//\     FOSDEM 2005 : http://www.fosdem.org
v_/_    H.323 phone : callto:ils.seconix.com/dsandras seconix com